mirror of
https://github.com/LegacyModdingMC/UniMixins.git
synced 2026-11-19 11:59:38 +00:00
Give transformers more unique and descriptive names
This commit is contained in:
1 parent
a4bddd8dbf
commit
ddd608a8f8
5 files changed
+14
-21
No files matched your search
+4
-4
@@ -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<String> 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]);
|
||||
}
|
||||
|
||||
+3
-3
@@ -15,7 +15,7 @@ import static io.github.legacymoddingmc.unimixins.compat.CompatCore.LOGGER;
|
||||
* <p>Inserts a hook at the end of FMLCommonHandler#enhanceCrashReport.
|
||||
* <p>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();
|
||||
* }
|
||||
* </pre>
|
||||
*/
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
+3
-9
@@ -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<File> 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);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
+3
-4
@@ -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.*;
|
||||
* <p>Fixes classpath mods not getting loaded in dev env when running via the runClient Gradle task.</p>
|
||||
*/
|
||||
|
||||
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;
|
||||
}
|
||||
Reference in new issue
Block a user