LiteLoader 1.5_01

+ Compatibility for FML's new runtime deobfuscation

LiteLoader 1.5_01
+ Compatibility for FML's new runtime deobfuscation
Mumfrey
1 parent 7e6adb61
Showing 3 changed files with 33 additions and 14 deletions
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/util/ModUtilities.java
java/com/mumfrey/liteloader/util/PrivateFields.java
@@ -65,7 +65,7 @@ public final class LiteLoader implements FilenameFilter
 	/**
 	 * Liteloader version 
 	 */
-	private static final String LOADER_VERSION = "1.5";
+	private static final String LOADER_VERSION = "1.5_01";
 	/**
 	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
@@ -336,7 +336,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	private void prepareClassOverrides()
 	{
-		this.registerBaseClassOverride(ModUtilities.getObfuscatedFieldName("net.minecraft.src.CallableJVMFlags", "h"), "h");
+		this.registerBaseClassOverride(ModUtilities.getObfuscatedFieldName("net.minecraft.src.CallableJVMFlags", "h", "h"), "h");
 	}
 	/**
@@ -8,14 +8,29 @@ import java.util.Set;
 import com.mumfrey.liteloader.core.LiteLoader;
+import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.*;
 public abstract class ModUtilities
 {
+	/**
+	 * Collection of packets we have already overridden, so that duplicate registrations can generate a warning
+	 */
 	private static Set<Integer> overriddenPackets = new HashSet<Integer>();
 	/**
+	 * True if FML is being used, in which case we use searge names instead of raw field/method names
+	 */
+	private static boolean forgeModLoader = false;
+	
+	static
+	{
+		// Check for FML
+		forgeModLoader = ClientBrandRetriever.getClientModName().contains("fml");
+	}
+	
+	/**
 	 * Add a renderer map entry for the specified entity class
 	 * 
 	 * @param entityClass
@@ -92,9 +107,10 @@ public abstract class ModUtilities
 	 * @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)
+	public static String getObfuscatedFieldName(String fieldName, String obfuscatedFieldName, String seargeFieldName)
 	{
-		return (!net.minecraft.src.Tessellator.instance.getClass().getSimpleName().equals("Tessellator")) ? obfuscatedFieldName : fieldName;
+		if (forgeModLoader) return seargeFieldName;
+		return !net.minecraft.src.Tessellator.instance.getClass().getSimpleName().equals("Tessellator") ? obfuscatedFieldName : fieldName;
 	}
 	/**
@@ -33,6 +33,8 @@ public class PrivateFields&lt;P, T&gt;
 	 */
 	public final String name;
+	public final String seargeName;
+	
 	/**
 	 * Name used to access the field, determined at init
 	 */
@@ -45,13 +47,14 @@ public class PrivateFields&lt;P, T&gt;
 	 * @param mcpName
 	 * @param name
 	 */
-	private PrivateFields(Class<P> owner, String mcpName, String name)
+	private PrivateFields(Class<P> owner, String mcpName, String name, String seargeName)
 	{
 		this.parentClass = owner;
-		this.mcpName = mcpName;
-		this.name = name;
+		this.mcpName     = mcpName;
+		this.name        = name;
+		this.seargeName  = seargeName;
-		this.fieldName = ModUtilities.getObfuscatedFieldName(mcpName, name);
+		this.fieldName = ModUtilities.getObfuscatedFieldName(mcpName, name, seargeName);
 	}
 	/**
@@ -127,16 +130,16 @@ public class PrivateFields&lt;P, T&gt;
 	 */
 	public static final class StaticFields<P, T> extends PrivateFields<P, T>
 	{
-		public StaticFields(Class<P> owner, String mcpName, String name) { super(owner, mcpName, name); }
+		public StaticFields(Class<P> owner, String mcpName, String name, String fmlName) { super(owner, mcpName, name, fmlName); }
 		public T get() { return get(null); }
 		public void set(T value) { set(null, value); }
-		public static final StaticFields<Packet, Map>           packetClassToIdMap = new StaticFields<Packet, Map>     (Packet.class,     "packetClassToIdMap", "a"); // Packet/packetClassToIdMap
-		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a"); // TileEntity/nameToClassMap
+		public static final StaticFields<Packet, Map>           packetClassToIdMap = new StaticFields<Packet, Map>     (Packet.class,     "packetClassToIdMap", "a", "field_73291_a"); // Packet/packetClassToIdMap
+		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a", "field_70326_a"); // TileEntity/nameToClassMap
 	}
-	public static final PrivateFields<Minecraft, Timer>       minecraftTimer = new PrivateFields<Minecraft, Timer>    (Minecraft.class,     "timer",           "V");  // Minecraft/timer
-	public static final PrivateFields<Minecraft, Profiler> minecraftProfiler = new PrivateFields<Minecraft, Profiler> (Minecraft.class,     "mcProfiler",      "J");  // Minecraft/mcProfiler
-	public static final PrivateFields<RenderManager, Map>    entityRenderMap = new PrivateFields<RenderManager, Map>  (RenderManager.class, "entityRenderMap", "q");  // RenderManager/entityRenderMap
+	public static final PrivateFields<Minecraft, Timer>       minecraftTimer = new PrivateFields<Minecraft, Timer>    (Minecraft.class,     "timer",           "V", "field_71428_T");  // Minecraft/timer
+	public static final PrivateFields<Minecraft, Profiler> minecraftProfiler = new PrivateFields<Minecraft, Profiler> (Minecraft.class,     "mcProfiler",      "J", "field_71424_I");  // Minecraft/mcProfiler
+	public static final PrivateFields<RenderManager, Map>    entityRenderMap = new PrivateFields<RenderManager, Map>  (RenderManager.class, "entityRenderMap", "q", "field_78729_o");  // RenderManager/entityRenderMap
 }