From ddd608a8f8458c08418c8a2fbab4e3972289d3f5 Mon Sep 17 00:00:00 2001 From: makamys Date: Sat, 21 Oct 2023 02:48:04 +0200 Subject: [PATCH] Give transformers more unique and descriptive names --- .../legacymoddingmc/unimixins/compat/CompatCore.java | 8 ++++---- ...rmer.java => EnhanceCrashReportsTransformer.java} | 6 +++--- ...rmer.java => IgnoreDuplicateJarsTransformer.java} | 12 +++--------- .../unimixins/devcompat/DevCompatCore.java | 2 +- ...va => ClasspathModDiscoveryFixerTransformer.java} | 7 +++---- 5 files changed, 14 insertions(+), 21 deletions(-) rename module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/{FMLCommonHandlerTransformer.java => EnhanceCrashReportsTransformer.java} (90%) rename module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/{ModDiscovererTransformer.java => IgnoreDuplicateJarsTransformer.java} (89%) rename module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/{ModDiscovererTransformer.java => ClasspathModDiscoveryFixerTransformer.java} (88%) diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java index 76f7778..b9a951c 100644 --- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatCore.java @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import io.github.legacymoddingmc.unimixins.common.abstraction.ComparableVersion; import io.github.legacymoddingmc.unimixins.common.config.ConfigUtil; import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper; -import io.github.legacymoddingmc.unimixins.compat.asm.ModDiscovererTransformer; +import io.github.legacymoddingmc.unimixins.compat.asm.IgnoreDuplicateJarsTransformer; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,10 +41,10 @@ public class CompatCore implements IFMLLoadingPlugin { public String[] getASMTransformerClass() { List classes = new ArrayList<>(); if(CompatConfig.enhanceCrashReports) { - classes.add("io.github.legacymoddingmc.unimixins.compat.asm.FMLCommonHandlerTransformer"); + classes.add("io.github.legacymoddingmc.unimixins.compat.asm.EnhanceCrashReportsTransformer"); } - if(ModDiscovererTransformer.wantsToRun()) { - classes.add("io.github.legacymoddingmc.unimixins.compat.asm.ModDiscovererTransformer"); + if(IgnoreDuplicateJarsTransformer.wantsToRun()) { + classes.add("io.github.legacymoddingmc.unimixins.compat.asm.IgnoreDuplicateJarsTransformer"); } return classes.toArray(new String[0]); } diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/FMLCommonHandlerTransformer.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/EnhanceCrashReportsTransformer.java similarity index 90% rename from module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/FMLCommonHandlerTransformer.java rename to module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/EnhanceCrashReportsTransformer.java index 0c6b53d..4a68bac 100644 --- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/FMLCommonHandlerTransformer.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/EnhanceCrashReportsTransformer.java @@ -15,7 +15,7 @@ import static io.github.legacymoddingmc.unimixins.compat.CompatCore.LOGGER; *

Inserts a hook at the end of FMLCommonHandler#enhanceCrashReport. *

We use a transformer instead of a mixin because FML is a minefield for mixin errors. */ -public class FMLCommonHandlerTransformer implements IClassTransformer { +public class EnhanceCrashReportsTransformer implements IClassTransformer { @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { if(basicClass == null) return null; @@ -34,7 +34,7 @@ public class FMLCommonHandlerTransformer implements IClassTransformer { * { * category.addCrashSectionCallable(call.getLabel(), call); * } - * + FMLCommonHandlerTransformer.Hooks.postEnhanceCrashReport(); + * + EnhanceCrashReportsTransformer.Hooks.postEnhanceCrashReport(); * } * */ @@ -65,7 +65,7 @@ public class FMLCommonHandlerTransformer implements IClassTransformer { //ALOAD category inject.add(new VarInsnNode(ALOAD, 2)); //INVOKESTATIC foo/bar.postEnhanceCrashReport(Lnet/minecraft/crash/CrashReport;Lnet/minecraft/crash/CrashReportCategory;)V - inject.add(new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/FMLCommonHandlerTransformer$Hooks", "postEnhanceCrashReport", "(Lnet/minecraft/crash/CrashReport;Lnet/minecraft/crash/CrashReportCategory;)V", false)); + inject.add(new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/EnhanceCrashReportsTransformer$Hooks", "postEnhanceCrashReport", "(Lnet/minecraft/crash/CrashReport;Lnet/minecraft/crash/CrashReportCategory;)V", false)); m.instructions.insertBefore(injectionTarget, inject); } } diff --git a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/ModDiscovererTransformer.java b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/IgnoreDuplicateJarsTransformer.java similarity index 89% rename from module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/ModDiscovererTransformer.java rename to module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/IgnoreDuplicateJarsTransformer.java index 66b8ef6..acd4f93 100644 --- a/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/ModDiscovererTransformer.java +++ b/module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/asm/IgnoreDuplicateJarsTransformer.java @@ -1,9 +1,5 @@ package io.github.legacymoddingmc.unimixins.compat.asm; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multiset; -import com.google.common.collect.SetMultimap; import cpw.mods.fml.common.discovery.ModCandidate; import cpw.mods.fml.common.discovery.ModDiscoverer; import net.minecraft.launchwrapper.IClassTransformer; @@ -13,10 +9,8 @@ import org.objectweb.asm.tree.*; import java.io.File; import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; import java.lang.reflect.Field; import java.util.*; -import java.util.stream.Collectors; import static io.github.legacymoddingmc.unimixins.compat.CompatCore.LOGGER; import static org.objectweb.asm.Opcodes.ALOAD; @@ -26,7 +20,7 @@ import static org.objectweb.asm.Opcodes.INVOKESTATIC; * Makes the mod discoverer ignore duplicate UniMixins jars that come from java agents. This allows UniMixins to be * safely used as a Java agent instead of having to hunt down the UniMix jar and add that as one. */ -public class ModDiscovererTransformer implements IClassTransformer { +public class IgnoreDuplicateJarsTransformer implements IClassTransformer { private static Set uniMixinsJavaAgentJars; @@ -70,7 +64,7 @@ public class ModDiscovererTransformer implements IClassTransformer { } private byte[] doTransformModDiscoverer(byte[] bytes) { - LOGGER.info("ModDiscovererTransformer: Transforming ModDiscoverer#identifyMods to ignore duplicate UniMixins jars coming from Java agents."); + LOGGER.info("IgnoreDuplicateJarsTransformer: Transforming ModDiscoverer#identifyMods to ignore duplicate UniMixins jars coming from Java agents."); try { ClassNode classNode = new ClassNode(); @@ -80,7 +74,7 @@ public class ModDiscovererTransformer implements IClassTransformer { if(m.name.equals("identifyMods")) { InsnList patch = new InsnList(); patch.add(new VarInsnNode(ALOAD, 0)); - patch.add(new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/ModDiscovererTransformer$Hooks", "preIdentifyMods", "(Lcpw/mods/fml/common/discovery/ModDiscoverer;)V")); + patch.add(new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/IgnoreDuplicateJarsTransformer$Hooks", "preIdentifyMods", "(Lcpw/mods/fml/common/discovery/ModDiscoverer;)V")); m.instructions.insert(patch); } } diff --git a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java b/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java index c03c937..728dbfc 100644 --- a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java +++ b/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatCore.java @@ -18,7 +18,7 @@ public class DevCompatCore implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { - return new String[] {relativeClassName("asm.ModDiscovererTransformer")}; + return new String[] {relativeClassName("asm.ClasspathModDiscoveryFixerTransformer")}; } private static String relativeClassName(String relName) { diff --git a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ModDiscovererTransformer.java b/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer.java similarity index 88% rename from module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ModDiscovererTransformer.java rename to module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer.java index 516bd41..aab0125 100644 --- a/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ModDiscovererTransformer.java +++ b/module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer.java @@ -2,7 +2,6 @@ package io.github.legacymoddingmc.unimixins.devcompat.asm; import static io.github.legacymoddingmc.unimixins.devcompat.DevCompatCore.LOGGER; import static org.objectweb.asm.Opcodes.INVOKESTATIC; -import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; import net.minecraft.launchwrapper.IClassTransformer; import org.objectweb.asm.ClassReader; @@ -18,7 +17,7 @@ import java.util.*; *

Fixes classpath mods not getting loaded in dev env when running via the runClient Gradle task.

*/ -public class ModDiscovererTransformer implements IClassTransformer { +public class ClasspathModDiscoveryFixerTransformer implements IClassTransformer { @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { @@ -34,7 +33,7 @@ public class ModDiscovererTransformer implements IClassTransformer { } private byte[] doTransformModDiscoverer(byte[] bytes) { - LOGGER.info("ModDiscovererTransformer: Transforming ModDiscoverer#findClasspathMods to ignore reparseable coremods."); + LOGGER.info("ClasspathModDiscoveryFixerTransformer: Transforming ModDiscoverer#findClasspathMods to ignore reparseable coremods."); try { ClassNode classNode = new ClassNode(); @@ -49,7 +48,7 @@ public class ModDiscovererTransformer implements IClassTransformer { if(i.getOpcode() == INVOKESTATIC) { MethodInsnNode mi = (MethodInsnNode)i; if(mi.owner.equals("cpw/mods/fml/relauncher/CoreModManager") && mi.name.equals("getReparseableCoremods") && mi.desc.equals("()Ljava/util/List;")) { - m.instructions.insertBefore(mi, new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/devcompat/asm/ModDiscovererTransformer$Hooks", "redirectGetReparseableCoremods", mi.desc)); + m.instructions.insertBefore(mi, new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/devcompat/asm/ClasspathModDiscoveryFixerTransformer$Hooks", "redirectGetReparseableCoremods", mi.desc)); it.remove(); break; }