moving PrivateFields to common and adding PrivateFieldsClient for client side

Mumfrey
1 parent 171e491f
Showing 7 changed files with 153 additions and 86 deletions
debug/obfuscation.properties
java/client/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
java/client/com/mumfrey/liteloader/client/SoundHandlerReloadInhibitor.java
java/client/com/mumfrey/liteloader/client/util/PrivateFieldsClient.java
java/client/com/mumfrey/liteloader/util/ModUtilities.java
java/common/com/mumfrey/liteloader/core/runtime/Obf.java
java/client/com/mumfrey/liteloader/client/util/PrivateFields.java → java/common/com/mumfrey/liteloader/util/PrivateFields.java
@@ -18,6 +18,7 @@ field_71477_af=serverPort
 field_147712_ad=shaderResourceLocations
 field_147713_ae=shaderIndex
 field_175083_ad=useShader
+field_149528_b=view
 func_148833_a=processPacket
 func_71411_J=runGameLoop
 func_71407_l=runTick
@@ -52,4 +53,11 @@ func_71370_a=resize
 func_175069_a=loadShader
 func_78481_a=getFOVModifier
 func_78479_a=setupCameraTransform
-func_147693_a=loadSoundResource
 \ No newline at end of file
+func_147693_a=loadSoundResource
+func_180784_a=onBlockClicked
+func_180236_a=activateBlockOrUseItem
+func_147346_a=processPlayerBlockPlacement
+func_175087_a=handleAnimation
+func_147345_a=processPlayerDigging
+func_71190_q=updateTimeLightAndEntities
+func_180031_a=checkThreadAndEnqueue
 \ No newline at end of file
@@ -12,7 +12,7 @@ import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraft.network.play.server.S01PacketJoinGame;
 import net.minecraft.network.play.server.S3FPacketCustomPayload;
-import com.mumfrey.liteloader.client.util.PrivateFields;
+import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
 import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
@@ -67,7 +67,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
 	{
 		if (netHandler instanceof INetHandlerLoginClient)
 		{
-			NetworkManager networkManager = PrivateFields.netManager.get(((NetHandlerLoginClient)netHandler));
+			NetworkManager networkManager = PrivateFieldsClient.netManager.get(((NetHandlerLoginClient)netHandler));
 			networkManager.sendPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
 		}
 		else if (netHandler instanceof INetHandlerPlayClient)
@@ -6,7 +6,7 @@ import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
-import com.mumfrey.liteloader.client.util.PrivateFields;
+import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -53,7 +53,7 @@ public class SoundHandlerReloadInhibitor
 		{
 			if (!this.inhibited)
 			{
-				List<IResourceManagerReloadListener> reloadListeners = PrivateFields.reloadListeners.get(this.resourceManager);
+				List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
 				if (reloadListeners != null)
 				{
 					this.storedIndex = reloadListeners.indexOf(this.soundHandler);
@@ -87,7 +87,7 @@ public class SoundHandlerReloadInhibitor
 		{
 			if (this.inhibited)
 			{
-				List<IResourceManagerReloadListener> reloadListeners = PrivateFields.reloadListeners.get(this.resourceManager);
+				List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
 				if (reloadListeners != null)
 				{
 					if (this.storedIndex > -1)
+package com.mumfrey.liteloader.client.util;
+
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ObjectIntIdentityMap;
+import net.minecraft.util.RegistryNamespaced;
+import net.minecraft.util.RegistrySimple;
+
+import com.mumfrey.liteloader.core.runtime.Obf;
+import com.mumfrey.liteloader.util.PrivateFields;
+
+@SuppressWarnings("rawtypes")
+public class PrivateFieldsClient<P, T> extends PrivateFields<P, T>
+{
+	private PrivateFieldsClient(Class<P> owner, Obf obf)
+	{
+		super(owner, obf);
+	}
+	
+	public static final PrivateFieldsClient<RenderManager, Map>                            entityRenderMap = new PrivateFieldsClient<RenderManager, Map>                      (RenderManager.class,                Obf.entityRenderMap);
+	public static final PrivateFieldsClient<NetHandlerLoginClient, NetworkManager>              netManager = new PrivateFieldsClient<NetHandlerLoginClient, NetworkManager>   (NetHandlerLoginClient.class,        Obf.networkManager);
+	public static final PrivateFieldsClient<RegistrySimple, Map>                           registryObjects = new PrivateFieldsClient<RegistrySimple, Map>                     (RegistrySimple.class,               Obf.registryObjects);                     
+	public static final PrivateFieldsClient<RegistryNamespaced, ObjectIntIdentityMap> underlyingIntegerMap = new PrivateFieldsClient<RegistryNamespaced, ObjectIntIdentityMap>(RegistryNamespaced.class,           Obf.underlyingIntegerMap);                     
+	public static final PrivateFieldsClient<ObjectIntIdentityMap, IdentityHashMap>             identityMap = new PrivateFieldsClient<ObjectIntIdentityMap, IdentityHashMap>   (ObjectIntIdentityMap.class,         Obf.identityMap);                     
+	public static final PrivateFieldsClient<ObjectIntIdentityMap, List>                         objectList = new PrivateFieldsClient<ObjectIntIdentityMap, List>              (ObjectIntIdentityMap.class,         Obf.objectList);                     
+	public static final PrivateFieldsClient<TileEntityRendererDispatcher, Map>          specialRendererMap = new PrivateFieldsClient<TileEntityRendererDispatcher, Map>       (TileEntityRendererDispatcher.class, Obf.mapSpecialRenderers);
+	public static final PrivateFieldsClient<TileEntity, Map>                      tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityNameToClassMap);
+	public static final PrivateFieldsClient<TileEntity, Map>                      tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityClassToNameMap);
+	
+	public static final PrivateFieldsClient<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>> reloadListeners =
+			new PrivateFieldsClient<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>>(SimpleReloadableResourceManager.class, Obf.reloadListeners);
+}
 \ No newline at end of file
@@ -6,13 +6,8 @@ import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.DisplayMode;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
@@ -21,16 +16,18 @@ import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
-import net.minecraft.launchwrapper.IClassTransformer;
-import net.minecraft.launchwrapper.Launch;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ObjectIntIdentityMap;
 import net.minecraft.util.RegistryNamespaced;
 import net.minecraft.util.RegistrySimple;
 import net.minecraft.util.ResourceLocation;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
-import com.mumfrey.liteloader.client.util.PrivateFields;
+import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -42,41 +39,11 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 public abstract class ModUtilities
 {
 	/**
-	 * True if FML is being used, in which case we use searge names instead of raw field/method names
-	 */
-	private static boolean fmlDetected = false;
-	
-	private static boolean seargeNames = false;
-	
-	static
-	{
-		// Check for FML
-		ModUtilities.fmlDetected = ModUtilities.fmlIsPresent();
-
-		try
-		{
-			Minecraft.class.getDeclaredField("running");
-		}
-		catch (SecurityException ex)
-		{
-		}
-		catch (NoSuchFieldException ex)
-		{
-			ModUtilities.seargeNames = true;
-		}
-	}
-
-	/**
 	 * @return true if FML is present in the current environment
 	 */
 	public static boolean fmlIsPresent()
 	{
-//		if (ClientBrandRetriever.getClientModName().contains("fml")) return true;
-
-		for (IClassTransformer transformer : Launch.classLoader.getTransformers())
-			if (transformer.getClass().getName().contains("fml")) return true;
-
-		return false;
+		return Obf.fmlIsPresent();
 	}
     public static void setWindowSize(int width, int height)
@@ -105,7 +72,7 @@ public abstract class ModUtilities
 	{
 		RenderManager renderManager = Minecraft.getMinecraft().getRenderManager();
-		Map<Class<? extends Entity>, Render> entityRenderMap = PrivateFields.entityRenderMap.get(renderManager);
+		Map<Class<? extends Entity>, Render> entityRenderMap = PrivateFieldsClient.entityRenderMap.get(renderManager);
 		if (entityRenderMap != null)
 		{
 			entityRenderMap.put(entityClass, renderer);
@@ -123,7 +90,7 @@ public abstract class ModUtilities
         try
         {
-        	Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> specialRendererMap = PrivateFields.specialRendererMap.get(tileEntityRenderer);
+        	Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> specialRendererMap = PrivateFieldsClient.specialRendererMap.get(tileEntityRenderer);
 			specialRendererMap.put(tileEntityClass, renderer);
 			renderer.setRendererDispatcher(tileEntityRenderer);
 		}
@@ -228,8 +195,8 @@ public abstract class ModUtilities
 	{
         try
 		{
-			Map<String, Class<? extends TileEntity>> nameToClassMap = PrivateFields.tileEntityNameToClassMap.get(null);
-			Map<Class<? extends TileEntity>, String> classToNameMap = PrivateFields.tileEntityClassToNameMap.get(null);
+			Map<String, Class<? extends TileEntity>> nameToClassMap = PrivateFieldsClient.tileEntityNameToClassMap.get(null);
+			Map<Class<? extends TileEntity>, String> classToNameMap = PrivateFieldsClient.tileEntityClassToNameMap.get(null);
 			nameToClassMap.put(entityName, tileEntityClass);
 			classToNameMap.put(tileEntityClass, entityName);
@@ -248,8 +215,7 @@ public abstract class ModUtilities
 	 */
 	public static String getObfuscatedFieldName(String fieldName, String obfuscatedFieldName, String seargeFieldName)
 	{
-		boolean deobfuscated = Tessellator.class.getSimpleName().equals("Tessellator");
-		return deobfuscated ? (ModUtilities.seargeNames ? seargeFieldName : fieldName) : (ModUtilities.fmlDetected ? seargeFieldName : obfuscatedFieldName);
+		return Obf.getObfuscatedFieldName(fieldName, obfuscatedFieldName, seargeFieldName);
 	}
 	/**
@@ -260,8 +226,7 @@ public abstract class ModUtilities
 	 */
 	public static String getObfuscatedFieldName(Obf obf)
 	{
-		boolean deobfuscated = Tessellator.class.getSimpleName().equals("Tessellator");
-		return deobfuscated ? (ModUtilities.seargeNames ? obf.srg : obf.name) : (ModUtilities.fmlDetected ? obf.srg : obf.obf);
+		return Obf.getObfuscatedFieldName(obf);
 	}
 	@SuppressWarnings("unchecked")
@@ -274,10 +239,10 @@ public abstract class ModUtilities
 		if (registry instanceof RegistryNamespaced)
 		{
 			RegistryNamespaced rns = (RegistryNamespaced)registry;
-			underlyingIntegerMap = PrivateFields.underlyingIntegerMap.get(rns); 
+			underlyingIntegerMap = PrivateFieldsClient.underlyingIntegerMap.get(rns); 
 		}
-		Map<K, V> registryObjects = PrivateFields.registryObjects.get(registry);
+		Map<K, V> registryObjects = PrivateFieldsClient.registryObjects.get(registry);
 		if (registryObjects != null)
 		{
 			V existingValue = registryObjects.get(key);
@@ -287,8 +252,8 @@ public abstract class ModUtilities
 				if (underlyingIntegerMap != null)
 				{
-					IdentityHashMap<V, Integer> identityMap = PrivateFields.identityMap.get(underlyingIntegerMap);
-					List<V> objectList = PrivateFields.objectList.get(underlyingIntegerMap);
+					IdentityHashMap<V, Integer> identityMap = PrivateFieldsClient.identityMap.get(underlyingIntegerMap);
+					List<V> objectList = PrivateFieldsClient.objectList.get(underlyingIntegerMap);
 					if (identityMap != null) identityMap.remove(existingValue);
 					if (objectList != null) objectList.remove(existingValue);
 				}
@@ -7,6 +7,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.server.MinecraftServer;
+
 /**
  * Centralised obfuscation table for LiteLoader
  *
@@ -70,6 +74,14 @@ public class Obf
 	public static final Obf                       Render = new Obf("net.minecraft.client.renderer.entity.Render",                "cpu" );
 	public static final Obf                 GuiTextField = new Obf("net.minecraft.client.gui.GuiTextField",                      "bul" );
 	public static final Obf                 SoundHandler = new Obf("net.minecraft.client.audio.SoundHandler",                    "czh" );
+	public static final Obf                     BlockPos = new Obf("net.minecraft.util.BlockPos",                                "dt"  );
+	public static final Obf                   EnumFacing = new Obf("net.minecraft.util.EnumFacing",                              "ej"  );
+	public static final Obf           ItemInWorldManager = new Obf("net.minecraft.server.management.ItemInWorldManager",         "qx"  );
+	public static final Obf         NetHandlerPlayServer = new Obf("net.minecraft.network.NetHandlerPlayServer",                 "rj"  );
+	public static final Obf                 EntityPlayer = new Obf("net.minecraft.entity.player.EntityPlayer",                   "ahd" );
+	public static final Obf                        World = new Obf("net.minecraft.world.World",                                  "aqu" );
+	public static final Obf                    ItemStack = new Obf("net.minecraft.item.ItemStack",                               "amj" );
+	public static final Obf             PacketThreadUtil = new Obf("net.minecraft.network.PacketThreadUtil",                     "ig"  );
 	// Fields
 	// -----------------------------------------------------------------------------------------
@@ -93,6 +105,7 @@ public class Obf
 	public static final Obf      shaderResourceLocations = new Obf("field_147712_ad",                                            "ab"  );
 	public static final Obf                  shaderIndex = new Obf("field_147713_ae",                                            "ac"  );
 	public static final Obf                    useShader = new Obf("field_175083_ad",                                            "ad"  );
+	public static final Obf                 viewDistance = new Obf("field_149528_b",                                             "b"   );
 	// Methods
 	// -----------------------------------------------------------------------------------------
@@ -132,6 +145,13 @@ public class Obf
 	public static final Obf               getFOVModifier = new Obf("func_78481_a",                                               "a"   );
 	public static final Obf         setupCameraTransform = new Obf("func_78479_a",                                               "a"   );
 	public static final Obf            loadSoundResource = new Obf("func_147693_a",                                              "a"   );
+	public static final Obf               onBlockClicked = new Obf("func_180784_a",                                              "a"   );
+	public static final Obf       activateBlockOrUseItem = new Obf("func_180236_a",                                              "a"   );
+	public static final Obf  processPlayerBlockPlacement = new Obf("func_147346_a",                                              "a"   );
+	public static final Obf              handleAnimation = new Obf("func_175087_a",                                              "a"   );
+	public static final Obf         processPlayerDigging = new Obf("func_147345_a",                                              "a"   );
+	public static final Obf   updateTimeLightAndEntities = new Obf("func_71190_q",                                               "z"   );
+	public static final Obf        checkThreadAndEnqueue = new Obf("func_180031_a",                                              "a"   );
 	public static final int MCP = 0;
 	public static final int SRG = 1;
@@ -383,4 +403,61 @@ public class Obf
 			return this.ordinal;
 		}
 	}
+
+	/**
+	 * True if FML is being used, in which case we use searge names instead of raw field/method names
+	 */
+	private static boolean fmlDetected = false;
+	
+	private static boolean seargeNames = false;
+	
+	static
+	{
+		// Check for FML
+		Obf.fmlDetected = Obf.fmlIsPresent();
+
+		try
+		{
+			MinecraftServer.class.getDeclaredField("serverRunning");
+		}
+		catch (SecurityException ex)
+		{
+		}
+		catch (NoSuchFieldException ex)
+		{
+			Obf.seargeNames = true;
+		}
+	}
+
+	public static boolean fmlIsPresent()
+	{
+		for (IClassTransformer transformer : Launch.classLoader.getTransformers())
+			if (transformer.getClass().getName().contains("fml")) return true;
+
+		return false;
+	}
+
+	/**
+	 * Abstraction helper function
+	 * 
+	 * @param fieldName Name of field to get, returned unmodified if in debug mode
+	 * @return Obfuscated field name if present
+	 */
+	public static String getObfuscatedFieldName(String fieldName, String obfuscatedFieldName, String seargeFieldName)
+	{
+		boolean deobfuscated = MinecraftServer.class.getSimpleName().equals("MinecraftServer");
+		return deobfuscated ? (Obf.seargeNames ? seargeFieldName : fieldName) : (Obf.fmlDetected ? seargeFieldName : obfuscatedFieldName);
+	}
+	
+	/**
+	 * Abstraction helper function
+	 * 
+	 * @param obf Field to get, returned unmodified if in debug mode
+	 * @return Obfuscated field name if present
+	 */
+	public static String getObfuscatedFieldName(Obf obf)
+	{
+		boolean deobfuscated = MinecraftServer.class.getSimpleName().equals("MinecraftServer");
+		return deobfuscated ? (Obf.seargeNames ? obf.srg : obf.name) : (Obf.fmlDetected ? obf.srg : obf.obf);
+	}
 }
-package com.mumfrey.liteloader.client.util;
+package com.mumfrey.liteloader.util;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import net.minecraft.client.network.NetHandlerLoginClient;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
-import net.minecraft.client.resources.IResourceManagerReloadListener;
-import net.minecraft.client.resources.SimpleReloadableResourceManager;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ObjectIntIdentityMap;
-import net.minecraft.util.RegistryNamespaced;
-import net.minecraft.util.RegistrySimple;
+import net.minecraft.network.play.client.C15PacketClientSettings;
 import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.util.ModUtilities;
 /**
  * Wrapper for obf/mcp reflection-accessed private fields, mainly added to centralise the locations I have to update the obfuscated field names
@@ -28,7 +15,6 @@ import com.mumfrey.liteloader.util.ModUtilities;
  * @param <P> Parent class type, the type of the class that owns the field
  * @param <T> Field type, the type of the field value
  */
-@SuppressWarnings("rawtypes")
 public class PrivateFields<P, T>
 {
 	/**
@@ -51,7 +37,7 @@ public class PrivateFields&lt;P, T&gt;
 	protected PrivateFields(Class<P> owner, Obf obf)
 	{
 		this.parentClass = owner;
-		this.fieldName = ModUtilities.getObfuscatedFieldName(obf);
+		this.fieldName = Obf.getObfuscatedFieldName(obf);
 	}
 	/**
@@ -137,17 +123,7 @@ public class PrivateFields&lt;P, T&gt;
 		return value;
 	}
-
-	public static final PrivateFields<RenderManager, Map>                            entityRenderMap = new PrivateFields<RenderManager, Map>                      (RenderManager.class,                Obf.entityRenderMap);
-	public static final PrivateFields<NetHandlerLoginClient, NetworkManager>              netManager = new PrivateFields<NetHandlerLoginClient, NetworkManager>   (NetHandlerLoginClient.class,        Obf.networkManager);
-	public static final PrivateFields<RegistrySimple, Map>                           registryObjects = new PrivateFields<RegistrySimple, Map>                     (RegistrySimple.class,               Obf.registryObjects);                     
-	public static final PrivateFields<RegistryNamespaced, ObjectIntIdentityMap> underlyingIntegerMap = new PrivateFields<RegistryNamespaced, ObjectIntIdentityMap>(RegistryNamespaced.class,           Obf.underlyingIntegerMap);                     
-	public static final PrivateFields<ObjectIntIdentityMap, IdentityHashMap>             identityMap = new PrivateFields<ObjectIntIdentityMap, IdentityHashMap>   (ObjectIntIdentityMap.class,         Obf.identityMap);                     
-	public static final PrivateFields<ObjectIntIdentityMap, List>                         objectList = new PrivateFields<ObjectIntIdentityMap, List>              (ObjectIntIdentityMap.class,         Obf.objectList);                     
-	public static final PrivateFields<TileEntityRendererDispatcher, Map>          specialRendererMap = new PrivateFields<TileEntityRendererDispatcher, Map>       (TileEntityRendererDispatcher.class, Obf.mapSpecialRenderers);
-	public static final PrivateFields<TileEntity, Map>                      tileEntityNameToClassMap = new PrivateFields<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityNameToClassMap);
-	public static final PrivateFields<TileEntity, Map>                      tileEntityClassToNameMap = new PrivateFields<TileEntity, Map>                         (TileEntity.class,                   Obf.tileEntityClassToNameMap);
-	public static final PrivateFields<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>> reloadListeners =
-			new PrivateFields<SimpleReloadableResourceManager, List<IResourceManagerReloadListener>>(SimpleReloadableResourceManager.class, Obf.reloadListeners);
+	public static final PrivateFields<C15PacketClientSettings, Integer> viewDistance = new PrivateFields<C15PacketClientSettings, Integer>(C15PacketClientSettings.class, Obf.viewDistance);
+
 }
 \ No newline at end of file