From 2ca75b3fa42d21a3598f1cdc25c7e03cb6c7bdd1 Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 16 Aug 2014 13:21:07 -0400 Subject: [PATCH] Update to legacylauncher 1.10 and asm 5.0.3 --- fml/jsons/1.7.10-dev.json | 6 +++--- fml/jsons/1.7.10-rel.json | 6 +++--- fml/jsons/1.7.10.json | 2 +- .../asm/transformers/EventSubscriptionTransformer.java | 8 ++++---- .../fml/common/asm/transformers/ItemStackTransformer.java | 2 +- .../fml/common/asm/transformers/TerminalTransformer.java | 4 ++-- .../cpw/mods/fml/common/eventhandler/ASMEventHandler.java | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fml/jsons/1.7.10-dev.json b/fml/jsons/1.7.10-dev.json index f2998c6b96..68a2ab70f2 100644 --- a/fml/jsons/1.7.10-dev.json +++ b/fml/jsons/1.7.10-dev.json @@ -8,10 +8,10 @@ "assets": "1.7.10", "libraries": [ { - "name": "net.minecraft:launchwrapper:1.9" + "name": "net.minecraft:launchwrapper:1.10" }, { - "name": "org.ow2.asm:asm-debug-all:4.1", + "name": "org.ow2.asm:asm-debug-all:5.0.3", "children" : ["sources"], "url" : "http://repo.maven.apache.org/maven2" }, @@ -79,7 +79,7 @@ "name": "lzma:lzma:0.0.1" }, { - "name": "com.mojang:realms:1.3.2" + "name": "com.mojang:realms:1.3.5" }, { "name": "org.apache.commons:commons-compress:1.8.1" diff --git a/fml/jsons/1.7.10-rel.json b/fml/jsons/1.7.10-rel.json index 690f3a1c8d..50f3dd3614 100644 --- a/fml/jsons/1.7.10-rel.json +++ b/fml/jsons/1.7.10-rel.json @@ -24,11 +24,11 @@ "url": "http://files.minecraftforge.net/maven/" }, { - "name": "net.minecraft:launchwrapper:1.9", + "name": "net.minecraft:launchwrapper:1.10", "serverreq":true }, { - "name": "org.ow2.asm:asm-all:4.1", + "name": "org.ow2.asm:asm-all:5.0.3", "serverreq":true }, { @@ -117,7 +117,7 @@ "serverreq":true }, { - "name": "com.mojang:realms:1.3.2" + "name": "com.mojang:realms:1.3.5" }, { "name": "org.apache.commons:commons-compress:1.8.1" diff --git a/fml/jsons/1.7.10.json b/fml/jsons/1.7.10.json index f58f1a7d93..020bda29c5 100644 --- a/fml/jsons/1.7.10.json +++ b/fml/jsons/1.7.10.json @@ -8,7 +8,7 @@ "assets": "1.7.10", "libraries": [ { - "name": "com.mojang:realms:1.3.2" + "name": "com.mojang:realms:1.3.5" }, { "name": "org.apache.commons:commons-compress:1.8.1" diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java index 6e0fdd0a85..9d76e27189 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java @@ -141,7 +141,7 @@ public class EventSubscriptionTransformer implements IClassTransformer */ MethodNode method = new MethodNode(ASM4, ACC_PUBLIC, "", getMethodDescriptor(VOID_TYPE), null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); - method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "", getMethodDescriptor(VOID_TYPE))); + method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "", getMethodDescriptor(VOID_TYPE), false)); method.instructions.add(new InsnNode(RETURN)); if (!hasDefaultCtr) { @@ -161,7 +161,7 @@ public class EventSubscriptionTransformer implements IClassTransformer */ method = new MethodNode(ASM4, ACC_PROTECTED, "setup", getMethodDescriptor(VOID_TYPE), null, null); method.instructions.add(new VarInsnNode(ALOAD, 0)); - method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "setup", getMethodDescriptor(VOID_TYPE))); + method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "setup", getMethodDescriptor(VOID_TYPE), false)); method.instructions.add(new FieldInsnNode(GETSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor())); LabelNode initLisitener = new LabelNode(); method.instructions.add(new JumpInsnNode(IFNULL, initLisitener)); @@ -171,8 +171,8 @@ public class EventSubscriptionTransformer implements IClassTransformer method.instructions.add(new TypeInsnNode(NEW, tList.getInternalName())); method.instructions.add(new InsnNode(DUP)); method.instructions.add(new VarInsnNode(ALOAD, 0)); - method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "getListenerList", getMethodDescriptor(tList))); - method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tList.getInternalName(), "", getMethodDescriptor(VOID_TYPE, tList))); + method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tSuper.getInternalName(), "getListenerList", getMethodDescriptor(tList), false)); + method.instructions.add(new MethodInsnNode(INVOKESPECIAL, tList.getInternalName(), "", getMethodDescriptor(VOID_TYPE, tList), false)); method.instructions.add(new FieldInsnNode(PUTSTATIC, classNode.name, "LISTENER_LIST", tList.getDescriptor())); method.instructions.add(new InsnNode(RETURN)); classNode.methods.add(method); diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java index abf52f4b6d..dd6ab2d7af 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java @@ -71,7 +71,7 @@ public class ItemStackTransformer implements IClassTransformer { if (itemField.name.equals(fi.name) && fi.getOpcode() == Opcodes.GETFIELD) { it.remove(); - MethodInsnNode replace = new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/minecraft/item/ItemStack",getItemMethod.name, getItemMethod.desc); + MethodInsnNode replace = new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/minecraft/item/ItemStack",getItemMethod.name, getItemMethod.desc, false); it.add(replace); } } diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java index d5056c3ccb..865486bc67 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java @@ -52,7 +52,7 @@ public class TerminalTransformer implements IClassTransformer return new MethodVisitor(Opcodes.ASM4, super.visitMethod(mAccess, mName, mDesc, mSignature, mExceptions)) { @Override - public void visitMethodInsn(int opcode, String owner, String name, String desc) + public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean isIntf) { if (opcode == Opcodes.INVOKESTATIC && owner.equals("java/lang/System") && name.equals("exit") && desc.equals("(I)V")) { @@ -98,7 +98,7 @@ public class TerminalTransformer implements IClassTransformer desc = "(Ljava/lang/Runtime;I)V"; } - super.visitMethodInsn(opcode, owner, name, desc); + super.visitMethodInsn(opcode, owner, name, desc, isIntf); } }; } diff --git a/fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java b/fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java index fd63de2b9f..d8584f3441 100644 --- a/fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java +++ b/fml/src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java @@ -94,7 +94,7 @@ public class ASMEventHandler implements IEventListener mv = cw.visitMethod(ACC_PUBLIC, "", "(Ljava/lang/Object;)V", null, null); mv.visitCode(); mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V"); + mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 1); mv.visitFieldInsn(PUTFIELD, desc, "instance", "Ljava/lang/Object;"); @@ -110,7 +110,7 @@ public class ASMEventHandler implements IEventListener mv.visitTypeInsn(CHECKCAST, instType); mv.visitVarInsn(ALOAD, 1); mv.visitTypeInsn(CHECKCAST, eventType); - mv.visitMethodInsn(INVOKEVIRTUAL, instType, callback.getName(), Type.getMethodDescriptor(callback)); + mv.visitMethodInsn(INVOKEVIRTUAL, instType, callback.getName(), Type.getMethodDescriptor(callback), false); mv.visitInsn(RETURN); mv.visitMaxs(2, 2); mv.visitEnd();