fix: Crash with gtnhlib

Closes: #242

Author: FalsePattern

build.gradle.kts

@@ -257,7 +257,7 @@ dependencies {
     compileOnly(deobf("optifine:optifine:1.7.10_hd_u_e7"))
 
     compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7")
-    compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.21:api")
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.4")
 
     compileOnly("com.github.basdxz:Apparatus:2.12.3:dev") { excludeDeps() }
     compileOnly("com.github.jss2a98aj:NotFine:0.2.5:dev") { excludeDeps() }

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

@@ -22,22 +22,67 @@
 
 package com.falsepattern.falsetweaks.asm;
 
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.val;
 
 import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.Launch;
 
+import java.lang.reflect.Field;
+import java.util.AbstractList;
 import java.util.List;
 
 public class ASMFixerUtility {
-    public static void removeGTNHLibHook(List<IClassTransformer> transformers) {
-        val iter = transformers.iterator();
-        while (iter.hasNext()) {
-            val transformer = iter.next();
-            if (transformer.getClass()
-                           .getName()
-                           .equals("com.gtnewhorizon.gtnhlib.core.transformer.TessellatorRedirectorTransformer")) {
-                iter.remove();
-            }
+    @SneakyThrows
+    public static void removeGTNHLibThreadingHook(Field f) {
+        val transformers = (List<IClassTransformer>)f.get(Launch.classLoader);
+        transformers.removeIf(ASMFixerUtility::isForbidden);
+        f.set(Launch.classLoader, new ThreadSafeTransformerFilterList<>(transformers));
+    }
+
+    private static boolean isForbidden(Object obj) {
+        val n = obj.getClass().getName();
+        return n.startsWith("com.gtnewhorizon.gtnhlib") && n.endsWith("TessellatorRedirectorTransformer");
+    }
+
+    @RequiredArgsConstructor
+    private static class ThreadSafeTransformerFilterList<T> extends AbstractList<T> {
+        private final List<T> real;
+        @Override
+        public T get(int index) {
+            return real.get(index);
+        }
+
+        @Override
+        public int size() {
+            return real.size();
+        }
+
+        @Override
+        public boolean add(T t) {
+            if (isForbidden(t))
+                return false;
+            return real.add(t);
+        }
+
+        @Override
+        public T set(int index, T element) {
+            if (isForbidden(element))
+                return null;
+            return real.set(index, element);
+        }
+
+        @Override
+        public void add(int index, T element) {
+            if (isForbidden(element))
+                return;
+            real.add(index, element);
+        }
+
+        @Override
+        public T remove(int index) {
+            return real.remove(index);
         }
     }
 }

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

@@ -39,6 +39,7 @@
 import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;
 
 import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.LaunchClassLoader;
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 
@@ -63,8 +64,12 @@ public class CoreLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
         if (isClient) {
             if (ModuleConfig.THREADED_CHUNK_UPDATES) {
+                try {
+                    val f = LaunchClassLoader.class.getDeclaredField("transformers");
+                    f.setAccessible(true);
+                    ASMFixerUtility.removeGTNHLibThreadingHook(f);
+                } catch (Throwable ignores) {}
                 ThreadingCompat.executeConfigFixes();
-                pleaseDontBreakMyThreadedRendering();
             }
 
             if (ModuleConfig.TEXTURE_OPTIMIZATIONS) {
@@ -81,19 +86,6 @@ public class CoreLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private static void pleaseDontBreakMyThreadedRendering() {
-        // Evil hack
-        try {
-            val theClass = Class.forName("com.gtnewhorizon.gtnhlib.core.transformer.TessellatorRedirectorTransformer");
-            val exclusionsField = theClass.getDeclaredField("TransformerExclusions");
-            exclusionsField.setAccessible(true);
-            val exclusions = (List<String>) exclusionsField.get(null);
-            exclusions.set(0, "");
-        } catch (Throwable ignored) {
-        }
-    }
-
     @Override
     public String[] getASMTransformerClass() {
         val mixinTweakClasses = GlobalProperties.<List<String>>get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKCLASSES);

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

@@ -55,10 +55,6 @@ public String[] getLaunchArguments() {
         val f = LaunchClassLoader.class.getDeclaredField("transformers");
         f.setAccessible(true);
         val transformers = (List<IClassTransformer>) f.get(Launch.classLoader);
-        try {
-            ASMFixerUtility.removeGTNHLibHook(transformers);
-        } catch (Throwable ignored) {
-        }
         transformers.add(CoreLoadingPlugin.FIELD_HACK_TF);
         return new String[0];
     }

src/main/java/com/falsepattern/falsetweaks/modules/threadedupdates/ThreadTessellator.java

@@ -23,14 +23,25 @@
 package com.falsepattern.falsetweaks.modules.threadedupdates;
 
 import com.falsepattern.falsetweaks.modules.threading.MainThreadContainer;
+import com.gtnewhorizon.gtnhlib.api.CapturingTesselator;
 import lombok.val;
 
 import net.minecraft.client.renderer.Tessellator;
+import cpw.mods.fml.common.Loader;
 
 public class ThreadTessellator {
     private static final ThreadLocal<Tessellator> TESS = ThreadLocal.withInitial(Tessellator::new);
+    private static final boolean GTNHLIB_PRESENT = Loader.isModLoaded("gtnhlib");
 
     public static Tessellator getThreadTessellator() {
+        if (GTNHLIB_PRESENT) {
+            return GTNHLibInterop.getThreadTessellator();
+        } else {
+            return getThreadTessellatorRaw();
+        }
+    }
+
+    private static Tessellator getThreadTessellatorRaw() {
         if (MainThreadContainer.isMainThread()) {
             return mainThreadTessellator();
         } else {
@@ -47,4 +58,13 @@ public static Tessellator swapMainTessellator(Tessellator tess) {
         Tessellator.instance = tess;
         return old;
     }
+
+    private static class GTNHLibInterop {
+        public static Tessellator getThreadTessellator() {
+            if (CapturingTesselator.isCapturing()) {
+                return CapturingTesselator.getThreadTesselator();
+            }
+            return getThreadTessellatorRaw();
+        }
+    }
 }