From fbebbd4049ede627edd8b4bb9938aefaeb2b4192 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Tue, 16 Jul 2024 21:00:21 -0700 Subject: [PATCH] Also disable Better FPS (#558) --- .../angelica/loading/MixinCompatHackTweaker.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java index 3dd663952..814a9d9fc 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java @@ -17,14 +17,14 @@ import java.util.List; import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; public class MixinCompatHackTweaker implements ITweaker { - public static final boolean DISABLE_OPTIFINE_AND_FASTCRAFT = true; + public static final boolean DISABLE_OPTIFINE_FASTCRAFT_BETTERFPS = true; @Override public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { verifyDependencies(); - if(DISABLE_OPTIFINE_AND_FASTCRAFT) { - LOGGER.info("Disabling Optifine and Fastcraft (if present)"); - disableOptifineAndFastcraft(); + if(DISABLE_OPTIFINE_FASTCRAFT_BETTERFPS) { + LOGGER.info("Disabling Optifinem, Fastcraft, and BetterFPS (if present)"); + disableOptifineFastcraftAndBetterFPS(); } if (AngelicaConfig.enableHudCaching){ @@ -57,8 +57,8 @@ public class MixinCompatHackTweaker implements ITweaker { } } - private void disableOptifineAndFastcraft() { - // Remove Optifine and Fastcraft transformers & Mod Containers + private void disableOptifineFastcraftAndBetterFPS() { + // Remove Optifine, Fastcraft, and BetterFPS transformers & Mod Containers try { LaunchClassLoader lcl = Launch.classLoader; Field xformersField = lcl.getClass().getDeclaredField("transformers"); @@ -67,7 +67,7 @@ public class MixinCompatHackTweaker implements ITweaker { List xformers = (List) xformersField.get(lcl); for (int idx = xformers.size() - 1; idx >= 0; idx--) { final String name = xformers.get(idx).getClass().getName(); - if (name.startsWith("optifine") || name.startsWith("fastcraft")) { + if (name.startsWith("optifine") || name.startsWith("fastcraft") || name.startsWith("me.guichaguri.betterfps")) { LOGGER.info("Removing transformer " + name); xformers.remove(idx); }