Anvilcraft/anvilauth-injector
2
0
Fork 0
forked from MirrorHub/authlib-injector
Code Pull requests Activity

polish

Browse source
This commit is contained in:
yushijinhun 2019-01-23 20:17:27 +08:00
parent 1003212d38
commit b4e97786b0
No known key found for this signature in database
GPG key ID: 5BC167F73EA558E4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/moe/yushi/authlibinjector/transform/CallbackSupport.java
View file

@ -27,7 +27,9 @@ import org.objectweb.asm.Type;
import moe.yushi.authlibinjector.transform.TransformUnit.TransformContext; import moe.yushi.authlibinjector.transform.TransformUnit.TransformContext;
public class CallbackSupport { public final class CallbackSupport {
private CallbackSupport() {
}
private static Method findCallbackMethod(Class<?> owner, String methodName) { private static Method findCallbackMethod(Class<?> owner, String methodName) {
for (Method method : owner.getDeclaredMethods()) { for (Method method : owner.getDeclaredMethods()) {

6
src/main/java/moe/yushi/authlibinjector/transform/support/MC52974_1710Workaround.java
View file

@ -123,7 +123,6 @@ public class MC52974_1710Workaround {
ctx.markModified(); ctx.markModified();
super.visitInsn(DUP); super.visitInsn(DUP);
CallbackSupport.invoke(ctx, mv, MC52974_1710Workaround.class, "markGameProfile"); CallbackSupport.invoke(ctx, mv, MC52974_1710Workaround.class, "markGameProfile");
super.visitTypeInsn(CHECKCAST, "com/mojang/authlib/GameProfile");
} }
super.visitInsn(opcode); super.visitInsn(opcode);
} }
@ -154,11 +153,12 @@ public class MC52974_1710Workaround {
return new MethodVisitor(ASM7, super.visitMethod(access, name, descriptor, signature, exceptions)) { return new MethodVisitor(ASM7, super.visitMethod(access, name, descriptor, signature, exceptions)) {
@Override @Override
public void visitFieldInsn(int opcode, String owner, String name, String descriptor) { public void visitFieldInsn(int opcode, String owner, String name, String descriptor) {
super.visitFieldInsn(opcode, owner, name, descriptor);
if (opcode == GETFIELD && (isNotchName if (opcode == GETFIELD && (isNotchName
? "gb".equals(owner) && "b".equals(name) && "Lcom/mojang/authlib/GameProfile;".equals(descriptor) ? "gb".equals(owner) && "b".equals(name) && "Lcom/mojang/authlib/GameProfile;".equals(descriptor)
: "net/minecraft/network/play/server/S0CPacketSpawnPlayer".equals(owner) && "field_148955_b".equals(name) && "Lcom/mojang/authlib/GameProfile;".equals(descriptor))) { : "net/minecraft/network/play/server/S0CPacketSpawnPlayer".equals(owner) && "field_148955_b".equals(name) && "Lcom/mojang/authlib/GameProfile;".equals(descriptor))) {
ctx.markModified(); ctx.markModified();
super.visitFieldInsn(opcode, owner, name, descriptor);
if (isNotchName) { if (isNotchName) {
super.visitMethodInsn(INVOKESTATIC, "net/minecraft/server/MinecraftServer", "I", "()Lnet/minecraft/server/MinecraftServer;", false); super.visitMethodInsn(INVOKESTATIC, "net/minecraft/server/MinecraftServer", "I", "()Lnet/minecraft/server/MinecraftServer;", false);
} else { } else {
@ -167,8 +167,6 @@ public class MC52974_1710Workaround {
super.visitLdcInsn(isNotchName ? 1 : 0); super.visitLdcInsn(isNotchName ? 1 : 0);
CallbackSupport.invoke(ctx, mv, MC52974_1710Workaround.class, "accessGameProfile"); CallbackSupport.invoke(ctx, mv, MC52974_1710Workaround.class, "accessGameProfile");
super.visitTypeInsn(CHECKCAST, "com/mojang/authlib/GameProfile"); super.visitTypeInsn(CHECKCAST, "com/mojang/authlib/GameProfile");
} else {
super.visitFieldInsn(opcode, owner, name, descriptor);
} }
} }
}; };