diff --git a/data/lzstools/function/give/wrench.mcfunction b/data/lzstools/function/give/wrench.mcfunction index ecd4cc6..579d2e6 100644 --- a/data/lzstools/function/give/wrench.mcfunction +++ b/data/lzstools/function/give/wrench.mcfunction @@ -1 +1 @@ -give @s minecraft:carrot_on_a_stick[minecraft:item_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_model_data={strings:["lzstools:wrench_default"]},minecraft:custom_data={"lzstools":["wrench"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=false,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] \ No newline at end of file +give @s minecraft:carrot_on_a_stick[minecraft:item_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=[{"text":"Default"}],minecraft:custom_model_data={strings:["lzstools:wrench_default"]},minecraft:custom_data={"lzstools":["wrench"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=false,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] \ No newline at end of file diff --git a/data/lzstools_chisel/function/mainhand.mcfunction b/data/lzstools_chisel/function/mainhand.mcfunction index 855e0ad..47db600 100644 --- a/data/lzstools_chisel/function/mainhand.mcfunction +++ b/data/lzstools_chisel/function/mainhand.mcfunction @@ -1,3 +1,5 @@ tag @s add lzstools_chisel_mainhand # Raycast from player's position -function lzstools_chisel:raycast/start \ No newline at end of file +function lzstools_chisel:raycast/start + +swing @s mainhand \ No newline at end of file diff --git a/data/lzstools_trowel/function/mainhand.mcfunction b/data/lzstools_trowel/function/mainhand.mcfunction index 5263ba6..ded4a29 100644 --- a/data/lzstools_trowel/function/mainhand.mcfunction +++ b/data/lzstools_trowel/function/mainhand.mcfunction @@ -1,3 +1,5 @@ tag @s add lzstools_trowel_mainhand # Raycast from player's position -function lzstools_trowel:raycast/start \ No newline at end of file +function lzstools_trowel:raycast/start + +swing @s mainhand \ No newline at end of file diff --git a/data/lzstools_trowel/function/offhand.mcfunction b/data/lzstools_trowel/function/offhand.mcfunction index d2649f7..cf30387 100644 --- a/data/lzstools_trowel/function/offhand.mcfunction +++ b/data/lzstools_trowel/function/offhand.mcfunction @@ -1,3 +1,5 @@ tag @s add lzstools_trowel_offhand # Raycast from player's position -function lzstools_trowel:raycast/start \ No newline at end of file +function lzstools_trowel:raycast/start + +swing @s offhand \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction b/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction index 1200a96..ab52ce2 100644 --- a/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction +++ b/data/lzstools_wrench/function/rotate/glazed_terracotta/mode.mcfunction @@ -1,10 +1,10 @@ ## Mode 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":["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":["West"]}}}] run tag @s add TerracottaWEST +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}] run tag @s add TerracottaNORTH +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}] run tag @s add TerracottaEAST +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}] run tag @s add TerracottaSOUTH +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}] run tag @s add TerracottaWEST $execute as @s[scores={lzt_wrench_success=0}, tag=TerracottaNORTH] store result score @s lzt_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=north] replace $execute as @s[scores={lzt_wrench_success=0}, tag=TerracottaEAST] store result score @s lzt_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=east] replace diff --git a/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction b/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction index 569ad9f..cec62d7 100644 --- a/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/glazed_terracotta/rotate.mcfunction @@ -1,4 +1,7 @@ ## Glazed Terracotta -execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["Terracotta"]}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench +execute as @s[nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}] run function lzstools_wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/glazed_terracotta/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/nesw/rotate.mcfunction b/data/lzstools_wrench/function/rotate/nesw/rotate.mcfunction index 2e0dbe6..18915f2 100644 --- a/data/lzstools_wrench/function/rotate/nesw/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/nesw/rotate.mcfunction @@ -1,12 +1,12 @@ ## NESW # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/waterlogged_cycle with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/nesw/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/neswud/rotate.mcfunction b/data/lzstools_wrench/function/rotate/neswud/rotate.mcfunction index 85d7209..487cc08 100644 --- a/data/lzstools_wrench/function/rotate/neswud/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/neswud/rotate.mcfunction @@ -2,12 +2,12 @@ # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/waterlogged_cycle with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/neswud/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/banners/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/banners/rotate.mcfunction index 0e65b68..ec48f97 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/banners/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/banners/rotate.mcfunction @@ -1,7 +1,7 @@ ## Banners # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/banners/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/banners/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/banners/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/banners/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/banners/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/banners/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/banners/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/comparator/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/comparator/rotate.mcfunction index 3b8dddc..69a2fa7 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/comparator/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/comparator/rotate.mcfunction @@ -1,7 +1,7 @@ ## Comparator # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/comparator/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/comparator/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/comparator/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/comparator/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/comparator/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/comparator/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/comparator/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/copper_golem_statues/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/copper_golem_statues/rotate.mcfunction index 6965a59..5a89131 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/copper_golem_statues/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/copper_golem_statues/rotate.mcfunction @@ -1,7 +1,7 @@ ## Copper Golems # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/copper_golem_statues/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/crafter/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/crafter/rotate.mcfunction index cd048a3..3bc5c6c 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/crafter/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/crafter/rotate.mcfunction @@ -1,7 +1,7 @@ ## Crafter # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/crafter/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/crafter/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/crafter/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/crafter/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/crafter/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/crafter/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/crafter/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/ender_chest/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/ender_chest/rotate.mcfunction index 80cd7e0..f9027dd 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/ender_chest/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/ender_chest/rotate.mcfunction @@ -1,7 +1,7 @@ ## Ender Chest # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/ender_chest/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/ender_chest/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/ender_chest/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/ender_chest/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/ender_chest/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/ender_chest/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/ender_chest/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/grindstone/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/grindstone/rotate.mcfunction index 97df950..0f0cad4 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/grindstone/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/grindstone/rotate.mcfunction @@ -1,6 +1,6 @@ ## Grindstone # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/grindstone/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/grindstone/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/grindstone/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/grindstone/player with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/grindstone/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/hopper/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/hopper/rotate.mcfunction index eda1233..70799da 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/hopper/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/hopper/rotate.mcfunction @@ -1,7 +1,7 @@ ## Hopper # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/hopper/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/hopper/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/hopper/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/hopper/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/hopper/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/hopper/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/hopper/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/rails/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/rails/rotate.mcfunction index a502a44..574e78e 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/rails/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/rails/rotate.mcfunction @@ -1,5 +1,5 @@ ## Rails # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/rails/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/rails/player with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/rails/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/repeater/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/repeater/rotate.mcfunction index 931584a..e351b5b 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/repeater/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/repeater/rotate.mcfunction @@ -1,7 +1,7 @@ ## Repeater # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/repeater/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/repeater/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/repeater/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/repeater/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/repeater/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/repeater/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/repeater/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/signs/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/signs/rotate.mcfunction index 5eb13de..8964d91 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/signs/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/signs/rotate.mcfunction @@ -1,7 +1,7 @@ ## Signs # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/signs/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/signs/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/signs/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/signs/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/signs/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/signs/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/signs/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/signs_hanging/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/signs_hanging/rotate.mcfunction index 9ab6b8f..ca355ca 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/signs_hanging/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/signs_hanging/rotate.mcfunction @@ -1,6 +1,6 @@ ## Signs Hanging # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/signs_hanging/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/signs_hanging/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/signs_hanging/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/signs_hanging/player with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/signs_hanging/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/skulls/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/skulls/rotate.mcfunction index 86be3e4..3d12dac 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/skulls/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/skulls/rotate.mcfunction @@ -1,7 +1,7 @@ ## Heads and Skulls # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/skulls/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/skulls/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/skulls/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/skulls/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/skulls/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/skulls/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/skulls/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/lzstools_wrench/function/rotate/partialbox/stairs/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/stairs/rotate.mcfunction index 2d7e190..8d284e2 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/stairs/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/stairs/rotate.mcfunction @@ -1,7 +1,7 @@ ## Stairs # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/stairs/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/stairs/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/stairs/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/stairs/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/stairs/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/stairs/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/stairs/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/partialbox/trapdoors/rotate.mcfunction b/data/lzstools_wrench/function/rotate/partialbox/trapdoors/rotate.mcfunction index 0b03e36..36fcdf9 100644 --- a/data/lzstools_wrench/function/rotate/partialbox/trapdoors/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/partialbox/trapdoors/rotate.mcfunction @@ -1,7 +1,7 @@ ## Trapdoors # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function lzstools_wrench:rotate/partialbox/trapdoors/flip with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function lzstools_wrench:rotate/partialbox/trapdoors/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function lzstools_wrench:rotate/partialbox/trapdoors/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}] run function lzstools_wrench:rotate/partialbox/trapdoors/flip with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run function lzstools_wrench:rotate/partialbox/trapdoors/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run function lzstools_wrench:rotate/partialbox/trapdoors/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run function lzstools_wrench:rotate/partialbox/trapdoors/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/rotate/xyz/rotate.mcfunction b/data/lzstools_wrench/function/rotate/xyz/rotate.mcfunction index c3bc205..32f3dcc 100644 --- a/data/lzstools_wrench/function/rotate/xyz/rotate.mcfunction +++ b/data/lzstools_wrench/function/rotate/xyz/rotate.mcfunction @@ -1,10 +1,10 @@ ## X Y Z # Rotate Based on Wrench Mode -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/waterlogged_player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/waterlogged_click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/waterlogged_player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/waterlogged_click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run execute if predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/waterlogged_cycle with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/player with storage lzstools:wrench -execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/click with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/player with storage lzstools:wrench +execute as @s[scores={lzt_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/click with storage lzstools:wrench execute as @s[scores={lzt_wrench_success=0}] run execute unless predicate lzstools:waterlogged run function lzstools_wrench:rotate/xyz/cycle with storage lzstools:wrench diff --git a/data/lzstools_wrench/function/wrench/offhand.mcfunction b/data/lzstools_wrench/function/wrench/offhand.mcfunction index 98e70c3..0129373 100644 --- a/data/lzstools_wrench/function/wrench/offhand.mcfunction +++ b/data/lzstools_wrench/function/wrench/offhand.mcfunction @@ -2,18 +2,22 @@ scoreboard players set @s lzt_wrench_success 0 # Change wrench mode -execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Default"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:flip -execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Flip"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_player -execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Player"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_click -execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Click"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_north - -# Return to Default -execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Terracotta"]}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:default +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_default"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:flip +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_player +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:face_click +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_north +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_east +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_south +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:terracotta_west +execute as @s[scores={lzt_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}}] store result score @s lzt_wrench_success run item modify entity @s weapon.offhand lzstools_wrench:default # Confirm with action bar -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Default"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Flip"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Player"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Face Click"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:lore":["Terracotta"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] \ No newline at end of file +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_default"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_flip"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_player"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_face_click"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_north"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_east"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_south"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":["wrench"]},"minecraft:custom_model_data":{"strings":["lzstools:wrench_terracotta_west"]}}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] \ No newline at end of file diff --git a/data/lzstools_wrench/function/wrench/rotate.mcfunction b/data/lzstools_wrench/function/wrench/rotate.mcfunction index 302d9ec..d40f070 100644 --- a/data/lzstools_wrench/function/wrench/rotate.mcfunction +++ b/data/lzstools_wrench/function/wrench/rotate.mcfunction @@ -4,3 +4,5 @@ scoreboard players set @s lzt_wrench_raycast 0 #Raycast from player's position function lzstools_wrench:raycast/start + +swing @s mainhand \ No newline at end of file diff --git a/data/lzstools_wrench/item_modifier/terracotta_east.json b/data/lzstools_wrench/item_modifier/terracotta_east.json index b783e28..f3c3df1 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_east.json +++ b/data/lzstools_wrench/item_modifier/terracotta_east.json @@ -16,7 +16,7 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstools:wrench_terracotta" + "lzstools:wrench_terracotta_east" ], "mode": "replace_all" } diff --git a/data/lzstools_wrench/item_modifier/terracotta_north.json b/data/lzstools_wrench/item_modifier/terracotta_north.json index 8eacd38..e709dae 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_north.json +++ b/data/lzstools_wrench/item_modifier/terracotta_north.json @@ -16,7 +16,7 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstools:wrench_terracotta" + "lzstools:wrench_terracotta_north" ], "mode": "replace_all" } diff --git a/data/lzstools_wrench/item_modifier/terracotta_south.json b/data/lzstools_wrench/item_modifier/terracotta_south.json index 27f8662..049b8c1 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_south.json +++ b/data/lzstools_wrench/item_modifier/terracotta_south.json @@ -16,7 +16,7 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstools:wrench_terracotta" + "lzstools:wrench_terracotta_south" ], "mode": "replace_all" } diff --git a/data/lzstools_wrench/item_modifier/terracotta_west.json b/data/lzstools_wrench/item_modifier/terracotta_west.json index c303926..a9e4053 100644 --- a/data/lzstools_wrench/item_modifier/terracotta_west.json +++ b/data/lzstools_wrench/item_modifier/terracotta_west.json @@ -16,7 +16,7 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstools:wrench_terracotta" + "lzstools:wrench_terracotta_west" ], "mode": "replace_all" } diff --git a/data/lzstools_wrench/recipe/wrench.json b/data/lzstools_wrench/recipe/wrench.json index 368add9..2c52c8a 100644 --- a/data/lzstools_wrench/recipe/wrench.json +++ b/data/lzstools_wrench/recipe/wrench.json @@ -21,7 +21,9 @@ "italic": false }, "minecraft:lore": [ - "Default" + { + "text": "Default" + } ], "minecraft:custom_model_data": { "strings": [