Update to 1.21

MightyKnight · Jul 13, 2024 · b56b0d9 · b56b0d9
1 parent 1ade43d
commit b56b0d9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,12 +2,12 @@ org.gradle.jvmargs = -Xmx3G
 org.gradle.parallel=true
 
 # Fabric properties
-common_minecraft_version = 1.20.4
-common_yarn_mappings = 1.20.4+build.3
-loader_version = 0.15.7
+common_minecraft_version = 1.21
+common_yarn_mappings = 1.21+build.2
+loader_version = 0.15.11
 
 # Mod properties
-mod_version = 1.7.2
+mod_version = 1.8.0
 maven_group = me.mightyknight
 archives_base_name = shield-disruptor
 

diff --git a/shield-disruptor-mc120/src/main/resources/fabric.mod.json b/shield-disruptor-mc120/src/main/resources/fabric.mod.json
@@ -21,7 +21,7 @@
     ]
   },
   "depends": {
-    "minecraft": ["1.20.x"]
+    "minecraft": ["1.20.x", "1.21.x"]
   },
   "custom": {
     "modmenu": {

diff --git a/src/main/java/me/mightyknight/sd/common/mixin/MixinHeldItemRenderer.java b/src/main/java/me/mightyknight/sd/common/mixin/MixinHeldItemRenderer.java
@@ -63,14 +63,14 @@ private void hideShield(LivingEntity entity, ItemStack stack, ModelTransformatio
             }
 
             // Block items in the tag "c:tools/shields" (>1.20.5)
-            if(Versioned.REGISTRY.stackHasTag(stack, new Identifier("c", "tools/shields"))) {
+            if(Versioned.REGISTRY.stackHasTag(stack, Identifier.of("c", "tools/shields"))) {
                 callback.cancel();
                 return;
             }
 
             // Block items in the item tag "c:shields"
             // [LEGACY] This tag was changed to "c:tools/shields" in 1.20.5
-            if(Versioned.REGISTRY.stackHasTag(stack, new Identifier("c", "shields"))) {
+            if(Versioned.REGISTRY.stackHasTag(stack, Identifier.of("c", "shields"))) {
                 callback.cancel();
                 return;
             }
@@ -93,7 +93,7 @@ private void hideShield(LivingEntity entity, ItemStack stack, ModelTransformatio
             }
 
             // Check if item has the tag
-            Identifier tagId = new Identifier(
+            Identifier tagId = Identifier.of(
                     tagKey.split(":")[0].replaceFirst("#", ""),
                     tagKey.split(":")[1]);
 

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -31,7 +31,7 @@
     "shieldisruptor.mixins.json"
   ],
   "depends": {
-    "minecraft": ["1.16.x", "1.17.x", "1.18.x", "1.19.x", "1.20.x"],
+    "minecraft": ["1.16.x", "1.17.x", "1.18.x", "1.19.x", "1.20.x", "1.21.x"],
     "cloth-config2": "*"
   },
   "recommends": {