Convert to new IMixins and MixinsBuilder system

dependencies.gradle

@@ -10,7 +10,7 @@ dependencies {
         transitive = false
     }
     compileOnly "curse.maven:chunkpregen-267193:3756388"
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.1-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev')
     compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.15.01:dev") {
         transitive = false
     }
@@ -19,7 +19,7 @@ dependencies {
     compileOnly("curse.maven:thermalexpansion-69163:2388759")
     compileOnly("curse.maven:matteroverdrive-229694:2331162")
     compileOnly("curse.maven:projecte-226410:2340786")
-    compileOnly('com.github.GTNewHorizons:Botania:1.11.3-GTNH:dev') {
+    compileOnly('com.github.GTNewHorizons:Botania:1.12.16-GTNH:dev') {
         transitive = false
     }
     compileOnly("org.projectlombok:lombok:1.18.22") {
@@ -46,6 +46,6 @@ dependencies {
     compileOnly(deobfMaven(curseMaven, "curse.maven:applied-energistics-2-223794:2296430"))
 
     // Provides deobf support like in FG2
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev')
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev')
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev')
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev')
 }

gradle.properties

@@ -151,7 +151,7 @@ modrinthProjectId = xTJanN3v
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.

settings.gradle

@@ -33,7 +33,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
 }
 
 

src/main/java/org/embeddedt/archaicfix/ArchaicCore.java

@@ -1,38 +1,41 @@
 package org.embeddedt.archaicfix;
 
-import com.google.common.collect.ImmutableMap;
 import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
+import com.gtnewhorizon.gtnhmixins.builders.IMixins;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.embeddedt.archaicfix.asm.Mixin;
-import org.embeddedt.archaicfix.asm.TargetedMod;
 import org.embeddedt.archaicfix.asm.transformer.VampirismTransformer;
 import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.embeddedt.archaicfix.config.ConfigException;
 import org.embeddedt.archaicfix.config.ConfigurationManager;
 import org.embeddedt.archaicfix.helpers.LetsEncryptHelper;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @IFMLLoadingPlugin.Name("ArchaicCore")
 @IFMLLoadingPlugin.MCVersion("1.7.10")
 public class ArchaicCore implements IFMLLoadingPlugin, IEarlyMixinLoader {
+
     public static final Logger LOGGER = LogManager.getLogger("ArchaicCore");
+
     static {
         VampirismTransformer.init();
         try {
             ConfigurationManager.registerConfig(ArchaicConfig.class);
-        } catch(ConfigException e) {
+        } catch (ConfigException e) {
             throw new RuntimeException(e);
         }
         LetsEncryptHelper.replaceSSLContext();
     }
+
     @Override
     public String[] getASMTransformerClass() {
-        return new String[] {
-            "org.embeddedt.archaicfix.asm.ArchaicTransformer"
+        return new String[]{
+                "org.embeddedt.archaicfix.asm.ArchaicTransformer"
         };
     }
 
@@ -61,38 +64,8 @@ public String getMixinConfig() {
         return "mixins.archaicfix.early.json";
     }
 
-    public static Set<TargetedMod> coreMods = new HashSet<>();
-
-    private static final ImmutableMap<String, TargetedMod> MODS_BY_CLASS = ImmutableMap.<String, TargetedMod>builder()
-            .put("optifine.OptiFineForgeTweaker", TargetedMod.OPTIFINE)
-            .put("fastcraft.Tweaker", TargetedMod.FASTCRAFT)
-            .put("cofh.asm.LoadingPlugin", TargetedMod.COFHCORE)
-            .put("com.mitchej123.hodgepodge.core.HodgepodgeCore", TargetedMod.HODGEPODGE)
-            .build();
-
-    private static void detectCoreMods(Set<String> loadedCoreMods) {
-        MODS_BY_CLASS.forEach((key, value) -> {
-            if (loadedCoreMods.contains(key))
-                coreMods.add(value);
-        });
-    }
-
     @Override
     public List<String> getMixins(Set<String> loadedCoreMods) {
-        List<String> mixins = new ArrayList<>();
-        detectCoreMods(loadedCoreMods);
-        LOGGER.info("Detected coremods: [{}]", coreMods.stream().map(TargetedMod::name).collect(Collectors.joining(", ")));
-        final List<String> notLoading = new ArrayList<>();
-
-        for (Mixin mixin : Mixin.values()) {
-            if (mixin.getPhase() == Mixin.Phase.EARLY && mixin.shouldLoadSide() && mixin.getFilter().test(coreMods)) {
-                mixins.add(mixin.getMixin());
-            } else {
-                notLoading.add(mixin.getMixin());
-            }
-        }
-
-        LOGGER.info("Not loading the following early mixins: [{}]", String.join(", ", notLoading));
-        return mixins;
+        return IMixins.getEarlyMixins(Mixin.class, loadedCoreMods);
     }
 }

src/main/java/org/embeddedt/archaicfix/asm/LateMixinPlugin.java

@@ -2,40 +2,21 @@
 
 import com.gtnewhorizon.gtnhmixins.ILateMixinLoader;
 import com.gtnewhorizon.gtnhmixins.LateMixin;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.embeddedt.archaicfix.ArchaicCore;
+import com.gtnewhorizon.gtnhmixins.builders.IMixins;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Set;
 
 @LateMixin
 public class LateMixinPlugin implements ILateMixinLoader {
-    private static final Logger LOGGER = LogManager.getLogger();
+
     @Override
     public String getMixinConfig() {
         return "mixins.archaicfix.late.json";
     }
 
     @Override
     public List<String> getMixins(Set<String> loadedMods) {
-        List<String> mixins = new ArrayList<>();
-        Set<TargetedMod> validMods = new HashSet<>(ArchaicCore.coreMods);
-        HashMap<String, TargetedMod> modById = new HashMap<>();
-        for(TargetedMod t : TargetedMod.values()) {
-            if(t.getModId() != null)
-                modById.put(t.getModId(), t);
-        }
-        for(String modId : loadedMods) {
-            TargetedMod t = modById.get(modId);
-            if(t != null)
-                validMods.add(t);
-        }
-        LOGGER.info("Detected mods: [" + validMods.stream().map(TargetedMod::name).collect(Collectors.joining(", ")) + "]");
-        for(Mixin mixin : Mixin.values()) {
-            if(mixin.getPhase() == Mixin.Phase.LATE && mixin.shouldLoadSide() && mixin.getFilter().test(validMods))
-                mixins.add(mixin.getMixin());
-        }
-        return mixins;
+        return IMixins.getLateMixins(Mixin.class, loadedMods);
     }
 }