LiteLoader 1.6.4_02 - experimental - banish CallableJVMFlags override an use ASM instead

Mumfrey
1 parent b8f2dade
Showing 5 changed files with 72 additions and 57 deletions
.classpath
java/com/mumfrey/liteloader/launch/LiteLoaderTransformer.java
java/net/minecraft/src/CallableJVMFlags.java
javadoc/guava-14.0.1-javadoc.jar
lib/asm-debug-all-4.1.jar
@@ -7,10 +7,15 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/LiteLoader/javadoc/guava-14.0.1-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="/Client/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/launchwrapper-1.8.jar"/>
 	<classpathentry kind="lib" path="lib/jopt-simple-4.5.jar"/>
 	<classpathentry kind="lib" path="lib/launcher.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-4.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
 package com.mumfrey.liteloader.launch;
+import java.util.ListIterator;
+
 import net.minecraft.launchwrapper.IClassTransformer;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
 public class LiteLoaderTransformer implements IClassTransformer
 {
 	private static final String classMappingRenderLightningBolt = "net.minecraft.src.RenderLightningBolt";
+	private static final String classMappingCallableJVMFlags = "net.minecraft.src.CallableJVMFlags";
 	// TODO Obfuscation 1.6.4
 	private static final String classMappingRenderLightningBoltObf = "bha";
+	private static final String classMappingCallableJVMFlagsObf = "h";
 	private static boolean postInit = false;
@@ -21,6 +35,58 @@ public class LiteLoaderTransformer implements IClassTransformer
 			LiteLoaderTweaker.postInit();
 		}
+		if (classMappingCallableJVMFlags.equals(name) || classMappingCallableJVMFlagsObf.equals(name))
+		{
+			try
+			{
+				return this.transformCallableJVMFlags(basicClass);
+			}
+			catch (Exception ex) {}
+		}
+		
 		return basicClass;
 	}
+	
+	/**
+	 * Inject the additional callback for populating the crash report into the CallableJVMFlags class
+	 * 
+	 * @param basicClass basic class
+	 * @return transformed class
+	 */
+	private byte[] transformCallableJVMFlags(byte[] basicClass)
+	{
+		ClassReader classReader = new ClassReader(basicClass);
+		ClassNode classNode = new ClassNode();
+		classReader.accept(classNode, ClassReader.EXPAND_FRAMES);
+		
+		for (MethodNode method : classNode.methods)
+		{
+			if ("<init>".equals(method.name))
+			{
+				this.transformCallableJVMFlagsConstructor(method);
+			}
+		}
+		
+		ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+		classNode.accept(writer);
+		return writer.toByteArray();
+	}
+
+	/**
+	 * @param ctor
+	 */
+	public void transformCallableJVMFlagsConstructor(MethodNode ctor)
+	{
+		InsnList code = new InsnList();
+		code.add(new VarInsnNode(Opcodes.ALOAD, 1));
+		code.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/LiteLoader", "populateCrashReport", "(Ljava/lang/Object;)V"));
+		
+		ListIterator<AbstractInsnNode> insns = ctor.instructions.iterator();
+		while (insns.hasNext())
+		{
+			AbstractInsnNode insnNode = insns.next();
+			if (insnNode.getOpcode() == Opcodes.RETURN)
+				ctor.instructions.insertBefore(insnNode, code);
+		}
+	}
 }
-package net.minecraft.src;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import com.mumfrey.liteloader.core.LiteLoader;
-
-class CallableJVMFlags implements Callable<String>
-{
-	/** Reference to the CrashReport object. */
-	final CrashReport theCrashReport;
-	
-	CallableJVMFlags(CrashReport par1CrashReport)
-	{
-		this.theCrashReport = par1CrashReport;
-		LiteLoader.populateCrashReport(par1CrashReport);
-	}
-	
-	/**
-	 * Returns the number of JVM Flags along with the passed JVM Flags.
-	 */
-	public String getJVMFlagsAsString()
-	{
-		RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
-		List<String> var2 = var1.getInputArguments();
-		int var3 = 0;
-		StringBuilder var4 = new StringBuilder();
-		Iterator<String> var5 = var2.iterator();
-		
-		while (var5.hasNext())
-		{
-			String var6 = var5.next();
-			
-			if (var6.startsWith("-X"))
-			{
-				if (var3++ > 0)
-				{
-					var4.append(" ");
-				}
-				
-				var4.append(var6);
-			}
-		}
-		
-		return String.format("%d total; %s", new Object[] {Integer.valueOf(var3), var4.toString()});
-	}
-	
-	@Override
-	public String call()
-	{
-		return this.getJVMFlagsAsString();
-	}
-}