Merge pull request #2 from amcocan/dev

Added New Features

Author: amcocan

README.md

@@ -23,6 +23,15 @@ The custom recipes are pretty self explanitory from just the names (_they follow
 I will explain this feature when I successfully add it into the datapack.
 <!-- Creepers / Endermen / Ghasts / Withers - Selective Griefing Removal -->
 
+## armorstatues
+Armor Statues allows the player to manipulate armorstands for decoration purposes using a custom `minecraft:written_book`. To learn how to get the custom `minecraft:written_book`, run `/trigger as_help`.
+
+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 [Vanilla Tweeks](https://vanillatweaks.net/picker/datapacks/) & [Github](https://github.com/MukiTanuki/armor-statues#).
+<!-- Might remove some of the features in this datapack. -->
+
 ## 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._
@@ -31,19 +40,26 @@ This feature adds tha ability to bring items within 16 blocks of the player to t
 I will explain this feature when I successfully add it into the datapack.
 <!-- A way to toggle pvp. -->
 
+## extrashell
+This feature increases the drop of shulker shells to guarantee 2 `minecraft:shulker_shell` items. This will sidestep the looting requirments from MJE.
+
 ## fastleafdecay
-I will explain this feature when I successfully add it into the datapack.
-<!-- Adds fast leaf decay for all trees. -->
+Adds fast leaf decay for all trees.
+
+Fast Leaf Decay was built by [Grant](https://twitter.com/GrantGryczan). Check out the rest of [Grant's](https://github.com/GrantGryczan) work!
+
+Maintained by [Vanilla Tweeks](https://vanillatweaks.net/about/).
+
+> Learn about the details of this datapack on [x.com/vanillatweaks](https://x.com/vanillatweaks/status/1294840567168479233).
 
 ## invframe
 This feature adds the ability to _hide_, _show_, and _find_ a `minecraft:item_frame` or `minecraft:glow_item_frame`. When a `minecraft:item_frame` or `minecraft:glow_item_frame` is hidden, it is also fixed so that you don't have the item rotating or the frame breaking. When a `minecraft:item_frame` or `minecraft:glow_item_frame` is shown, it is unfixed so that you can rotate the item and break the frame. You can use this feature by using the triggers below.
 - `/trigger find_frame` ~ _This makes it possible to find a `minecraft:item_frame` or `minecraft:glow_item_frame` that is invisible and empty._
 - `/trigger hide_frame` ~ _This hides the nearest `minecraft:item_frame` or `minecraft:glow_item_frame` within 1.5 blocks of the player._
 - `/trigger show_frame` ~ _This unhides the nearest `minecraft:item_frame` or `minecraft:glow_item_frame` within 1.5 blocks of the player._
 
-## invstand
-I will explain this feature when I successfully add it into the datapack.
-<!-- Invisible / Invulnerable / Locking - Armor Stands -->
+## mutetags
+To silence an entity rename a `minecraft:name_tag` to `/mute` (case-sensitive) and apply the `minecraft:name_tag` to the entity. To revert this change, repeat the steps with a `minecraft:name_tag` renamed to `/unmute` (case-sensitive).
 
 ## packauthor
 This feature uses the `tellraw` command to provide information on the datapack everytime the datapack is reloaded. It also creates the following two `trigger` commands that people can use.
@@ -54,16 +70,13 @@ 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
+## pocketshulker [Ignored]
 I will explain this feature when I successfully add it into the datapack.
+> For the time being, I will _ignore adding this feature_ as there are preblems with the duplication of items and optimization.
 <!-- Opening shulkers in inventory. -->
 
 ## shearheads
 This feature adds the ability to collect a `minecraft:blocks/player_head` without having to kill the player in MJE. Eventualy this feature will extend to other mobs/entities as well, but in the meantime it remains for players only.
 > The items `minecraft:blocks/player_head` will not carry special properties that extend beyond the purpose of decorations. For example, collecting a wither skelleton head (in the future) will not give you a `minecraft:blocks/wither_skeleton_skull`.
 
 To collect the `minecraft:blocks/player_head` you will need to craft a special item useing the recipe found in `minecraft/recipe/god_reaper.json`. This is a shapeless recipe that consists of a `minecraft:armor_stand`, `minecraft:written_book`, and `minecraft:shears`. Once this item is aquired, simply walk up to the player you want the head from and hit them with this item. You must be within 2 blocks of them and they have to be in survival mode for this to work. This feature successfuly triggers only when the entitiy takes damage from the custom item and you are in the correct range.
-
-## silencetags
-I will explain this feature when I successfully add it into the datapack.
-<!-- Add name tags that silence mobs permanently. -->

data/antigrief/function/loop.mcfunction

@@ -0,0 +1,14 @@
+# ======= Antigrief =======
+# Creeper antigrief.
+execute as @e[type=minecraft:creeper,tag=!antigrief] at @s run data merge entity @s {ExplosionRadius:0}
+tag @e[type=minecraft:creeper,tag=!antigrief] add antigrief
+
+# Enderman antigrief.
+# This feature is located at "data\minecraft\tags\block\enderman_holdable.json" in this datapack.
+
+# Ghast antigrief.
+execute as @e[type=minecraft:ghast,tag=!antigrief] at @s run data merge entity @s {ExplosionPower:0}
+tag @e[type=minecraft:ghast,tag=!antigrief] add antigrief
+
+# ======= Antigrief Loop =======
+schedule function antigrief:loop 1s 

data/antigrief/function/setup.mcfunction

@@ -0,0 +1,3 @@
+# ======= Antigrief =======
+# Alert everyone that datapack loaded successfully.
+tellraw @a[team=!no_alerts] {"text":"Antigrief function initialized successfully.", "color":"green", "italic":false}

data/armor_statues/advancement/crafting.json

@@ -0,0 +1,30 @@
+{
+  "parent": "armor_statues:root",
+  "criteria": {
+    "craft_book": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:written_book"
+            ],
+            "predicates": {
+              "minecraft:written_book_content": {
+                "title": "Statues"
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  "requirements": [
+    [
+      "craft_book"
+    ]
+  ],
+  "rewards": {
+    "function": "armor_statues:craft_book"
+  }
+}

data/armor_statues/advancement/enable.json

@@ -0,0 +1,16 @@
+{
+  "parent": "armor_statues:root",
+  "criteria": {
+    "tick": {
+      "trigger": "minecraft:tick"
+    }
+  },
+  "requirements": [
+    [
+      "tick"
+    ]
+  ],
+  "rewards": {
+    "function": "armor_statues:enable"
+  }
+}

data/armor_statues/advancement/root.json

@@ -0,0 +1,12 @@
+{
+  "criteria": {
+    "impossible": {
+      "trigger": "minecraft:impossible"
+    }
+  },
+  "requirements": [
+    [
+      "impossible"
+    ]
+  ]
+}

data/armor_statues/function/admin.mcfunction

@@ -0,0 +1,19 @@
+#
+# Description:	Display admin options in chat
+# Called by:	Player
+# Entity @s:	Player
+#
+tellraw @s [{"text":"Customizable Armor Stands - Admin Options","color":"yellow","bold":true}]
+tellraw @s [{"text":"Get book from help: ","color":"aqua"},{"storage":"customizable_armor_stands:settings", "nbt":"as_admin.book_help", "color":"green", "clickEvent":{"action":"run_command", "value":"/function armor_statues:admin/book_from_help_toggle"}, "hoverEvent":{"action":"show_text", "contents":{"text":"Click to toggle", "color":"yellow"}}}]
+tellraw @s [{"text":"Craftable book: ","color":"aqua"},{"storage":"customizable_armor_stands:settings", "nbt":"as_admin.book_craft", "color":"green", "clickEvent":{"action":"run_command", "value":"/function armor_statues:admin/craft_book_toggle"}, "hoverEvent":{"action":"show_text", "contents":{"text":"Click to toggle", "color":"yellow"}}}]
+tellraw @s [{"text":"UUID locked Armor Stands: ","color":"aqua"},{"storage":"customizable_armor_stands:settings", "nbt":"as_admin.uuid_lock", "color":"green", "clickEvent":{"action":"run_command", "value":"/function armor_statues:admin/uuid_lock_toggle"}, "hoverEvent":{"action":"show_text", "contents":{"text":"Makes locked armor stands only unlockable by the player who locked them or creative players.\\n\\nClick to toggle", "color":"yellow"}}}]
+#
+tellraw @s [{"text":"Delete unused invisible stands","color":"green","hoverEvent":{"action":"show_text","contents":[{"text":"Deletes any invisible armor stands in loaded chunks that are not holding or wearing any items.","color":"yellow"}]},"clickEvent":{"action":"run_command","value":"/function armor_statues:admin/unused"}}]
+tellraw @s [{"text":"Highlight all stands","color":"green","hoverEvent":{"action":"show_text","contents":[{"text":"Gives all stands within 64 blocks the glowing effect for 15 seconds","color":"yellow"}]},"clickEvent":{"action":"run_command","value":"/effect give @e[type=armor_stand,distance=..64] minecraft:glowing 15 1 true"}}]
+#tellraw @s [{"text":"Reduce local server load","color":"green","hoverEvent":{"action":"show_text","contents":[{"text":"Sets the Marker tag on all locked armor stands within 128 blocks. This reduces the load on the server from ticking the entities but makes the stands unaffected by entity updates such as being pushed by pistons. The Marker tag can be reset for individual stands by unlocking them.","color":"yellow"}]},"clickEvent":{"action":"run_command","value":"/function armor_statues:admin/marker"}}]
+tellraw @s [{"text":"--------------------------","color":"yellow","bold":true}]
+#
+# The "Reduce local server load" option has the unfortunate side effect of moving the stands' eye line to their base.
+# If this puts it inside a block, the items held and worn by the stand turn black.
+# Commented out for the time being whilst options are investigated.
+#

data/armor_statues/function/admin/book_from_help_toggle.mcfunction

@@ -0,0 +1,11 @@
+#
+# Description:	Disable option to get the book directly from the help menu
+# Called by:	armor_statues:admin via chat link
+# Entity @s:	player
+#
+execute store success score #as_success as_help run data modify storage customizable_armor_stands:settings as_admin.book_help set value "Disabled"
+execute unless score #as_success as_help matches 1 run data modify storage customizable_armor_stands:settings as_admin.book_help set value "Enabled"
+#
+tellraw @s [{"text":"Getting the book from the help menu has been ","color":"aqua"},{"storage":"customizable_armor_stands:settings", "nbt":"as_admin.book_help"}]
+#
+function armor_statues:admin

data/armor_statues/function/admin/craft_book_toggle.mcfunction

@@ -0,0 +1,11 @@
+#
+# Description:	Enable option to get the book by crafting
+# Called by:	armor_statues:admin via chat link
+# Entity @s:	player
+#
+execute store success score #as_success as_help run data modify storage customizable_armor_stands:settings as_admin.book_craft set value "Disabled"
+execute unless score #as_success as_help matches 1 run data modify storage customizable_armor_stands:settings as_admin.book_craft set value "Enabled"
+#
+tellraw @s [{"text":"Getting the book via crafting has been ","color":"aqua"},{"storage":"customizable_armor_stands:settings", "nbt":"as_admin.book_craft"}]
+#
+function armor_statues:admin

data/armor_statues/function/admin/marker.mcfunction

@@ -0,0 +1,24 @@
+#
+# This function is currently not used - see armor_statues:admin for details
+#
+
+#
+# Description:	Sets the Marker tag on all locked armor stands within 128 blocks
+# Called by:	armor_statues:admin via chat clickEvent
+# Entity @s:	Player
+#
+# Note: DisabledSlots tag is checked to exclude armor stands in tool racks
+#
+# Store number of affected stands for reporting
+#
+execute store result score @s as_pose run execute if entity @e[type=armor_stand,distance=..128,tag=as_locked,nbt=!{Marker:1b},nbt=!{DisabledSlots:4079166}]
+#
+# Set Marker tag on affected stands
+#
+execute as @e[type=armor_stand,distance=..128,tag=as_locked,nbt=!{Marker:1b},nbt=!{DisabledSlots:4079166}] run data merge entity @s {Marker:1b}
+#
+# Report number affected
+#
+tellraw @p [{"text":"Marker set on ","color":"aqua"},{"score":{"name":"@s","objective":"as_pose"},"color":"aqua"},{"text":" armor stands","color":"aqua"}]
+#
+scoreboard players reset @s as_pose