version bump v2.0.0

RealMuffinTime · RealMuffinTime · commit 404b5223aca7 · 2024-06-29T16:29:58.000+02:00
update to mc version 1.21
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # The MuffinTime Datapack
-This datapack is used to change resources of totems while using [muffintime-resource-pack](https://github.com/RealMuffinTime/muffintime-resource-pack). For Minecraft Version `1.20.x`.
+This datapack is used to change resources of totems while using [muffintime-resource-pack](https://github.com/RealMuffinTime/muffintime-resource-pack). For Minecraft Version `1.21.x`.
 
 It's is possible to change Totem textures via the command `/function muffintime:<totem_type>`.  
 Currently `<totem_type>` can be one of:
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -1,3 +1,8 @@
+### Version [v2.0.0](https://github.com/RealMuffinTime/muffintime-data-pack/releases/tag/v2.0.0) - 2024-06-29
+###### Changes
+- Changed functions and item_modifiers to account for changes in MC 1.21
+- Renamed functions/item_modifiers to function/item_modifier to account for changes in MC 1.21
+
 ### Version [v1.0.0](https://github.com/RealMuffinTime/muffintime-data-pack/releases/tag/v1.0.0) - 2024-02-02
 ###### New stuff
 - Added functions and item_modifiers to change totems CustomModelData
diff --git a/data/muffintime/function/ahegao.mcfunction b/data/muffintime/function/ahegao.mcfunction
@@ -0,0 +1 @@
+item modify entity @s weapon.mainhand muffintime:ahegao
diff --git a/data/muffintime/function/blue.mcfunction b/data/muffintime/function/blue.mcfunction
@@ -0,0 +1 @@
+item modify entity @s weapon.mainhand muffintime:blue
diff --git a/data/muffintime/function/green.mcfunction b/data/muffintime/function/green.mcfunction
@@ -0,0 +1 @@
+item modify entity @s weapon.mainhand muffintime:green
diff --git a/data/muffintime/function/red.mcfunction b/data/muffintime/function/red.mcfunction
@@ -0,0 +1 @@
+item modify entity @s weapon.mainhand muffintime:red
diff --git a/data/muffintime/function/yellow.mcfunction b/data/muffintime/function/yellow.mcfunction
@@ -0,0 +1 @@
+item modify entity @s weapon.mainhand muffintime:yellow
diff --git a/data/muffintime/functions/ahegao.mcfunction b/data/muffintime/functions/ahegao.mcfunction
diff --git a/data/muffintime/functions/blue.mcfunction b/data/muffintime/functions/blue.mcfunction
diff --git a/data/muffintime/functions/green.mcfunction b/data/muffintime/functions/green.mcfunction
diff --git a/data/muffintime/functions/red.mcfunction b/data/muffintime/functions/red.mcfunction
diff --git a/data/muffintime/functions/yellow.mcfunction b/data/muffintime/functions/yellow.mcfunction
diff --git a/data/muffintime/item_modifier/ahegao.json b/data/muffintime/item_modifier/ahegao.json
@@ -1,7 +1,7 @@
 [
     {
-        "function": "minecraft:set_nbt",
-        "tag": "{\"CustomModelData\":69}",
+        "function": "minecraft:set_custom_model_data",
+        "value": 69,
         "conditions": [
             {
                 "condition": "minecraft:entity_properties",
diff --git a/data/muffintime/item_modifier/blue.json b/data/muffintime/item_modifier/blue.json
@@ -1,7 +1,7 @@
 [
     {
-        "function": "minecraft:set_nbt",
-        "tag": "{\"CustomModelData\":1}",
+        "function": "minecraft:set_custom_model_data",
+        "value": 1,
         "conditions": [
             {
                 "condition": "minecraft:entity_properties",
diff --git a/data/muffintime/item_modifier/green.json b/data/muffintime/item_modifier/green.json
@@ -1,7 +1,7 @@
 [
     {
-        "function": "minecraft:set_nbt",
-        "tag": "{\"CustomModelData\":0}",
+        "function": "minecraft:set_custom_model_data",
+        "value": 0,
         "conditions": [
             {
                 "condition": "minecraft:entity_properties",
diff --git a/data/muffintime/item_modifier/red.json b/data/muffintime/item_modifier/red.json
@@ -1,7 +1,7 @@
 [
     {
-        "function": "minecraft:set_nbt",
-        "tag": "{\"CustomModelData\":2}",
+        "function": "minecraft:set_custom_model_data",
+        "value": 2,
         "conditions": [
             {
                 "condition": "minecraft:entity_properties",
diff --git a/data/muffintime/item_modifier/yellow.json b/data/muffintime/item_modifier/yellow.json
@@ -1,7 +1,7 @@
 [
     {
-        "function": "minecraft:set_nbt",
-        "tag": "{\"CustomModelData\":3}",
+        "function": "minecraft:set_custom_model_data",
+        "value": 3,
         "conditions": [
             {
                 "condition": "minecraft:entity_properties",
diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 15,
-    "description": "The MuffinTime Datapack v1.0.0"
+    "pack_format": 48,
+    "description": "The MuffinTime Datapack v2"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+item modify entity @s weapon.mainhand muffintime:ahegao`