add GuiTextField accessor interface

Mumfrey
1 parent 0e3dd41e
Showing 6 changed files with 205 additions and 44 deletions
java/client/com/mumfrey/liteloader/client/overlays/IGuiTextField.java
java/client/com/mumfrey/liteloader/client/transformers/MinecraftTransformer.java
java/client/com/mumfrey/liteloader/gl/GL.java
java/common/com/mumfrey/liteloader/core/runtime/Obf.java
java/common/com/mumfrey/liteloader/transformers/ByteCodeUtilities.java
java/common/com/mumfrey/liteloader/transformers/access/AccessorTransformer.java
+package com.mumfrey.liteloader.client.overlays;
+
+import com.mumfrey.liteloader.transformers.access.Accessor;
+
+/**
+ * Adapter for GuiTextField to expose internal properties, mainly to allow sensible subclassing
+ * 
+ * @author Adam Mummery-Smith
+ */
+@Accessor("GuiTextField")
+public interface IGuiTextField
+{
+	@Accessor("#2")  public abstract int     getXPosition();
+	@Accessor("#2")  public abstract void    setXPosition(int xPosition);
+	
+	@Accessor("#3")  public abstract int     getYPosition();
+	@Accessor("#3")  public abstract void    setYPosition(int yPosition);
+	
+	@Accessor("#4")  public abstract int     getInternalWidth();
+	@Accessor("#4")  public abstract void    setInternalWidth(int width);
+	
+	@Accessor("#5")  public abstract int     getHeight();
+	@Accessor("#5")  public abstract void    setHeight(int height);
+	
+	@Accessor("#12") public abstract boolean isEnabled();
+//	@Accessor("#12") public abstract void    setEnabled(boolean enabled); // built in
+	
+	@Accessor("#13") public abstract int     getLineScrollOffset();
+	
+	@Accessor("#16") public abstract int     getTextColor();
+//	@Accessor("#16") public abstract void    setTextColor(int color); // built in
+	
+	@Accessor("#17") public abstract int     getDisabledTextColour();
+//	@Accessor("#17") public abstract void    setDisabledTextColour(int color); // built in
+}
@@ -24,6 +24,7 @@ public class MinecraftTransformer extends AccessorTransformer
 	protected void addAccessors()
 	{
 		this.addAccessor(Obf.IMinecraft.name);
+		this.addAccessor(Obf.IGuiTextField.name);
 	}
 	@Override
@@ -1272,4 +1272,19 @@ public class GL
 	{
 		GL11.glPolygonMode(face, mode);
 	}
+	
+	public static void glPixelStorei(int pname, int param)
+	{
+		GL11.glPixelStorei(pname, param);
+	}
+	
+	public static void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer pixels)
+	{
+		GL11.glReadPixels(x, y, width, height, format, type, pixels);
+	}
+	
+	public static void glGetTexImage(int target, int level, int format, int type, ByteBuffer pixels)
+	{
+		GL11.glGetTexImage(target, level, format, type, pixels);
+	}
 }
@@ -26,6 +26,7 @@ public class Obf
 	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"                              );
@@ -62,6 +63,7 @@ public class Obf
 	public static final Obf                       Entity = new Obf("net.minecraft.entity.Entity",                                "wv"  );
 	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" );
 	// Fields
 	// -----------------------------------------------------------------------------------------
@@ -205,6 +207,48 @@ public class Obf
 	{
 		return String.format("L%s;", this.names[type].replace('.', '/'));
 	}
+	
+	/**
+	 * Test whether any of this Obf's dimensions match the supplied name
+	 * 
+	 * @param name
+	 */
+	public boolean matches(String name)
+	{
+		return this.obf.equals(name) || this.srg.equals(name)|| this.name.equals(name);
+	}
+	
+	/**
+	 * Test whether any of this Obf's dimensions match the supplied name or ordinal
+	 * 
+	 * @param name
+	 * @param ordinal
+	 */
+	public boolean matches(String name, int ordinal)
+	{
+		if (this.isOrdinal() && ordinal > -1)
+		{
+			return this.getOrdinal() == ordinal;
+		}
+		
+		return this.matches(name);
+	}
+	
+	/**
+	 * Returns true if this is an ordinal pointer
+	 */
+	public boolean isOrdinal()
+	{
+		return false;
+	}
+	
+	/**
+	 * Get the ordinal for this entry
+	 */
+	public int getOrdinal()
+	{
+		return -1;
+	}
 	/**
 	 * @param seargeName
@@ -269,4 +313,55 @@ public class Obf
 		return Obf.getByName(name);
 	}
+	
+	/**
+	 * Ordinal reference, can be passed to some methods which accept an {@link Obf} to indicate an offset into a
+	 * class rather than a named reference.
+	 * 
+	 * @author Adam Mummery-Smith
+	 */
+	public static class Ord extends Obf
+	{
+		/**
+		 * Field/method offset 
+		 */
+		private final int ordinal;
+
+		/**
+		 * @param name Field/method name
+		 * @param ordinal Field/method ordinal
+		 */
+		public Ord(String name, int ordinal)
+		{
+			super(name);
+			this.ordinal = ordinal;
+		}
+		
+		/**
+		 * @param ordinal Field ordinal
+		 */
+		public Ord(int ordinal)
+		{
+			super("ord#" + ordinal);
+			this.ordinal = ordinal;
+		}
+		
+		/* (non-Javadoc)
+		 * @see com.mumfrey.liteloader.core.runtime.Obf#isOrdinal()
+		 */
+		@Override
+		public boolean isOrdinal()
+		{
+			return true;
+		}
+
+		/* (non-Javadoc)
+		 * @see com.mumfrey.liteloader.core.runtime.Obf#getOrdinal()
+		 */
+		@Override
+		public int getOrdinal()
+		{
+			return this.ordinal;
+		}
+	}
 }
@@ -526,7 +526,46 @@ public abstract class ByteCodeUtilities
 		return null;
 	}
-	
+
+	/**
+	 * Find a method in the target class which matches the specified method name and descriptor
+	 * 
+	 * @param classNode
+	 * @param methodName
+	 * @param desc
+	 */
+	public static MethodNode findMethod(ClassNode classNode, Obf obf, String desc)
+	{
+		int ordinal = 0;
+		
+		for (MethodNode method : classNode.methods)
+		{
+			if (obf.matches(method.name, ordinal++) && method.desc.equals(desc))
+				return method;
+		}
+		
+		return null;
+	}
+
+	/**
+	 * Find a field in the target class which matches the specified field name
+	 * 
+	 * @param classNode
+	 * @param fieldName
+	 */
+	public static FieldNode findField(ClassNode classNode, Obf obf)
+	{
+		int ordinal = 0;
+		
+		for (FieldNode field : classNode.fields)
+		{
+			if (obf.matches(field.name, ordinal++))
+				return field;
+		}
+		
+		return null;
+	}
+
 	public static ClassNode loadClass(String className) throws IOException
 	{
 		return ByteCodeUtilities.loadClass(className, true, null);
@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import net.minecraft.launchwrapper.Launch;
@@ -33,6 +35,8 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public abstract class AccessorTransformer extends ClassTransformer
 {
+	static final Pattern ordinalRefPattern = Pattern.compile("^#([0-9]{1,5})$");
+	
 	/**
 	 * An injection record
 	 * 
@@ -103,6 +107,13 @@ public abstract class AccessorTransformer extends ClassTransformer
 		 */
 		private Obf getObf(String name)
 		{
+			Matcher ordinalPattern = AccessorTransformer.ordinalRefPattern.matcher(name);
+			if (ordinalPattern.matches())
+			{
+				int ordinal = Integer.parseInt(ordinalPattern.group(1));
+				return new Obf.Ord(ordinal);
+			}
+			
 			if (this.obfProvider != null)
 			{
 				Obf obf = this.obfProvider.getByName(name);
@@ -228,14 +239,14 @@ public abstract class AccessorTransformer extends ClassTransformer
 			if (accessor != null)
 			{
 				targetId = ByteCodeUtilities.<String>getAnnotationValue(accessor);
-				Obf targetName = this.getObf(targetId);
-				if (this.injectAccessor(classNode, method, targetName)) return;
+				Obf target = this.getObf(targetId);
+				if (this.injectAccessor(classNode, method, target)) return;
 			}
 			else if (invoker != null)
 			{
 				targetId = ByteCodeUtilities.<String>getAnnotationValue(invoker);
-				Obf targetName = this.getObf(targetId);
-				if (this.injectInvoker(classNode, method, targetName)) return;
+				Obf target = this.getObf(targetId);
+				if (this.injectInvoker(classNode, method, target)) return;
 			}
 			else
 			{
@@ -255,9 +266,9 @@ public abstract class AccessorTransformer extends ClassTransformer
 		 * @param method
 		 * @param targetName
 		 */
-		private boolean injectAccessor(ClassNode classNode, MethodNode method, Obf targetName)
+		private boolean injectAccessor(ClassNode classNode, MethodNode method, Obf target)
 		{
-			FieldNode targetField = this.findField(classNode, targetName);
+			FieldNode targetField = ByteCodeUtilities.findField(classNode, target);
 			if (targetField != null)
 			{
 				LiteLoaderLogger.debug("[AccessorTransformer] Found field %s for %s", targetField.name, method.name);
@@ -283,9 +294,9 @@ public abstract class AccessorTransformer extends ClassTransformer
 		 * @param method
 		 * @param targetName
 		 */
-		private boolean injectInvoker(ClassNode classNode, MethodNode method, Obf targetName)
+		private boolean injectInvoker(ClassNode classNode, MethodNode method, Obf target)
 		{
-			MethodNode targetMethod = this.findMethod(classNode, targetName, method.desc);
+			MethodNode targetMethod = ByteCodeUtilities.findMethod(classNode, target, method.desc);
 			if (targetMethod != null)
 			{
 				LiteLoaderLogger.debug("[AccessorTransformer] Found method %s for %s", targetMethod.name, method.name);
@@ -422,41 +433,6 @@ public abstract class AccessorTransformer extends ClassTransformer
 		}
 		/**
-		 * Find a field in the target class which matches the specified field name
-		 * 
-		 * @param classNode
-		 * @param fieldName
-		 */
-		private FieldNode findField(ClassNode classNode, Obf fieldName)
-		{
-			for (FieldNode field : classNode.fields)
-			{
-				if (fieldName.obf.equals(field.name) || fieldName.srg.equals(field.name)|| fieldName.name.equals(field.name))
-					return field;
-			}
-			
-			return null;
-		}
-
-		/**
-		 * Find a method in the target class which matches the specified method name and descriptor
-		 * 
-		 * @param classNode
-		 * @param methodName
-		 * @param desc
-		 */
-		private MethodNode findMethod(ClassNode classNode, Obf methodName, String desc)
-		{
-			for (MethodNode method : classNode.methods)
-			{
-				if ((methodName.obf.equals(method.name) || methodName.srg.equals(method.name)|| methodName.name.equals(method.name)) && method.desc.equals(desc))
-					return method;
-			}
-			
-			return null;
-		}
-
-		/**
 		 * Add a method from the template interface to the target class 
 		 * 
 		 * @param classNode