Updated to 1.21.5 and added model names for resource packs.

data/wrench/function/config/pillars/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchPillars WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/pillars/enable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}]
+execute if score WrenchPillars WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/pillars/enable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}]
 
-execute if score WrenchPillars WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/pillars/disable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}]
+execute if score WrenchPillars WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/pillars/disable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}]

data/wrench/function/config/rails/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchRails WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/rails/enable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}]
+execute if score WrenchRails WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/rails/enable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}]
 
-execute if score WrenchRails WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/rails/disable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}]
+execute if score WrenchRails WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/rails/disable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}]

data/wrench/function/config/redstone/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchRedstone WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/redstone/enable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}]
+execute if score WrenchRedstone WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/redstone/enable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}]
 
-execute if score WrenchRedstone WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/redstone/disable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}]
+execute if score WrenchRedstone WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/redstone/disable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}]

data/wrench/function/config/rods/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchRods WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/rods/enable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}]
+execute if score WrenchRods WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/rods/enable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}]
 
-execute if score WrenchRods WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/rods/disable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}]
+execute if score WrenchRods WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/rods/disable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}]

data/wrench/function/config/slabs/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchSlabs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/slabs/enable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}]
+execute if score WrenchSlabs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/slabs/enable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}]
 
-execute if score WrenchSlabs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/slabs/disable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}]
+execute if score WrenchSlabs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/slabs/disable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}]

data/wrench/function/config/stairs/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchStairs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/stairs/enable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}]
+execute if score WrenchStairs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/stairs/enable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}]
 
-execute if score WrenchStairs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/stairs/disable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}]
+execute if score WrenchStairs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/stairs/disable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}]

data/wrench/function/config/terracotta/main.mcfunction

@@ -1,6 +1,6 @@
 #Enabled = 600
 #Disabled = 601
 
-execute if score WrenchTerracotta WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/terracotta/enable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}]
+execute if score WrenchTerracotta WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/terracotta/enable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}]
 
-execute if score WrenchTerracotta WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/terracotta/disable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}]
+execute if score WrenchTerracotta WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/terracotta/disable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}]

data/wrench/function/raycast/partialbox.mcfunction

@@ -39,3 +39,4 @@ execute if block ~ ~ ~ minecraft:hopper unless score WrenchRedstone WrenchConfig
 execute if block ~ ~ ~ #minecraft:slabs unless score WrenchSlabs WrenchConfig matches 0 run function wrench:raycast/partialbox/slabs
 execute if block ~ ~ ~ #minecraft:stairs unless score WrenchStairs WrenchConfig matches 0 run function wrench:raycast/partialbox/stairs
 execute if block ~ ~ ~ minecraft:end_rod unless score WrenchRods WrenchConfig matches 0 run function wrench:raycast/partialbox/end_rods
+execute if block ~ ~ ~ minecraft:chain unless score WrenchRods WrenchConfig matches 0 run function wrench:raycast/partialbox/chain

data/wrench/function/raycast/partialbox/chain.mcfunction

@@ -0,0 +1,4 @@
+#Chain
+execute if block ~ ~ ~ minecraft:chain[axis=x] if score py WrenchRaycast matches 7..8 if score pz WrenchRaycast matches 7..8 run function wrench:rotate/chain_flip
+execute if block ~ ~ ~ minecraft:chain[axis=y] if score px WrenchRaycast matches 7..8 if score pz WrenchRaycast matches 7..8 run function wrench:rotate/chain_flip
+execute if block ~ ~ ~ minecraft:chain[axis=z] if score px WrenchRaycast matches 7..8 if score py WrenchRaycast matches 7..8 run function wrench:rotate/chain_flip

data/wrench/function/rotate/chain_flip.mcfunction

@@ -0,0 +1,5 @@
+### Flip Chain
+
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:chain[axis=z] replace minecraft:chain[axis=y]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:chain[axis=y] replace minecraft:chain[axis=x]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:chain[axis=x] replace minecraft:chain[axis=z]

data/wrench/function/rotate/glazed_terracotta.mcfunction

@@ -1,3 +1,3 @@
 ### Glazed Terracotta
-execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"Terracotta"']}}}] run function wrench:rotate/glazed_terracotta_mode
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["Terracotta"]}}}] run function wrench:rotate/glazed_terracotta_mode
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/glazed_terracotta_cycle

data/wrench/function/rotate/glazed_terracotta_mode.mcfunction

@@ -1,10 +1,10 @@
 ### Rotate Glazed Terracotta
 
 # Terracotta Mode Rotation
-execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"North"']}}}] run tag @s add TerracottaNORTH
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["North"]}}}] run tag @s add TerracottaNORTH
-execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"East"']}}}] run tag @s add TerracottaEAST
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["East"]}}}] run tag @s add TerracottaEAST
-execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"South"']}}}] run tag @s add TerracottaSOUTH
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["South"]}}}] run tag @s add TerracottaSOUTH
-execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"West"']}}}] run tag @s add TerracottaWEST
+execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["West"]}}}] run tag @s add TerracottaWEST
 
 ## Shades
 

data/wrench/function/rotate/pillars.mcfunction

@@ -1,6 +1,6 @@
 ### Pillars
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/pillars_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/pillars_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/pillars_click
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/pillars_click
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/pillars_cycle

data/wrench/function/rotate/rails.mcfunction

@@ -1,5 +1,5 @@
 ### Rails
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/rails_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/rails_player
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/rails_cycle

data/wrench/function/rotate/redstone.mcfunction

@@ -4,11 +4,11 @@
 execute if block ~ ~ ~ #wrench:redstone{Items:[{}]} run scoreboard players set @s WrenchSuccess -1
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Flip"']}}}] run function wrench:rotate/redstone_flip
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/redstone_flip
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/redstone_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/redstone_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/redstone_click
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/redstone_click
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/redstone_cycle
 
 # Container Full Show Error
 execute as @s[scores={WrenchSuccess=-1}] run playsound minecraft:entity.item_frame.break block @s ~ ~ ~
-execute as @s[scores={WrenchSuccess=-1}] run title @s actionbar [{"text":"Rotate Failed, "},{"text":"Container must be empty!","color":"red"}]
+execute as @s[scores={WrenchSuccess=-1}] run title @s actionbar [{"text":"Rotate Failed: ","color":"red"},{"text":"Container must be empty!","color":"white"}]

data/wrench/function/rotate/slabs_flip.mcfunction

@@ -282,7 +282,7 @@ execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:smooth_red_sandstone_slab[type=top] replace minecraft:smooth_red_sandstone_slab[type=bottom]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:smooth_red_sandstone_slab[type=bottom] replace minecraft:smooth_red_sandstone_slab[type=top]
 
-# Resin Brick Slab
+# Resin Brick
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:resin_brick_slab[type=top,waterlogged=true] replace minecraft:resin_brick_slab[type=bottom,waterlogged=true]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:resin_brick_slab[type=bottom,waterlogged=true] replace minecraft:resin_brick_slab[type=top,waterlogged=true]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:resin_brick_slab[type=top] replace minecraft:resin_brick_slab[type=bottom]

data/wrench/function/rotate/stairs.mcfunction

@@ -1,7 +1,7 @@
 ### Stairs
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Flip"']}}}] run function wrench:rotate/stairs_flip
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/stairs_flip
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/stairs_player
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/stairs_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/stairs_click
+execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/stairs_click
 execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/stairs_cycle

data/wrench/function/rotate/stairs_player.mcfunction

@@ -630,7 +630,7 @@ execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if score py WrenchRa
 execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if score py WrenchRaycast matches 8.. store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:oak_stairs[half=top,facing=north] replace minecraft:oak_stairs[waterlogged=false]
 execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if score py WrenchRaycast matches 8.. store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:oak_stairs[half=top,facing=east] replace minecraft:oak_stairs[waterlogged=false]
 
-# Oak
+# Pale Oak
 execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if score py WrenchRaycast matches ..7 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:pale_oak_stairs[half=bottom,facing=south,waterlogged=true] replace minecraft:pale_oak_stairs[waterlogged=true]
 execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if score py WrenchRaycast matches ..7 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:pale_oak_stairs[half=bottom,facing=west,waterlogged=true] replace minecraft:pale_oak_stairs[waterlogged=true]
 execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if score py WrenchRaycast matches ..7 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:pale_oak_stairs[half=bottom,facing=north,waterlogged=true] replace minecraft:pale_oak_stairs[waterlogged=true]

data/wrench/function/use.mcfunction

@@ -1,6 +1,7 @@
 #Check for wrench input
-execute if entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{Wrench:597832584}}}}] run function wrench:rotate
+execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{lzstealth:"wrench"}}}}] run function wrench:rotate
-execute if entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{Wrench:597832584}}}]}] run function wrench:wrench/offhand
+execute if entity @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{lzstealth:"wrench"}}}}}] run function wrench:wrench/offhand
+
 
 #Check if wrench has been crafted
 execute as @s[scores={WrenchInput=1..}] run function wrench:wrench/convert

data/wrench/function/wrench/convert.mcfunction

@@ -1,3 +1,3 @@
 #Check if wrench has been crafted
-item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":"Wrench"}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=[{"text":"Default"}],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
-item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":"Wrench"}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=[{"text":"Default"}],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]

data/wrench/function/wrench/give.mcfunction

@@ -1 +1 @@
-give @s minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+give @s minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]

data/wrench/function/wrench/offhand.mcfunction

@@ -2,22 +2,27 @@
 scoreboard players set @s WrenchSuccess 0
 
 #Change wrench mode
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Flip"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Default"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Flip"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_flip"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Player"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Click"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Flip"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Face Player"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_face_player"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
+
+execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Player"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Face Click"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_face_click"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
+
 # Only allow Terracotta more if terracotta rotating is enabled
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 0 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Click"]}}}}] unless score WrenchTerracotta WrenchConfig matches 0 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta","North"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
+
 # Retun to Default
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Terracotta"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+
+execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Click"]}}}}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
 
 
 #Confirm with action bar
-title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Default"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}]
-title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Flip"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}]
-title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Player"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}]
-title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Click"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}]
-title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
+title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Terracotta"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}]
 
 #Reset input
 scoreboard players set @s WrenchInput 0

data/wrench/function/wrench/terracotta.mcfunction

@@ -1,8 +1,8 @@
 #Advance terracotta mode rotation, show title
-item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"East"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "East"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
-item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"South"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "South"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
-item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"West"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "West"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
-item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true]
+item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "North"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}]
 title @s[tag=TerracottaNORTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"East","color":"white"}]
 title @s[tag=TerracottaEAST] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"South","color":"white"}]
 title @s[tag=TerracottaSOUTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"West","color":"white"}]

data/wrench/tags/block/partialbox.json

@@ -9,6 +9,7 @@
         "#minecraft:slabs",
         "#minecraft:stairs",
         "minecraft:end_rod",
+        "minecraft:chain",
         "minecraft:piston",
         "minecraft:sticky_piston"
     ]

pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
-        "pack_format": 41,
+        "pack_format": 71,
         "description": "Wrench pack to allow easy rotation of blocks. Configurable."
     }
 }