Add support for trapped hanging signs

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

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

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"}}'

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

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

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

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