Merge branch 'dev' into release/1.21

opekope2 · Dec 1, 2024 · 01ecb69 · 01ecb69
2 parents 072a300 + e9e9ca8
commit 01ecb69
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/StaffMod/src/main/resources/data/avm_staff/advancement/coronavirus.json b/StaffMod/src/main/resources/data/avm_staff/advancement/coronavirus.json
@@ -28,10 +28,12 @@
           "equipment": {
             "head": {
               "items": "avm_staff:crown_of_king_orange",
-              "components": {
-                "minecraft:enchantments": {
-                  "minecraft:binding_curse": 1
-                }
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:binding_curse"
+                  }
+                ]
               }
             }
           }
@@ -45,10 +47,12 @@
           "equipment": {
             "head": {
               "items": "avm_staff:crown_of_king_orange",
-              "components": {
-                "minecraft:enchantments": {
-                  "minecraft:binding_curse": 1
-                }
+              "predicates": {
+                "minecraft:enchantments": [
+                  {
+                    "enchantments": "minecraft:binding_curse"
+                  }
+                ]
               }
             }
           }

diff --git a/StaffMod/src/main/resources/data/minecraft/tags/item/enchantable/equippable.json b/StaffMod/src/main/resources/data/minecraft/tags/item/enchantable/equippable.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "avm_staff:crown_of_king_orange"
+  ]
+}
diff --git a/StaffMod/src/main/resources/data/minecraft/tags/item/enchantable/vanishing.json b/StaffMod/src/main/resources/data/minecraft/tags/item/enchantable/vanishing.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "#avm_staff:staffs"
+    "#avm_staff:staffs",
+    "avm_staff:crown_of_king_orange"
   ]
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 java = "21" # Don't forget to update *.mixins.json
 kotlin = "2.0.0"
-staff-mod = "0.20.0"
+staff-mod = "0.20.1"
 architectury-plugin = "3.4-SNAPSHOT"
 architectury-loom = "1.7-SNAPSHOT"
 yarn = "1.21+build.9"