AstralTransRocketries/authlib-injector
1
0
Fork 0
mirror of https://github.com/unmojang/authlib-injector.git synced 2025-10-03 08:11:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

MC52974_1710Workaround supports forge

Browse Source
This commit is contained in:
yushijinhun 2019-01-20 17:19:56 +08:00
parent bee0998925
commit 8bd0f3b803
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
1 changed files with 62 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/main/java/moe/yushi/authlibinjector/transform/support/MC52974_1710Workaround.java
View File

@ -10,6 +10,7 @@ import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.function.Function;
import java.util.logging.Level; import java.util.logging.Level;
import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassVisitor;
@ -22,7 +23,7 @@ import moe.yushi.authlibinjector.transform.TransformUnit;
import moe.yushi.authlibinjector.util.Logging; import moe.yushi.authlibinjector.util.Logging;
import moe.yushi.authlibinjector.util.WeakIdentityHashMap; import moe.yushi.authlibinjector.util.WeakIdentityHashMap;
public class MC52974_1710Workaround implements TransformUnit { public class MC52974_1710Workaround {
private MC52974_1710Workaround() { private MC52974_1710Workaround() {
} }
@ -30,8 +31,9 @@ public class MC52974_1710Workaround implements TransformUnit {
MainArgumentsTransformer.getVersionSeriesListeners().add(version -> { MainArgumentsTransformer.getVersionSeriesListeners().add(version -> {
if ("1.7.10".equals(version)) { if ("1.7.10".equals(version)) {
Logging.TRANSFORM.info("Enable MC-52974 Workaround for 1.7.10"); Logging.TRANSFORM.info("Enable MC-52974 Workaround for 1.7.10");
AuthlibInjector.getClassTransformer().units.add(new MC52974_1710Workaround()); AuthlibInjector.getClassTransformer().units.add(new SessionTransformer());
AuthlibInjector.retransformClasses("bbs", "gb"); AuthlibInjector.getClassTransformer().units.add(new S0CPacketSpawnPlayerTransformer());
AuthlibInjector.retransformClasses("bbs", "net.minecraft.util.Session", "gb", "net.minecraft.network.play.server.S0CPacketSpawnPlayer");
} }
}); });
} }
@ -45,7 +47,7 @@ public class MC52974_1710Workaround implements TransformUnit {
} }
} }
public static Object accessGameProfile(Object gp, Object minecraftServer) { public static Object accessGameProfile(Object gp, Object minecraftServer, boolean isNotchName) {
synchronized (markedGameProfiles) { synchronized (markedGameProfiles) {
Optional<Object> value = markedGameProfiles.get(gp); Optional<Object> value = markedGameProfiles.get(gp);
if (value != null) { if (value != null) {
@ -57,15 +59,21 @@ public class MC52974_1710Workaround implements TransformUnit {
if (minecraftServer != null) { if (minecraftServer != null) {
Logging.TRANSFORM.info("Filling properties for " + gp); Logging.TRANSFORM.info("Filling properties for " + gp);
try { try {
Class<?> classGameProfile = gp.getClass(); ClassLoader cl = minecraftServer.getClass().getClassLoader();
Class<?> classGameProfile = cl.loadClass("com.mojang.authlib.GameProfile");
Object gameProfile = classGameProfile.getConstructor(UUID.class, String.class) Object gameProfile = classGameProfile.getConstructor(UUID.class, String.class)
.newInstance( .newInstance(
classGameProfile.getMethod("getId").invoke(gp), classGameProfile.getMethod("getId").invoke(gp),
classGameProfile.getMethod("getName").invoke(gp)); classGameProfile.getMethod("getName").invoke(gp));
// MD: net/minecraft/server/MinecraftServer/av ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; net/minecraft/server/MinecraftServer/func_147130_as ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; Class<?> classMinecraftServer = cl.loadClass("net.minecraft.server.MinecraftServer");
Object minecraftSessionService = minecraftServer.getClass().getMethod("av").invoke(minecraftServer); Object minecraftSessionService = (isNotchName
Object filledGameProfile = minecraftSessionService.getClass().getMethod("fillProfileProperties", classGameProfile, boolean.class) ? classMinecraftServer.getMethod("av")
: classMinecraftServer.getMethod("func_147130_as"))
.invoke(minecraftServer);
Object filledGameProfile = cl.loadClass("com.mojang.authlib.minecraft.MinecraftSessionService").getMethod("fillProfileProperties", classGameProfile, boolean.class)
.invoke(minecraftSessionService, gameProfile, true); .invoke(minecraftSessionService, gameProfile, true);
markedGameProfiles.put(gp, Optional.of(filledGameProfile)); markedGameProfiles.put(gp, Optional.of(filledGameProfile));
@ -79,15 +87,16 @@ public class MC52974_1710Workaround implements TransformUnit {
return gp; return gp;
} }
@Override private static class SessionTransformer implements TransformUnit {
public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) { @Override
if ("bbs".equals(className)) { public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) {
// CL: bbs net/minecraft/util/Session return detectNotchName(className, "bbs", "net.minecraft.util.Session", isNotchName -> new ClassVisitor(ASM7, writer) {
return Optional.of(new ClassVisitor(ASM7, 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) {
if ("e".equals(name) && "()Lcom/mojang/authlib/GameProfile;".equals(descriptor)) { if (isNotchName
// MD: bbs/e ()Lcom/mojang/authlib/GameProfile; net/minecraft/util/Session/func_148256_e ()Lcom/mojang/authlib/GameProfile; ? "e".equals(name) && "()Lcom/mojang/authlib/GameProfile;".equals(descriptor)
: "func_148256_e".equals(name) && "()Lcom/mojang/authlib/GameProfile;".equals(descriptor)) {
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 visitInsn(int opcode) { public void visitInsn(int opcode) {
@ -104,27 +113,40 @@ public class MC52974_1710Workaround implements TransformUnit {
} }
} }
}); });
}
} else if ("gb".equals(className)) { @Override
// CL: gb net/minecraft/network/play/server/S0CPacketSpawnPlayer public String toString() {
return Optional.of(new ClassVisitor(ASM7, writer) { return "1.7.10 MC-52974 Workaround (Session)";
}
}
private static class S0CPacketSpawnPlayerTransformer implements TransformUnit {
@Override
public Optional<ClassVisitor> transform(ClassLoader classLoader, String className, ClassVisitor writer, Runnable modifiedCallback) {
return detectNotchName(className, "gb", "net.minecraft.network.play.server.S0CPacketSpawnPlayer", isNotchName -> new ClassVisitor(ASM7, 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) {
if ("b".equals(name) && "(Let;)V".equals(descriptor)) { if (isNotchName
// MD: gb/b (Let;)V net/minecraft/network/play/server/S0CPacketSpawnPlayer/func_148840_b (Lnet/minecraft/network/PacketBuffer;)V ? "b".equals(name) && "(Let;)V".equals(descriptor)
// func_148840_b,writePacketData,0,Writes the raw packet data to the data stream. : "func_148840_b".equals(name) && "(Lnet/minecraft/network/PacketBuffer;)V".equals(descriptor)) {
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); super.visitFieldInsn(opcode, owner, name, descriptor);
// FD: gb/b net/minecraft/network/play/server/S0CPacketSpawnPlayer/field_148955_b
if (opcode == GETFIELD && "gb".equals(owner) && "b".equals(name) && "Lcom/mojang/authlib/GameProfile;".equals(descriptor)) { if (opcode == GETFIELD && (isNotchName
? "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))) {
modifiedCallback.run(); modifiedCallback.run();
// MD: net/minecraft/server/MinecraftServer/I ()Lnet/minecraft/server/MinecraftServer; net/minecraft/server/MinecraftServer/func_71276_C ()Lnet/minecraft/server/MinecraftServer; if (isNotchName) {
// func_71276_C,getServer,0,Gets mcServer. 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 {
super.visitMethodInsn(INVOKESTATIC, Type.getInternalName(MC52974_1710Workaround.class), "accessGameProfile", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", false); super.visitMethodInsn(INVOKESTATIC, "net/minecraft/server/MinecraftServer", "func_71276_C", "()Lnet/minecraft/server/MinecraftServer;", false);
}
super.visitLdcInsn(isNotchName ? 1 : 0);
super.visitMethodInsn(INVOKESTATIC, Type.getInternalName(MC52974_1710Workaround.class), "accessGameProfile", "(Ljava/lang/Object;Ljava/lang/Object;Z)Ljava/lang/Object;", false);
super.visitTypeInsn(CHECKCAST, "com/mojang/authlib/GameProfile"); super.visitTypeInsn(CHECKCAST, "com/mojang/authlib/GameProfile");
} }
} }
@ -135,11 +157,20 @@ public class MC52974_1710Workaround implements TransformUnit {
} }
}); });
} }
return Optional.empty();
@Override
public String toString() {
return "1.7.10 MC-52974 Workaround (S0CPacketSpawnPlayer)";
}
} }
@Override private static <T> Optional<T> detectNotchName(String input, String ifNotchName, String ifDeobf, Function<Boolean, T> callback) {
public String toString() { if (ifNotchName.equals(input)) {
return "MC-52974 Workaround for 1.7.10"; return Optional.of(callback.apply(true));
} else if (ifDeobf.equals(input)) {
return Optional.of(callback.apply(false));
} else {
return Optional.empty();
}
} }
} }