GTNHLib compat for real

Author: FalsePattern

build.gradle.kts

@@ -62,6 +62,7 @@ repositories {
             includeGroup("com.falsepattern")
         }
     }
+    exclusive(maven("horizon", "https://mvn.falsepattern.com/horizon"), "com.github.GTNewHorizons")
     exclusive(jitpack(), "com.github.basdxz")
     exclusive(maven("mega_uploads", "https://mvn.falsepattern.com/gtmega_uploads"), "optifine")
     exclusive(mega(), "codechicken")
@@ -74,6 +75,8 @@ dependencies {
 
     compileOnly(deobf("optifine:optifine:1.7.10_hd_u_e7"))
 
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.19:dev")
+
     implementation("org.joml:joml:1.10.5")
     implementation("it.unimi.dsi:fastutil:8.5.13")
 

src/main/java/com/falsepattern/falsetweaks/asm/CoreLoadingPlugin.java

@@ -35,8 +35,12 @@
 import lombok.Getter;
 import lombok.val;
 
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @IFMLLoadingPlugin.TransformerExclusions(Tags.ROOT_PKG + ".asm")
 public class CoreLoadingPlugin implements IFMLLoadingPlugin {
@@ -73,6 +77,15 @@ 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"};
     }
 

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/TessellatorMixin.java

@@ -27,6 +27,8 @@
 import com.falsepattern.falsetweaks.modules.threadedupdates.ICapturableTessellator;
 import com.falsepattern.falsetweaks.modules.threadedupdates.OptiFineCompat;
 import com.falsepattern.falsetweaks.modules.threadedupdates.ThreadedChunkUpdateHelper;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -116,16 +118,15 @@ public void discard() {
      * @reason Allow using multiple tessellator instances concurrently by removing static field access in alternate
      * instances.
      */
-    @Redirect(method = "reset",
-              at = @At(value = "INVOKE",
+    @WrapOperation(method = "reset",
+                   at = @At(value = "INVOKE",
                        target = "Ljava/nio/ByteBuffer;clear()Ljava/nio/Buffer;"),
-              require = 0, //gtnhlib crashes the game if this is nonzero
-              expect = 1)
-    private Buffer removeStaticBufferAccessOutsideSingleton(ByteBuffer buffer) {
+                   require = 1)
+    private Buffer removeStaticBufferAccessOutsideSingleton(ByteBuffer instance, Operation<Buffer> original) {
         if (((Object) this) == ThreadedChunkUpdateHelper.mainThreadTessellator()) {
-            return buffer.clear();
+            instance.clear();
         }
-        return buffer;
+        return instance;
     }
 
     @Inject(method = "startDrawingQuads",

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/gtnhlib/TessellatorManagerMixin.java

@@ -0,0 +1,19 @@
+package com.falsepattern.falsetweaks.mixin.mixins.client.threadedupdates.gtnhlib;
+
+import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(value = TessellatorManager.class,
+       remap = false)
+public abstract class TessellatorManagerMixin {
+
+    /**
+     * @author FalsePattern
+     * @reason FalseTweaks hijack
+     */
+    @Overwrite
+    public static boolean isMainInstance(Object instance) {
+        return true;
+    }
+}

src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/Mixin.java

@@ -237,6 +237,11 @@ public enum Mixin implements IMixin {
                                                          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

src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/TargetedMod.java

@@ -54,6 +54,7 @@ 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));