Change the ordinal of FMLLoadingPlugin to fix the crash with BetterFps before Minecraft 1.10.2. (#131)

Clean up codes.
This commit is contained in:
ZekerZhayard authored and GitHub committed 2020-12-15 21:17:10 +08:00
1 parent a1b52eb7ac
commit 581a2dddea
13 files changed
+72 -138

No files matched your search

@@ -5,7 +5,7 @@ import java.util.Map;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
@IFMLLoadingPlugin.Name("CustomSkinLoader")
@IFMLLoadingPlugin.SortingIndex(1100)
@IFMLLoadingPlugin.SortingIndex(-10)
public class ForgePlugin implements IFMLLoadingPlugin {
@Override
@@ -1,18 +1,28 @@
package customskinloader.forge;
import java.io.File;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Set;
import customskinloader.forge.platform.IFMLPlatform;
import net.minecraft.launchwrapper.ITweaker;
import net.minecraft.launchwrapper.Launch;
import net.minecraft.launchwrapper.LaunchClassLoader;
public class ForgeTweaker implements ITweaker {
public ForgeTweaker() {
try {
IFMLPlatform.FMLPlatformInitializer.initFMLPlatform();
} catch (Exception exception) {
throw new RuntimeException(exception);
private final static String FML_PLATFORM_INITIALIZER = "customskinloader.forge.platform.IFMLPlatform$FMLPlatformInitializer";
@SuppressWarnings("unchecked")
public ForgeTweaker() throws Exception {
// FML is loaded by LaunchClassLoader but we are in AppClassLoader.
if (!this.getClass().getClassLoader().equals(Launch.classLoader)) {
Field field = LaunchClassLoader.class.getDeclaredField("classLoaderExceptions");
field.setAccessible(true);
String exclusionName = this.getClass().getName().substring(0, this.getClass().getName().lastIndexOf("."));
((Set<String>) field.get(Launch.classLoader)).remove(exclusionName);
Launch.classLoader.addTransformerExclusion(exclusionName);
Launch.classLoader.loadClass(FML_PLATFORM_INITIALIZER).getMethod("initFMLPlatform").invoke(null);
}
}
@@ -26,11 +26,11 @@ public class TransformerManager {
}
public interface IClassTransformer {
void transform(ClassNode cn);
ClassNode transform(ClassNode cn);
}
public interface IMethodTransformer {
void transform(ClassNode cn, MethodNode mn);
MethodNode transform(ClassNode cn, MethodNode mn);
}
public Map<String, IClassTransformer> classMap = new HashMap<>();
@@ -58,7 +58,7 @@ public class TransformerManager {
private TransformTarget getTransformTarget(Class<?> cl) {
logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s", cl.getName());
if (!cl.isAnnotationPresent(TransformTarget.class)) {
logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation.");
logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation");
return null;
}
return cl.getAnnotation(TransformTarget.class);
@@ -76,18 +76,18 @@ public class TransformerManager {
map.put(className, new HashMap<String, IMethodTransformer>());
for (String methodName : target.methodNames()) {
map.get(className).put(methodName + target.desc(), transformer);
logger.info("[CSL DEBUG] REGISTERING METHOD %s(%s)", className, methodName + target.desc());
logger.info("[CSL DEBUG] REGISTERING METHOD %s::%s", className, methodName + target.desc());
}
}
public ClassNode transform(ClassNode classNode) {
IClassTransformer transformer = classMap.get(classNode.name.replace("/", "."));
public ClassNode transform(ClassNode classNode, String className) {
IClassTransformer transformer = classMap.get(className);
if (transformer != null) {
try {
transformer.transform(classNode);
logger.info("[CSL DEBUG] Successfully transformed class %s", classNode.name);
classNode = transformer.transform(classNode);
logger.info("[CSL DEBUG] Successfully transformed class %s", className);
} catch (Exception e) {
logger.warning("[CSL DEBUG] An error happened when transforming class %s.", classNode.name);
logger.warning("[CSL DEBUG] An error happened when transforming class %s", className);
logger.warning(e);
}
}
@@ -99,10 +99,10 @@ public class TransformerManager {
String methodTarget = methodName + methodDesc;
if (transMap != null && transMap.containsKey(methodTarget)) {
try {
transMap.get(methodTarget).transform(classNode, methodNode);
methodNode = transMap.get(methodTarget).transform(classNode, methodNode);
logger.info("[CSL DEBUG] Successfully transformed method %s in class %s", methodName, className);
} catch (Exception e) {
logger.warning("[CSL DEBUG] An error happened when transforming method %s in class %s.", methodTarget, className);
logger.warning("[CSL DEBUG] An error happened when transforming method %s in class %s", methodTarget, className);
logger.warning(e);
}
}
@@ -1,6 +1,9 @@
package customskinloader.forge.loader;
import java.util.ArrayList;
import customskinloader.forge.TransformerManager;
import customskinloader.forge.platform.IFMLPlatform;
import customskinloader.forge.transformer.FakeInterfacesTransformer;
import customskinloader.forge.transformer.PlayerTabTransformer;
import customskinloader.forge.transformer.SkinManagerTransformer;
@@ -48,10 +51,15 @@ public class LaunchWrapper implements IClassTransformer {
}
//Transform ClassNode
transformerManager.transform(cn);
cn = transformerManager.transform(cn, className);
ArrayList<MethodNode> methods = new ArrayList<>();
for (MethodNode mn : cn.methods) {
transformerManager.transform(cn, mn, className, mn.name, mn.desc);
String mappedMethodName = IFMLPlatform.FMLPlatformInitializer.platform.getRemapper().mapMethodName(cn.name, mn.name, mn.desc);
String mappedMethodDesc = IFMLPlatform.FMLPlatformInitializer.platform.getRemapper().mapMethodDesc(mn.desc);
methods.add(transformerManager.transform(cn, mn, className, mappedMethodName, mappedMethodDesc));
}
cn.methods.clear();
cn.methods.addAll(methods);
//Parse Class Node to bytes
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
@@ -1,49 +0,0 @@
package customskinloader.forge.loader;
import customskinloader.forge.TransformerManager;
import customskinloader.forge.transformer.FakeSkinManagerTransformer;
import customskinloader.forge.transformer.PlayerTabTransformer;
import customskinloader.forge.transformer.SkinManagerTransformer;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
/**
* ModLauncher for 1.13+
* @deprecated Use JavaScript Instead
*/
@Deprecated
public class ModLauncher {
private static final TransformerManager.IMethodTransformer[] TRANFORMERS = {
new SkinManagerTransformer.InitTransformer(),
new SkinManagerTransformer.LoadSkinTransformer(),
new SkinManagerTransformer.LoadProfileTexturesTransformer(),
new SkinManagerTransformer.LoadSkinFromCacheTransformer(),
new PlayerTabTransformer.ScoreObjectiveTransformer(),
new FakeSkinManagerTransformer.InitTransformer()
};
private TransformerManager transformerManager = new TransformerManager(TRANFORMERS);
public ClassNode transform(ClassNode input) {
for (MethodNode mn : input.methods) {
transformerManager.transform(input, mn, input.name, mn.name, mn.desc);
}
return input;
}
//Singleton
private volatile static ModLauncher INSTANCE = null;
public static ModLauncher instance() {
if (INSTANCE == null) {
synchronized (ModLauncher.class) {
if (INSTANCE == null) {
INSTANCE = new ModLauncher();
}
}
}
return INSTANCE;
}
}
@@ -10,9 +10,11 @@ import java.util.Set;
import com.google.common.base.Strings;
import customskinloader.forge.ForgePlugin;
import net.minecraft.launchwrapper.ITweaker;
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
import net.minecraftforge.fml.relauncher.CoreModManager;
import net.minecraftforge.fml.relauncher.FMLLaunchHandler;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
import org.objectweb.asm.commons.Remapper;
public class DefaultFMLPlatform implements IFMLPlatform {
private final static String FML_PLUGIN_WRAPPER = "net.minecraftforge.fml.relauncher.CoreModManager$FMLPluginWrapper";
@@ -67,6 +69,11 @@ public class DefaultFMLPlatform implements IFMLPlatform {
((List<ITweaker>) field.get(null)).add(tweaker);
}
@Override
public Remapper getRemapper() {
return FMLDeobfuscatingRemapper.INSTANCE;
}
protected Class<?> getFMLLoadingPluginClass() {
return ForgePlugin.class;
}
@@ -11,6 +11,7 @@ import java.util.Set;
import customskinloader.forge.TransformerManager;
import net.minecraft.launchwrapper.ITweaker;
import net.minecraft.launchwrapper.Launch;
import org.objectweb.asm.commons.Remapper;
public interface IFMLPlatform {
enum Result {
@@ -26,6 +27,8 @@ public interface IFMLPlatform {
}
class FMLPlatformInitializer {
public static IFMLPlatform platform;
private final static ServiceLoader<IFMLPlatform> platformsLoader = ServiceLoader.load(IFMLPlatform.class);
private final static Set<IFMLPlatform> platforms = new HashSet<>();
@@ -37,7 +40,6 @@ public interface IFMLPlatform {
@SuppressWarnings("unchecked")
public static void initFMLPlatform() throws Exception {
IFMLPlatform platform = null;
for (IFMLPlatform platform0 : platforms) {
Set<IFMLPlatform> otherPlatforms = new HashSet<>(platforms);
otherPlatforms.remove(platform0);
@@ -90,4 +92,6 @@ public interface IFMLPlatform {
ITweaker createFMLPluginWrapper(String name, File location, int sortIndex) throws Exception;
void addLoadPlugins(ITweaker tweaker) throws Exception;
Remapper getRemapper();
}
@@ -10,8 +10,9 @@ public class FakeInterfacesTransformer {
)
public static class MinecraftTransformer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
public ClassNode transform(ClassNode cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeMinecraft");
return cn;
}
}
@@ -20,8 +21,9 @@ public class FakeInterfacesTransformer {
)
public static class AbstractTextureTransfomer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
public ClassNode transform(ClassNode cn) {
cn.interfaces.add("net/minecraft/client/renderer/texture/Texture");
return cn;
}
}
@@ -30,10 +32,11 @@ public class FakeInterfacesTransformer {
)
public static class TextureTransformer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
public ClassNode transform(ClassNode cn) {
if (cn.access == 0) {
cn.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT;
}
return cn;
}
}
@@ -42,9 +45,10 @@ public class FakeInterfacesTransformer {
)
public static class TextureManagerTransformer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
public ClassNode transform(ClassNode cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_1");
cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_2");
return cn;
}
}
}
@@ -1,57 +0,0 @@
package customskinloader.forge.transformer;
import customskinloader.forge.TransformerManager;
import customskinloader.forge.TransformerManager.IMethodTransformer;
import customskinloader.forge.TransformerManager.TransformTarget;
import org.objectweb.asm.tree.*;
import java.util.ListIterator;
/**
* Transformer of FakeSkinManager for 1.13+
* @deprecated Use JavaScript Instead
*/
@Deprecated
public class FakeSkinManagerTransformer {
private final static String TARGET_CLASS = "net/minecraft/client/renderer/ThreadDownloadImageData";
private final static String NEW_TARGET_CLASS = "net/minecraft/client/renderer/texture/ThreadDownloadImageData";
private final static String CALLBACK_CLASS = "net/minecraft/client/resources/SkinManager$SkinAvailableCallback";
@TransformTarget(className = "customskinloader.fake.FakeSkinManager",
methodNames = {"<init>"},
desc = "(Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V")
public static class InitTransformer implements IMethodTransformer {
@Override
public void transform(ClassNode cn, MethodNode mn) {
TransformerManager.logger.info("1.13 detected, FakeSkinManager will be transformed.");
//ClassNameRemapper.remapClassName(cn, TARGET_CLASS, NEW_TARGET_CLASS);
//MethodNameRemapper.remapMethodName(cn, CALLBACK_CLASS, "func_180521_a", "onSkinTextureAvailable");
InsnList il = mn.instructions;
ListIterator<AbstractInsnNode> li = il.iterator();
while (li.hasNext()) {
AbstractInsnNode ain = li.next();
if (ain instanceof MethodInsnNode) {
MethodInsnNode min = (MethodInsnNode) ain;
if (min.owner.equals(TARGET_CLASS)) {
min.owner = NEW_TARGET_CLASS;
//il.set(min, new MethodInsnNode(min.getOpcode(), NEW_TARGET_CLASS, min.name, min.desc, false));
}
if (min.owner.equals(CALLBACK_CLASS) && min.name.equals("func_180521_a")) {
min.name = "onSkinTextureAvailable";
//il.set(min, new MethodInsnNode(min.getOpcode(), min.owner, "onSkinTextureAvailable", min.desc, false));
}
} else if (ain instanceof TypeInsnNode) {
TypeInsnNode tin = (TypeInsnNode) ain;
if (tin.desc.equals(TARGET_CLASS)) {
tin.desc = NEW_TARGET_CLASS;
}
}
}
}
}
}
@@ -19,7 +19,7 @@ public class PlayerTabTransformer {
public static class ScoreObjectiveTransformer implements IMethodTransformer {
//From: http://git.oschina.net/AsteriskTeam/TabIconHackForge/blob/master/src/main/java/kengxxiao/tabiconhack/coremod/TabIconHackForgeClassTransformer.java#L30-L43
@Override
public void transform(ClassNode cn, MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
for (ListIterator<AbstractInsnNode> iterator = mn.instructions.iterator(); iterator.hasNext();) {
AbstractInsnNode node = iterator.next();
if (node.getOpcode() == Opcodes.INVOKEVIRTUAL && ((MethodInsnNode) node).name.equals("func_71387_A")) {
@@ -27,6 +27,7 @@ public class PlayerTabTransformer {
mn.instructions.set(node, new InsnNode(Opcodes.ICONST_1));
}
}
return mn;
}
}
}
@@ -19,7 +19,7 @@ public class SkinManagerTransformer {
desc="(Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V")
public static class InitTransformer implements IMethodTransformer{
@Override
public void transform(ClassNode cn,MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
boolean hasField = false;
for (FieldNode fn : cn.fields) {
if (fn.name.equals("fakeManager")) {
@@ -43,6 +43,7 @@ public class SkinManagerTransformer {
"(Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/io/File;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V", false));
mn.instructions.add(new FieldInsnNode(Opcodes.PUTFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager;"));
mn.instructions.add(new InsnNode(Opcodes.RETURN));
return mn;
}
}
@TransformTarget(className="net.minecraft.client.resources.SkinManager",
@@ -50,7 +51,7 @@ public class SkinManagerTransformer {
desc="(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;")
public static class LoadSkinTransformer implements IMethodTransformer{
@Override
public void transform(ClassNode cn,MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
mn.instructions.clear();
mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0));
mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager;"));
@@ -60,6 +61,7 @@ public class SkinManagerTransformer {
mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,"customskinloader/fake/FakeSkinManager","loadSkin",
"(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;", false));
mn.instructions.add(new InsnNode(Opcodes.ARETURN));
return mn;
}
}
@TransformTarget(className="net.minecraft.client.resources.SkinManager",
@@ -67,7 +69,7 @@ public class SkinManagerTransformer {
desc="(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V")
public static class LoadProfileTexturesTransformer implements IMethodTransformer{
@Override
public void transform(ClassNode cn,MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
mn.instructions.clear();
mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0));
mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager;"));
@@ -77,6 +79,7 @@ public class SkinManagerTransformer {
mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,"customskinloader/fake/FakeSkinManager","loadProfileTextures",
"(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V", false));
mn.instructions.add(new InsnNode(Opcodes.RETURN));
return mn;
}
}
@TransformTarget(className="net.minecraft.client.resources.SkinManager",
@@ -84,7 +87,7 @@ public class SkinManagerTransformer {
desc="(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;")
public static class LoadSkinFromCacheTransformer implements IMethodTransformer{
@Override
public void transform(ClassNode cn,MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
mn.instructions.clear();
mn.instructions.add(new VarInsnNode(Opcodes.ALOAD,0));
mn.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "net/minecraft/client/resources/SkinManager", "fakeManager", "Lcustomskinloader/fake/FakeSkinManager;"));
@@ -92,6 +95,7 @@ public class SkinManagerTransformer {
mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,"customskinloader/fake/FakeSkinManager","loadSkinFromCache",
"(Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;", false));
mn.instructions.add(new InsnNode(Opcodes.ARETURN));
return mn;
}
}
}
@@ -24,7 +24,7 @@ public class SpectatorMenuTransformer {
public static class PlayerMenuObjectTransformer implements IMethodTransformer {
@Override
public void transform(ClassNode cn, MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
InsnList il = mn.instructions;
ListIterator<AbstractInsnNode> li = il.iterator();
@@ -50,6 +50,7 @@ public class SpectatorMenuTransformer {
break;
}
}
return mn;
}
}
@@ -17,12 +17,13 @@ public class TileEntitySkullTransformer {
)
public static class UpdateGameProfileTransformer implements TransformerManager.IMethodTransformer {
@Override
public void transform(ClassNode cn, MethodNode mn) {
public MethodNode transform(ClassNode cn, MethodNode mn) {
InsnList il = new InsnList();
il.add(new VarInsnNode(Opcodes.ALOAD, 0));
il.add(new InsnNode(Opcodes.ARETURN));
il.add(new FrameNode(Opcodes.F_SAME, 0, null, 0, null));
mn.instructions.insert(il);
return mn;
}
}
}