AstralTransRocketries/authlib-injector
1
0
Fork 0
mirror of https://github.com/unmojang/authlib-injector.git synced 2025-09-30 23:01:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply AuthlibLogInterceptor only if necessary

Browse Source
This commit is contained in:
yushijinhun 2018-12-29 21:42:53 +08:00
parent 57e145d7da
commit 42ed5a9b1e
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/moe/yushi/authlibinjector/transform/AuthlibLogInterceptor.java
View File

@ -196,18 +196,23 @@ public class AuthlibLogInterceptor implements TransformUnit {
} }
@Override @Override
public Optional<ClassVisitor> transform(String className, ClassVisitor writer, Runnable modifiedCallback) { public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) {
if (className.startsWith("com.mojang.authlib.")) { if (className.startsWith("com.mojang.authlib.")) {
synchronized (interceptedClassloaders) {
if (interceptedClassloaders.contains(classLoader)) {
return Optional.empty();
}
}
return Optional.of(new ClassVisitor(ASM6, writer) { return Optional.of(new ClassVisitor(ASM6, writer) {
@Override @Override
public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) { public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions); MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
if ("<clinit>".equals(name)) { if ("<clinit>".equals(name)) {
modifiedCallback.run();
mv.visitLdcInsn(Type.getType("L" + className.replace('.', '/') + ";")); mv.visitLdcInsn(Type.getType("L" + className.replace('.', '/') + ";"));
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "getClassLoader", "()Ljava/lang/ClassLoader;", false); mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "getClassLoader", "()Ljava/lang/ClassLoader;", false);
mv.visitMethodInsn(INVOKESTATIC, AuthlibLogInterceptor.class.getName().replace('.', '/'), "onClassLoading", "(Ljava/lang/ClassLoader;)V", false); mv.visitMethodInsn(INVOKESTATIC, AuthlibLogInterceptor.class.getName().replace('.', '/'), "onClassLoading", "(Ljava/lang/ClassLoader;)V", false);
modifiedCallback.run();
} }
return mv; return mv;
} }

8
src/main/java/moe/yushi/authlibinjector/transform/ClassTransformer.java
View File

@ -34,10 +34,12 @@ public class ClassTransformer implements ClassFileTransformer {
private String className; private String className;
private byte[] classBuffer; private byte[] classBuffer;
private ClassWriter pooledClassWriter; private ClassWriter pooledClassWriter;
private ClassLoader classLoader;
public TransformHandle(String className, byte[] classBuffer) { public TransformHandle(ClassLoader classLoader, String className, byte[] classBuffer) {
this.className = className; this.className = className;
this.classBuffer = classBuffer; this.classBuffer = classBuffer;
this.classLoader = classLoader;
} }
public void accept(TransformUnit unit) { public void accept(TransformUnit unit) {
@ -49,7 +51,7 @@ public class ClassTransformer implements ClassFileTransformer {
pooledClassWriter = null; pooledClassWriter = null;
} }
Optional<ClassVisitor> optionalVisitor = unit.transform(className, writer, () -> currentModified = true); Optional<ClassVisitor> optionalVisitor = unit.transform(classLoader, className, writer, () -> currentModified = true);
if (optionalVisitor.isPresent()) { if (optionalVisitor.isPresent()) {
currentModified = false; currentModified = false;
ClassReader reader = new ClassReader(classBuffer); ClassReader reader = new ClassReader(classBuffer);
@ -96,7 +98,7 @@ public class ClassTransformer implements ClassFileTransformer {
} }
} }
TransformHandle handle = new TransformHandle(className, classfileBuffer); TransformHandle handle = new TransformHandle(loader, className, classfileBuffer);
units.forEach(handle::accept); units.forEach(handle::accept);
listeners.forEach(it -> it.onClassLoading(loader, className, handle.getFinalResult(), handle.getAppliedTransformers())); listeners.forEach(it -> it.onClassLoading(loader, className, handle.getFinalResult(), handle.getAppliedTransformers()));

2
src/main/java/moe/yushi/authlibinjector/transform/LdcTransformUnit.java
View File

@ -9,7 +9,7 @@ import moe.yushi.authlibinjector.util.Logging;
public abstract class LdcTransformUnit implements TransformUnit { public abstract class LdcTransformUnit implements TransformUnit {
@Override @Override
public Optional<ClassVisitor> transform(String className, ClassVisitor writer, Runnable modifiedCallback) { public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) {
return Optional.of(new ClassVisitor(ASM6, writer) { return Optional.of(new ClassVisitor(ASM6, writer) {
@Override @Override

2
src/main/java/moe/yushi/authlibinjector/transform/SkinWhitelistTransformUnit.java
View File

@ -21,7 +21,7 @@ public class SkinWhitelistTransformUnit implements TransformUnit {
} }
@Override @Override
public Optional<ClassVisitor> transform(String className, ClassVisitor writer, Runnable modifiedCallback) { public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) {
if ("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService".equals(className)) { if ("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService".equals(className)) {
return Optional.of(new ClassVisitor(ASM6, writer) { return Optional.of(new ClassVisitor(ASM6, writer) {

2
src/main/java/moe/yushi/authlibinjector/transform/TransformUnit.java
View File

@ -5,6 +5,6 @@ import org.objectweb.asm.ClassVisitor;
public interface TransformUnit { public interface TransformUnit {
Optional<ClassVisitor> transform(String className, ClassVisitor writer, Runnable modifiedCallback); Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback);
} }

2
src/main/java/moe/yushi/authlibinjector/transform/YggdrasilKeyTransformUnit.java
View File

@ -23,7 +23,7 @@ public class YggdrasilKeyTransformUnit implements TransformUnit {
} }
@Override @Override
public Optional<ClassVisitor> transform(String className, ClassVisitor writer, Runnable modifiedCallback) { public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) {
if ("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService".equals(className)) { if ("com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService".equals(className)) {
return Optional.of(new ClassVisitor(ASM6, writer) { return Optional.of(new ClassVisitor(ASM6, writer) {