diff --git a/dependencies.gradle b/dependencies.gradle index 8a68b0f7..a215b708 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -33,7 +33,7 @@ dependencies { testRuntimeOnly("org.junit.vintage:junit-vintage-engine") compileOnly("com.github.GTNewHorizons:lwjgl3ify:3.0.25") { transitive = false } - compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.10") { transitive = false } + compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.1.1") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:CodeChickenCore:1.4.16:dev") { transitive = false } diff --git a/repositories.gradle b/repositories.gradle index 78820fb6..428f8ccf 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -40,4 +40,5 @@ repositories { includeGroup 'xyz.wagyourtail.jvmdowngrader' } } + mavenLocal() } diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorRedirectorWrapper.java b/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorRedirectorWrapper.java index 379c6d5c..b32e716f 100644 --- a/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorRedirectorWrapper.java +++ b/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorRedirectorWrapper.java @@ -57,12 +57,20 @@ public class RFBTessellatorRedirectorWrapper implements RfbClassTransformer { } @Override - public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context, - @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) { + public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader, + @NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className, + @NotNull ClassNodeHandle classNode) { final boolean changed = inner.transformClassNode(classNode.getNode()); if (changed) { classNode.computeMaxs(); GTNHLibClassDump.dumpRFBClass(className, classNode, this); } + return changed; + } + + @Override + public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context, + @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) { + transformClassIfNeeded(classLoader, context, manifest, className, classNode); } } diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorTransformerWrapper.java b/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorTransformerWrapper.java index 1d91bb2d..cb28a028 100644 --- a/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorTransformerWrapper.java +++ b/src/main/java/com/gtnewhorizon/gtnhlib/core/rfb/transformers/RFBTessellatorTransformerWrapper.java @@ -48,12 +48,20 @@ public class RFBTessellatorTransformerWrapper implements RfbClassTransformer { } @Override - public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context, - @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) { + public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader, + @NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className, + @NotNull ClassNodeHandle classNode) { final boolean changed = inner.transformClassNode(classNode.getNode()); if (changed) { classNode.computeFrames(); GTNHLibClassDump.dumpRFBClass(className, classNode, this); } + return changed; + } + + @Override + public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context, + @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) { + transformClassIfNeeded(classLoader, context, manifest, className, classNode); } } diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/core/shared/transformers/TessellatorRedirector.java b/src/main/java/com/gtnewhorizon/gtnhlib/core/shared/transformers/TessellatorRedirector.java index 3547ad0e..c46cf943 100644 --- a/src/main/java/com/gtnewhorizon/gtnhlib/core/shared/transformers/TessellatorRedirector.java +++ b/src/main/java/com/gtnewhorizon/gtnhlib/core/shared/transformers/TessellatorRedirector.java @@ -27,7 +27,7 @@ public final class TessellatorRedirector { } public boolean shouldTransform(byte[] basicClass) { - return cstPoolParser.find(basicClass, true); + return cstPoolParser.find(basicClass); } /**