Dont CapturingTessalator if OF/FC is loaded (#50)

* Dont CapturingTessalator if OF/FC is loaded * spotless
GTNewHorizons · Aug 18, 2024 · 48c6281 · 48c6281
1 parent 5157c9c
commit 48c6281
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/core/MixinCompatHackTweaker.java b/src/main/java/com/gtnewhorizon/gtnhlib/core/MixinCompatHackTweaker.java
@@ -9,6 +9,7 @@
 
 import com.gtnewhorizon.gtnhlib.core.transformer.TessellatorRedirectorTransformer;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
 
 public class MixinCompatHackTweaker implements ITweaker {
@@ -34,7 +35,7 @@ public String[] getLaunchArguments() {
             final boolean rfbLoaded = Launch.blackboard.getOrDefault("gtnhlib.rfbPluginLoaded", Boolean.FALSE)
                     == Boolean.TRUE;
 
-            if (!rfbLoaded) {
+            if (!rfbLoaded && !(Loader.isModLoaded("Optifine") || Loader.isModLoaded("FastCraft"))) {
                 // Run after Mixins, but before LWJGl3ify
                 Launch.classLoader.registerTransformer(TessellatorRedirectorTransformer.class.getName());
             }

diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/mixins/Mixins.java b/src/main/java/com/gtnewhorizon/gtnhlib/mixins/Mixins.java
@@ -15,9 +15,11 @@
 public enum Mixins {
 
     TESSELLATOR(new Builder("Sodium").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT).setPhase(Phase.EARLY)
-            .setApplyIf(() -> true).addMixinClasses("MixinTessellator")),
+            .setApplyIf(() -> true).addExcludedMod(TargetedMod.OPTIFINE).addExcludedMod(TargetedMod.FASTCRAFT)
+            .addMixinClasses("MixinTessellator")),
     WAVEFRONT_VBO(new Builder("WavefrontObject").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
-            .setPhase(Phase.EARLY).setApplyIf(() -> true).addMixinClasses("MixinWavefrontObject")),;
+            .setPhase(Phase.EARLY).setApplyIf(() -> true).addExcludedMod(TargetedMod.OPTIFINE)
+            .addExcludedMod(TargetedMod.FASTCRAFT).addMixinClasses("MixinWavefrontObject")),;
 
     private final List<String> mixinClasses;
     private final Supplier<Boolean> applyIf;