adding new overlays, fixing minor bugs in AccessorTransformer

Mumfrey
1 parent 89fce7f9
Showing 10 changed files with 107 additions and 21 deletions
debug/obfuscation.properties
java/client/com/mumfrey/liteloader/client/overlays/IEntityRenderer.java
java/client/com/mumfrey/liteloader/client/overlays/ISoundHandler.java
java/client/com/mumfrey/liteloader/client/transformers/MinecraftTransformer.java
java/common/com/mumfrey/liteloader/core/runtime/Obf.java
java/common/com/mumfrey/liteloader/transformers/ByteCodeUtilities.java
java/common/com/mumfrey/liteloader/transformers/ObfProvider.java
java/common/com/mumfrey/liteloader/transformers/access/Accessor.java
java/common/com/mumfrey/liteloader/transformers/access/AccessorTransformer.java
java/common/com/mumfrey/liteloader/transformers/access/Invoker.java
@@ -15,6 +15,9 @@ field_71425_J=running
 field_110449_ao=defaultResourcePacks
 field_71475_ae=serverName
 field_71477_af=serverPort
+field_147712_ad=shaderResourceLocations
+field_147713_ae=shaderIndex
+field_175083_ad=useShader
 func_148833_a=processPacket
 func_71411_J=runGameLoop
 func_71407_l=runTick
@@ -45,4 +48,8 @@ func_148260_a=saveScreenshot
 func_148822_b=isFramebufferEnabled
 func_147939_a=doRenderEntity
 func_76986_a=doRender
-func_71370_a=resize
 \ No newline at end of file
+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
+package com.mumfrey.liteloader.client.overlays;
+
+import net.minecraft.util.ResourceLocation;
+
+import com.mumfrey.liteloader.transformers.access.Accessor;
+import com.mumfrey.liteloader.transformers.access.Invoker;
+
+/**
+ * Adapter for EntityRenderer to expose some private functionality
+ *
+ * @author Adam Mummery-Smith
+ */
+@Accessor("EntityRenderer")
+public interface IEntityRenderer
+{
+	@Accessor("useShader") public abstract boolean getUseShader();
+	@Accessor("useShader") public abstract void setUseShader(boolean useShader);
+	
+	@Accessor("shaderResourceLocations") public abstract ResourceLocation[] getShaders();
+	
+	@Accessor("shaderIndex") public abstract int getShaderIndex();
+	@Accessor("shaderIndex") public abstract void setShaderIndex(int shaderIndex);
+	
+	@Invoker("loadShader") public abstract void selectShader(ResourceLocation shader);
+	
+	@Invoker("getFOVModifier") public abstract float getFOV(float partialTicks, boolean armFOV);
+	
+	@Invoker("setupCameraTransform") public abstract void setupCamera(float partialTicks, int pass);
+}
+package com.mumfrey.liteloader.client.overlays;
+
+import net.minecraft.client.audio.SoundList;
+import net.minecraft.util.ResourceLocation;
+
+import com.mumfrey.liteloader.transformers.access.Accessor;
+import com.mumfrey.liteloader.transformers.access.Invoker;
+
+@Accessor("SoundHandler")
+public interface ISoundHandler
+{
+	@Invoker("loadSoundResource")
+	public abstract void addSound(ResourceLocation sound, SoundList soundList);
+}
@@ -25,6 +25,8 @@ public class MinecraftTransformer extends AccessorTransformer
 	{
 		this.addAccessor(Obf.IMinecraft.name);
 		this.addAccessor(Obf.IGuiTextField.name);
+		this.addAccessor(Obf.IEntityRenderer.name);
+		this.addAccessor(Obf.ISoundHandler.name);
 	}
 	@Override
@@ -25,8 +25,6 @@ public class Obf
 	public static final Obf                 PacketEvents = new Obf("com.mumfrey.liteloader.core.PacketEvents"                          );
 	public static final Obf           PacketEventsClient = new Obf("com.mumfrey.liteloader.client.PacketEventsClient"                  );
 	public static final Obf                   LoadingBar = new Obf("com.mumfrey.liteloader.client.gui.startup.LoadingBar"              );
-	public static final Obf                   IMinecraft = new Obf("com.mumfrey.liteloader.client.overlays.IMinecraft"                 );
-	public static final Obf                IGuiTextField = new Obf("com.mumfrey.liteloader.client.overlays.IGuiTextField"              );
 	public static final Obf                  GameProfile = new Obf("com.mojang.authlib.GameProfile"                                    );
 	public static final Obf                MinecraftMain = new Obf("net.minecraft.client.main.Main"                                    );
 	public static final Obf              MinecraftServer = new Obf("net.minecraft.server.MinecraftServer"                              );
@@ -36,6 +34,13 @@ public class Obf
 	public static final Obf                     postInit = new Obf("postInit"                                                          );
 	public static final Obf                  constructor = new Obf("<init>"                                                            );
+	// Overlays and Accessor Interfaces
+	// -----------------------------------------------------------------------------------------
+	public static final Obf                   IMinecraft = new Obf("com.mumfrey.liteloader.client.overlays.IMinecraft"                 );
+	public static final Obf                IGuiTextField = new Obf("com.mumfrey.liteloader.client.overlays.IGuiTextField"              );
+	public static final Obf              IEntityRenderer = new Obf("com.mumfrey.liteloader.client.overlays.IEntityRenderer"            );
+	public static final Obf                ISoundHandler = new Obf("com.mumfrey.liteloader.client.overlays.ISoundHandler"              );
+
 	// Classes
 	// -----------------------------------------------------------------------------------------
 	public static final Obf                    Minecraft = new Obf("net.minecraft.client.Minecraft",                             "bsu" );
@@ -64,6 +69,7 @@ public class Obf
 	public static final Obf                RenderManager = new Obf("net.minecraft.client.renderer.entity.RenderManager",         "cpt" );
 	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" );
 	// Fields
 	// -----------------------------------------------------------------------------------------
@@ -84,6 +90,9 @@ public class Obf
 	public static final Obf         defaultResourcePacks = new Obf("field_110449_ao",                                            "aw"  );
 	public static final Obf                   serverName = new Obf("field_71475_ae",                                             "am"  );
 	public static final Obf                   serverPort = new Obf("field_71477_af",                                             "an"  );
+	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"  );
 	// Methods
 	// -----------------------------------------------------------------------------------------
@@ -119,6 +128,10 @@ public class Obf
 	public static final Obf                     doRender = new Obf("func_76986_a",                                               "a"   );
 	public static final Obf        doRenderShadowAndFire = new Obf("func_76979_b",                                               "b"   );
 	public static final Obf                       resize = new Obf("func_71370_a",                                               "a"   );
+	public static final Obf                   loadShader = new Obf("func_175069_a",                                              "a"   );
+	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 int MCP = 0;
 	public static final int SRG = 1;
@@ -249,6 +262,12 @@ public class Obf
 	{
 		return -1;
 	}
+	
+	@Override
+	public String toString()
+	{
+		return String.format("%s[%s,%s,%s]@%d", this.getClass().getSimpleName(), this.name, this.srg, this.obf, this.getOrdinal());
+	}
 	/**
 	 * @param seargeName
@@ -300,7 +319,7 @@ public class Obf
 		{
 			for (Field fd : obf.getFields())
 			{
-				if (fd.getType().equals(Obf.class))
+				if (Obf.class.isAssignableFrom(fd.getType()))
 				{
 					String fieldName = fd.getName();
 					Obf entry = (Obf)fd.get(null);
@@ -531,16 +531,16 @@ public abstract class ByteCodeUtilities
 	 * Find a method in the target class which matches the specified method name and descriptor
 	 * 
 	 * @param classNode
-	 * @param methodName
+	 * @param searchFor
 	 * @param desc
 	 */
-	public static MethodNode findMethod(ClassNode classNode, Obf obf, String desc)
+	public static MethodNode findMethod(ClassNode classNode, Obf searchFor, String desc)
 	{
 		int ordinal = 0;
 		for (MethodNode method : classNode.methods)
 		{
-			if (obf.matches(method.name, ordinal++) && method.desc.equals(desc))
+			if (searchFor.matches(method.name, ordinal++) && method.desc.equals(desc))
 				return method;
 		}
@@ -551,15 +551,15 @@ public abstract class ByteCodeUtilities
 	 * Find a field in the target class which matches the specified field name
 	 * 
 	 * @param classNode
-	 * @param fieldName
+	 * @param searchFor
 	 */
-	public static FieldNode findField(ClassNode classNode, Obf obf)
+	public static FieldNode findField(ClassNode classNode, Obf searchFor)
 	{
 		int ordinal = 0;
 		for (FieldNode field : classNode.fields)
 		{
-			if (obf.matches(field.name, ordinal++))
+			if (searchFor.matches(field.name, ordinal++))
 				return field;
 		}
@@ -14,7 +14,6 @@ public interface ObfProvider
 	 * Try to locate an obfuscation table entry by name (id), returns null if no entry was found
 	 * 
 	 * @param name
-	 * @return
 	 */
 	public abstract Obf getByName(String name);
 }
@@ -14,5 +14,5 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.CLASS)
 public @interface Accessor
 {
-	public String value();
+	public String[] value();
 }
@@ -105,8 +105,10 @@ public abstract class AccessorTransformer extends ClassTransformer
 		 * 
 		 * @param name Obfuscation table entry to fetch
 		 */
-		private Obf getObf(String name)
+		private Obf getObf(List<String> names)
 		{
+			String name = names.get(0);
+			
 			Matcher ordinalPattern = AccessorTransformer.ordinalRefPattern.matcher(name);
 			if (ordinalPattern.matches())
 			{
@@ -128,8 +130,15 @@ public abstract class AccessorTransformer extends ClassTransformer
 			{
 				return obf;
 			}
-			
-			throw new RuntimeException("No obfuscation table entry could be found for '" + name + "'");
+
+			if (names.size() > 0 && names.size() < 4)
+			{
+				String name2 = names.size() > 1 ? names.get(1) : name;
+				String name3 = names.size() > 2 ? names.get(2) : name;
+				return new AccessorTransformer.Mapping(name, name2, name3);
+			}
+
+			throw new RuntimeException("Invalid obfuscation table entry specified: '" + names + "'");
 		}
 		/**
@@ -175,7 +184,7 @@ public abstract class AccessorTransformer extends ClassTransformer
 				throw new RuntimeException("Accessor interfaces must be annotated with an @Accessor annotation specifying the target class");
 			}
-			String targetClass = ByteCodeUtilities.<String>getAnnotationValue(annotation);
+			List<String> targetClass = ByteCodeUtilities.<List<String>>getAnnotationValue(annotation);
 			if (targetClass == null || targetClass.isEmpty())
 			{
 				throw new RuntimeException("Invalid @Accessor annotation, the annotation must specify a target class");
@@ -233,18 +242,18 @@ public abstract class AccessorTransformer extends ClassTransformer
 			LiteLoaderLogger.debug("[AccessorTransformer] Attempting to add %s to %s", method.name, classNode.name);
-			String targetId = null;
+			List<String> targetId = null;
 			AnnotationNode accessor = ByteCodeUtilities.getInvisibleAnnotation(method, Accessor.class);
 			AnnotationNode invoker = ByteCodeUtilities.getInvisibleAnnotation(method, Invoker.class);
 			if (accessor != null)
 			{
-				targetId = ByteCodeUtilities.<String>getAnnotationValue(accessor);
+				targetId = ByteCodeUtilities.<List<String>>getAnnotationValue(accessor);
 				Obf target = this.getObf(targetId);
 				if (this.injectAccessor(classNode, method, target)) return;
 			}
 			else if (invoker != null)
 			{
-				targetId = ByteCodeUtilities.<String>getAnnotationValue(invoker);
+				targetId = ByteCodeUtilities.<List<String>>getAnnotationValue(invoker);
 				Obf target = this.getObf(targetId);
 				if (this.injectInvoker(classNode, method, target)) return;
 			}
@@ -448,6 +457,14 @@ public abstract class AccessorTransformer extends ClassTransformer
 		}
 	}
+	protected static class Mapping extends Obf
+	{
+		protected Mapping(String seargeName, String obfName, String mcpName)
+		{
+			super(seargeName, obfName, mcpName);
+		}
+	}
+	
 	/**
 	 * List of accessors to inject
 	 */
@@ -514,7 +531,6 @@ public abstract class AccessorTransformer extends ClassTransformer
 	 * @param transformedName
 	 * @param basicClass
 	 * @param classNode
-	 * @return
 	 */
 	public ClassNode apply(String name, String transformedName, byte[] basicClass, ClassNode classNode)
 	{
@@ -14,5 +14,5 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.CLASS)
 public @interface Invoker
 {
-	public String value();
+	public String[] value();
 }