handle login success packet asynchronously, closes #72

Mumfrey
1 parent 2a83f2dc
Showing 3 changed files with 32 additions and 6 deletions
java/client/com/mumfrey/liteloader/PostLoginListener.java
java/common/com/mumfrey/liteloader/core/LiteLoader.java
java/common/com/mumfrey/liteloader/core/PacketEvents.java
@@ -9,5 +9,12 @@ import net.minecraft.network.login.server.S02PacketLoginSuccess;
  */
 public interface PostLoginListener extends LiteMod
 {
+	/**
+	 * Called immediately after login, before the player has properly joined the game. Note that this event is raised
+	 * <b>in the network thread</b> and is not marshalled to the main thread as other packet-generated events are.
+	 * 
+	 * @param netHandler
+	 * @param packet
+	 */
 	public abstract void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess packet);
 }
@@ -44,6 +44,7 @@ import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
 import com.mumfrey.liteloader.interfaces.ObjectFactory;
 import com.mumfrey.liteloader.interfaces.PanelManager;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
+import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.messaging.MessageBus;
 import com.mumfrey.liteloader.modconfig.ConfigManager;
@@ -486,6 +487,14 @@ public final class LiteLoader
 	}
 	/**
+	 * Get the type of environment (client or dedicated server)
+	 */
+	public static EnvironmentType getEnvironmentType()
+	{
+		return LiteLoader.instance.environment.getType();
+	}
+	
+	/**
 	 * Used to get the name of the modpack being used
 	 * 
 	 * @return name of the modpack in use or null if no pack
@@ -126,6 +126,7 @@ public abstract class PacketEvents implements InterfaceProvider
 		IThreadListener threadListener = this.getPacketContextListener(packetInfo.getContext());
 		if (threadListener != null && !threadListener.isCallingFromMinecraftThread())
 		{
+			this.handleAsyncPacketEvent(e, netHandler, packetId);
 			return;
 		}
@@ -146,24 +147,33 @@ public abstract class PacketEvents implements InterfaceProvider
 	 * @param context
 	 */
 	protected abstract IThreadListener getPacketContextListener(Packets.Context context);
-
+	
 	/**
 	 * @param e
 	 * @param netHandler
 	 * @param packetId
-	 * 
-	 * @return true if the packet was handled by a local handler and shouldn't be forwarded to later handlers
 	 */
-	protected boolean handlePacketEvent(PacketEventInfo<Packet> e, INetHandler netHandler, int packetId)
+	protected void handleAsyncPacketEvent(PacketEventInfo<Packet> e, INetHandler netHandler, int packetId)
 	{
 		Packet packet = e.getSource();
 		if (packetId == this.loginSuccessPacketId)
 		{
 			this.handlePacket(e, netHandler, (S02PacketLoginSuccess)packet);
-			return true;
 		}
-		
+	}
+
+	/**
+	 * @param e
+	 * @param netHandler
+	 * @param packetId
+	 * 
+	 * @return true if the packet was handled by a local handler and shouldn't be forwarded to later handlers
+	 */
+	protected boolean handlePacketEvent(PacketEventInfo<Packet> e, INetHandler netHandler, int packetId)
+	{
+		Packet packet = e.getSource();
+
 		if (packetId == this.serverChatPacketId)
 		{
 			this.handlePacket(e, netHandler, (S02PacketChat)packet);