Fix dj2addons for real

gradle.properties

@@ -16,7 +16,7 @@ mappings_version=39-1.12
 mod_id=fugue
 mod_name=Fugue
 mod_main_class=Fugue
-mod_version=0.17.4
+mod_version=0.17.5
 mod_base_package=com.cleanroommc.fugue
 mod_authors=kappa_maintainer
 mod_description=A mod that patch dead mods for Cleanroom

src/main/java/com/cleanroommc/fugue/common/TransformerHelper.java

@@ -2,6 +2,7 @@
 
 import com.cleanroommc.fugue.config.FugueConfig;
 import com.cleanroommc.fugue.modifiers.DJ2AddonsFixer;
+import com.cleanroommc.fugue.modifiers.DJ2PhaseFixer;
 import com.cleanroommc.fugue.modifiers.IC2ExtraFixer;
 import com.cleanroommc.fugue.transformer.advancedrocket.ClassTransformerTransformer;
 import com.cleanroommc.fugue.transformer.betterfc.HK_LoaderTransformer;
@@ -11,6 +12,7 @@
 import com.cleanroommc.fugue.transformer.colytra.EntityLivingBaseTransformer;
 import com.cleanroommc.fugue.transformer.crossbow.TransformerEntityArrowTransformer;
 import com.cleanroommc.fugue.transformer.customskinloader.ForgeTweakerTransformer;
+import com.cleanroommc.fugue.transformer.dj2addons.DJ2AddonsCoreTransformer;
 import com.cleanroommc.fugue.transformer.dropt.ValidatorAdapterFactoryTransformer;
 import com.cleanroommc.fugue.transformer.ears.EarsASMTransformer;
 import com.cleanroommc.fugue.transformer.enchantmentcontrol.EnumInputClassTransformer;
@@ -253,6 +255,8 @@ public static void registerTransformers() {
         }
         if (FugueConfig.modPatchConfig.enableDivineJourney2Addons) {
             Config.registerConfigModifier(new DJ2AddonsFixer(), "mixins.dj2addons.init.json");
+            Config.registerConfigModifier(new DJ2PhaseFixer(), "mixins.dj2addons.json");
+            TransformerDelegate.registerExplicitTransformer(new DJ2AddonsCoreTransformer(), "org.btpos.dj2addons.core.DJ2AddonsCore");
         }
 
         if (FugueConfig.getCodeSourcePatchTargets.length > 0) {

src/main/java/com/cleanroommc/fugue/config/ModPatchConfig.java

@@ -146,6 +146,7 @@ public class ModPatchConfig {
     public boolean enableBetterPortals = true;
     @Config.Name("Enable Essential Patch")
     public boolean enableEssential = true;
+    @Config.Comment("Only use with dj2addons 1.2.1.1 or lower")
     @Config.Name("Enable Divine Journey 2 Addons Patch")
     public boolean enableDivineJourney2Addons = true;
 }

src/main/java/com/cleanroommc/fugue/modifiers/DJ2AddonsFixer.java

@@ -1,5 +1,6 @@
 package com.cleanroommc.fugue.modifiers;
 
+import org.spongepowered.asm.mixin.Mixins;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigModifier;
 
 import java.util.List;
@@ -8,6 +9,7 @@ public class DJ2AddonsFixer implements IMixinConfigModifier {
     @Override
     public List<String> modifyMixinClasses(List<String> list) {
         list.removeIf(s -> s.endsWith("MLoader"));
+        Mixins.addConfiguration("mixins.dj2addons.json");
         return list;
     }
 }

src/main/java/com/cleanroommc/fugue/modifiers/DJ2PhaseFixer.java

@@ -0,0 +1,11 @@
+package com.cleanroommc.fugue.modifiers;
+
+import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigModifier;
+
+public class DJ2PhaseFixer implements IMixinConfigModifier {
+
+    public MixinEnvironment modifyEnvironment(MixinEnvironment environment) {
+        return MixinEnvironment.getEnvironment(MixinEnvironment.Phase.MOD);
+    }
+}

src/main/java/com/cleanroommc/fugue/transformer/dj2addons/DJ2AddonsCoreTransformer.java

@@ -0,0 +1,22 @@
+package com.cleanroommc.fugue.transformer.dj2addons;
+
+import com.cleanroommc.fugue.common.Fugue;
+import javassist.ClassPool;
+import javassist.CtClass;
+import top.outlands.foundation.IExplicitTransformer;
+
+import java.io.ByteArrayInputStream;
+
+public class DJ2AddonsCoreTransformer implements IExplicitTransformer {
+    @Override
+    public byte[] transform(byte[] bytes) {
+        try {
+            CtClass cc = ClassPool.getDefault().makeClass(new ByteArrayInputStream(bytes));
+            cc.getDeclaredMethod("verifyCoreLoaded").setBody("{}");
+            bytes = cc.toBytecode();
+        } catch (Throwable t) {
+            Fugue.LOGGER.error("Exception {} on {}", t, this.getClass().getSimpleName());
+        }
+        return bytes;
+    }
+}