Patching aa is dumb

CleanroomMC · Mar 22, 2024 · 9bddc80 · 9bddc80
1 parent 6e9e3c3
commit 9bddc80
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 45 deletions.
diff --git a/src/main/java/com/cleanroommc/fugue/FugueLoadingPlugin.java b/src/main/java/com/cleanroommc/fugue/FugueLoadingPlugin.java
@@ -80,7 +80,6 @@ public class FugueLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader
         if (FugueConfig.modPatchConfig.enableSmoothFont) {
             TransformerDelegate.registerExplicitTransformerByInstance(new FontRendererTransformer(), "net.minecraft.client.gui.FontRenderer");
         }
-        TransformerDelegate.registerExplicitTransformerByInstance(new AquaAcrobaticsCoreTransformer(), "com.fuzs.aquaacrobatics.core.AquaAcrobaticsCore");
         if (FugueConfig.modPatchConfig.enableCSL) {
             TransformerDelegate.registerExplicitTransformerByInstance(new ForgeTweakerTransformer(), "customskinloader.forge.ForgeTweaker");
         }
@@ -152,17 +151,13 @@ public String getAccessTransformerClass() {
 
     @Override
     public List<String> getMixinConfigs() {
-        return Arrays.asList("fugue.mixin.theasm.json", "META-INF/mixins.aquaacrobatics.json");
+        return Arrays.asList("fugue.mixin.theasm.json");
     }
 
     @Override
     public boolean shouldMixinConfigQueue(String mixinConfig) {
         return switch (mixinConfig) {
             case "fugue.mixin.theasm.json" -> Launch.classLoader.isClassExist("zone.rong.loliasm.common.crashes.ModIdentifier") && FugueConfig.modPatchConfig.enableTheASM;
-            case "META-INF/mixins.aquaacrobatics.json" ->
-                    FugueConfig.modPatchConfig.enable_AquaAcrobatics_SledgeHammer_Compat &&
-                            Launch.classLoader.isClassExist("com.fuzs.aquaacrobatics.core.AquaAcrobaticsCore") &&
-                            Launch.classLoader.isClassExist("io.github.lxgaming.sledgehammer.launch.SledgehammerLoadingPlugin");
             default -> true;
         };
     }

diff --git a/src/main/java/com/cleanroommc/fugue/config/ModPatchConfig.java b/src/main/java/com/cleanroommc/fugue/config/ModPatchConfig.java
@@ -56,7 +56,4 @@ public class ModPatchConfig {
     public boolean enableSmoothFont = true;
     @Config.Name("Enable Custom Skin Loader Patch")
     public boolean enableCSL = true;
-    @Config.Name("Enable Compat Patch between AquaAcrobatics and SledgeHammer")
-    @Config.Comment("Use a very dumb way to handle incompat comes from Sledgehammer. Only enable this when needed.")
-    public boolean enable_AquaAcrobatics_SledgeHammer_Compat = false;
 }
diff --git a/src/main/java/com/cleanroommc/fugue/transformer/AquaAcrobaticsCoreTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/AquaAcrobaticsCoreTransformer.java
diff --git a/src/main/java/com/cleanroommc/fugue/transformer/EnderCoreTransformerTransformer.java b/src/main/java/com/cleanroommc/fugue/transformer/EnderCoreTransformerTransformer.java
@@ -9,10 +9,6 @@
 public class EnderCoreTransformerTransformer implements IExplicitTransformer {
     @Override
     public byte[] transform(byte[] bytes) {
-        if (bytes == null)
-        {
-            return null;
-        }
         ClassNode classNode = new ClassNode();
         ClassReader classReader = new ClassReader(bytes);
         classReader.accept(classNode, 0);