Merge branch 'gtnhlib-mutual-compat'

FalsePattern · Nov 11, 2024 · 0d5ef9b · 0d5ef9b
2 parents 230d0f7 + 2307585
commit 0d5ef9b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 38 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,7 +75,7 @@ dependencies {
 
     compileOnly(deobf("optifine:optifine:1.7.10_hd_u_e7"))
 
-    compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.19:dev")
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.20:api")
 
     implementation("org.joml:joml:1.10.5")
     implementation("it.unimi.dsi:fastutil:8.5.13")

diff --git a/src/main/java/com/falsepattern/falsetweaks/FalseTweaks.java b/src/main/java/com/falsepattern/falsetweaks/FalseTweaks.java
@@ -42,7 +42,8 @@
      guiFactory = Tags.ROOT_PKG + ".config.FalseTweaksGuiFactory",
      acceptableRemoteVersions = "*",
      dependencies = "required-after:falsepatternlib@[1.4.2,);" +
-                    "after:neodymium@[0.3.2,);"
+                    "after:neodymium@[0.3.2,);" +
+                    "after:gtnhlib@[0.5.20,);"
      )
 public class FalseTweaks {
 

diff --git a/src/main/java/com/falsepattern/falsetweaks/asm/CoreLoadingPlugin.java b/src/main/java/com/falsepattern/falsetweaks/asm/CoreLoadingPlugin.java
@@ -77,15 +77,6 @@ private static void pleaseDontBreakMyThreadedRendering() {
 
     @Override
     public String[] getASMTransformerClass() {
-        if (ModuleConfig.THREADED_CHUNK_UPDATES()) {
-            try {
-                val f = LaunchClassLoader.class.getDeclaredField("transformerExceptions");
-                f.setAccessible(true);
-                @SuppressWarnings("unchecked") val s = (Set<String>) f.get(Launch.classLoader);
-                s.remove("com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager");
-            } catch (Throwable ignored) {
-            }
-        }
         return new String[]{Tags.ROOT_PKG + ".asm.FalseTweaksTransformer"};
     }
 

diff --git a/...tern/falsetweaks/mixin/mixins/client/threadedupdates/gtnhlib/TessellatorManagerMixin.java b/...tern/falsetweaks/mixin/mixins/client/threadedupdates/gtnhlib/TessellatorManagerMixin.java
diff --git a/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/Mixin.java b/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/Mixin.java
@@ -236,12 +236,6 @@ public enum Mixin implements IMixin {
     ThreadedUpdates_Automagy_RenderBlockGlowOverlayMixin(Side.CLIENT,
                                                          THREADING.and(require(TargetedMod.AUTOMAGY)),
                                                          "threadedupdates.automagy.RenderBlockGlowOverlayMixin"),
-
-    // GTNHLib
-    ThreadedUpdates_GTNHLib_TessellatorManagerMixin(Side.CLIENT,
-                                                    THREADING.and(require(TargetedMod.GTNHLIB)),
-                                                    "threadedupdates.gtnhlib.TessellatorManagerMixin"),
-
     //endregion Threaded Chunk Updates
 
     //region Texture Optimizations Module

diff --git a/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/TargetedMod.java b/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/TargetedMod.java
@@ -54,7 +54,6 @@ public enum TargetedMod implements ITargetedMod {
     COMPUTRONICS("Computronics", false, contains("Computronics-")),
     EXTRA_CELLS("Extra Cells 2", false, contains("ExtraCells-")),
     AUTOMAGY("Automagy", false, contains("Automagy-")),
-    GTNHLIB("GTNHLib", false, contains("gtnhlib-"))
     ;
 
     public static Predicate<List<ITargetedMod>> REQUIRE_OPTIFINE_WITHOUT_SHADERS = require(OPTIFINE_WITHOUT_SHADERS).or(require(OPTIFINE_WITH_DYNAMIC_LIGHTS));

diff --git a/.../java/com/falsepattern/falsetweaks/modules/threadedupdates/ThreadedChunkUpdateHelper.java b/.../java/com/falsepattern/falsetweaks/modules/threadedupdates/ThreadedChunkUpdateHelper.java
@@ -33,6 +33,7 @@
 import com.falsepattern.falsetweaks.modules.threadexec.ThreadedTask;
 import com.falsepattern.falsetweaks.modules.triangulator.ToggleableTessellatorManager;
 import com.google.common.base.Preconditions;
+import com.gtnewhorizon.gtnhlib.api.CapturingTesselator;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -516,6 +517,16 @@ public Tessellator getThreadTessellator() {
         }
     }
 
+    public static class GTNHLibCompat extends ThreadedChunkUpdateHelper {
+        @Override
+        public Tessellator getThreadTessellator() {
+            if (CapturingTesselator.isCapturing()) {
+                return CapturingTesselator.getThreadTesselator();
+            }
+            return super.getThreadTessellator();
+        }
+    }
+
     @RequiredArgsConstructor
     private static class PendingTaskUpdate {
         public final List<WorldRenderer> tasks;

diff --git a/src/main/java/com/falsepattern/falsetweaks/proxy/ClientProxy.java b/src/main/java/com/falsepattern/falsetweaks/proxy/ClientProxy.java
@@ -39,6 +39,7 @@
 import com.falsepattern.falsetweaks.modules.triangulator.calibration.Calibration;
 import com.falsepattern.falsetweaks.modules.voxelizer.loading.LayerMetadataSection;
 import com.falsepattern.falsetweaks.modules.voxelizer.loading.LayerMetadataSerializer;
+import cpw.mods.fml.common.Loader;
 import lombok.val;
 
 import net.minecraft.client.Minecraft;
@@ -104,7 +105,11 @@ public String call() {
     public void init(FMLInitializationEvent e) {
         super.init(e);
         if (ModuleConfig.THREADED_CHUNK_UPDATES()) {
-            ThreadedChunkUpdateHelper.instance = new ThreadedChunkUpdateHelper();
+            if (Loader.isModLoaded("gtnhlib")) {
+                ThreadedChunkUpdateHelper.instance = new ThreadedChunkUpdateHelper.GTNHLibCompat();
+            } else {
+                ThreadedChunkUpdateHelper.instance = new ThreadedChunkUpdateHelper();
+            }
             ThreadedChunkUpdateHelper.instance.init();
         }
     }