Fix Hologram Removal Not Respecting Item Frame Rotation

Author: Bloo-dev

gm4_holographic_tags/data/gm4_holographic_tags/function/destroy_hologram.mcfunction

@@ -1,8 +1,17 @@
-# @s = hologram AEC if empty item frame is nearby
+# @s = hologram text display if empty item frame is nearby
+# at @s positioned ^ ^ ^-0.3 (block face the hologram was placed from)
 # run from main
 
-data merge entity @e[type=#gm4_holographic_tags:item_frames,limit=1,sort=nearest,distance=..0.1] {Tags:["gm4_hologram"],Item:{id:"minecraft:name_tag",count:1,components:{"minecraft:repair_cost":0}}}
-data modify entity @e[type=#gm4_holographic_tags:item_frames,limit=1,sort=nearest,distance=..0.1] Item.components."minecraft:custom_name" set from entity @s text.text
+# prepare data to reduce selector count
+data modify storage gm4_holographic_tags:temp properties.rotation_hologram set from entity @s Rotation
+execute store result storage gm4_holographic_tags:temp properties.rotation_x_hologram int 1 run data get storage gm4_holographic_tags:temp properties.rotation_hologram[0]
+execute store result storage gm4_holographic_tags:temp properties.rotation_y_hologram int 1 run data get storage gm4_holographic_tags:temp properties.rotation_hologram[1]
+data modify storage gm4_holographic_tags:temp properties.text set from entity @s text.text
 
+# attempt move data from hologram to item frame, if destroy failed, also fail this function
+execute as @e[type=#gm4_holographic_tags:item_frames,limit=1,sort=nearest,distance=..0.1] unless function gm4_holographic_tags:read_hologram_data run return fail
+data remove storage gm4_holographic_tags:temp properties
+
+# particles & hologram removal
 particle minecraft:block{block_state:"minecraft:stripped_birch_log"} ~ ~ ~ .2 .2 .2 .1 10
 kill @s

gm4_holographic_tags/data/gm4_holographic_tags/function/read_hologram_data.mcfunction

@@ -0,0 +1,22 @@
+# Moves data from the hologram to the item frame, unless their rotations are different
+# @s = item frame ready to receive a nametag
+# at block face hologram was placed from
+# run from return_name_tag
+
+# check if the rotation matches
+data modify storage gm4_holographic_tags:temp properties.rotation_item_frame set from entity @s Rotation
+execute store result storage gm4_holographic_tags:temp properties.rotation_x_item_frame int 1 run data get storage gm4_holographic_tags:temp properties.rotation_item_frame[0]
+execute store result storage gm4_holographic_tags:temp properties.rotation_y_item_frame int 1 run data get storage gm4_holographic_tags:temp properties.rotation_item_frame[1]
+
+execute store success storage gm4_holographic_tags:temp properties.rotation_x_differs int 1 run data modify storage gm4_holographic_tags:temp properties.rotation_x_hologram set from storage gm4_holographic_tags:temp properties.rotation_x_item_frame
+execute if data storage gm4_holographic_tags:temp properties{rotation_x_differs:1} run return fail
+execute store success storage gm4_holographic_tags:temp properties.rotation_y_differs int 1 run data modify storage gm4_holographic_tags:temp properties.rotation_y_hologram set from storage gm4_holographic_tags:temp properties.rotation_y_item_frame
+execute if data storage gm4_holographic_tags:temp properties{rotation_y_differs:1} run return fail
+
+
+# rotation matched, move data
+data merge entity @s {Tags:["gm4_hologram"],Item:{id:"minecraft:name_tag",count:1,components:{"minecraft:repair_cost":0}}}
+data modify entity @s Item.components."minecraft:custom_name" set from storage gm4_holographic_tags:temp properties.text
+
+# signal that data transfer was successful
+return 1