LiteLoader 1.6.4_02 - dev only - merge NPE fix from 1.7 branch

Mumfrey
1 parent 70ad9fc2
Showing 5 changed files with 12 additions and 124 deletions
java/com/mumfrey/liteloader/core/Events.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/PluginChannels.java
java/com/mumfrey/liteloader/core/hooks/asm/ASMHookProxy.java
java/com/mumfrey/liteloader/core/hooks/asm/PacketTransformer.java
@@ -9,14 +9,7 @@ import net.minecraft.src.*;
 import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.Tickable;
-import com.mumfrey.liteloader.core.hooks.HookChat;
-import com.mumfrey.liteloader.core.hooks.HookLogin;
 import com.mumfrey.liteloader.core.hooks.HookProfiler;
-import com.mumfrey.liteloader.core.hooks.asm.ASMHookProxy;
-import com.mumfrey.liteloader.core.hooks.asm.ChatPacketTransformer;
-import com.mumfrey.liteloader.core.hooks.asm.LoginPacketTransformer;
-import com.mumfrey.liteloader.core.hooks.asm.PacketTransformer;
-import com.mumfrey.liteloader.util.ModUtilities;
 import com.mumfrey.liteloader.util.PrivateFields;
 /**
@@ -41,11 +34,6 @@ public class Events implements IPlayerUsage
 	private final PluginChannels pluginChannels;
 	/**
-	 * ASM hook proxy 
-	 */
-	private final ASMHookProxy asmProxy;
-	
-	/**
 	 * Reference to the minecraft timer
 	 */
 	private Timer minecraftTimer;
@@ -53,7 +41,7 @@ public class Events implements IPlayerUsage
 	/**
 	 * Flags which keep track of whether hooks have been applied
 	 */
-	private boolean hookInitDone, lateInitDone, chatHooked, loginHooked, tickHooked;
+	private boolean hookInitDone, lateInitDone, tickHooked;
 	/**
 	 * Profiler hook objects
@@ -153,12 +141,11 @@ public class Events implements IPlayerUsage
 	 * @param minecraft
 	 * @param pluginChannels
 	 */
-	Events(LiteLoader loader, Minecraft minecraft, PluginChannels pluginChannels, ASMHookProxy asmProxy)
+	Events(LiteLoader loader, Minecraft minecraft, PluginChannels pluginChannels)
 	{
 		this.loader = loader;
 		this.minecraft = minecraft;
 		this.pluginChannels = pluginChannels;
-		this.asmProxy = asmProxy;
 	}
 	/**
@@ -245,40 +232,6 @@ public class Events implements IPlayerUsage
 		{
 			LiteLoader.getLogger().info("Event manager is registering hooks");
-			// Chat hook
-			if ((this.chatListeners.size() > 0 || this.chatFilters.size() > 0) && !this.chatHooked)
-			{
-				this.chatHooked = true;
-				
-				if (ChatPacketTransformer.isInjected())
-				{
-					PacketTransformer.registerProxy(Packet3Chat.class, this.asmProxy);
-				}
-				else
-				{
-					LiteLoader.getLogger().info("Callback injection failed for chat packet, injecting reflection hook");
-					HookChat.register();
-					HookChat.registerPacketHandler(this);
-				}
-			}
-			
-			// Login hook
-			if ((this.preLoginListeners.size() > 0 || this.loginListeners.size() > 0) && !this.loginHooked)
-			{
-				this.loginHooked = true;
-				
-				if (LoginPacketTransformer.isInjected())
-				{
-					PacketTransformer.registerProxy(Packet1Login.class, this.asmProxy);
-				}
-				else
-				{
-					LiteLoader.getLogger().info("Callback injection failed for login packet, injecting reflection hook");
-					ModUtilities.registerPacketOverride(1, HookLogin.class);
-					HookLogin.events = this;
-				}
-			}
-
 			// Tick hook
 			if (!this.tickHooked)
 			{
@@ -289,8 +242,6 @@ public class Events implements IPlayerUsage
 			// Sanity hook
 			PlayerUsageSnooper snooper = this.minecraft.getPlayerUsageSnooper();
 			PrivateFields.playerStatsCollector.setFinal(snooper, this);
-
-			this.pluginChannels.initHook();
 		}
 		catch (Exception ex)
 		{
@@ -35,7 +35,6 @@ import net.minecraft.src.SimpleReloadableResourceManager;
 import net.minecraft.src.World;
 import com.mumfrey.liteloader.*;
-import com.mumfrey.liteloader.core.hooks.asm.ASMHookProxy;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
 import com.mumfrey.liteloader.gui.GuiControlsPaginated;
@@ -151,11 +150,6 @@ public final class LiteLoader
 	private final LinkedList<ModFile> disabledMods = new LinkedList<ModFile>();
 	/**
-	 * ASM hook proxy
-	 */
-	private final ASMHookProxy asmProxy = new ASMHookProxy();
-	
-	/**
 	 * Event manager
 	 */
 	private Events events;
@@ -163,7 +157,7 @@ public final class LiteLoader
 	/**
 	 * Plugin channel manager 
 	 */
-	private final PluginChannels pluginChannels = new PluginChannels(this.asmProxy);
+	private final PluginChannels pluginChannels = new PluginChannels();
 	/**
 	 * Permission Manager
@@ -357,7 +351,7 @@ public final class LiteLoader
 		this.minecraft = minecraft;
 		// Create the event broker
-		this.events = new Events(this, this.minecraft, this.pluginChannels, this.asmProxy);
+		this.events = new Events(this, this.minecraft, this.pluginChannels);
 		// Spawn mod instances
 		this.loadMods();
@@ -11,10 +11,6 @@ import net.minecraft.src.Packet1Login;
 import net.minecraft.src.Packet250CustomPayload;
 import com.mumfrey.liteloader.PluginChannelListener;
-import com.mumfrey.liteloader.core.hooks.HookPluginChannels;
-import com.mumfrey.liteloader.core.hooks.asm.ASMHookProxy;
-import com.mumfrey.liteloader.core.hooks.asm.CustomPayloadPacketTransformer;
-import com.mumfrey.liteloader.core.hooks.asm.PacketTransformer;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 /**
@@ -29,11 +25,6 @@ public class PluginChannels
 	private static final String CHANNEL_UNREGISTER = "UNREGISTER";
 	/**
-	 * True if we have initialised the hook
-	 */
-	private boolean hookInitDone;
-	
-	/**
 	 * Mapping of plugin channel names to listeners
 	 */
 	private HashMap<String, LinkedList<PluginChannelListener>> pluginChannels = new HashMap<String, LinkedList<PluginChannelListener>>();
@@ -43,40 +34,13 @@ public class PluginChannels
 	 */
 	private LinkedList<PluginChannelListener> pluginChannelListeners = new LinkedList<PluginChannelListener>();
-	private ASMHookProxy asmProxy;
-
 	/**
 	 * Package private
 	 */
-	PluginChannels(ASMHookProxy proxy)
-	{
-		this.asmProxy = proxy;
-	}
-
-	/**
-	 * 
-	 */
-	public void initHook()
+	PluginChannels()
 	{
-		// Plugin channels hook
-		if (this.pluginChannelListeners.size() > 0 && !this.hookInitDone)
-		{
-			if (CustomPayloadPacketTransformer.isInjected())
-			{
-				PacketTransformer.registerProxy(Packet250CustomPayload.class, this.asmProxy);
-			}
-			else
-			{
-				LiteLoader.getLogger().info("Callback injection failed for custom payload packet, injecting reflection hook");
-				HookPluginChannels.register();
-				HookPluginChannels.registerPacketHandler(this);
-			}
-			
-			this.hookInitDone = true;
-		}
 	}
-	
 	/**
 	 * @param pluginChannelListener
 	 */
@@ -85,8 +49,6 @@ public class PluginChannels
 		if (!this.pluginChannelListeners.contains(pluginChannelListener))
 		{
 			this.pluginChannelListeners.add(pluginChannelListener);
-			if (this.hookInitDone)
-				this.initHook();
 		}
 	}
@@ -16,15 +16,17 @@ import net.minecraft.src.Packet3Chat;
  * 
  * @author Adam Mummery-Smith
  */
-public class ASMHookProxy
+public abstract class ASMHookProxy
 {
+	private ASMHookProxy() {}
+	
 	/**
 	 * Packet3Chat::processPacket()
 	 * 
 	 * @param netHandler
 	 * @param packet
 	 */
-	public void handleChatPacket(NetHandler netHandler, Packet3Chat packet)
+	public static void handleChatPacket(NetHandler netHandler, Packet3Chat packet)
 	{
 		Events events = LiteLoader.getEvents();
 		if (events.onChat(packet))
@@ -39,7 +41,7 @@ public class ASMHookProxy
 	 * @param netHandler
 	 * @param packet
 	 */
-	public void handleLoginPacket(NetHandler netHandler, Packet1Login packet)
+	public static void handleLoginPacket(NetHandler netHandler, Packet1Login packet)
 	{
 		Events events = LiteLoader.getEvents();
 		if (events.onPreLogin(netHandler, packet))
@@ -55,7 +57,7 @@ public class ASMHookProxy
 	 * @param netHandler
 	 * @param packet
 	 */
-	public void handleCustomPayloadPacket(NetHandler netHandler, Packet250CustomPayload packet)
+	public static void handleCustomPayloadPacket(NetHandler netHandler, Packet250CustomPayload packet)
 	{
 		netHandler.handleCustomPayload(packet);
 package com.mumfrey.liteloader.core.hooks.asm;
-import java.lang.reflect.Field;
 import java.util.List;
 import org.objectweb.asm.ClassReader;
@@ -146,7 +145,7 @@ public abstract class PacketTransformer implements IClassTransformer
 		method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
 		// Invoke the handler function with the args we just pushed onto the stack
-		method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "com/mumfrey/liteloader/core/hooks/asm/ASMHookProxy", this.handlerMethodName, targetMethodSig));
+		method.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/hooks/asm/ASMHookProxy", this.handlerMethodName, targetMethodSig));
 		// Return
 		method.instructions.add(new InsnNode(Opcodes.RETURN));
@@ -175,24 +174,4 @@ public abstract class PacketTransformer implements IClassTransformer
 		return null;
 	}
-	
-	/**
-	 * Register the proxy (handler) for a packet
-	 * 
-	 * @param packetClass
-	 * @param proxy
-	 */
-	public static void registerProxy(Class<?> packetClass, ASMHookProxy proxy)
-	{
-		try
-		{
-			Field fProxy = packetClass.getDeclaredField("proxy");
-			fProxy.setAccessible(true);
-			fProxy.set(null, proxy);
-		}
-		catch (Exception ex)
-		{
-			ex.printStackTrace();
-		}
-	}
 }
 \ No newline at end of file