From added4375c58241b1a26a35b1320053c237624d5 Mon Sep 17 00:00:00 2001 From: Misode Date: Tue, 31 Oct 2023 12:39:29 +0100 Subject: [PATCH] Add support for trapped hanging signs --- gm4_trapped_signs/beet.yaml | 1 + .../functions/activate.mcfunction | 13 +++ .../functions/complete.mcfunction | 2 +- .../functions/deactivate.mcfunction | 13 +++ .../functions/destroy.mcfunction | 8 -- .../functions/machine/assign_tag.mcfunction | 29 +++++++ .../create_secret_trapped_sign.mcfunction | 15 +--- .../machine/create_trapped_sign.mcfunction | 17 +--- .../functions/machine/destroy.mcfunction | 21 ++++- .../functions/machine/drop_item.mcfunction | 32 +++++++- .../functions/ray.mcfunction | 2 +- .../recipes/secret_trapped_sign.mcfunction | 11 +++ .../functions/recipes/trapped_sign.mcfunction | 11 +++ .../crafting/secret_trapped_acacia_sign.json | 29 ------- .../crafting/secret_trapped_bamboo_sign.json | 29 ------- .../crafting/secret_trapped_birch_sign.json | 29 ------- .../crafting/secret_trapped_cherry_sign.json | 29 ------- .../crafting/secret_trapped_crimson_sign.json | 29 ------- .../secret_trapped_dark_oak_sign.json | 29 ------- .../crafting/secret_trapped_jungle_sign.json | 29 ------- .../secret_trapped_mangrove_sign.json | 29 ------- .../crafting/secret_trapped_oak_sign.json | 29 ------- .../crafting/secret_trapped_spruce_sign.json | 29 ------- .../crafting/secret_trapped_warped_sign.json | 29 ------- .../crafting/trapped_acacia_sign.json | 29 ------- .../crafting/trapped_bamboo_sign.json | 29 ------- .../crafting/trapped_birch_sign.json | 29 ------- .../crafting/trapped_cherry_sign.json | 29 ------- .../crafting/trapped_crimson_sign.json | 29 ------- .../crafting/trapped_dark_oak_sign.json | 29 ------- .../crafting/trapped_jungle_sign.json | 29 ------- .../crafting/trapped_mangrove_sign.json | 29 ------- .../crafting/trapped_oak_sign.json | 29 ------- .../crafting/trapped_spruce_sign.json | 29 ------- .../crafting/trapped_warped_sign.json | 29 ------- .../items/secret_trapped_acacia_sign.json | 32 -------- .../items/secret_trapped_bamboo_sign.json | 32 -------- .../items/secret_trapped_birch_sign.json | 32 -------- .../items/secret_trapped_cherry_sign.json | 32 -------- .../items/secret_trapped_crimson_sign.json | 32 -------- .../items/secret_trapped_dark_oak_sign.json | 32 -------- .../items/secret_trapped_jungle_sign.json | 32 -------- .../items/secret_trapped_mangrove_sign.json | 32 -------- .../items/secret_trapped_oak_sign.json | 32 -------- .../items/secret_trapped_spruce_sign.json | 32 -------- .../items/secret_trapped_warped_sign.json | 32 -------- .../items/trapped_acacia_sign.json | 32 -------- .../items/trapped_bamboo_sign.json | 32 -------- .../loot_tables/items/trapped_birch_sign.json | 32 -------- .../items/trapped_cherry_sign.json | 32 -------- .../items/trapped_crimson_sign.json | 32 -------- .../items/trapped_dark_oak_sign.json | 32 -------- .../items/trapped_jungle_sign.json | 32 -------- .../items/trapped_mangrove_sign.json | 32 -------- .../loot_tables/items/trapped_oak_sign.json | 32 -------- .../items/trapped_spruce_sign.json | 32 -------- .../items/trapped_warped_sign.json | 32 -------- gm4_trapped_signs/generate_types.py | 82 +++++++++++++++++++ 58 files changed, 215 insertions(+), 1384 deletions(-) delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/functions/destroy.mcfunction create mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/assign_tag.mcfunction delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_acacia_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_bamboo_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_birch_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_cherry_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_crimson_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_dark_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_jungle_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_mangrove_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_spruce_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_warped_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_acacia_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_bamboo_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_birch_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_cherry_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_crimson_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_dark_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_jungle_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_mangrove_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_spruce_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_warped_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_acacia_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_bamboo_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_birch_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_cherry_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_crimson_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_dark_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_jungle_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_mangrove_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_spruce_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_warped_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_acacia_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_bamboo_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_birch_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_cherry_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_crimson_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_dark_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_jungle_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_mangrove_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_oak_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_spruce_sign.json delete mode 100644 gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_warped_sign.json create mode 100644 gm4_trapped_signs/generate_types.py diff --git a/gm4_trapped_signs/beet.yaml b/gm4_trapped_signs/beet.yaml index 33247a2205..2b4bc101ef 100644 --- a/gm4_trapped_signs/beet.yaml +++ b/gm4_trapped_signs/beet.yaml @@ -6,6 +6,7 @@ data_pack: load: . pipeline: + - gm4_trapped_signs.generate_types - gm4.plugins.extend.module - gm4.plugins.include.lib_custom_crafters - gm4.plugins.include.lib_machines diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/activate.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/activate.mcfunction index e8fa8c1d1b..5db65797d6 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/activate.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/activate.mcfunction @@ -16,5 +16,18 @@ execute if block ~ ~ ~ #minecraft:wall_signs[facing=west] run fill ~1 ~-2 ~ ~1 ~ execute if block ~ ~ ~ #minecraft:wall_signs[facing=east] run fill ~-1 ~ ~1 ~-1 ~ ~-1 redstone_wire[power=1] replace redstone_wire[power=0] execute if block ~ ~ ~ #minecraft:wall_signs[facing=east] run fill ~-2 ~ ~ ~-2 ~ ~ redstone_wire[power=1] replace redstone_wire[power=0] execute if block ~ ~ ~ #minecraft:wall_signs[facing=east] run fill ~-1 ~-2 ~ ~-1 ~1 ~ redstone_wire[power=1] replace redstone_wire[power=0] + +execute if block ~ ~ ~ #minecraft:ceiling_hanging_signs run fill ~-1 ~ ~ ~1 ~ ~ redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:ceiling_hanging_signs run fill ~ ~ ~-1 ~ ~ ~1 redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:ceiling_hanging_signs run fill ~ ~-1 ~ ~ ~2 ~ redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~-1 ~ ~-1 ~1 ~ ~1 redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~-1 ~1 ~ ~1 ~1 ~ redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~ ~1 ~-1 ~ ~1 ~1 redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~ ~2 ~ ~ ~2 ~ redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=north] run fill ~-2 ~ ~ ~2 ~ ~ redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=south] run fill ~-2 ~ ~ ~2 ~ ~ redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=east] run fill ~ ~ ~-2 ~ ~ ~2 redstone_wire[power=1] replace redstone_wire[power=0] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=west] run fill ~ ~ ~-2 ~ ~ ~2 redstone_wire[power=1] replace redstone_wire[power=0] + tag @s add gm4_trapped_signs_pulsed tag @s remove gm4_trapped_signs_need_pulse diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/complete.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/complete.mcfunction index 1b76e77f7a..b5166d92aa 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/complete.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/complete.mcfunction @@ -1,5 +1,5 @@ # @s = trapped sign -# run from process +# run from process_uncompleted execute if entity @s[tag=!gm4_secret_trapped_sign] run data modify block ~ ~ ~ front_text.messages[3] set value '{"text":"-*-","bold":false,"italic":false,"underlined":false,"color":"black","clickEvent":{"action":"run_command","value":"function gm4_trapped_signs:pulse"}}' execute if entity @s[tag=gm4_secret_trapped_sign] run data modify block ~ ~ ~ front_text.messages[3] set value '{"text":"","bold":false,"italic":false,"underlined":false,"color":"black","clickEvent":{"action":"run_command","value":"function gm4_trapped_signs:pulse"}}' diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/deactivate.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/deactivate.mcfunction index d7b843412f..019cc94838 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/deactivate.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/deactivate.mcfunction @@ -19,4 +19,17 @@ execute if block ~ ~ ~ #minecraft:wall_signs[facing=west] run fill ~2 ~ ~ ~2 ~ ~ execute if block ~ ~ ~ #minecraft:wall_signs[facing=east] run fill ~-1 ~-2 ~ ~-1 ~1 ~ redstone_wire[power=0] replace redstone_wire[power=1] execute if block ~ ~ ~ #minecraft:wall_signs[facing=east] run fill ~-2 ~ ~ ~-2 ~ ~ redstone_wire[power=0] replace redstone_wire[power=1] execute if block ~ ~ ~ #minecraft:wall_signs[facing=east] run fill ~-1 ~ ~1 ~-1 ~ ~-1 redstone_wire[power=0] replace redstone_wire[power=1] + +execute if block ~ ~ ~ #minecraft:ceiling_hanging_signs run fill ~-1 ~ ~ ~1 ~ ~ redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:ceiling_hanging_signs run fill ~ ~ ~-1 ~ ~ ~1 redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:ceiling_hanging_signs run fill ~ ~-1 ~ ~ ~2 ~ redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~-1 ~ ~-1 ~1 ~ ~1 redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~-1 ~1 ~ ~1 ~1 ~ redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~ ~1 ~-1 ~ ~1 ~1 redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs run fill ~ ~2 ~ ~ ~2 ~ redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=north] run fill ~-2 ~ ~ ~2 ~ ~ redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=south] run fill ~-2 ~ ~ ~2 ~ ~ redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=east] run fill ~ ~ ~-2 ~ ~ ~2 redstone_wire[power=0] replace redstone_wire[power=1] +execute if block ~ ~ ~ #minecraft:wall_hanging_signs[facing=west] run fill ~ ~ ~-2 ~ ~ ~2 redstone_wire[power=0] replace redstone_wire[power=1] + tag @s remove gm4_trapped_signs_pulsed diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/destroy.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/destroy.mcfunction deleted file mode 100644 index ea1f4fb27e..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/destroy.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# @s = trapped sign that needs to be broken -# run from process - -execute if entity @s[tag=gm4_trapped_signs_pulsed] at @s run function gm4_trapped_signs:deactivate - -summon area_effect_cloud ~ ~ ~ {Passengers:[{id:"minecraft:item",Item:{id:"minecraft:redstone",Count:3b}},{id:"minecraft:item",Item:{id:"minecraft:tripwire_hook",Count:2b}}]} -execute if entity @s[tag=gm4_secret_trapped_sign] run summon area_effect_cloud ~ ~ ~ {Passengers:[{id:"minecraft:item",Item:{id:"minecraft:black_dye",Count:1b}}]} -kill @s diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/assign_tag.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/assign_tag.mcfunction new file mode 100644 index 0000000000..2e122c9a39 --- /dev/null +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/assign_tag.mcfunction @@ -0,0 +1,29 @@ +# Assigns a tag to the marker, used to drop the correct item after destroying the sign +# @s = raycast marker +# located at the center of the placed sign +# run from machine/create_secret_trapped_sign and machine/create_trapped_sign + +# The order of the tag name is inconsistent, but it stays like this for backwards compatibility +execute if block ~ ~ ~ #gm4_trapped_signs:acacia_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_acacia_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:bamboo_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_bamboo_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:birch_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_birch_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:cherry_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_cherry_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:crimson_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_crimson_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:dark_oak_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_dark_oak_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:jungle_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_jungle_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:mangrove_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_mangrove_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:oak_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_oak_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:spruce_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_spruce_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:warped_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_warped_trapped_sign + +execute if block ~ ~ ~ #gm4_trapped_signs:acacia_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_acacia_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:bamboo_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_bamboo_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:birch_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_birch_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:cherry_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_cherry_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:crimson_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_crimson_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:dark_oak_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_dark_oak_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:jungle_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_jungle_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:mangrove_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_mangrove_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:oak_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_oak_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:spruce_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_spruce_hanging_trapped_sign +execute if block ~ ~ ~ #gm4_trapped_signs:warped_hanging_signs run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_warped_hanging_trapped_sign diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_secret_trapped_sign.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_secret_trapped_sign.mcfunction index cdef72354e..448b63b607 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_secret_trapped_sign.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_secret_trapped_sign.mcfunction @@ -6,20 +6,7 @@ summon marker ~ ~ ~ {Tags:["gm4_trapped_sign","gm4_secret_trapped_sign","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:'"gm4_secret_trapped_sign"'} scoreboard players set @e[type=marker,tag=gm4_trapped_sign,tag=gm4_new_machine,distance=..0.1,limit=1] gm4_entity_version 1 -execute if block ~ ~ ~ acacia_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_acacia_trapped_sign -execute if block ~ ~ ~ acacia_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_acacia_trapped_sign -execute if block ~ ~ ~ birch_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_birch_trapped_sign -execute if block ~ ~ ~ birch_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_birch_trapped_sign -execute if block ~ ~ ~ crimson_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_crimson_trapped_sign -execute if block ~ ~ ~ crimson_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_crimson_trapped_sign -execute if block ~ ~ ~ dark_oak_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_dark_oak_trapped_sign -execute if block ~ ~ ~ dark_oak_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_dark_oak_trapped_sign -execute if block ~ ~ ~ jungle_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_jungle_trapped_sign -execute if block ~ ~ ~ jungle_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_jungle_trapped_sign -execute if block ~ ~ ~ spruce_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_spruce_trapped_sign -execute if block ~ ~ ~ spruce_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_spruce_trapped_sign -execute if block ~ ~ ~ warped_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_warped_trapped_sign -execute if block ~ ~ ~ warped_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_warped_trapped_sign +function gm4_trapped_signs:machine/assign_tag tag @e[type=marker,distance=..0.1] remove gm4_new_machine kill @s diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_trapped_sign.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_trapped_sign.mcfunction index 1baa58446e..9431d8d899 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_trapped_sign.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/create_trapped_sign.mcfunction @@ -3,23 +3,10 @@ # located at the center of the placed sign # run from place_trapped_sign -summon marker ~ ~ ~ {Tags:["gm4_trapped_sign","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:'"gm4_secret_trapped_sign"'} +summon marker ~ ~ ~ {Tags:["gm4_trapped_sign","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:'"gm4_trapped_sign"'} scoreboard players set @e[type=marker,tag=gm4_trapped_sign,tag=gm4_new_machine,distance=..0.1,limit=1] gm4_entity_version 1 -execute if block ~ ~ ~ acacia_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_acacia_trapped_sign -execute if block ~ ~ ~ acacia_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_acacia_trapped_sign -execute if block ~ ~ ~ birch_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_birch_trapped_sign -execute if block ~ ~ ~ birch_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_birch_trapped_sign -execute if block ~ ~ ~ crimson_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_crimson_trapped_sign -execute if block ~ ~ ~ crimson_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_crimson_trapped_sign -execute if block ~ ~ ~ dark_oak_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_dark_oak_trapped_sign -execute if block ~ ~ ~ dark_oak_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_dark_oak_trapped_sign -execute if block ~ ~ ~ jungle_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_jungle_trapped_sign -execute if block ~ ~ ~ jungle_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_jungle_trapped_sign -execute if block ~ ~ ~ spruce_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_spruce_trapped_sign -execute if block ~ ~ ~ spruce_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_spruce_trapped_sign -execute if block ~ ~ ~ warped_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_warped_trapped_sign -execute if block ~ ~ ~ warped_wall_sign run tag @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] add gm4_warped_trapped_sign +function gm4_trapped_signs:machine/assign_tag tag @e[type=marker,distance=..0.1] remove gm4_new_machine kill @s diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/destroy.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/destroy.mcfunction index d4e01b86e3..4ed0ccbdcd 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/destroy.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/destroy.mcfunction @@ -1,19 +1,36 @@ # destroys the trapped_sign # @s = trapped_sign marker # located at @s -# run from gm4_smelteries:machine/verify_destroy +# run from machine/verify_destroy # kill entities related to machine block scoreboard players set $dropped_item gm4_machine_data 0 execute if entity @s[tag=gm4_acacia_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:acacia_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] + +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_acacia_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:acacia_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_acacia_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:acacia_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_bamboo_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:bamboo_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_bamboo_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:bamboo_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_birch_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:birch_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_birch_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:birch_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_cherry_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:cherry_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_cherry_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:cherry_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_crimson_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:crimson_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_crimson_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:crimson_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_dark_oak_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:dark_oak_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_dark_oak_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:dark_oak_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_jungle_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:jungle_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_jungle_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:jungle_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_mangrove_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:mangrove_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_mangrove_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:mangrove_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_oak_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:oak_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_oak_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:oak_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_spruce_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:spruce_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_spruce_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:spruce_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_warped_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:warped_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] -kill @s +execute if score $dropped_item gm4_machine_data matches 0 if entity @s[tag=gm4_warped_hanging_trapped_sign] store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:warped_hanging_sign",Count:1b}},nbt=!{Item:{tag:{}}},limit=1,sort=nearest] # drop item (unless broken in creative mode) execute if score $dropped_item gm4_machine_data matches 1 run function gm4_trapped_signs:machine/drop_item + +kill @s diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/drop_item.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/drop_item.mcfunction index 534e2a4295..3d03c8d953 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/drop_item.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/machine/drop_item.mcfunction @@ -1,22 +1,52 @@ # drops the trapped sign item # @s = trapped sign marker # located at @s -# run from gm4_trapped_signs:machine/destroy +# run from machine/destroy execute if entity @s[tag=gm4_acacia_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_acacia_sign +execute if entity @s[tag=gm4_bamboo_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_bamboo_sign execute if entity @s[tag=gm4_birch_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_birch_sign +execute if entity @s[tag=gm4_cherry_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_cherry_sign execute if entity @s[tag=gm4_crimson_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_crimson_sign execute if entity @s[tag=gm4_dark_oak_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_dark_oak_sign execute if entity @s[tag=gm4_jungle_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_jungle_sign +execute if entity @s[tag=gm4_mangrove_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_mangrove_sign execute if entity @s[tag=gm4_oak_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_oak_sign execute if entity @s[tag=gm4_spruce_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_spruce_sign execute if entity @s[tag=gm4_warped_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_warped_sign +execute if entity @s[tag=gm4_acacia_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_acacia_hanging_sign +execute if entity @s[tag=gm4_bamboo_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_bamboo_hanging_sign +execute if entity @s[tag=gm4_birch_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_birch_hanging_sign +execute if entity @s[tag=gm4_cherry_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_cherry_hanging_sign +execute if entity @s[tag=gm4_crimson_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_crimson_hanging_sign +execute if entity @s[tag=gm4_dark_oak_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_dark_oak_hanging_sign +execute if entity @s[tag=gm4_jungle_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_jungle_hanging_sign +execute if entity @s[tag=gm4_mangrove_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_mangrove_hanging_sign +execute if entity @s[tag=gm4_oak_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_oak_hanging_sign +execute if entity @s[tag=gm4_spruce_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_spruce_hanging_sign +execute if entity @s[tag=gm4_warped_hanging_trapped_sign,tag=!gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/trapped_warped_hanging_sign + execute if entity @s[tag=gm4_acacia_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_acacia_sign +execute if entity @s[tag=gm4_bamboo_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_bamboo_sign execute if entity @s[tag=gm4_birch_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_birch_sign +execute if entity @s[tag=gm4_cherry_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_cherry_sign execute if entity @s[tag=gm4_crimson_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_crimson_sign execute if entity @s[tag=gm4_dark_oak_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_dark_oak_sign execute if entity @s[tag=gm4_jungle_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_jungle_sign +execute if entity @s[tag=gm4_mangrove_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_mangrove_sign execute if entity @s[tag=gm4_oak_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_oak_sign execute if entity @s[tag=gm4_spruce_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_spruce_sign execute if entity @s[tag=gm4_warped_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_warped_sign + +execute if entity @s[tag=gm4_acacia_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_acacia_hanging_sign +execute if entity @s[tag=gm4_bamboo_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_bamboo_hanging_sign +execute if entity @s[tag=gm4_birch_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_birch_hanging_sign +execute if entity @s[tag=gm4_cherry_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_cherry_hanging_sign +execute if entity @s[tag=gm4_crimson_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_crimson_hanging_sign +execute if entity @s[tag=gm4_dark_oak_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_dark_oak_hanging_sign +execute if entity @s[tag=gm4_jungle_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_jungle_hanging_sign +execute if entity @s[tag=gm4_mangrove_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_mangrove_hanging_sign +execute if entity @s[tag=gm4_oak_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_oak_hanging_sign +execute if entity @s[tag=gm4_spruce_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_spruce_hanging_sign +execute if entity @s[tag=gm4_warped_hanging_trapped_sign,tag=gm4_secret_trapped_sign] run loot spawn ~ ~ ~ loot gm4_trapped_signs:items/secret_trapped_warped_hanging_sign diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/ray.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/ray.mcfunction index 757cb6149a..5252852521 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/ray.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/ray.mcfunction @@ -3,4 +3,4 @@ scoreboard players add gm4_ray_counter gm4_count 1 tp @s ^ ^ ^0.01 -execute if score gm4_ray_counter gm4_count matches 0..500 at @s unless block ~ ~ ~ #minecraft:signs run function gm4_trapped_signs:ray +execute if score gm4_ray_counter gm4_count matches 0..500 at @s unless block ~ ~ ~ #minecraft:all_signs run function gm4_trapped_signs:ray diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/secret_trapped_sign.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/secret_trapped_sign.mcfunction index 868d1b1c4c..cc0f90b1f1 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/secret_trapped_sign.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/secret_trapped_sign.mcfunction @@ -1,11 +1,22 @@ execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:oak_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_oak_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:oak_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_oak_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:spruce_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_spruce_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:spruce_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_spruce_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:birch_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_birch_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:birch_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_birch_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:jungle_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_jungle_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:jungle_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_jungle_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:acacia_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_acacia_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:acacia_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_acacia_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:dark_oak_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_dark_oak_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:dark_oak_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_dark_oak_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:mangrove_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_mangrove_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:mangrove_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_mangrove_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:cherry_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_cherry_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:cherry_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_cherry_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:bamboo_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_bamboo_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:bamboo_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_bamboo_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:crimson_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_crimson_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:crimson_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_crimson_hanging_sign execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:warped_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_warped_sign +execute if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:warped_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/secret_trapped_warped_hanging_sign diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/trapped_sign.mcfunction b/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/trapped_sign.mcfunction index d52d2d3707..c26b3b2fd1 100644 --- a/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/trapped_sign.mcfunction +++ b/gm4_trapped_signs/data/gm4_trapped_signs/functions/recipes/trapped_sign.mcfunction @@ -1,11 +1,22 @@ execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:oak_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_oak_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:oak_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_oak_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:spruce_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_spruce_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:spruce_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_spruce_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:birch_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_birch_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:birch_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_birch_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:jungle_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_jungle_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:jungle_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_jungle_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:acacia_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_acacia_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:acacia_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_acacia_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:dark_oak_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_dark_oak_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:dark_oak_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_dark_oak_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:mangrove_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_mangrove_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:mangrove_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_mangrove_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:cherry_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_cherry_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:cherry_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_cherry_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:bamboo_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_bamboo_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:bamboo_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_bamboo_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:crimson_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_crimson_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:crimson_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_crimson_hanging_sign execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:warped_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_warped_sign +execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:warped_hanging_sign"}]} run loot replace block ~ ~ ~ container.0 loot gm4_trapped_signs:crafting/trapped_warped_hanging_sign diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_acacia_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_acacia_sign.json deleted file mode 100644 index 82d79d7af4..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_acacia_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_acacia_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_bamboo_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_bamboo_sign.json deleted file mode 100644 index 7a0b0a9031..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_bamboo_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_bamboo_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_birch_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_birch_sign.json deleted file mode 100644 index d7b42f2a82..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_birch_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_birch_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_cherry_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_cherry_sign.json deleted file mode 100644 index a72fb23769..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_cherry_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_cherry_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_crimson_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_crimson_sign.json deleted file mode 100644 index 6c8189f954..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_crimson_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_crimson_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_dark_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_dark_oak_sign.json deleted file mode 100644 index 835e95fb3f..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_dark_oak_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_dark_oak_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_jungle_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_jungle_sign.json deleted file mode 100644 index 0565e0cf7e..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_jungle_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_jungle_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_mangrove_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_mangrove_sign.json deleted file mode 100644 index a6305e9594..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_mangrove_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_mangrove_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_oak_sign.json deleted file mode 100644 index 2f10809139..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_oak_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_oak_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_spruce_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_spruce_sign.json deleted file mode 100644 index b82e61c9cc..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_spruce_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_spruce_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_warped_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_warped_sign.json deleted file mode 100644 index d49f1f7dbb..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/secret_trapped_warped_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/secret_trapped_warped_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_acacia_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_acacia_sign.json deleted file mode 100644 index 0ca6329698..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_acacia_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_acacia_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_bamboo_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_bamboo_sign.json deleted file mode 100644 index 0b7fecf15a..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_bamboo_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_bamboo_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_birch_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_birch_sign.json deleted file mode 100644 index 887ea3b16f..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_birch_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_birch_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_cherry_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_cherry_sign.json deleted file mode 100644 index 3c7a158ae7..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_cherry_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_cherry_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_crimson_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_crimson_sign.json deleted file mode 100644 index 9583b5e06f..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_crimson_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_crimson_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_dark_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_dark_oak_sign.json deleted file mode 100644 index 3c9141811c..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_dark_oak_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_dark_oak_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_jungle_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_jungle_sign.json deleted file mode 100644 index 4ad9166000..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_jungle_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_jungle_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_mangrove_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_mangrove_sign.json deleted file mode 100644 index 4302ed646c..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_mangrove_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_mangrove_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_oak_sign.json deleted file mode 100644 index b2b9f43cee..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_oak_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_oak_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_spruce_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_spruce_sign.json deleted file mode 100644 index 2dd642a67e..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_spruce_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_spruce_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_warped_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_warped_sign.json deleted file mode 100644 index e3955d2013..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/crafting/trapped_warped_sign.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "gm4_trapped_signs:items/trapped_warped_sign", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_acacia_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_acacia_sign.json deleted file mode 100644 index d8928866be..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_acacia_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:acacia_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.acacia_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_bamboo_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_bamboo_sign.json deleted file mode 100644 index 5ffbdc049a..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_bamboo_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bamboo_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_birch_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_birch_sign.json deleted file mode 100644 index 15a2eabc22..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_birch_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:birch_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.birch_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_cherry_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_cherry_sign.json deleted file mode 100644 index 3833b973e4..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_cherry_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:cherry_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_crimson_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_crimson_sign.json deleted file mode 100644 index 55a1d628d6..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_crimson_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:crimson_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.crimson_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_dark_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_dark_oak_sign.json deleted file mode 100644 index a14248c387..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_dark_oak_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:dark_oak_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.dark_oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_jungle_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_jungle_sign.json deleted file mode 100644 index 9caff2c649..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_jungle_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:jungle_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.jungle_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_mangrove_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_mangrove_sign.json deleted file mode 100644 index 4f1c644180..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_mangrove_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:mangrove_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_oak_sign.json deleted file mode 100644 index 951018ec72..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_oak_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:oak_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_spruce_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_spruce_sign.json deleted file mode 100644 index f139777669..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_spruce_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:spruce_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.spruce_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_warped_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_warped_sign.json deleted file mode 100644 index 6f0af846a6..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/secret_trapped_warped_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:warped_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420002,gm4_secret_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign.secret", - "fallback": "Secret Trapped %s", - "with": [ - { - "translate": "block.minecraft.warped_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_acacia_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_acacia_sign.json deleted file mode 100644 index 0f0a52235c..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_acacia_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:acacia_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.acacia_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_bamboo_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_bamboo_sign.json deleted file mode 100644 index a3b023b960..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_bamboo_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bamboo_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_birch_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_birch_sign.json deleted file mode 100644 index 281d12c622..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_birch_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:birch_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.birch_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_cherry_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_cherry_sign.json deleted file mode 100644 index c6529fcd8b..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_cherry_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:cherry_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_crimson_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_crimson_sign.json deleted file mode 100644 index 81c017f299..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_crimson_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:crimson_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.crimson_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_dark_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_dark_oak_sign.json deleted file mode 100644 index b5ffb59906..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_dark_oak_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:dark_oak_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.dark_oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_jungle_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_jungle_sign.json deleted file mode 100644 index 816c704572..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_jungle_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:jungle_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.jungle_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_mangrove_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_mangrove_sign.json deleted file mode 100644 index f5b3b5c8b6..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_mangrove_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:mangrove_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_oak_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_oak_sign.json deleted file mode 100644 index e3372b2333..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_oak_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:oak_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.oak_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_spruce_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_spruce_sign.json deleted file mode 100644 index 1a5a92038f..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_spruce_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:spruce_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.spruce_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_warped_sign.json b/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_warped_sign.json deleted file mode 100644 index aa8082cf5b..0000000000 --- a/gm4_trapped_signs/data/gm4_trapped_signs/loot_tables/items/trapped_warped_sign.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:warped_sign", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:3420001,gm4_trapped_sign:1b,HideFlags:1,Enchantments:[{id:\"minecraft:protection\",lvl:0s}]}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.trapped_sign", - "fallback": "Trapped %s", - "with": [ - { - "translate": "block.minecraft.warped_sign" - } - ], - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_trapped_signs/generate_types.py b/gm4_trapped_signs/generate_types.py new file mode 100644 index 0000000000..89a76bfd79 --- /dev/null +++ b/gm4_trapped_signs/generate_types.py @@ -0,0 +1,82 @@ +from beet import Context, BlockTag, LootTable + +TYPES = [ + "acacia", + "bamboo", + "birch", + "cherry", + "crimson", + "dark_oak", + "jungle", + "mangrove", + "oak", + "spruce", + "warped", +] + +def beet_default(ctx: Context): + """Generate loot tables and block tags for each sign type""" + + for type in TYPES: + for hanging in [True, False]: + for secret in [True, False]: + item = f"{type}_{'hanging_' if hanging else ''}sign" + name = f"{'secret_' if secret else ''}trapped_{item}" + + ctx.data[f"{ctx.project_id}:items/{name}"] = LootTable({ + "pools": [{ + "rolls": 1, + "entries": [{ + "type": "minecraft:item", + "name": f"minecraft:{item}", + "functions": [ + { + "function": "minecraft:set_nbt", + "tag": f"{'{'}CustomModelData:3420002,gm4_{'secret_' if secret else ''}trapped_sign:1b,HideFlags:1,Enchantments:[{'{'}id:'minecraft:protection',lvl:0s{'}'}]{'}'}" + }, + { + "function": "minecraft:set_name", + "name": { + "translate": f"item.gm4.trapped_sign{'.secret' if secret else ''}", + "fallback": f"{'Secret ' if secret else ''}Trapped %s", + "with": [{ "translate": f"block.minecraft.{item}" }], + "italic": False + } + } + ] + }] + }] + }) + + ctx.data[f"{ctx.project_id}:crafting/{name}"] = LootTable({ + "type": "minecraft:generic", + "pools": [ + { + "rolls": 8, + "entries": [{ + "type": "minecraft:item", + "name": "minecraft:air" + }] + }, + { + "rolls": 1, + "entries": [{ + "type": "minecraft:loot_table", + "name": f"gm4_trapped_signs:items/{name}", + "functions": [{ + "function": "minecraft:set_count", + "count": 1 + }] + }] + } + ] + }) + + for type in TYPES: + for hanging in [True, False]: + ctx.data[f"{ctx.project_id}:{type}_{'hanging_' if hanging else ''}signs"] = BlockTag({ + "values": [ + f"{type}_{'hanging_' if hanging else ''}sign", + f"{type}_wall_{'hanging_' if hanging else ''}sign" + ] + })