LiteLoader / LiteLoader · Commits

Commit 9732820697cda15b91f0ce0e1f0c45501e2c9842

Authored by Mumfrey
1 parent a7acdc44

reverting ASM library to 4.1 to improve compatibility with 3rd party components

Inline Side-by-side
Showing 13 changed files with 45 additions and 44 deletions
.classpath
  View file @9732820
@@ -18,6 +18,6 @@ @@ -18,6 +18,6 @@
18 <classpathentry exported="true" kind="lib" path="/Client/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/> 18 <classpathentry exported="true" kind="lib" path="/Client/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
19 <classpathentry exported="true" kind="lib" path="/Client/jars/libraries/com/mojang/authlib/1.5.13/authlib-1.5.13.jar"/> 19 <classpathentry exported="true" kind="lib" path="/Client/jars/libraries/com/mojang/authlib/1.5.13/authlib-1.5.13.jar"/>
20 <classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.1/lwjgl-2.9.1.jar"/> 20 <classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.1/lwjgl-2.9.1.jar"/>
21 - <classpathentry exported="true" kind="lib" path="lib/asm-debug-all-5.0.3.jar"/> 21 + <classpathentry exported="true" kind="lib" path="lib/asm-debug-all-4.1.jar"/>
22 <classpathentry kind="output" path="bin"/> 22 <classpathentry kind="output" path="bin"/>
23 </classpath> 23 </classpath>
LiteLoader.iml
  View file @9732820
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 <orderEntry type="module-library" exported=""> 47 <orderEntry type="module-library" exported="">
48 <library> 48 <library>
49 <CLASSES> 49 <CLASSES>
50 - <root url="jar://$MODULE_DIR$/lib/asm-debug-all-5.0.3.jar!/" /> 50 + <root url="jar://$MODULE_DIR$/lib/asm-debug-all-4.1.jar!/" />
51 </CLASSES> 51 </CLASSES>
52 <JAVADOC /> 52 <JAVADOC />
53 <SOURCES /> 53 <SOURCES />
ant/build_liteloader.xml
  View file @9732820
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" /> 4 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" />
5 5
6 <!-- Versions !!IMPORTANT --> 6 <!-- Versions !!IMPORTANT -->
7 - <property name="version" value="1.7.10" /> 7 + <property name="version" value="1.7.10_01" />
8 <property name="mcversion" value="1.7.10" /> 8 <property name="mcversion" value="1.7.10" />
9 <property name="author" value="Mumfrey" /> 9 <property name="author" value="Mumfrey" />
10 10
java/client/com/mumfrey/liteloader/client/gen/GenProfilerTransformer.java
  View file @9732820
@@ -77,7 +77,7 @@ public class GenProfilerTransformer implements IClassTransformer @@ -77,7 +77,7 @@ public class GenProfilerTransformer implements IClassTransformer
77 77
78 for (Entry<MethodInsnNode, String> node : injectionNodes.entrySet()) 78 for (Entry<MethodInsnNode, String> node : injectionNodes.entrySet())
79 { 79 {
80 - method.instructions.insert(node.getKey(), new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/gen/GenProfiler", "storeSignature", "(Ljava/lang/String;)V", false)); 80 + method.instructions.insert(node.getKey(), new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/gen/GenProfiler", "storeSignature", "(Ljava/lang/String;)V"));
81 method.instructions.insert(node.getKey(), new LdcInsnNode(node.getValue())); 81 method.instructions.insert(node.getKey(), new LdcInsnNode(node.getValue()));
82 } 82 }
83 } 83 }
java/client/com/mumfrey/liteloader/client/transformers/CrashReportTransformer.java
  View file @9732820
@@ -58,7 +58,7 @@ public class CrashReportTransformer extends ClassTransformer @@ -58,7 +58,7 @@ public class CrashReportTransformer extends ClassTransformer
58 { 58 {
59 InsnList code = new InsnList(); 59 InsnList code = new InsnList();
60 code.add(new VarInsnNode(Opcodes.ALOAD, 1)); 60 code.add(new VarInsnNode(Opcodes.ALOAD, 1));
61 - code.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/LiteLoader", "populateCrashReport", "(Ljava/lang/Object;)V", false)); 61 + code.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "com/mumfrey/liteloader/core/LiteLoader", "populateCrashReport", "(Ljava/lang/Object;)V"));
62 62
63 ListIterator<AbstractInsnNode> insns = ctor.instructions.iterator(); 63 ListIterator<AbstractInsnNode> insns = ctor.instructions.iterator();
64 while (insns.hasNext()) 64 while (insns.hasNext())
java/client/com/mumfrey/liteloader/client/transformers/MinecraftOverlayTransformer.java
  View file @9732820
@@ -66,8 +66,8 @@ public class MinecraftOverlayTransformer extends ClassOverlayTransformer @@ -66,8 +66,8 @@ public class MinecraftOverlayTransformer extends ClassOverlayTransformer
66 LiteLoaderLogger.info("MinecraftOverlayTransformer found INIT injection point, this is good."); 66 LiteLoaderLogger.info("MinecraftOverlayTransformer found INIT injection point, this is good.");
67 found = true; 67 found = true;
68 68
69 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftOverlayTransformer.LITELOADER_TWEAKER_CLASS, MinecraftOverlayTransformer.METHOD_INIT, "()V", false));  
70 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftOverlayTransformer.LITELOADER_TWEAKER_CLASS, MinecraftOverlayTransformer.METHOD_POSTINIT, "()V", false)); 69 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftOverlayTransformer.LITELOADER_TWEAKER_CLASS, MinecraftOverlayTransformer.METHOD_INIT, "()V"));
  70 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, MinecraftOverlayTransformer.LITELOADER_TWEAKER_CLASS, MinecraftOverlayTransformer.METHOD_POSTINIT, "()V"));
71 } 71 }
72 } 72 }
73 73
@@ -78,11 +78,11 @@ public class MinecraftOverlayTransformer extends ClassOverlayTransformer @@ -78,11 +78,11 @@ public class MinecraftOverlayTransformer extends ClassOverlayTransformer
78 LdcInsnNode ldcInsn = (LdcInsnNode)insn; 78 LdcInsnNode ldcInsn = (LdcInsnNode)insn;
79 if ("textures/blocks".equals(ldcInsn.cst)) 79 if ("textures/blocks".equals(ldcInsn.cst))
80 { 80 {
81 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "initTextures", "()V", false)); 81 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "initTextures", "()V"));
82 } 82 }
83 } 83 }
84 84
85 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "incrementProgress", "()V", false)); 85 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.LoadingBar.ref, "incrementProgress", "()V"));
86 } 86 }
87 } 87 }
88 88
java/common/com/mumfrey/liteloader/core/LiteLoaderVersion.java
  View file @9732820
@@ -9,44 +9,45 @@ import com.mumfrey.liteloader.update.UpdateSite; @@ -9,44 +9,45 @@ import com.mumfrey.liteloader.update.UpdateSite;
9 * LiteLoader version table 9 * LiteLoader version table
10 * 10 *
11 * @author Adam Mummery-Smith 11 * @author Adam Mummery-Smith
12 - * @version 1.7.10 12 + * @version 1.7.10_01
13 */ 13 */
14 public enum LiteLoaderVersion 14 public enum LiteLoaderVersion
15 { 15 {
16 LEGACY(0, 0, "-", "Unknown", "-"), 16 LEGACY(0, 0, "-", "Unknown", "-"),
17 FUTURE(Integer.MAX_VALUE, Long.MAX_VALUE, "-", "Future", "-"), 17 FUTURE(Integer.MAX_VALUE, Long.MAX_VALUE, "-", "Future", "-"),
18 18
19 - MC_1_5_2_R1(9, 0, "1.5.2", "1.5.2", "1.5.2" ),  
20 - MC_1_6_1_R0(11, 0, "1.6.1", "1.6.1", "1.6.1", "1.6.r1"),  
21 - MC_1_6_1_R1(11, 0, "1.6.1", "1.6.1", "1.6.1", "1.6.r1"),  
22 - MC_1_6_2_R0(12, 0, "1.6.2", "1.6.2", "1.6.2", "1.6.r2"),  
23 - MC_1_6_2_R1(12, 1374025480, "1.6.2", "1.6.2_01", "1.6.2", "1.6.r2"),  
24 - MC_1_6_2_R2(13, 1374709543, "1.6.2", "1.6.2_02", "1.6.2", "1.6.r2"),  
25 - MC_1_6_2_R3(14, 1375228794, "1.6.2", "1.6.2_03", "1.6.2", "1.6.r2"),  
26 - MC_1_6_2_R4(15, 1375662298, "1.6.2", "1.6.2_04", "1.6.2", "1.6.r2"),  
27 - MC_1_6_3_R0(16, 1375662298, "1.6.3", "1.6.3", "1.6.3", "1.6.r3"),  
28 - MC_1_6_4_R0(17, 1380279938, "1.6.4", "1.6.4", "1.6.4", "1.6.r4"),  
29 - MC_1_6_4_R1(18, 1380796916, "1.6.4", "1.6.4_01", "1.6.4", "1.6.r4"),  
30 - MC_1_6_4_R2(19, 1380796916, "1.6.4", "1.6.4_02", "1.6.4", "1.6.r4"),  
31 - MC_1_7_2_R0(20, 1386027226, "1.7.2", "1.7.2", "1.7.2", "1.7.r1"),  
32 - MC_1_7_2_R1(21, 1388455995, "1.7.2", "1.7.2_01", "1.7.2_01"),  
33 - MC_1_7_2_R2(22, 1391815963, "1.7.2", "1.7.2_02", "1.7.2_02"),  
34 - MC_1_7_2_R3(23, 1391890695, "1.7.2", "1.7.2_03", "1.7.2_02", "1.7.2_03"),  
35 - MC_1_7_2_R4(24, 1392487926, "1.7.2", "1.7.2_04", "1.7.2_02", "1.7.2_03", "1.7.2_04"),  
36 - MC_1_7_2_R5(25, 0, "1.7.2", "1.7.2_05", "1.7.2_02", "1.7.2_03", "1.7.2_04", "1.7.2_05"),  
37 - MC_1_7_2_R6(26, 0, "1.7.2", "1.7.2_06", "1.7.2_06"),  
38 - MC_1_7_10_R0(27, 1404330030, "1.7.10", "1.7.10", "1.7.10"); 19 + MC_1_5_2_R1(9, 0, "1.5.2", "1.5.2", "1.5.2" ),
  20 + MC_1_6_1_R0(11, 0, "1.6.1", "1.6.1", "1.6.1", "1.6.r1"),
  21 + MC_1_6_1_R1(11, 0, "1.6.1", "1.6.1", "1.6.1", "1.6.r1"),
  22 + MC_1_6_2_R0(12, 0, "1.6.2", "1.6.2", "1.6.2", "1.6.r2"),
  23 + MC_1_6_2_R1(12, 1374025480, "1.6.2", "1.6.2_01", "1.6.2", "1.6.r2"),
  24 + MC_1_6_2_R2(13, 1374709543, "1.6.2", "1.6.2_02", "1.6.2", "1.6.r2"),
  25 + MC_1_6_2_R3(14, 1375228794, "1.6.2", "1.6.2_03", "1.6.2", "1.6.r2"),
  26 + MC_1_6_2_R4(15, 1375662298, "1.6.2", "1.6.2_04", "1.6.2", "1.6.r2"),
  27 + MC_1_6_3_R0(16, 1375662298, "1.6.3", "1.6.3", "1.6.3", "1.6.r3"),
  28 + MC_1_6_4_R0(17, 1380279938, "1.6.4", "1.6.4", "1.6.4", "1.6.r4"),
  29 + MC_1_6_4_R1(18, 1380796916, "1.6.4", "1.6.4_01", "1.6.4", "1.6.r4"),
  30 + MC_1_6_4_R2(19, 1380796916, "1.6.4", "1.6.4_02", "1.6.4", "1.6.r4"),
  31 + MC_1_7_2_R0(20, 1386027226, "1.7.2", "1.7.2", "1.7.2", "1.7.r1"),
  32 + MC_1_7_2_R1(21, 1388455995, "1.7.2", "1.7.2_01", "1.7.2_01"),
  33 + MC_1_7_2_R2(22, 1391815963, "1.7.2", "1.7.2_02", "1.7.2_02"),
  34 + MC_1_7_2_R3(23, 1391890695, "1.7.2", "1.7.2_03", "1.7.2_02", "1.7.2_03"),
  35 + MC_1_7_2_R4(24, 1392487926, "1.7.2", "1.7.2_04", "1.7.2_02", "1.7.2_03", "1.7.2_04"),
  36 + MC_1_7_2_R5(25, 0, "1.7.2", "1.7.2_05", "1.7.2_02", "1.7.2_03", "1.7.2_04", "1.7.2_05"),
  37 + MC_1_7_2_R6(26, 0, "1.7.2", "1.7.2_06", "1.7.2_06"),
  38 + MC_1_7_10_R0(27, 1404330030, "1.7.10", "1.7.10", "1.7.10"),
  39 + MC_1_7_10_R1(28, 1404673785, "1.7.10", "1.7.10_01", "1.7.10");
39 40
40 /** 41 /**
41 * Current loader version 42 * Current loader version
42 */ 43 */
43 - public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_7_10_R0; 44 + public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_7_10_R1;
44 45
45 private static final String UPDATE_SITE_URL = "http://dl.liteloader.com/versions/"; 46 private static final String UPDATE_SITE_URL = "http://dl.liteloader.com/versions/";
46 private static final String UPDATE_SITE_VERSIONS_JSON = "versions.json"; 47 private static final String UPDATE_SITE_VERSIONS_JSON = "versions.json";
47 private static final String UPDATE_SITE_ARTEFACT_NAME = "com.mumfrey:liteloader"; 48 private static final String UPDATE_SITE_ARTEFACT_NAME = "com.mumfrey:liteloader";
48 49
49 - private static final UpdateSite updateSite = new UpdateSite(UPDATE_SITE_URL, UPDATE_SITE_VERSIONS_JSON, LiteLoaderVersion.CURRENT.getMinecraftVersion(), UPDATE_SITE_ARTEFACT_NAME, LiteLoaderVersion.CURRENT.getReleaseTimestamp()); 50 + private static final UpdateSite updateSite = new UpdateSite(UPDATE_SITE_URL, UPDATE_SITE_VERSIONS_JSON, LiteLoaderVersion.CURRENT.getMinecraftVersion(), LiteLoaderVersion.UPDATE_SITE_ARTEFACT_NAME, LiteLoaderVersion.CURRENT.getReleaseTimestamp());
50 51
51 private final int revision; 52 private final int revision;
52 53
java/common/com/mumfrey/liteloader/launch/LiteLoaderTransformer.java
  View file @9732820
@@ -38,7 +38,7 @@ public class LiteLoaderTransformer extends ClassTransformer @@ -38,7 +38,7 @@ public class LiteLoaderTransformer extends ClassTransformer
38 { 38 {
39 if ("main".equals(method.name)) 39 if ("main".equals(method.name))
40 { 40 {
41 - method.instructions.insert(new MethodInsnNode(Opcodes.INVOKESTATIC, LiteLoaderTransformer.LITELOADER_TWEAKER_CLASS, LiteLoaderTransformer.METHOD_PRE_BEGIN_GAME, "()V", false)); 41 + method.instructions.insert(new MethodInsnNode(Opcodes.INVOKESTATIC, LiteLoaderTransformer.LITELOADER_TWEAKER_CLASS, LiteLoaderTransformer.METHOD_PRE_BEGIN_GAME, "()V"));
42 } 42 }
43 } 43 }
44 44
java/common/com/mumfrey/liteloader/transformers/CallbackInjectionTransformer.java
  View file @9732820
@@ -221,7 +221,7 @@ public abstract class CallbackInjectionTransformer extends ClassTransformer @@ -221,7 +221,7 @@ public abstract class CallbackInjectionTransformer extends ClassTransformer
221 private InsnList genProfilerCallbackInsns(InsnList injected, Callback callback, int refNumber) 221 private InsnList genProfilerCallbackInsns(InsnList injected, Callback callback, int refNumber)
222 { 222 {
223 injected.add(new LdcInsnNode(refNumber)); 223 injected.add(new LdcInsnNode(refNumber));
224 - injected.add(new MethodInsnNode(Opcodes.INVOKESTATIC, callback.getCallbackClass(), callback.getCallbackMethod(), "(I)V", false)); 224 + injected.add(new MethodInsnNode(Opcodes.INVOKESTATIC, callback.getCallbackClass(), callback.getCallbackMethod(), "(I)V"));
225 225
226 if (callback.getChainedCallbacks().size() > 0) 226 if (callback.getChainedCallbacks().size() > 0)
227 { 227 {
@@ -297,7 +297,7 @@ public abstract class CallbackInjectionTransformer extends ClassTransformer @@ -297,7 +297,7 @@ public abstract class CallbackInjectionTransformer extends ClassTransformer
297 String callbackMethodDesc = String.format("(%s%s%s%s)%s", hasReturnRef ? callbackReturnValueArg : "", hasReturnRef ? "I" : "", classInstanceArg, CallbackInjectionTransformer.getMethodArgs(methodNode), callbackReturnType); 297 String callbackMethodDesc = String.format("(%s%s%s%s)%s", hasReturnRef ? callbackReturnValueArg : "", hasReturnRef ? "I" : "", classInstanceArg, CallbackInjectionTransformer.getMethodArgs(methodNode), callbackReturnType);
298 298
299 // Add the callback method insn to the injected instructions list 299 // Add the callback method insn to the injected instructions list
300 - injected.add(new MethodInsnNode(Opcodes.INVOKESTATIC, callback.getCallbackClass(), callback.getCallbackMethod(), callbackMethodDesc, false)); 300 + injected.add(new MethodInsnNode(Opcodes.INVOKESTATIC, callback.getCallbackClass(), callback.getCallbackMethod(), callbackMethodDesc));
301 301
302 // If the callback RETURNs a value then push the appropriate RETURN opcode into the insns list 302 // If the callback RETURNs a value then push the appropriate RETURN opcode into the insns list
303 if (callback.injectReturn()) 303 if (callback.injectReturn())
java/common/com/mumfrey/liteloader/transformers/PacketTransformer.java
  View file @9732820
@@ -190,7 +190,7 @@ public abstract class PacketTransformer extends ClassTransformer @@ -190,7 +190,7 @@ public abstract class PacketTransformer extends ClassTransformer
190 insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); 190 insns.add(new VarInsnNode(Opcodes.ALOAD, 0));
191 191
192 // Invoke the handler function with the args we just pushed onto the stack 192 // Invoke the handler function with the args we just pushed onto the stack
193 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, this.handlerClassName, this.handlerMethodName, targetMethodSig, false)); 193 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, this.handlerClassName, this.handlerMethodName, targetMethodSig));
194 194
195 method.instructions.insert(method.instructions.getFirst(), insns); 195 method.instructions.insert(method.instructions.getFirst(), insns);
196 } 196 }
@@ -217,7 +217,7 @@ public abstract class PacketTransformer extends ClassTransformer @@ -217,7 +217,7 @@ public abstract class PacketTransformer extends ClassTransformer
217 method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0)); 217 method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
218 218
219 // Invoke the handler function with the args we just pushed onto the stack 219 // Invoke the handler function with the args we just pushed onto the stack
220 - method.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, this.handlerClassName, this.handlerMethodName, targetMethodSig, false)); 220 + method.instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC, this.handlerClassName, this.handlerMethodName, targetMethodSig));
221 221
222 // Return if no exception 222 // Return if no exception
223 method.instructions.add(new InsnNode(Opcodes.RETURN)); 223 method.instructions.add(new InsnNode(Opcodes.RETURN));
java/common/com/mumfrey/liteloader/transformers/event/Event.java
  View file @9732820
@@ -309,13 +309,13 @@ public class Event implements Comparable&lt;Event&gt; @@ -309,13 +309,13 @@ public class Event implements Comparable&lt;Event&gt;
309 insns.add(new LdcInsnNode(this.name)); ctorMAXS++; 309 insns.add(new LdcInsnNode(this.name)); ctorMAXS++;
310 insns.add(this.methodIsStatic ? new InsnNode(Opcodes.ACONST_NULL) : new VarInsnNode(Opcodes.ALOAD, 0)); ctorMAXS++; 310 insns.add(this.methodIsStatic ? new InsnNode(Opcodes.ACONST_NULL) : new VarInsnNode(Opcodes.ALOAD, 0)); ctorMAXS++;
311 insns.add(new InsnNode(cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0)); ctorMAXS++; 311 insns.add(new InsnNode(cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0)); ctorMAXS++;
312 - insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, this.eventInfoClass, Obf.constructor.name, EventInfo.getConstructorDescriptor(), false)); 312 + insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, this.eventInfoClass, Obf.constructor.name, EventInfo.getConstructorDescriptor()));
313 insns.add(new VarInsnNode(Opcodes.ASTORE, eventInfoVar)); 313 insns.add(new VarInsnNode(Opcodes.ASTORE, eventInfoVar));
314 314
315 // Call the event handler method in the proxy 315 // Call the event handler method in the proxy
316 insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar)); 316 insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar));
317 Event.pushArgs(argumentTypes, insns, this.methodIsStatic); 317 Event.pushArgs(argumentTypes, insns, this.methodIsStatic);
318 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Event.getActiveProxyRef(), handler.name, handler.desc, false)); 318 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Event.getActiveProxyRef(), handler.name, handler.desc));
319 319
320 if (cancellable) 320 if (cancellable)
321 { 321 {
@@ -340,7 +340,7 @@ public class Event implements Comparable&lt;Event&gt; @@ -340,7 +340,7 @@ public class Event implements Comparable&lt;Event&gt;
340 protected void injectCancellationCode(final InsnList insns, final AbstractInsnNode injectionPoint, int eventInfoVar) 340 protected void injectCancellationCode(final InsnList insns, final AbstractInsnNode injectionPoint, int eventInfoVar)
341 { 341 {
342 insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar)); 342 insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar));
343 - insns.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.eventInfoClass, EventInfo.getIsCancelledMethodName(), EventInfo.getIsCancelledMethodSig(), false)); 343 + insns.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.eventInfoClass, EventInfo.getIsCancelledMethodName(), EventInfo.getIsCancelledMethodSig()));
344 344
345 LabelNode notCancelled = new LabelNode(); 345 LabelNode notCancelled = new LabelNode();
346 insns.add(new JumpInsnNode(Opcodes.IFEQ, notCancelled)); 346 insns.add(new JumpInsnNode(Opcodes.IFEQ, notCancelled));
@@ -371,7 +371,7 @@ public class Event implements Comparable&lt;Event&gt; @@ -371,7 +371,7 @@ public class Event implements Comparable&lt;Event&gt;
371 insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar)); 371 insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar));
372 String accessor = ReturnEventInfo.getReturnAccessor(this.methodReturnType); 372 String accessor = ReturnEventInfo.getReturnAccessor(this.methodReturnType);
373 String descriptor = ReturnEventInfo.getReturnDescriptor(this.methodReturnType); 373 String descriptor = ReturnEventInfo.getReturnDescriptor(this.methodReturnType);
374 - insns.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.eventInfoClass, accessor, descriptor, false)); 374 + insns.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.eventInfoClass, accessor, descriptor));
375 if (this.methodReturnType.getSort() == Type.OBJECT) 375 if (this.methodReturnType.getSort() == Type.OBJECT)
376 { 376 {
377 insns.add(new TypeInsnNode(Opcodes.CHECKCAST, this.methodReturnType.getInternalName())); 377 insns.add(new TypeInsnNode(Opcodes.CHECKCAST, this.methodReturnType.getInternalName()));
@@ -509,7 +509,7 @@ public class Event implements Comparable&lt;Event&gt; @@ -509,7 +509,7 @@ public class Event implements Comparable&lt;Event&gt;
509 insns.add(new LineNumberNode(++lineNumber, lineNumberLabel)); 509 insns.add(new LineNumberNode(++lineNumber, lineNumberLabel));
510 510
511 Event.pushArgs(args, insns, true); 511 Event.pushArgs(args, insns, true);
512 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, listener.ownerRef, listener.getOrInflectName(event.name), handlerMethod.desc, false)); 512 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, listener.ownerRef, listener.getOrInflectName(event.name), handlerMethod.desc));
513 } 513 }
514 514
515 insns.add(tryCatchEnd); // } 515 insns.add(tryCatchEnd); // }
@@ -517,12 +517,12 @@ public class Event implements Comparable&lt;Event&gt; @@ -517,12 +517,12 @@ public class Event implements Comparable&lt;Event&gt;
517 517
518 insns.add(tryCatchHandler1); // catch (NoSuchMethodError err) { 518 insns.add(tryCatchHandler1); // catch (NoSuchMethodError err) {
519 insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); 519 insns.add(new VarInsnNode(Opcodes.ALOAD, 0));
520 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.EventProxy.ref, "onMissingHandler", "(Ljava/lang/Error;Lcom/mumfrey/liteloader/transformers/event/EventInfo;)V", false)); 520 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.EventProxy.ref, "onMissingHandler", "(Ljava/lang/Error;Lcom/mumfrey/liteloader/transformers/event/EventInfo;)V"));
521 insns.add(new JumpInsnNode(Opcodes.GOTO, tryCatchExit)); 521 insns.add(new JumpInsnNode(Opcodes.GOTO, tryCatchExit));
522 522
523 insns.add(tryCatchHandler2); // } catch (NoClassDefFoundError err) { 523 insns.add(tryCatchHandler2); // } catch (NoClassDefFoundError err) {
524 insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); 524 insns.add(new VarInsnNode(Opcodes.ALOAD, 0));
525 - insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.EventProxy.ref, "onMissingClass", "(Ljava/lang/Error;Lcom/mumfrey/liteloader/transformers/event/EventInfo;)V", false)); 525 + insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Obf.EventProxy.ref, "onMissingClass", "(Ljava/lang/Error;Lcom/mumfrey/liteloader/transformers/event/EventInfo;)V"));
526 insns.add(new JumpInsnNode(Opcodes.GOTO, tryCatchExit)); 526 insns.add(new JumpInsnNode(Opcodes.GOTO, tryCatchExit));
527 527
528 insns.add(tryCatchExit); // } 528 insns.add(tryCatchExit); // }
lib/asm-debug-all-4.1.jar 0 → 100644
View file @9732820
No preview for this file type
lib/asm-debug-all-5.0.3.jar deleted 100644 → 0
View file @a7acdc4
No preview for this file type