Update mod version to b2.1, Mixin fixes

StavWasPlayZ · Oct 10, 2023 · 6646e5c · 6646e5c
1 parent a46de51
commit 6646e5c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ version = project.mod_version
 group = project.maven_group
 
 base {
-	archivesName = project.archives_base_name
+	archivesName = project.archives_base_name + "-fabric-" + project.minecraft_version
 }
 
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -6,10 +6,10 @@ org.gradle.parallel=true
 # check these on https://fabricmc.net/develop
 minecraft_version=1.20.1
 parchment_mappings=1.20.1:2023.07.02
-loader_version=0.14.23
+loader_version=0.14.21
 
 # Mod Properties
-mod_version=1.0.0
+mod_version=b2.1
 maven_group=com.cstav.evenmoreinstruments
 archives_base_name=evenmoreinstruments
 

diff --git a/src/main/java/com/cstav/evenmoreinstruments/gamerule/ModGameRules.java b/src/main/java/com/cstav/evenmoreinstruments/gamerule/ModGameRules.java
@@ -13,7 +13,7 @@ public static void load() {}
 
     public static final GameRules.Key<GameRules.IntegerValue>
         RULE_LOOPER_MAX_NOTES = GameRulesAccessor.callRegister(Main.MODID+"_looperMaxNotes", Category.MISC,
-            GameRuleIntegerInvoker.invokeCreate(255)
+            GameRuleIntegerInvoker.callCreate(255)
         )
     ;
     //NOTE: GameRulesIntRuleAccessor exists

diff --git a/src/main/java/com/cstav/evenmoreinstruments/mixins/required/GameRuleIntegerInvoker.java b/src/main/java/com/cstav/evenmoreinstruments/mixins/required/GameRuleIntegerInvoker.java
@@ -8,8 +8,8 @@
 @Mixin(GameRules.IntegerValue.class)
 public interface GameRuleIntegerInvoker {
 
-    @Invoker
-    public static GameRules.Type<GameRules.IntegerValue> invokeCreate(int pDefaultValue) {
+    @Invoker("create")
+    public static GameRules.Type<GameRules.IntegerValue> callCreate(int pDefaultValue) {
         throw new AssertionError();
     }
 

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -34,7 +34,7 @@
 	"depends": {
 		"genshinstrument": ">=3.3.1",
 
-		"fabricloader": ">=0.14.23",
+		"fabricloader": ">=0.14.21",
 		"minecraft": "~1.20.1",
 		"java": ">=17",
 

diff --git a/src/main/resources/mixins.evenmoreinstruments.optional.json b/src/main/resources/mixins.evenmoreinstruments.optional.json
@@ -2,9 +2,11 @@
     "required": false,
 	"package": "com.cstav.evenmoreinstruments.mixins.optional",
 	"compatibilityLevel": "JAVA_17",
-	"refmap": "mixins.evenmoreinstruments.refmap.json",
 	"client": [
         "ParrotLooperDanceInjector"
 	],
-	"minVersion": "0.8"
+	"minVersion": "0.8",
+	"injectors": {
+		"defaultRequire": 1
+	}
 }
diff --git a/src/main/resources/mixins.evenmoreinstruments.required.json b/src/main/resources/mixins.evenmoreinstruments.required.json
@@ -2,9 +2,11 @@
     "required": true,
 	"package": "com.cstav.evenmoreinstruments.mixins.required",
 	"compatibilityLevel": "JAVA_17",
-	"refmap": "mixins.evenmoreinstruments.refmap.json",
 	"mixins": [
         "GameRuleIntegerInvoker"
 	],
-	"minVersion": "0.8"
+	"minVersion": "0.8",
+	"injectors": {
+		"defaultRequire": 1
+	}
 }