diff --git a/src/main/java/com/falsepattern/falsetweaks/asm/CoreLoadingPlugin.java b/src/main/java/com/falsepattern/falsetweaks/asm/CoreLoadingPlugin.java index f685745..4e07164 100644 --- 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) 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/src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/gtnhlib/TessellatorManagerMixin.java b/src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/gtnhlib/TessellatorManagerMixin.java deleted file mode 100644 index 6f8ee64..0000000 --- a/src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/threadedupdates/gtnhlib/TessellatorManagerMixin.java +++ /dev/null @@ -1,19 +0,0 @@ -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; - } -} 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 index 673cd26..aaa9ed5 100644 --- 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 index bfade52..8af57ac 100644 --- 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> REQUIRE_OPTIFINE_WITHOUT_SHADERS = require(OPTIFINE_WITHOUT_SHADERS).or(require(OPTIFINE_WITH_DYNAMIC_LIGHTS));