migrate to new mixins

- update bs
- update deps
- make gradlew executeable
- migrate to new mixins

Author: Pilzinsel64

dependencies.gradle

@@ -34,7 +34,7 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.21:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.6.37:dev")
     devOnlyNonPublishable(rfg.deobf("curse.maven:the-erebus-220698:2305035"))
     compileOnly(rfg.deobf("curse.maven:dimensional-doors-legacy-404239:4967772"))
     compileOnly(rfg.deobf(project.files("libs/dimdoors-legacy.jar")))

gradle.properties

@@ -142,7 +142,7 @@ modrinthProjectId = 7403dfh4
 #       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.

gradle/wrapper/gradle-wrapper.jar

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

gradlew

@@ -4,8 +4,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.gtnewhorizon.gtnhlib.mixin.IMixins;
 import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
+import com.gtnewhorizon.gtnhmixins.builders.IMixins;
 
 import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.ModMetadata;

settings.gradle

@@ -3,9 +3,9 @@
 import java.util.List;
 import java.util.Set;
 
-import com.gtnewhorizon.gtnhlib.mixin.IMixins;
 import com.gtnewhorizon.gtnhmixins.ILateMixinLoader;
 import com.gtnewhorizon.gtnhmixins.LateMixin;
+import com.gtnewhorizon.gtnhmixins.builders.IMixins;
 
 import de.pilz.alternativechunkloading.mixins.Mixins;
 

src/main/java/de/pilz/alternativechunkloading/core/AlternativeChunkloadingCore.java

@@ -1,102 +1,44 @@
 package de.pilz.alternativechunkloading.mixins;
 
-import java.util.List;
 import java.util.function.Supplier;
 
-import com.gtnewhorizon.gtnhlib.mixin.IMixins;
-import com.gtnewhorizon.gtnhlib.mixin.ITargetedMod;
-import com.gtnewhorizon.gtnhlib.mixin.MixinBuilder;
-import com.gtnewhorizon.gtnhlib.mixin.Phase;
-import com.gtnewhorizon.gtnhlib.mixin.Side;
-import com.gtnewhorizon.gtnhlib.mixin.TargetedMod;
+import com.gtnewhorizon.gtnhmixins.builders.IMixins;
+import com.gtnewhorizon.gtnhmixins.builders.MixinBuilder;
 
 import de.pilz.alternativechunkloading.configuration.ConfigBetterChunkloading;
 import de.pilz.alternativechunkloading.configuration.ConfigFixes;
 
 public enum Mixins implements IMixins {
 
-    VANILLA_MODIFY_FIX_STRUCTURE_GENERATION(
-        new MixinBuilder("Modifies provideChunk to block unallowed requests.").addTargetedMod(TargetedMod.VANILLA)
-            .setSide(Side.BOTH)
-            .setPhase(Phase.EARLY)
-            .setApplyIf(() -> ConfigBetterChunkloading.enable && ConfigBetterChunkloading.disableForPopulation)
-            .addMixinClasses("minecraft.MixinChunkProviderServer", "minecraft.MixinChunk")),
-    VANILLA_FIX_NETHER_PORTAL_GENERATION(
-        new MixinBuilder("Fix nether portal generation").addTargetedMod(TargetedMod.VANILLA)
-            .setSide(Side.BOTH)
-            .setPhase(Phase.EARLY)
-            .setApplyIf(() -> ConfigFixes.fixVanillaNetherPortalGeneration)
-            .addMixinClasses("minecraft.MixinTeleporter")),
-    EREBUS_FIX_EREBUS_NULL_CHECKS(new MixinBuilder("Add missing null checks").addTargetedMod(TargetedModEx.THEEREBUS)
-        .setSide(Side.BOTH)
-        .setPhase(Phase.LATE)
-        .setApplyIf(() -> ConfigFixes.fixErebusNullChecks)
-        .addMixinClasses("erebus.MixinSpawnerErebus")),
-    EREBUS_FIX_DIMDOORS_COMPAT(
-        new MixinBuilder("Add compatibility with Dimensional Doors").addTargetedMod(TargetedModEx.DIMDOORS)
-            .setSide(Side.BOTH)
-            .setPhase(Phase.LATE)
-            .setApplyIf(() -> ConfigFixes.fixDimDoorsCompatibility)
-            .addMixinClasses(
-                "dimdoors.modern.MixinChunkBlockSetter",
-                "dimdoors.modern.MixinDungeonSchematic",
-                "dimdoors.modern.MixinWorldBlockSettings",
-                "dimdoors.modern.MixinPocketBuilder")),
-    EREBUS_FIX_DIMDOORS_LEGACY_COMPAT(
-        new MixinBuilder("Add compatibility with Dimensional Doors").addTargetedMod(TargetedModEx.DIMDOORS)
-            .setSide(Side.BOTH)
-            .setPhase(Phase.LATE)
-            .setApplyIf(() -> ConfigFixes.fixDimDoorsCompatibility)
-            .addMixinClasses(
-                "dimdoors.legacy.MixinChunkBlockSetter",
-                "dimdoors.legacy.MixinDungeonSchematic",
-                "dimdoors.legacy.MixinWorldBlockSettings",
-                "dimdoors.legacy.MixinPocketBuilder"));
-
-    private final List<String> mixinClasses;
-    private final Supplier<Boolean> applyIf;
-    private final Phase phase;
-    private final Side side;
-    private final List<ITargetedMod> targetedMods;
-    private final List<ITargetedMod> excludedMods;
-
-    Mixins(MixinBuilder builder) {
-        this.mixinClasses = builder.mixinClasses;
-        this.applyIf = builder.applyIf;
-        this.side = builder.side;
-        this.targetedMods = builder.targetedMods;
-        this.excludedMods = builder.excludedMods;
-        this.phase = builder.phase;
-        if (this.targetedMods.isEmpty()) {
-            throw new RuntimeException("No targeted mods specified for " + this.name());
-        }
-        if (this.applyIf == null) {
-            throw new RuntimeException("No ApplyIf function specified for " + this.name());
-        }
-    }
-
-    public List<String> getMixinClasses() {
-        return mixinClasses;
-    }
-
-    public Supplier<Boolean> getApplyIf() {
-        return applyIf;
+    VANILLA_MODIFY_FIX_STRUCTURE_GENERATION(Side.COMMON, Phase.EARLY,
+        () -> ConfigBetterChunkloading.enable && ConfigBetterChunkloading.disableForPopulation,
+        "minecraft.MixinChunkProviderServer", "minecraft.MixinChunk"),
+    VANILLA_FIX_NETHER_PORTAL_GENERATION(Side.COMMON, Phase.EARLY, () -> ConfigFixes.fixVanillaNetherPortalGeneration,
+        "minecraft.MixinTeleporter"),
+    EREBUS_FIX_EREBUS_NULL_CHECKS(Side.COMMON, Phase.LATE, () -> ConfigFixes.fixErebusNullChecks,
+        "erebus.MixinSpawnerErebus"),
+    EREBUS_FIX_DIMDOORS_COMPAT(Side.COMMON, Phase.LATE, () -> ConfigFixes.fixDimDoorsCompatibility,
+        "dimdoors.modern.MixinChunkBlockSetter", "dimdoors.modern.MixinDungeonSchematic",
+        "dimdoors.modern.MixinWorldBlockSettings", "dimdoors.modern.MixinPocketBuilder"),
+    EREBUS_FIX_DIMDOORS_LEGACY_COMPAT(Side.COMMON, Phase.LATE, () -> ConfigFixes.fixDimDoorsCompatibility,
+        "dimdoors.legacy.MixinChunkBlockSetter", "dimdoors.legacy.MixinDungeonSchematic",
+        "dimdoors.legacy.MixinWorldBlockSettings", "dimdoors.legacy.MixinPocketBuilder");
+
+    private final MixinBuilder builder;
+
+    Mixins(Side side, Phase phase, String... mixins) {
+        builder = new MixinBuilder().addSidedMixins(side, mixins)
+            .setPhase(phase);
     }
 
-    public Phase getPhase() {
-        return phase;
+    Mixins(Side side, Phase phase, Supplier<Boolean> applyIf, String... mixins) {
+        builder = new MixinBuilder().addSidedMixins(side, mixins)
+            .setPhase(phase)
+            .setApplyIf(applyIf);
     }
 
-    public Side getSide() {
-        return side;
+    @Override
+    public MixinBuilder getBuilder() {
+        return builder;
     }
-
-    public List<ITargetedMod> getTargetedMods() {
-        return targetedMods;
-    }
-
-    public List<ITargetedMod> getExcludedMods() {
-        return excludedMods;
-    }
-
 }