Allow mod file names to have prefixes (#185)

FalsePattern · Jul 19, 2024 · f2cc929 · f2cc929
1 parent 80e0d69
commit f2cc929
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,16 @@ minecraft_fp {
 
 repositories {
     cursemavenEX()
-    exclusive(mavenpattern(), "com.falsepattern", "makamys")
+    mavenpattern() {
+        content {
+            includeGroups("com.falsepattern", "makamys")
+        }
+    }
+    mavenLocal {
+        content {
+            includeGroup("com.falsepattern")
+        }
+    }
     exclusive(jitpack(), "com.github.basdxz")
     exclusive(maven("mega_uploads", "https://mvn.falsepattern.com/gtmega_uploads"), "optifine")
     exclusive(mega(), "codechicken")
@@ -61,8 +70,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("com.falsepattern:falsepatternlib-mc1.7.10:1.2.5:api")
-    runtimeOnly("com.falsepattern:falsepatternlib-mc1.7.10:1.2.5:dev")
+    implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.4.0")
 
     compileOnly(rfg.deobf("optifine:optifine:1.7.10_hd_u_e7"))
 

diff --git a/src/main/java/com/falsepattern/falsetweaks/FalseTweaks.java b/src/main/java/com/falsepattern/falsetweaks/FalseTweaks.java
@@ -41,7 +41,7 @@
      acceptedMinecraftVersions = "[1.7.10]",
      guiFactory = Tags.ROOT_PKG + ".config.FalseTweaksGuiFactory",
      acceptableRemoteVersions = "*",
-     dependencies = "required-after:falsepatternlib@[1.2.0,);" +
+     dependencies = "required-after:falsepatternlib@[1.4.0,);" +
                     "after:neodymium@[0.3.2,);")
 public class FalseTweaks {
 

diff --git a/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/MixinPlugin.java b/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/MixinPlugin.java
@@ -43,4 +43,9 @@ public ITargetedMod[] getTargetedModEnumValues() {
     public IMixin[] getMixinEnumValues() {
         return Mixin.values();
     }
+
+    @Override
+    public boolean useNewFindJar() {
+        return true;
+    }
 }
diff --git a/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/TargetedMod.java b/src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/TargetedMod.java
@@ -34,26 +34,26 @@
 import static com.falsepattern.falsetweaks.mixin.plugin.standard.Extras.OPTIFINE_SHADERSMOD_VERSIONS;
 import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.avoid;
 import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.require;
-import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.startsWith;
+import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.contains;
 
 @RequiredArgsConstructor
 public enum TargetedMod implements ITargetedMod {
-    FOAMFIX("FoamFix", false, startsWith("foamfix")),
-    OPTIFINE_WITHOUT_SHADERS("OptiFine without shaders", false, startsWith("optifine").and(OPTIFINE_SHADERSMOD_VERSIONS.or(OPTIFINE_DYNAMIC_LIGHTS_VERSIONS).negate())),
-    OPTIFINE_WITH_SHADERS("OptiFine with shaders", false, startsWith("optifine").and(OPTIFINE_SHADERSMOD_VERSIONS)),
-    OPTIFINE_WITH_DYNAMIC_LIGHTS("OptiFine with dynamic lights", false, startsWith("optifine").and(OPTIFINE_DYNAMIC_LIGHTS_VERSIONS)),
-    FASTCRAFT("FastCraft", false, startsWith("fastcraft")),
-    CHROMATICRAFT("ChromatiCraft", false, startsWith("chromaticraft")),
-    REDSTONEPASTE("RedstonePaste", false, startsWith("redstonepaste")),
-    APPARATUS("Apparatus", false, startsWith("apparatus")),
-    RAILCRAFT("Railcraft", true, startsWith("railcraft")),
-    DRAGONAPI("DragonAPI", false, startsWith("dragonapi")),
-    NEODYMIUM("Neodymium", false, startsWith("neodymium-")),
-    NUCLEAR_CONTROL("Nuclear Control 2", false, startsWith("IC2NuclearControl-")),
-    OPEN_COMPUTERS("OpenComputers", false, startsWith("OpenComputers-")),
-    COMPUTRONICS("Computronics", false, startsWith("Computronics-")),
-    EXTRA_CELLS("Extra Cells 2", false, startsWith("ExtraCells-")),
-    AUTOMAGY("Automagy", false, startsWith("Automagy-")),
+    FOAMFIX("FoamFix", false, contains("foamfix")),
+    OPTIFINE_WITHOUT_SHADERS("OptiFine without shaders", false, contains("optifine").and(OPTIFINE_SHADERSMOD_VERSIONS.or(OPTIFINE_DYNAMIC_LIGHTS_VERSIONS).negate())),
+    OPTIFINE_WITH_SHADERS("OptiFine with shaders", false, contains("optifine").and(OPTIFINE_SHADERSMOD_VERSIONS)),
+    OPTIFINE_WITH_DYNAMIC_LIGHTS("OptiFine with dynamic lights", false, contains("optifine").and(OPTIFINE_DYNAMIC_LIGHTS_VERSIONS)),
+    FASTCRAFT("FastCraft", false, contains("fastcraft")),
+    CHROMATICRAFT("ChromatiCraft", false, contains("chromaticraft")),
+    REDSTONEPASTE("RedstonePaste", false, contains("redstonepaste")),
+    APPARATUS("Apparatus", false, contains("apparatus")),
+    RAILCRAFT("Railcraft", true, contains("railcraft")),
+    DRAGONAPI("DragonAPI", false, contains("dragonapi")),
+    NEODYMIUM("Neodymium", false, contains("neodymium-")),
+    NUCLEAR_CONTROL("Nuclear Control 2", false, contains("IC2NuclearControl-")),
+    OPEN_COMPUTERS("OpenComputers", false, contains("OpenComputers-")),
+    COMPUTRONICS("Computronics", false, contains("Computronics-")),
+    EXTRA_CELLS("Extra Cells 2", false, contains("ExtraCells-")),
+    AUTOMAGY("Automagy", false, contains("Automagy-")),
     ;
 
     public static Predicate<List<ITargetedMod>> REQUIRE_OPTIFINE_WITHOUT_SHADERS = require(OPTIFINE_WITHOUT_SHADERS).or(require(OPTIFINE_WITH_DYNAMIC_LIGHTS));
@@ -63,6 +63,7 @@ public enum TargetedMod implements ITargetedMod {
     public static Predicate<List<ITargetedMod>> REQUIRE_ANY_OPTIFINE = require(OPTIFINE_WITH_SHADERS).or(require(OPTIFINE_WITHOUT_SHADERS)).or(require(OPTIFINE_WITH_DYNAMIC_LIGHTS));
     public static Predicate<List<ITargetedMod>> AVOID_ANY_OPTIFINE = avoid(OPTIFINE_WITH_SHADERS).and(avoid(OPTIFINE_WITHOUT_SHADERS)).and(avoid(OPTIFINE_WITH_DYNAMIC_LIGHTS));
 
+
     @Getter
     private final String modName;
     @Getter