Custom placement improvements

Author: runcows

gm4_furniture/data/gm4_furniture/function/place/custom/furniture/metal_set/iron.spotlight.mcfunction

@@ -1,7 +1,7 @@
 # custom placement
 # @s = player who placed the furniture player head
 # at the center of the placed block rotated along axis to face towards player or away from the wall
-# run from place/custom/resolve_id
+# run from place/furniture/metal_set/iron.spotlight (generated)
 
 # set main display to base
 data modify entity @n[type=item_display,tag=gm4_new_furniture,tag=gm4_furniture.display,limit=1,distance=..1] item.components merge value {"minecraft:item_model":"gm4_furniture:metal_set/iron/spotlight/default/base","custom_data":{gm4_furniture:{lit:1}}}
@@ -17,5 +17,3 @@ execute if predicate gm4_furniture:is_sneaking run summon item_display ~ ~0.0625
 # rotate
 rotate @n[type=item_display,tag=gm4_furniture.display_2,tag=gm4_new_furniture,distance=..1] facing entity @s eyes
 rotate @n[type=item_display,tag=gm4_furniture.display_3,tag=gm4_new_furniture,distance=..1] facing entity @s eyes
-# assign ids to additional displays
-execute as @e[type=item_display,tag=gm4_furniture.additional_display,tag=gm4_new_furniture,distance=..1] store result score @s gm4_furniture_id run scoreboard players get @n[type=item_display,tag=gm4_new_furniture,tag=gm4_furniture.display,limit=1,distance=..1] gm4_furniture_id

gm4_furniture/data/gm4_furniture/function/place/custom/furniture/stone_set/lantern_2.mcfunction

@@ -1,6 +1,6 @@
 # custom placement
 # @s = player who placed the furniture player head
 # at the center of the placed block rotated along axis to face towards player or away from the wall
-# run from place/custom/resolve_id
+# run from place/furniture/stone_set/lantern_2 (generated)
 
 setblock ~ ~ ~ barrier

gm4_furniture/data/gm4_furniture/function/place/custom/furniture/stone_set/lantern_big_1.mcfunction

@@ -1,7 +1,7 @@
 # custom placement
 # @s = player who placed the furniture player head
 # at the center of the placed block rotated along axis to face towards player or away from the wall
-# run from place/custom/resolve_id
+# run from place/furniture/stone_set/lantern_big_1 (generated)
 
 setblock ~ ~ ~ barrier
 setblock ~ ~1 ~ barrier

gm4_furniture/data/gm4_furniture/function/place/custom/resolve_id.mcfunction

@@ -83,8 +83,7 @@ scoreboard players set @e[type=interaction,tag=gm4_new_furniture,distance=..8] g
 execute if score $rotation gm4_furniture_data matches 2.. as @e[tag=gm4_new_furniture,distance=..8] run data modify entity @s Rotation set from storage gm4_furniture:data Rotation
 
 # custom placement
-execute if score $custom_placement gm4_furniture_data matches 1 run function gm4_furniture:place/custom/resolve_id {furniture_id:"{{ category }}/{{ technical_id }}"}
-
+execute if score $custom_placement gm4_furniture_data matches 1 run function gm4_furniture:place/custom/furniture/{{ category }}/{{ technical_id }}
 
 # mark block as placed and set id
 playsound minecraft:block.barrel.close block @a[distance=..6] ~ ~ ~ 1 1.6