Merge pull request #7 from amcocan/dev

Bug Fixes  ~ Version 1.0.0 Beta Release 2

Author: amcocan

README.md

@@ -32,20 +32,14 @@ Armor Statues allows the player to manipulate armorstands for decoration purpose
 Armor Statues was built by [Phssthpok](https://x.com/MCPhssthpok), [MukiTanuki](https://twitter.com/mukitanuki), and [MSpaceDev](https://github.com/MSpaceDev). Check out the rest of [MukiTanuki's](https://github.com/MukiTanuki) and [MSpaceDev's](https://github.com/MSpaceDev) work!
 
 Maintained by [Vanilla Tweeks](https://vanillatweaks.net/about/).
-> Learn about the details of this datapack on [vanillatweaks.net](https://vanillatweaks.net/picker/datapacks/) & [github](https://github.com/MukiTanuki/armor-statues#).
-<!-- Might remove some of the features in this datapack. -->
+> Learn about the details of this datapack on [vanillatweaks.net](https://vanillatweaks.net/picker/datapacks/) & [github](https://github.com/MukiTanuki/armor-statues#). Also, I removed the itemframe features from this datapack since I added my own [here](#invframe).
 
 
 ## cleanup
 This feature adds tha ability to bring items within 16 blocks of the player to the players location using the following `trigger` command.
 - `/trigger clean_up` ~ _Brings all droped items within 16 blocks to the players location._
 
 
-<!-- ## combatswitch
-I will explain this feature when I successfully add it into the datapack.
-A way to toggle pvp. -->
-
-
 ## deathcords
 Will show you the cords of your last death using the following `trigger` command.
 - `/trigger death_cords` ~ _This will show you the cords and dimention of your last death._
@@ -118,12 +112,6 @@ This feature uses the `tellraw` command to provide information on the datapack e
 This feature adds the ability to sit anywhere the player wants using the following `trigger` command.
 - `/trigger sit` ~ _This makes the player sit in the location they were standing._
 
-<!-- 
-## pocketshulker [Ignored]
-Opening shulkers in inventory.
-> For the time being, I will _ignore adding this feature_ as there are preblems with the duplication of items and optimization.
--->
-
 
 ## shearheads
 This feature adds the ability to collect a `minecraft:blocks/player_head` without having to kill the player in MJE. This feature also extends to other mobs/entities as well.

data/antigrief/function/setup.mcfunction

@@ -2,4 +2,4 @@
 # Create and store the mobGriefing toggle in a scoreboard.
 scoreboard objectives add creeper_in_range dummy "Creeper In Range"
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Antigrief function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Antigrief function initialized successfully.", "color":"#ced4da"}]

data/armor_statues/function/load.mcfunction

@@ -33,4 +33,4 @@ execute unless data storage customizable_armor_stands:settings as_admin.book_cra
 execute unless data storage customizable_armor_stands:settings as_admin.book_help run data modify storage customizable_armor_stands:settings as_admin.book_help set value "Disabled"
 execute unless data storage customizable_armor_stands:settings as_admin.uuid_lock run data modify storage customizable_armor_stands:settings as_admin.uuid_lock set value "Disabled"
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Armor_statues function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Armor_statues function initialized successfully.", "color":"#ced4da"}]

data/cleanup/function/setup.mcfunction

@@ -2,4 +2,4 @@
 # Add trigger for players to run the cleanup function.
 scoreboard objectives add clean_up trigger "Clean Up"
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Cleanup function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Cleanup function initialized successfully.", "color":"#ced4da"}]

data/deathcords/function/loop.mcfunction

@@ -1,9 +1,9 @@
 # ======= Deathcords =======
 # Get the data from entity self.
-execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache Cache.Pos0 set from entity @s LastDeathLocation.pos[0]
-execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache Cache.Pos1 set from entity @s LastDeathLocation.pos[1]
-execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache Cache.Pos2 set from entity @s LastDeathLocation.pos[2]
-execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache Cache.Dimension set from entity @s LastDeathLocation.dimension
+execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache info.Pos0 set from entity @s LastDeathLocation.pos[0]
+execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache info.Pos1 set from entity @s LastDeathLocation.pos[1]
+execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache info.Pos2 set from entity @s LastDeathLocation.pos[2]
+execute as @a[scores={death_cords=1..}] run data modify storage deathcords:cache info.Dimension set from entity @s LastDeathLocation.dimension
 # Reset the timing of the title display message.
 execute as @a[scores={death_cords=1..}] run title @s reset
 # Set the timing of the title display message in ticks (20t == 1s).
@@ -13,12 +13,12 @@ execute as @a[scores={death_cords=1..}] run playsound minecraft:ui.toast.in mast
 # Show the title to entity self.
 execute as @a[scores={death_cords=1..}] run title @s title [{"text":"Last Death Cords", "color":"#ff003c"}]
 # Show the subtitle to entity self.
-execute as @a[scores={death_cords=1..}] run title @s subtitle [{"text":"| ", "color":"#ff003c"}, {"text":"Dimension: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"Cache.Dimension", "color":"#ced4da"}, {"text":" | ", "color":"#ff003c"}, {"text":"X: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"Cache.Pos0", "color":"#ced4da"}, {"text":" | ", "color":"#ff003c"}, {"text":"Y: ", "color":"#868e96"},{"storage":"deathcords:cache", "nbt":"Cache.Pos1", "color":"#ced4da"}, {"text":" | ", "color":"#ff003c"}, {"text":"Z: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"Cache.Pos2", "color":"#ced4da"}, {"text":" |", "color":"#ff003c"}]
+execute as @a[scores={death_cords=1..}] run title @s subtitle [{"text":"| ", "color":"#ff003c"}, {"text":"Dimension: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"info.Dimension", "color":"#ced4da"}, {"text":" | ", "color":"#ff003c"}, {"text":"X: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"info.Pos0", "color":"#ced4da"}, {"text":" | ", "color":"#ff003c"}, {"text":"Y: ", "color":"#868e96"},{"storage":"deathcords:cache", "nbt":"info.Pos1", "color":"#ced4da"}, {"text":" | ", "color":"#ff003c"}, {"text":"Z: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"info.Pos2", "color":"#ced4da"}, {"text":" |", "color":"#ff003c"}]
 # Show the title to entity self in chat.
 execute as @a[scores={death_cords=1..}] run tellraw @s [{"text":"\n", "color":"#ff003c"}, {"text":"Last Death Cords", "color":"#ff003c", "bold":true}]
 # Show the cords to entity self in chat.
-execute as @a[scores={death_cords=1..}] run tellraw @s [{"text":"| ", "color":"#ff003c"}, {"text":"Dimension: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"Cache.Dimension", "color":"#ced4da"}]
-execute as @a[scores={death_cords=1..}] run tellraw @s [{"text":"| ", "color":"#ff003c"}, {"text":"X: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"Cache.Pos0", "color":"#ced4da"}, {"text":"   ", "color":"#ff003c"}, {"text":"Y: ", "color":"#868e96"},{"storage":"deathcords:cache", "nbt":"Cache.Pos1", "color":"#ced4da"}, {"text":"   ", "color":"#ff003c"}, {"text":"Z: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"Cache.Pos2", "color":"#ced4da"}, {"text":"\n", "color":"#ff003c"}]
+execute as @a[scores={death_cords=1..}] run tellraw @s [{"text":"| ", "color":"#ff003c"}, {"text":"Dimension: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"info.Dimension", "color":"#ced4da"}]
+execute as @a[scores={death_cords=1..}] run tellraw @s [{"text":"| ", "color":"#ff003c"}, {"text":"X: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"info.Pos0", "color":"#ced4da"}, {"text":"   ", "color":"#ff003c"}, {"text":"Y: ", "color":"#868e96"},{"storage":"deathcords:cache", "nbt":"info.Pos1", "color":"#ced4da"}, {"text":"   ", "color":"#ff003c"}, {"text":"Z: ", "color":"#868e96"}, {"storage":"deathcords:cache", "nbt":"info.Pos2", "color":"#ced4da"}, {"text":"\n", "color":"#ff003c"}]
 # Reset and enable the trigger.
 execute as @a[scores={death_cords=1..}] run scoreboard players reset @s death_cords
 scoreboard players enable @a death_cords

data/deathcords/function/setup.mcfunction

@@ -2,4 +2,4 @@
 # Setup the scoreboard objective of type trigger.
 scoreboard objectives add death_cords trigger "Deathcords"
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Deathcords function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Deathcords function initialized successfully.", "color":"#ced4da"}]

data/durability_ping/function/load.mcfunction

@@ -72,4 +72,4 @@ advancement revoke @a only durability_ping:damage/elytra
 advancement revoke @a only durability_ping:damage/trident
 advancement revoke @a only durability_ping:damage/crossbow
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Durability_ping function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Durability_ping function initialized successfully.", "color":"#ced4da"}]

data/extrashell/function/setup.mcfunction

@@ -1,3 +1,3 @@
 # ======= Extra Shell =======
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Extrashell function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Extrashell function initialized successfully.", "color":"#ced4da"}]

data/fast_leaf_decay/function/load.mcfunction

@@ -38,4 +38,4 @@ scoreboard players reset * leafDec.paleS
 
 # ======= Fast Leaf Decay =======
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Fast_leaf_decay function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Fast_leaf_decay function initialized successfully.", "color":"#ced4da"}]

data/invframe/function/setup.mcfunction

@@ -5,4 +5,4 @@ scoreboard objectives add show_frame trigger "Show Frame"
 scoreboard objectives add find_frame trigger "Find Frame"
 # scoreboard objectives add debug_frame trigger "Debug Frame"
 # Alert everyone that datapack loaded successfully.
-tellraw @a[team=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Invframe function initialized successfully.", "color":"#ced4da"}]
+tellraw @a[tag=!no_alerts] [{"text":"| ", "color":"#ff003c"}, {"text":"Status: ", "color":"#868e96"}, {"text":"Invframe function initialized successfully.", "color":"#ced4da"}]

data/miniblocks/advancement/recipes/black_shulker_box.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:black_shulker_box"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:black_shulker_box"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:black_shulker_box"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/black_wool.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:black_wool"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:black_wool"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:black_wool"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/blue_shulker_box.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:blue_shulker_box"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:blue_shulker_box"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:blue_shulker_box"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/blue_wool.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:blue_wool"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:blue_wool"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:blue_wool"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/brown_shulker_box.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:brown_shulker_box"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:brown_shulker_box"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:brown_shulker_box"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/brown_wool.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:brown_wool"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:brown_wool"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:brown_wool"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/cyan_shulker_box.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:cyan_shulker_box"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cyan_shulker_box"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:cyan_shulker_box"
+    ]
+  }
+}

data/miniblocks/advancement/recipes/cyan_wool.json

@@ -0,0 +1,32 @@
+{
+  "parent": "mini_blocks:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "mini_blocks:cyan_wool"
+      }
+    },
+    "has_item": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cyan_wool"
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "mini_blocks:cyan_wool"
+    ]
+  }
+}