From e6a4cb1beb4894dfa4de24813e17e1675d027be8 Mon Sep 17 00:00:00 2001
From: MukiTanuki <mukitanuki@hotmail.com>
Date: Thu, 1 Jul 2021 10:32:07 -0600
Subject: [PATCH] Bugfix for nbt not saving properly to nbt

---
 data/armor_statues/functions/admin.mcfunction        | 1 +
 data/armor_statues/functions/storage_out.mcfunction  | 4 ++--
 data/armor_statues/functions/trigger/copy.mcfunction | 2 +-
 data/armor_statues/item_modifiers/storage_out.json   | 9 +++++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data/armor_statues/functions/admin.mcfunction b/data/armor_statues/functions/admin.mcfunction
index c54d7f6..83848b2 100644
--- a/data/armor_statues/functions/admin.mcfunction
+++ b/data/armor_statues/functions/admin.mcfunction
@@ -17,6 +17,7 @@ tellraw @s [{"text":"Max Undo States: ","color":"aqua","hoverEvent":{"action":"s
 #
 tellraw @s [{"text":"Item Frame animation time: ","color":"aqua","hoverEvent":{"action":"show_text","contents":[{"text":"Enables Armor Stand animations by placing a book with a saved pose into an item frame with redstone dust on the block.  Requires an Armor Stand to be 8 blocks from the item frame.  Sets the number of game ticks between animation time of the item frames.\n(16 is recommended for most mid-sized servers.)\nSet to 0 to disable animations.","color":"yellow"}]},"clickEvent":{"action":"suggest_command","value":"/scoreboard players set #animate_trigger as_angle <time>"}},{"score":{"name":"#animate_trigger","objective":"as_angle"},"color":"green"}]
 #
+# REDO this at some point!
 #tellraw @s [{"text":"Reduce local server load","color":"green","hoverEvent":{"action":"show_text","contents":[{"text":"Sets the Marker tag on all locked armor stands within 128 blocks. This reduces the load on the server from ticking the entities but makes the stands unaffected by entity updates such as being pushed by pistons. The Marker tag can be reset for individual stands by unlocking them.","color":"yellow"}]},"clickEvent":{"action":"run_command","value":"/function armor_statues:admin/marker"}}]
 tellraw @s [{"text":"--------------------------","color":"yellow","bold":"true"}]
 #
diff --git a/data/armor_statues/functions/storage_out.mcfunction b/data/armor_statues/functions/storage_out.mcfunction
index 541b889..f53aa66 100644
--- a/data/armor_statues/functions/storage_out.mcfunction
+++ b/data/armor_statues/functions/storage_out.mcfunction
@@ -5,5 +5,5 @@
 #
 # Copies data from storage to the players book
 #
-execute if entity @s[nbt={SelectedItem:{id:"minecraft:written_book", tag:{datapack:"ArmorStatuesV2"}}}] as @e[tag=as_temp, type=minecraft:pig, limit=1,sort=nearest] run item modify entity @s weapon.mainhand armor_statues:storage_out
-execute if entity @s[nbt={Inventory:[{id:"minecraft:written_book", Slot:-106b, tag:{datapack:"ArmorStatuesV2"}}]}] unless entity @s[nbt={SelectedItem:{id:"minecraft:written_book", tag:{datapack:"ArmorStatuesV2"}}}] as @e[tag=as_temp, type=minecraft:pig, sort=nearest, limit=1] run item modify entity @s weapon.offhand armor_statues:storage_out
\ No newline at end of file
+execute if entity @s[nbt={SelectedItem:{id:"minecraft:written_book", tag:{datapack:"ArmorStatuesV2"}}}] run item modify entity @s weapon.mainhand armor_statues:storage_out
+execute if entity @s[nbt={Inventory:[{id:"minecraft:written_book", Slot:-106b, tag:{datapack:"ArmorStatuesV2"}}]}] unless entity @s[nbt={SelectedItem:{id:"minecraft:written_book", tag:{datapack:"ArmorStatuesV2"}}}] run item modify entity @s weapon.offhand armor_statues:storage_out
\ No newline at end of file
diff --git a/data/armor_statues/functions/trigger/copy.mcfunction b/data/armor_statues/functions/trigger/copy.mcfunction
index f1802d1..5b40d94 100644
--- a/data/armor_statues/functions/trigger/copy.mcfunction
+++ b/data/armor_statues/functions/trigger/copy.mcfunction
@@ -14,7 +14,7 @@ data modify storage customizable_armor_stands:book_storage SavedItem.tag.SavedPo
 data modify storage customizable_armor_stands:book_storage SavedItem.tag.SavedPose.Invisible set from entity @s Invisible
 data modify storage customizable_armor_stands:book_storage SavedItem.tag.SavedPose.CustomNameVisible set from entity @s CustomNameVisible
 #
-execute as @p[tag=as_selected] run function armor_statues:storage_out_copy
+execute as @p[tag=as_selected] run function armor_statues:storage_out
 #
 title @a[tag=as_selected,tag=!as_chat] actionbar [{"selector":"@s","color":"dark_green"}, {"text":" Pose and settings copied to the book","color":"dark_green"}]
 tellraw @a[tag=as_selected,tag=as_chat] [{"text":"<Stick_God> ","color":"dark_green"}, {"selector":"@s","color":"dark_green"}, {"text":" Pose and settings copied to the book","color":"dark_green"}]
diff --git a/data/armor_statues/item_modifiers/storage_out.json b/data/armor_statues/item_modifiers/storage_out.json
index dd5c3bb..38ad72a 100644
--- a/data/armor_statues/item_modifiers/storage_out.json
+++ b/data/armor_statues/item_modifiers/storage_out.json
@@ -7,8 +7,13 @@
 		},
 		"ops": [
 			{
-				"source": "SavedItem",
-				"target": "[]",
+				"source": "SavedItem.tag",
+				"target": "{}",
+				"op": "merge"
+			},
+			{
+				"source": "SavedItem.tag.SavedPose",
+				"target": "SavedPose",
 				"op": "replace"
 			}
 		]