mirror of
https://github.com/FalsePattern/FalsePatternLib.git
synced 2026-11-16 14:14:52 +00:00
more mixin compat code
This commit is contained in:
4 files changed
+120
-39
No files matched your search
@@ -15,22 +15,15 @@ import java.util.List;
|
||||
@Accessors(fluent = true)
|
||||
@StableAPI(since = "__INTERNAL__")
|
||||
public class FPTransformer implements SmartTransformer {
|
||||
static final Logger LOG = LogManager.getLogger(Tags.MODNAME + " ASM");
|
||||
|
||||
@Getter
|
||||
private final List<IClassNodeTransformer> transformers;
|
||||
|
||||
@Getter
|
||||
private final Logger logger = LogManager.getLogger(Tags.MODNAME + " ASM");
|
||||
private final Logger logger = LOG;
|
||||
|
||||
public FPTransformer() {
|
||||
boolean obsolete;
|
||||
try {
|
||||
Class.forName("io.github.tox1cozz.mixinbooterlegacy.MixinBooterLegacyPlugin");
|
||||
logger.info("Detected MixinBooter Legacy.");
|
||||
obsolete = false;
|
||||
} catch (ClassNotFoundException e) {
|
||||
logger.info("Detected SpongeMixins or Grimoire. Applying legacy compat fix to IMixinPlugin.");
|
||||
obsolete = true;
|
||||
}
|
||||
transformers = Collections.singletonList(new IMixinPluginTransformer(obsolete));
|
||||
transformers = Collections.singletonList(new IMixinPluginTransformer());
|
||||
}
|
||||
}
|
||||
@@ -2,17 +2,14 @@ package com.falsepattern.lib.internal.asm;
|
||||
|
||||
import com.falsepattern.lib.asm.IClassNodeTransformer;
|
||||
import com.falsepattern.lib.internal.Tags;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import com.falsepattern.lib.mixin.MixinInfo;
|
||||
import lombok.val;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public class IMixinPluginTransformer implements IClassNodeTransformer {
|
||||
private final boolean obsolete;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "IMixinPluginTransformer";
|
||||
@@ -27,7 +24,16 @@ public class IMixinPluginTransformer implements IClassNodeTransformer {
|
||||
public void transform(ClassNode cn, String transformedName, boolean obfuscated) {
|
||||
val methods = cn.methods;
|
||||
val remove = new ArrayList<MethodNode>();
|
||||
if (obsolete) {
|
||||
if (MixinInfo.isMixinBooterLegacy()) {
|
||||
FPTransformer.LOG.info("Detected MixinBooterLegacy. Selecting proper methods in IMixinPlugin.");
|
||||
for (val method : methods) {
|
||||
if (method.name.equals("preApply_obsolete") || method.name.equals("postApply_obsolete")) {
|
||||
remove.add(method);
|
||||
}
|
||||
}
|
||||
methods.removeAll(remove);
|
||||
} else {
|
||||
FPTransformer.LOG.info("Could not detect MixinBooterLegacy. Selecting proper methods in IMixinPlugin.");
|
||||
for (val method : methods) {
|
||||
if (method.name.equals("preApply") || method.name.equals("postApply")) {
|
||||
remove.add(method);
|
||||
@@ -39,12 +45,6 @@ public class IMixinPluginTransformer implements IClassNodeTransformer {
|
||||
method.name = method.name.substring(0, method.name.indexOf('_'));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (val method : methods) {
|
||||
if (method.name.equals("preApply_obsolete") || method.name.equals("postApply_obsolete")) {
|
||||
remove.add(method);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user