Update Ascend to 1.20.6

Closes #195
Nincodedo · May 1, 2024 · 0bc1207 · 0bc1207
1 parent 97196a7
commit 0bc1207
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 18 deletions.
diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/any.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/any.json
@@ -5,7 +5,11 @@
       "conditions": {
         "items": [
           {
-            "nbt": "{NinUnique:\"Ascend\"}"
+            "components": {
+              "minecraft:custom_data": {
+                "nincodedo:unique_item": "Ascend"
+              }
+            }
           }
         ]
       }

diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/ignore_use.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/ignore_use.json
@@ -17,7 +17,17 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}},OnGround:0b}"
+              "equipment": {
+                "mainhand": {
+                  "components": {
+                    "minecraft:custom_data": {
+                      "nincodedo:unique_item": "Ascend",
+                      "nincodedo:powered": 1
+                    }
+                  }
+                }
+              },
+              "nbt": "{OnGround:0b}"
             }
           }
         ]

diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/initial.json
@@ -1,8 +1,10 @@
 {
   "display": {
     "icon": {
-      "item": "minecraft:carrot_on_a_stick",
-      "nbt": "{CustomModelData:1}"
+      "id": "minecraft:carrot_on_a_stick",
+      "components": {
+        "minecraft:custom_model_data": 1
+      }
     },
     "title": "What's Updog?",
     "description": "nm how bout u",
@@ -22,7 +24,7 @@
             "entity": "this",
             "predicate": {
               "type_specific": {
-                "type": "player",
+                "type": "minecraft:player",
                 "advancements": {
                   "nincodedo:unique_items/initial_library": true,
                   "nincodedo:unique_items/master_sword/initial": true

diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/main.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/main.json
@@ -1,8 +1,10 @@
 {
   "display": {
     "icon": {
-      "item": "minecraft:carrot_on_a_stick",
-      "nbt": "{CustomModelData:1}"
+      "id": "minecraft:carrot_on_a_stick",
+      "components": {
+        "minecraft:custom_model_data": 1
+      }
     },
     "title": "Ascend",
     "description": "My Zelda Needs Me",
@@ -18,7 +20,11 @@
       "conditions": {
         "items": [
           {
-            "nbt": "{NinUnique:\"Ascend\"}"
+            "components": {
+              "minecraft:custom_data": {
+                "nincodedo:unique_item": "Ascend"
+              }
+            }
           }
         ]
       }

diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/stop_initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/stop_initial.json
@@ -15,7 +15,16 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}}}",
+              "equipment": {
+                "mainhand": {
+                  "components": {
+                    "minecraft:custom_data": {
+                      "nincodedo:unique_item": "Ascend",
+                      "nincodedo:powered": 1
+                    }
+                  }
+                }
+              },
               "flags": {
                 "is_sneaking": true
               }

diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_ascend.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_ascend.json
@@ -19,7 +19,17 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}},OnGround:1b}"
+              "nbt": "{OnGround:1b}",
+              "equipment": {
+                "mainhand": {
+                  "components": {
+                    "minecraft:custom_data": {
+                      "nincodedo:unique_item": "Ascend",
+                      "nincodedo:powered": 1
+                    }
+                  }
+                }
+              }
             }
           }
         ]

diff --git a/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_initial.json b/datapacks/ocw-stuff/data/nincodedo/advancements/unique_items/ascend/use_initial.json
@@ -18,7 +18,17 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{SelectedItem:{tag:{NinUnique:\"Ascend\",NinPowered:1}},OnGround:1b}"
+              "nbt": "{OnGround:1b}",
+              "equipment": {
+                "mainhand": {
+                  "components": {
+                    "minecraft:custom_data": {
+                      "nincodedo:unique_item": "Ascend",
+                      "nincodedo:powered": 1
+                    }
+                  }
+                }
+              }
             }
           }
         ]

diff --git a/...ta/nincodedo/functions/uniqueitems/abilities/ascend/initial_activate_particles.mcfunction b/...ta/nincodedo/functions/uniqueitems/abilities/ascend/initial_activate_particles.mcfunction
@@ -1,5 +1,5 @@
-execute as @e[tag=xSQ] at @s run particle minecraft:dust 0.988 0.961 0.898 1 ~ ~.2 ~ 1 0 0 1 20
-execute as @e[tag=ySQ] at @s run particle minecraft:dust 0.988 0.961 0.898 1 ~ ~.2 ~ 0 0 1 1 20
+execute as @e[tag=xSQ] at @s run particle minecraft:dust{color:[0.988,0.961,0.898],scale:1} ~ ~.2 ~ 1 0 0 1 20
+execute as @e[tag=ySQ] at @s run particle minecraft:dust{color:[0.988,0.961,0.898],scale:1} ~ ~.2 ~ 0 0 1 1 20
 
 execute as @a[scores={ascend_phase=0}] at @s unless entity @e[tag=ascend_north,distance=..10] run summon minecraft:area_effect_cloud ~ ~ ~-1 {Duration:30,Tags:["xSQ","ascend_north"]}
 execute as @a[scores={ascend_phase=0}] at @s unless entity @e[tag=ascend_south,distance=..10] run summon minecraft:area_effect_cloud ~ ~ ~1 {Duration:30,Tags:["xSQ","ascend_south"]}

diff --git a/.../ocw-stuff/data/nincodedo/item_modifiers/multiverse/tools/increase_efficiency_by_one.json b/.../ocw-stuff/data/nincodedo/item_modifiers/multiverse/tools/increase_efficiency_by_one.json
@@ -11,7 +11,11 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "nbt": "{NinUnique:\"CobaltPickaxe\"}"
+            "components": {
+              "minecraft:custom_data": {
+                "NinUnique": "CobaltPickaxe"
+              }
+            }
           }
         }
       }

diff --git a/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/ascend.json b/datapacks/ocw-stuff/data/nincodedo/loot_tables/uniqueitems/ascend.json
@@ -8,12 +8,23 @@
           "name": "minecraft:carrot_on_a_stick",
           "functions": [
             {
-              "function": "minecraft:set_nbt",
-              "tag": "{NinPowered:1,NinUnique:\"Ascend\",Enchantments:[{}],CustomModelData:1,Unbreakable:1b}"
+              "function": "minecraft:set_components",
+              "components": {
+                "minecraft:unbreakable": {
+                  "show_in_tooltip": false
+                },
+                "minecraft:enchantment_glint_override": true,
+                "minecraft:custom_model_data": 1,
+                "minecraft:custom_data": {
+                  "nincodedo:powered": 1,
+                  "nincodedo:unique_item": "Ascend"
+                }
+              }
             },
             {
               "function": "minecraft:set_name",
               "entity": "this",
+              "target": "item_name",
               "name": {
                 "text": "Ascend",
                 "color": "green",
@@ -39,11 +50,12 @@
                   "color": "gray",
                   "extra": [
                     {
-                      "text": ": Initially Activate Ascend"
+                      "text": ": Activate Ascend"
                     }
                   ]
                 }
-              ]
+              ],
+              "mode": "replace_all"
             }
           ]
         }