From 0fbff175ff90852df40994243996e7c42bbb202d Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Thu, 25 Jan 2018 19:49:32 +0800 Subject: [PATCH] update asm to 6.0 --- build.gradle | 4 ++-- .../to2mbn/authlibinjector/transform/LdcTransformUnit.java | 6 +++--- .../transform/SkinWhitelistTransformUnit.java | 6 +++--- .../transform/YggdrasilKeyTransformUnit.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 430d2fc..38cfe33 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '2.0.1' + id 'com.github.johnrengelman.shadow' version '2.0.2' id 'com.palantir.git-version' version '0.10.0' id 'java' } @@ -10,7 +10,7 @@ repositories { } dependencies { - compile 'org.ow2.asm:asm:5.2' + compile 'org.ow2.asm:asm:6.0' compile 'org.yaml:snakeyaml:1.19' compileOnly ('net.minecraft:launchwrapper:1.12') { transitive = false diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java b/src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java index f46e21d..83bca53 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java +++ b/src/main/java/org/to2mbn/authlibinjector/transform/LdcTransformUnit.java @@ -1,6 +1,6 @@ package org.to2mbn.authlibinjector.transform; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASM6; import static org.to2mbn.authlibinjector.AuthlibInjector.log; import java.util.Optional; import java.util.function.Function; @@ -17,11 +17,11 @@ public class LdcTransformUnit implements TransformUnit { @Override public Optional transform(String className, ClassVisitor writer, Runnable modifiedCallback) { - return Optional.of(new ClassVisitor(ASM5, writer) { + return Optional.of(new ClassVisitor(ASM6, writer) { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return new MethodVisitor(ASM5, super.visitMethod(access, name, desc, signature, exceptions)) { + return new MethodVisitor(ASM6, super.visitMethod(access, name, desc, signature, exceptions)) { @Override public void visitLdcInsn(Object cst) { diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java b/src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java index 8eb6089..99de075 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java +++ b/src/main/java/org/to2mbn/authlibinjector/transform/SkinWhitelistTransformUnit.java @@ -2,7 +2,7 @@ package org.to2mbn.authlibinjector.transform; import static org.objectweb.asm.Opcodes.AASTORE; import static org.objectweb.asm.Opcodes.ANEWARRAY; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASM6; import static org.objectweb.asm.Opcodes.DUP; import static org.objectweb.asm.Opcodes.ICONST_0; import static org.objectweb.asm.Opcodes.ICONST_1; @@ -23,12 +23,12 @@ public class SkinWhitelistTransformUnit implements TransformUnit { @Override public Optional transform(String className, ClassVisitor writer, Runnable modifiedCallback) { if ("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService".equals(className)) { - return Optional.of(new ClassVisitor(ASM5, writer) { + return Optional.of(new ClassVisitor(ASM6, writer) { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { if ("".equals(name)) { - return new MethodVisitor(ASM5, super.visitMethod(access, name, desc, signature, exceptions)) { + return new MethodVisitor(ASM6, super.visitMethod(access, name, desc, signature, exceptions)) { int status = 0; diff --git a/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java b/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java index 13d9c3e..cab0710 100644 --- a/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java +++ b/src/main/java/org/to2mbn/authlibinjector/transform/YggdrasilKeyTransformUnit.java @@ -1,6 +1,6 @@ package org.to2mbn.authlibinjector.transform; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASM6; import static org.objectweb.asm.Opcodes.BASTORE; import static org.objectweb.asm.Opcodes.BIPUSH; import static org.objectweb.asm.Opcodes.DUP; @@ -25,12 +25,12 @@ public class YggdrasilKeyTransformUnit implements TransformUnit { @Override public Optional transform(String className, ClassVisitor writer, Runnable modifiedCallback) { if ("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService".equals(className)) { - return Optional.of(new ClassVisitor(ASM5, writer) { + return Optional.of(new ClassVisitor(ASM6, writer) { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { if ("".equals(name)) { - return new MethodVisitor(ASM5, super.visitMethod(access, name, desc, signature, exceptions)) { + return new MethodVisitor(ASM6, super.visitMethod(access, name, desc, signature, exceptions)) { int state = 0;