update to fplib 1.4.0 mixins

GTMEGA · Jul 20, 2024 · 724508e · 724508e
1 parent 76f5ed7
commit 724508e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 47 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -63,7 +63,7 @@ repositories {
 
 dependencies {
     ////////////////Our dependencies////////////////
-    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.2.5")
+    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.4.0")
     implementation("it.unimi.dsi:fastutil:8.5.13")
     implementationSplit("com.falsepattern:chunkapi-mc1.7.10:0.5.1")
 

diff --git a/src/main/java/com/falsepattern/endlessids/EndlessIDs.java b/src/main/java/com/falsepattern/endlessids/EndlessIDs.java
@@ -44,7 +44,7 @@
      name = Tags.MODNAME,
      acceptedMinecraftVersions = "[1.7.10]",
      dependencies = "required-after:chunkapi@[0.5.0,0.6.0);" +
-                    "required-after:falsepatternlib@[1.2.0,);" +
+                    "required-after:falsepatternlib@[1.4.0,);" +
                     "after:antiidconflict")
 public class EndlessIDs {
     public static final byte[] ZERO_LENGTH_BIOME_ARRAY_PLACEHOLDER = new byte[0];

diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/MixinPlugin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/MixinPlugin.java
@@ -45,4 +45,9 @@ public IMixin[] getMixinEnumValues() {
     public ITargetedMod[] getTargetedModEnumValues() {
         return TargetedMod.values();
     }
+
+    @Override
+    public boolean useNewFindJar() {
+        return true;
+    }
 }
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java
@@ -30,54 +30,53 @@
 import java.util.function.Predicate;
 
 import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.contains;
-import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.startsWith;
 
 @RequiredArgsConstructor
 public enum TargetedMod implements ITargetedMod {
-    ABYSSALCRAFT("AbyssalCraft", false, startsWith("abyssalcraft-")),
-    AROCKETRY("Advanced Rocketry", false, startsWith("advancedrocketry-")),
-    ATG("Alternate Terrain Generation", false, startsWith("atg")),
-    ANTIQUEATLAS("Antique Atlas", false, startsWith("antiqueatlas")),
-    ANTIIDCONFLICT("Anti ID Conflict", false, startsWith("antiidconflict")),
-    BOP("Biomes O' Plenty", false, startsWith("biomesoplenty-")),
-    BIOMETWEAKER("Biome Tweaker", false, startsWith("biometweaker-")),
-    BIOMEWAND("Biome Wand", false, startsWith("1.7.10-biome-wand-").or(startsWith("biome-wand"))),
-    BUILDCRAFT("BuildCraft", false, startsWith("buildcraft-").and(contains("compat").negate())),
-    COFHLIB("CoFH Lib", false, startsWith("cofhlib-")),
-    COMPACTMACHINES("Compact Machines", false, startsWith("compactmachines-")),
-    DARKWORLD("Dark World", false, startsWith("darkworld-")),
-    DIMDOORS("Dimensional Doors", false, startsWith("dimensionaldoors-").or(startsWith("dimdoors-"))),
-    DRAGONAPI("DragonAPI", false, startsWith("dragonapi")),
-    EB("Enhanced Biomes", false, startsWith("Enhanced Biomes").or(startsWith("enhancedbiomes"))),
-    ENDERLICIOUS("Enderlicious", false, startsWith("enderlicious-")),
-    EREBUS("The Erebus", false, startsWith("theerebus")),
-    EXTRAPLANETS("Extra Planets", false, startsWith("extraplanets-")),
-    EXTRAUTILITIES("Extra Utilities", false, startsWith("extrautilities-")),
-    FUTUREPACK("Futurepack", false, startsWith("[1.7.10]futurepack").or(startsWith("futurepack-"))),
-    GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")),
-    GALAXYSPACE("GalaxySpace", false, startsWith("galaxyspace-")),
-    HIGHLANDS("Highlands", false, startsWith("highlands")),
-    ICG("Immersive Cavegen", false, startsWith("immersivecavegen")),
-    IR3("Industrial Revolution by Redstone Rebooted", false, startsWith("industrialrevolutionbyredstonerebooted-")),
-    LOTR("LOTR Mod", false, startsWith("lotrmod")),
-    MATTEROVERDRIVE("Matter Overdrive", false, startsWith("matteroverdrive-")),
-    MATTERMEGADRIVE("Matter Megadrive", false, startsWith("mattermegadrive-")),
-    MFQM("More Fun Quicksand Mod", false, startsWith("morefunquicksandmod-")),
-    NATURESCOMPASS("Nature's Compass", false, startsWith("naturescompass")),
-    NETHERLICIOUS("Netherlicious", false, startsWith("netherlicious-")),
-    NOMADICTENTS("Nomadic Tents", false, startsWith("nomadictents")),
-    OWG("Nostalgic world generation", false, startsWith("owg-").or(startsWith("nostalgiagenerator-"))),
-    RANDOMTHINGS("Random Things", false, startsWith("randomthings-")),
-    RESTRUCTURED("Restructured", false, startsWith("restructured-")),
-    RTG("Realistic Terrain Generation", false, startsWith("rtg-")),
-    RWG("Realistic World Gen", false, startsWith("rwg-")),
-    THAUMCRAFT("Thaumcraft", false, startsWith("thaumcraft")),
-    THUTCORE("ThutCore", false, startsWith("thutcore-").or(startsWith("thutmods-"))),
-    TROPICRAFT("Tropicraft", false, startsWith("tropicraft-")),
-    TWILIGHTFOREST("Twilight Forest", false, startsWith("twilightforest")),
-    UBC("Underground Biomes Constructs", false, startsWith("undergroundbiomesconstructs-")),
-    WITCHERY("Witchery", false, startsWith("witchery-")),
-    WORLDEDIT("WorldEdit", false, startsWith("worldedit-")),
+    ABYSSALCRAFT("AbyssalCraft", false, contains("abyssalcraft-")),
+    AROCKETRY("Advanced Rocketry", false, contains("advancedrocketry-")),
+    ATG("Alternate Terrain Generation", false, contains("atg")),
+    ANTIQUEATLAS("Antique Atlas", false, contains("antiqueatlas")),
+    ANTIIDCONFLICT("Anti ID Conflict", false, contains("antiidconflict")),
+    BOP("Biomes O' Plenty", false, contains("biomesoplenty-")),
+    BIOMETWEAKER("Biome Tweaker", false, contains("biometweaker-")),
+    BIOMEWAND("Biome Wand", false, contains("biome-wand")),
+    BUILDCRAFT("BuildCraft", false, contains("buildcraft-").and(contains("compat").negate())),
+    COFHLIB("CoFH Lib", false, contains("cofhlib-")),
+    COMPACTMACHINES("Compact Machines", false, contains("compactmachines-")),
+    DARKWORLD("Dark World", false, contains("darkworld-")),
+    DIMDOORS("Dimensional Doors", false, contains("dimensionaldoors-").or(contains("dimdoors-"))),
+    DRAGONAPI("DragonAPI", false, contains("dragonapi")),
+    EB("Enhanced Biomes", false, contains("Enhanced Biomes").or(contains("enhancedbiomes"))),
+    ENDERLICIOUS("Enderlicious", false, contains("enderlicious-")),
+    EREBUS("The Erebus", false, contains("theerebus")),
+    EXTRAPLANETS("Extra Planets", false, contains("extraplanets-")),
+    EXTRAUTILITIES("Extra Utilities", false, contains("extrautilities-")),
+    FUTUREPACK("Futurepack", false, contains("futurepack")),
+    GALACTICRAFTCORE("GalactiCraftCore", false, contains("galacticraftcore")),
+    GALAXYSPACE("GalaxySpace", false, contains("galaxyspace-")),
+    HIGHLANDS("Highlands", false, contains("highlands")),
+    ICG("Immersive Cavegen", false, contains("immersivecavegen")),
+    IR3("Industrial Revolution by Redstone Rebooted", false, contains("industrialrevolutionbyredstonerebooted-")),
+    LOTR("LOTR Mod", false, contains("lotrmod")),
+    MATTEROVERDRIVE("Matter Overdrive", false, contains("matteroverdrive-")),
+    MATTERMEGADRIVE("Matter Megadrive", false, contains("mattermegadrive-")),
+    MFQM("More Fun Quicksand Mod", false, contains("morefunquicksandmod-")),
+    NATURESCOMPASS("Nature's Compass", false, contains("naturescompass")),
+    NETHERLICIOUS("Netherlicious", false, contains("netherlicious-")),
+    NOMADICTENTS("Nomadic Tents", false, contains("nomadictents")),
+    OWG("Nostalgic world generation", false, contains("owg-").or(contains("nostalgiagenerator-"))),
+    RANDOMTHINGS("Random Things", false, contains("randomthings-")),
+    RESTRUCTURED("Restructured", false, contains("restructured-")),
+    RTG("Realistic Terrain Generation", false, contains("rtg-")),
+    RWG("Realistic World Gen", false, contains("rwg-")),
+    THAUMCRAFT("Thaumcraft", false, contains("thaumcraft")),
+    THUTCORE("ThutCore", false, contains("thutcore-").or(contains("thutmods-"))),
+    TROPICRAFT("Tropicraft", false, contains("tropicraft-")),
+    TWILIGHTFOREST("Twilight Forest", false, contains("twilightforest")),
+    UBC("Underground Biomes Constructs", false, contains("undergroundbiomesconstructs-")),
+    WITCHERY("Witchery", false, contains("witchery-")),
+    WORLDEDIT("WorldEdit", false, contains("worldedit-")),
     ;
 
     @Getter