Fix mixin in wrong phase

CleanroomMC · Mar 27, 2024 · bd451ac · bd451ac
1 parent 5c9ae8f
commit bd451ac
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -213,7 +213,7 @@ jar {
                 //'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
                 'FMLCorePlugin': 'com.cleanroommc.fugue.FugueLoadingPlugin',
                 'ForceLoadAsMod': true,
-                'MixinConfigs': 'fugue.mixin.json',
+                'MixinConfigs': 'fugue.mixin.mod.json,fugue.mixin.init.json',
                 //'FMLAT': 'accesstransformer.cfg',
                 'Implementation-Title': project.name,
                 'Implementation-Version': mod_version,

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ mappings_version=39-1.12
 mod_id=fugue
 mod_name=Fugue
 mod_main_class=Fugue
-mod_version=0.12.0-beta
+mod_version=0.12.1-beta
 mod_base_package=com.cleanroommc.fugue
 mod_authors=kappa_maintainer
 mod_description=A mod that patch dead mods for Cleanroom
diff --git a/src/main/java/com/cleanroommc/fugue/FugueLoadingPlugin.java b/src/main/java/com/cleanroommc/fugue/FugueLoadingPlugin.java
@@ -117,9 +117,6 @@ public class FugueLoadingPlugin implements IFMLLoadingPlugin {
 
     }
 
-    public FugueLoadingPlugin() {
-        //Mixins.addConfiguration("fugue.mixin.json");
-    }
 
     @Override
     public String[] getASMTransformerClass() {
@@ -152,18 +149,5 @@ public void injectData(Map<String, Object> map) {
     @Override
     public String getAccessTransformerClass() {
         return null;
-    }/*
-
-    @Override
-    public List<String> getMixinConfigs() {
-        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;
-            default -> true;
-        };
-    }*/
 }
diff --git a/src/main/resources/fugue.mixin.init.json b/src/main/resources/fugue.mixin.init.json
@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "package": "com.cleanroommc.fugue.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "refmap": "fugue.mixin.refmap.json",
+  "target": "@env(INIT)",
+  "plugin": "com.cleanroommc.fugue.FugueMixinConfigPlugin",
+  "mixins": [
+    "theasm.ModIdentifierMixin"
+  ],
+  "minVersion": "0.8"
+}
diff --git a/src/main/resources/fugue.mixin.json → src/main/resources/fugue.mixin.mod.json b/src/main/resources/fugue.mixin.json → src/main/resources/fugue.mixin.mod.json
@@ -15,7 +15,6 @@
     "projectred_core.WirePropagatorMixin",
     "solarflux.INetworkSFMixin",
     "solarflux.SolarFluxMixin",
-    "theasm.ModIdentifierMixin",
     "xaeroplus.ChunkHighlightSavingCacheMixin",
     "xaeroplus.XaeroPlusSettingsReflectionHaxMixin"
   ],