diff --git a/README.md b/README.md index 72e7260..7536649 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,6 @@ Additionally, you can change the Wrench's mode by right clicking in your offhand Information on how the different modes work is available in `WrenchModes.md`. ## Options -The Datapack can also be removed using `/function lz:uninstall`, this will remove all scoreboard components. +The Datapack can also be removed using `/function lzstools:uninstall`, this will remove all scoreboard components. Version 2.0 diff --git a/assets/lzstools/models/items/wrench_default.json b/assets/lzstools/models/items/wrench_default.json new file mode 100644 index 0000000..ebeb0e1 --- /dev/null +++ b/assets/lzstools/models/items/wrench_default.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "lzstools:item/wrench/default" + } +} \ No newline at end of file diff --git a/assets/lzstools/models/items/wrench_face_click.json b/assets/lzstools/models/items/wrench_face_click.json new file mode 100644 index 0000000..4ccf510 --- /dev/null +++ b/assets/lzstools/models/items/wrench_face_click.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "lzstools:item/wrench/face_click" + } + } \ No newline at end of file diff --git a/assets/lzstools/models/items/wrench_face_player.json b/assets/lzstools/models/items/wrench_face_player.json new file mode 100644 index 0000000..253d9f2 --- /dev/null +++ b/assets/lzstools/models/items/wrench_face_player.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "lzstools:item/wrench/face_player" + } +} \ No newline at end of file diff --git a/assets/lzstools/models/items/wrench_flip.json b/assets/lzstools/models/items/wrench_flip.json new file mode 100644 index 0000000..69d2626 --- /dev/null +++ b/assets/lzstools/models/items/wrench_flip.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "lzstools:item/wrench/flip" + } +} \ No newline at end of file diff --git a/assets/lzstools/models/items/wrench_terracotta.json b/assets/lzstools/models/items/wrench_terracotta.json new file mode 100644 index 0000000..1eb4410 --- /dev/null +++ b/assets/lzstools/models/items/wrench_terracotta.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "lzstools:item/wrench/terracotta" + } +} \ No newline at end of file diff --git a/assets/lzstools/textures/item/wrench/default.png b/assets/lzstools/textures/item/wrench/default.png new file mode 100644 index 0000000..f59f0db Binary files /dev/null and b/assets/lzstools/textures/item/wrench/default.png differ diff --git a/assets/lzstools/textures/item/wrench/face_click.png b/assets/lzstools/textures/item/wrench/face_click.png new file mode 100644 index 0000000..fe0a4e8 Binary files /dev/null and b/assets/lzstools/textures/item/wrench/face_click.png differ diff --git a/assets/lzstools/textures/item/wrench/face_player.png b/assets/lzstools/textures/item/wrench/face_player.png new file mode 100644 index 0000000..cb2ac5c Binary files /dev/null and b/assets/lzstools/textures/item/wrench/face_player.png differ diff --git a/assets/lzstools/textures/item/wrench/flip.png b/assets/lzstools/textures/item/wrench/flip.png new file mode 100644 index 0000000..e5b485c Binary files /dev/null and b/assets/lzstools/textures/item/wrench/flip.png differ diff --git a/assets/lzstools/textures/item/wrench/terracotta.png b/assets/lzstools/textures/item/wrench/terracotta.png new file mode 100644 index 0000000..0d2ddba Binary files /dev/null and b/assets/lzstools/textures/item/wrench/terracotta.png differ diff --git a/assets/minecraft/items/carrot_on_a_stick.json b/assets/minecraft/items/carrot_on_a_stick.json new file mode 100644 index 0000000..646189a --- /dev/null +++ b/assets/minecraft/items/carrot_on_a_stick.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "select", + "property": "custom_model_data", + "index": 1, + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/carrot_on_a_stick" + }, + "cases": [ + { "when": "lzstools:wrench_default", "model": { "type": "model", "model": "lzstools:items/wrench_default" } }, + { "when": "lzstools:wrench_flip", "model": { "type": "model", "model": "lzstools:items/wrench_flip" } }, + { "when": "lzstools:wrench_face_player", "model": { "type": "model", "model": "lzstools:items/wrench_face_player" } }, + { "when": "lzstools:wrench_face_click", "model": { "type": "model", "model": "lzstools:items/wrench_face_click" } }, + { "when": "lzstools:wrench_terracotta", "model": { "type": "model", "model": "lzstools:items/wrench_terracotta" } } + ] + } +} \ No newline at end of file diff --git a/data/lz/function/give/wrench.mcfunction b/data/lz/function/give/wrench.mcfunction deleted file mode 100644 index 36e9a51..0000000 --- a/data/lz/function/give/wrench.mcfunction +++ /dev/null @@ -1 +0,0 @@ -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=false,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] \ No newline at end of file diff --git a/data/lz/function/player.mcfunction b/data/lz/function/player.mcfunction deleted file mode 100644 index ca5e1d3..0000000 --- a/data/lz/function/player.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -scoreboard players set @s lz_click_check 0 - - -# Wrench -execute if predicate lz:wrench/mainhand run function wrench:wrench/rotate -execute if predicate lz:wrench/offhand run function wrench:wrench/offhand \ No newline at end of file diff --git a/data/lz/advancement/recipes.json b/data/lzstools/advancement/recipes.json similarity index 76% rename from data/lz/advancement/recipes.json rename to data/lzstools/advancement/recipes.json index fcd29c5..51bd8ba 100644 --- a/data/lz/advancement/recipes.json +++ b/data/lzstools/advancement/recipes.json @@ -5,6 +5,6 @@ } }, "rewards": { - "function": "lz:recipes" + "function": "lzstools:recipes" } } \ No newline at end of file diff --git a/data/lz/advancement/visible/root.json b/data/lzstools/advancement/visible/root.json similarity index 93% rename from data/lz/advancement/visible/root.json rename to data/lzstools/advancement/visible/root.json index 529cde1..ecfdf82 100644 --- a/data/lz/advancement/visible/root.json +++ b/data/lzstools/advancement/visible/root.json @@ -5,7 +5,7 @@ "components": { "minecraft:custom_model_data": { "strings": [ - "lzstealth:wrench" + "lzstools:wrench" ] } } diff --git a/data/lz/advancement/visible/wrench.json b/data/lzstools/advancement/visible/wrench.json similarity index 83% rename from data/lz/advancement/visible/wrench.json rename to data/lzstools/advancement/visible/wrench.json index 77b9199..dbe954d 100644 --- a/data/lz/advancement/visible/wrench.json +++ b/data/lzstools/advancement/visible/wrench.json @@ -5,8 +5,8 @@ "components": { "minecraft:custom_model_data": { "strings": [ - "lzstealth:wrench", - "lzstealth:wrench_default" + "lzstools:wrench", + "lzstools:wrench_default" ] } } @@ -21,7 +21,7 @@ "announce_to_chat": true, "hidden": false }, - "parent": "lz:visible/root", + "parent": "lzstools:visible/root", "criteria": { "": { "trigger": "minecraft:recipe_crafted", diff --git a/data/lzstools/function/give/wrench.mcfunction b/data/lzstools/function/give/wrench.mcfunction new file mode 100644 index 0000000..832087c --- /dev/null +++ b/data/lzstools/function/give/wrench.mcfunction @@ -0,0 +1 @@ +give @s minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_model_data={strings:["lzstools:wrench","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/lz/function/load.mcfunction b/data/lzstools/function/load.mcfunction similarity index 100% rename from data/lz/function/load.mcfunction rename to data/lzstools/function/load.mcfunction diff --git a/data/lzstools/function/player.mcfunction b/data/lzstools/function/player.mcfunction new file mode 100644 index 0000000..c9998a6 --- /dev/null +++ b/data/lzstools/function/player.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set @s lz_click_check 0 + + +# Wrench +execute if predicate lzstools:wrench/mainhand run function wrench:wrench/rotate +execute if predicate lzstools:wrench/offhand run function wrench:wrench/offhand \ No newline at end of file diff --git a/data/lz/function/recipes.mcfunction b/data/lzstools/function/recipes.mcfunction similarity index 100% rename from data/lz/function/recipes.mcfunction rename to data/lzstools/function/recipes.mcfunction diff --git a/data/lz/function/tick.mcfunction b/data/lzstools/function/tick.mcfunction similarity index 82% rename from data/lz/function/tick.mcfunction rename to data/lzstools/function/tick.mcfunction index 844f1f6..a0edd4b 100644 --- a/data/lz/function/tick.mcfunction +++ b/data/lzstools/function/tick.mcfunction @@ -1,2 +1,2 @@ # Click Check -execute as @a if score @s lz_click_check matches 1.. run function lz:player \ No newline at end of file +execute as @a if score @s lz_click_check matches 1.. run function lzstools:player \ No newline at end of file diff --git a/data/lz/function/uninstall.mcfunction b/data/lzstools/function/uninstall.mcfunction similarity index 100% rename from data/lz/function/uninstall.mcfunction rename to data/lzstools/function/uninstall.mcfunction diff --git a/data/lz/predicate/wrench/mainhand.json b/data/lzstools/predicate/wrench/mainhand.json similarity index 82% rename from data/lz/predicate/wrench/mainhand.json rename to data/lzstools/predicate/wrench/mainhand.json index 0ca3189..1ba8c37 100644 --- a/data/lz/predicate/wrench/mainhand.json +++ b/data/lzstools/predicate/wrench/mainhand.json @@ -8,7 +8,7 @@ "equipment": { "mainhand": { "predicates": { - "minecraft:custom_data": "{lzstealth:wrench}" + "minecraft:custom_data": "{lzstools:wrench}" } } } diff --git a/data/lz/predicate/wrench/offhand.json b/data/lzstools/predicate/wrench/offhand.json similarity index 82% rename from data/lz/predicate/wrench/offhand.json rename to data/lzstools/predicate/wrench/offhand.json index 30025b8..5071f31 100644 --- a/data/lz/predicate/wrench/offhand.json +++ b/data/lzstools/predicate/wrench/offhand.json @@ -8,7 +8,7 @@ "equipment": { "offhand": { "predicates": { - "minecraft:custom_data": "{lzstealth:wrench}" + "minecraft:custom_data": "{lzstools:wrench}" } } } diff --git a/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json index 86fa8d4..dd6cc75 100644 --- a/data/minecraft/tags/function/load.json +++ b/data/minecraft/tags/function/load.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "lz:load" + "lzstools:load" ] } \ No newline at end of file diff --git a/data/minecraft/tags/function/tick.json b/data/minecraft/tags/function/tick.json index 5dbb5b8..6c7f485 100644 --- a/data/minecraft/tags/function/tick.json +++ b/data/minecraft/tags/function/tick.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "lz:tick" + "lzstools:tick" ] } diff --git a/data/wrench/function/raycast/rayloop.mcfunction b/data/wrench/function/raycast/rayloop.mcfunction index 0e0b37b..434defe 100644 --- a/data/wrench/function/raycast/rayloop.mcfunction +++ b/data/wrench/function/raycast/rayloop.mcfunction @@ -2,7 +2,7 @@ # Set block data execute as @s run loot spawn ~ -65 ~ mine ~ ~ ~ minecraft:netherite_pickaxe[minecraft:enchantments={"minecraft:silk_touch":1}] -execute as @s run data modify storage lz:wrench block set from entity @n[type=minecraft:item,distance=..0.5,y=-65] Item.id +execute as @s run data modify storage lzstools:wrench block set from entity @n[type=minecraft:item,distance=..0.5,y=-65] Item.id execute as @s run execute as @s run kill @n[type=minecraft:item,distance=..0.5,y=-65] # Partial Blocks diff --git a/data/wrench/function/raycast/start.mcfunction b/data/wrench/function/raycast/start.mcfunction index 3b2f7fa..21995ba 100644 --- a/data/wrench/function/raycast/start.mcfunction +++ b/data/wrench/function/raycast/start.mcfunction @@ -7,4 +7,4 @@ execute as @e[tag=lz_wrench_raycast] at @s anchored eyes positioned ^ ^ ^ run fu #Raycasting finished, removing tag from the raycaster. tag @s remove lz_wrench_raycast -data remove storage lz:wrench block \ No newline at end of file +data remove storage lzstools:wrench block \ No newline at end of file diff --git a/data/wrench/function/rotate/banners/click.mcfunction b/data/wrench/function/rotate/banners/click.mcfunction index ada22e4..4adbee7 100644 --- a/data/wrench/function/rotate/banners/click.mcfunction +++ b/data/wrench/function/rotate/banners/click.mcfunction @@ -10,4 +10,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 4 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[rotation=4] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/banners/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/banners/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/banners/player.mcfunction b/data/wrench/function/rotate/banners/player.mcfunction index d2a97a9..a2eb67a 100644 --- a/data/wrench/function/rotate/banners/player.mcfunction +++ b/data/wrench/function/rotate/banners/player.mcfunction @@ -18,4 +18,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=-56.25..-33.75] store re $execute as @s[scores={lz_wrench_success=0}, y_rotation=-33.75..-11.25] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[rotation=7] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/banners/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/banners/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/banners/rotate.mcfunction b/data/wrench/function/rotate/banners/rotate.mcfunction index dbceef8..63e019a 100644 --- a/data/wrench/function/rotate/banners/rotate.mcfunction +++ b/data/wrench/function/rotate/banners/rotate.mcfunction @@ -1,7 +1,7 @@ ## Banners # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/banners/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/banners/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/banners/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/banners/cycle with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/banners/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/banners/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/banners/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/banners/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/glazed_terracotta/rotate.mcfunction b/data/wrench/function/rotate/glazed_terracotta/rotate.mcfunction index 49224df..07425a8 100644 --- a/data/wrench/function/rotate/glazed_terracotta/rotate.mcfunction +++ b/data/wrench/function/rotate/glazed_terracotta/rotate.mcfunction @@ -1,4 +1,4 @@ ## Glazed Terracotta -execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["Terracotta"]}}}] run function wrench:rotate/glazed_terracotta/mode with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/glazed_terracotta/cycle with storage lz:wrench +execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["Terracotta"]}}}] run function wrench:rotate/glazed_terracotta/mode with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/glazed_terracotta/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/nesw/click.mcfunction b/data/wrench/function/rotate/nesw/click.mcfunction index 9eca57b..8e36a4c 100644 --- a/data/wrench/function/rotate/nesw/click.mcfunction +++ b/data/wrench/function/rotate/nesw/click.mcfunction @@ -9,4 +9,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/nesw/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/nesw/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/nesw/player.mcfunction b/data/wrench/function/rotate/nesw/player.mcfunction index 27526de..2603fb6 100644 --- a/data/wrench/function/rotate/nesw/player.mcfunction +++ b/data/wrench/function/rotate/nesw/player.mcfunction @@ -6,4 +6,4 @@ $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=135. $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/nesw/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/nesw/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/nesw/rotate.mcfunction b/data/wrench/function/rotate/nesw/rotate.mcfunction index 2b00fec..b61ea3d 100644 --- a/data/wrench/function/rotate/nesw/rotate.mcfunction +++ b/data/wrench/function/rotate/nesw/rotate.mcfunction @@ -1,7 +1,7 @@ ## NESW # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/nesw/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/nesw/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/nesw/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/nesw/cycle with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/nesw/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/nesw/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/nesw/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/nesw/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/neswud/click.mcfunction b/data/wrench/function/rotate/neswud/click.mcfunction index 9f2f7d4..d79b53c 100644 --- a/data/wrench/function/rotate/neswud/click.mcfunction +++ b/data/wrench/function/rotate/neswud/click.mcfunction @@ -11,4 +11,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/neswud/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/neswud/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/neswud/player.mcfunction b/data/wrench/function/rotate/neswud/player.mcfunction index 36ffc5d..bf0af4a 100644 --- a/data/wrench/function/rotate/neswud/player.mcfunction +++ b/data/wrench/function/rotate/neswud/player.mcfunction @@ -8,4 +8,4 @@ $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=135. $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/neswud/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/neswud/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/neswud/rotate.mcfunction b/data/wrench/function/rotate/neswud/rotate.mcfunction index ed00ac0..132b7c1 100644 --- a/data/wrench/function/rotate/neswud/rotate.mcfunction +++ b/data/wrench/function/rotate/neswud/rotate.mcfunction @@ -1,7 +1,7 @@ ## NESW UD # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/neswud/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/neswud/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/neswud/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/neswud/cycle with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/neswud/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/neswud/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/neswud/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/neswud/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/rails/rotate.mcfunction b/data/wrench/function/rotate/rails/rotate.mcfunction index da13c71..7a371c7 100644 --- a/data/wrench/function/rotate/rails/rotate.mcfunction +++ b/data/wrench/function/rotate/rails/rotate.mcfunction @@ -1,5 +1,5 @@ ## Rails # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/rails/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/rails/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/rails/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/rails/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/signs/click.mcfunction b/data/wrench/function/rotate/signs/click.mcfunction index 8c3a1a0..b1c7236 100644 --- a/data/wrench/function/rotate/signs/click.mcfunction +++ b/data/wrench/function/rotate/signs/click.mcfunction @@ -15,4 +15,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 4 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false] run setblock ~ ~ ~ $(block)[waterlogged=false,rotation=4] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/signs/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/signs/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/signs/player.mcfunction b/data/wrench/function/rotate/signs/player.mcfunction index 4b3405d..c229650 100644 --- a/data/wrench/function/rotate/signs/player.mcfunction +++ b/data/wrench/function/rotate/signs/player.mcfunction @@ -35,4 +35,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=-56.25..-33.75] store re $execute as @s[scores={lz_wrench_success=0}, y_rotation=-33.75..-11.25] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false] run setblock ~ ~ ~ $(block)[waterlogged=false,rotation=7] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/signs/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/signs/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/signs/rotate.mcfunction b/data/wrench/function/rotate/signs/rotate.mcfunction index 902cf1b..10065f8 100644 --- a/data/wrench/function/rotate/signs/rotate.mcfunction +++ b/data/wrench/function/rotate/signs/rotate.mcfunction @@ -1,7 +1,7 @@ ## Signs # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/signs/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/signs/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/signs/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/signs/cycle with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/signs/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/signs/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/signs/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/signs/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/signs_hanging/player.mcfunction b/data/wrench/function/rotate/signs_hanging/player.mcfunction index ee0b821..f9dee69 100644 --- a/data/wrench/function/rotate/signs_hanging/player.mcfunction +++ b/data/wrench/function/rotate/signs_hanging/player.mcfunction @@ -35,4 +35,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=-56.25..-33.75] store re $execute as @s[scores={lz_wrench_success=0}, y_rotation=-33.75..-11.25] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false] run setblock ~ ~ ~ $(block)[attached=true,waterlogged=false,rotation=7] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/signs_hanging/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/signs_hanging/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/signs_hanging/rotate.mcfunction b/data/wrench/function/rotate/signs_hanging/rotate.mcfunction index 334f9b3..a35fddd 100644 --- a/data/wrench/function/rotate/signs_hanging/rotate.mcfunction +++ b/data/wrench/function/rotate/signs_hanging/rotate.mcfunction @@ -1,6 +1,6 @@ ## Signs Hanging # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/signs_hanging/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/signs_hanging/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/signs_hanging/cycle with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/signs_hanging/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/signs_hanging/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/signs_hanging/cycle with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/signs_wall/rotate.mcfunction b/data/wrench/function/rotate/signs_wall/rotate.mcfunction index b91173d..2d8fd65 100644 --- a/data/wrench/function/rotate/signs_wall/rotate.mcfunction +++ b/data/wrench/function/rotate/signs_wall/rotate.mcfunction @@ -1,4 +1,4 @@ ## Signs Wall # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/signs_wall/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/signs_wall/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/slabs/rotate.mcfunction b/data/wrench/function/rotate/slabs/rotate.mcfunction index d0a439b..1cac3cf 100644 --- a/data/wrench/function/rotate/slabs/rotate.mcfunction +++ b/data/wrench/function/rotate/slabs/rotate.mcfunction @@ -1,4 +1,4 @@ ## Slabs # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/slabs/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/slabs/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/stairs/click.mcfunction b/data/wrench/function/rotate/stairs/click.mcfunction index e602004..c7a43f5 100644 --- a/data/wrench/function/rotate/stairs/click.mcfunction +++ b/data/wrench/function/rotate/stairs/click.mcfunction @@ -21,4 +21,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 if score py lz_wrench_raycast matches 8.. store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false] run setblock ~ ~ ~ $(block)[half=top,facing=east] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/stairs/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/stairs/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/stairs/player.mcfunction b/data/wrench/function/rotate/stairs/player.mcfunction index 32146b8..597fceb 100644 --- a/data/wrench/function/rotate/stairs/player.mcfunction +++ b/data/wrench/function/rotate/stairs/player.mcfunction @@ -20,4 +20,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=-135..-45] if score py l ## Non-processed # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/stairs/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/stairs/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/stairs/rotate.mcfunction b/data/wrench/function/rotate/stairs/rotate.mcfunction index 0bfd57a..fa2fe3f 100644 --- a/data/wrench/function/rotate/stairs/rotate.mcfunction +++ b/data/wrench/function/rotate/stairs/rotate.mcfunction @@ -1,7 +1,7 @@ ## Stairs # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/stairs/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/stairs/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/stairs/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/stairs/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/stairs/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/stairs/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/stairs/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/stairs/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/trapdoors/click.mcfunction b/data/wrench/function/rotate/trapdoors/click.mcfunction index 80a99b2..52f7873 100644 --- a/data/wrench/function/rotate/trapdoors/click.mcfunction +++ b/data/wrench/function/rotate/trapdoors/click.mcfunction @@ -37,4 +37,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 if score py lz_wrench_raycast matches ..7 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false,open=false] run setblock ~ ~ ~ $(block)[half=bottom,facing=east,open=false] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/trapdoors/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/trapdoors/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/trapdoors/player.mcfunction b/data/wrench/function/rotate/trapdoors/player.mcfunction index 3a0fb4f..2a37259 100644 --- a/data/wrench/function/rotate/trapdoors/player.mcfunction +++ b/data/wrench/function/rotate/trapdoors/player.mcfunction @@ -34,4 +34,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=135..-135] if score py l $execute as @s[scores={lz_wrench_success=0}, y_rotation=-135..-45] if score py lz_wrench_raycast matches 8.. store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false,open=false] run setblock ~ ~ ~ $(block)[half=top,facing=west,open=false] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/trapdoors/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/trapdoors/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/trapdoors/rotate.mcfunction b/data/wrench/function/rotate/trapdoors/rotate.mcfunction index 37b765f..e552f56 100644 --- a/data/wrench/function/rotate/trapdoors/rotate.mcfunction +++ b/data/wrench/function/rotate/trapdoors/rotate.mcfunction @@ -1,7 +1,7 @@ ## Trapdoors # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/trapdoors/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/trapdoors/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/trapdoors/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/trapdoors/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/trapdoors/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/trapdoors/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/trapdoors/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/trapdoors/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/click.mcfunction b/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/click.mcfunction index 790a28d..4662248 100644 --- a/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/click.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/click.mcfunction @@ -14,4 +14,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false] run setblock ~ ~ ~ $(block)[waterlogged=false,facing=east] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/player.mcfunction b/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/player.mcfunction index 7417552..723057d 100644 --- a/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/player.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/player.mcfunction @@ -10,4 +10,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=135..-135] store result $execute as @s[scores={lz_wrench_success=0}, y_rotation=-135..-45] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[waterlogged=false] run setblock ~ ~ ~ $(block)[waterlogged=false,facing=east] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/rotate.mcfunction index 9e00d98..69a37f1 100644 --- a/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/calibrated_sculk_sensor/rotate.mcfunction @@ -1,7 +1,7 @@ ## Calibrated Sculk Sensor # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/calibrated_sculk_sensor/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/campfires/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/campfires/rotate.mcfunction index e29afa1..f54651f 100644 --- a/data/wrench/function/rotate/unique_blocks/campfires/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/campfires/rotate.mcfunction @@ -1,3 +1,3 @@ ## Campfires -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/campfires/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/campfires/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/comparator/click.mcfunction b/data/wrench/function/rotate/unique_blocks/comparator/click.mcfunction index 0d58343..8df59dc 100644 --- a/data/wrench/function/rotate/unique_blocks/comparator/click.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/comparator/click.mcfunction @@ -15,4 +15,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[mode=subtract] run setblock ~ ~ ~ $(block)[mode=subtract,facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/comparator/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/comparator/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/unique_blocks/comparator/player.mcfunction b/data/wrench/function/rotate/unique_blocks/comparator/player.mcfunction index 56adb0f..2545be0 100644 --- a/data/wrench/function/rotate/unique_blocks/comparator/player.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/comparator/player.mcfunction @@ -12,4 +12,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=135..-135] store result $execute as @s[scores={lz_wrench_success=0}, y_rotation=-135..-45] store result score @s lz_wrench_success unless block ~ ~ ~ $(block)[facing=west] run execute if block ~ ~ ~ $(block)[mode=subtract] run setblock ~ ~ ~ $(block)[mode=subtract,facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/comparator/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/comparator/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/unique_blocks/comparator/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/comparator/rotate.mcfunction index d4ccafb..4bdbe8e 100644 --- a/data/wrench/function/rotate/unique_blocks/comparator/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/comparator/rotate.mcfunction @@ -1,7 +1,7 @@ ## Comparator # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/comparator/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/comparator/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/comparator/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/comparator/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/comparator/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/comparator/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/comparator/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/comparator/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/crafter/click.mcfunction b/data/wrench/function/rotate/unique_blocks/crafter/click.mcfunction index f95cd18..e5d69ab 100644 --- a/data/wrench/function/rotate/unique_blocks/crafter/click.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/crafter/click.mcfunction @@ -17,4 +17,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[orientation=west_up] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/crafter/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/crafter/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/crafter/player.mcfunction b/data/wrench/function/rotate/unique_blocks/crafter/player.mcfunction index 2b237d4..f93eb6b 100644 --- a/data/wrench/function/rotate/unique_blocks/crafter/player.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/crafter/player.mcfunction @@ -14,4 +14,4 @@ $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=135. $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[orientation=west_up] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/crafter/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/crafter/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/unique_blocks/crafter/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/crafter/rotate.mcfunction index df65aa3..e495e4b 100644 --- a/data/wrench/function/rotate/unique_blocks/crafter/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/crafter/rotate.mcfunction @@ -1,7 +1,7 @@ ## Crafter # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/crafter/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/crafter/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/crafter/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/crafter/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/crafter/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/crafter/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/crafter/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/crafter/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/grindstone/player.mcfunction b/data/wrench/function/rotate/unique_blocks/grindstone/player.mcfunction index 83e4ff7..066e046 100644 --- a/data/wrench/function/rotate/unique_blocks/grindstone/player.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/grindstone/player.mcfunction @@ -14,4 +14,4 @@ $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=135. $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[face=floor,facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/grindstone/flip with storage lz:wrench \ No newline at end of file +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/grindstone/flip with storage lzstools:wrench \ No newline at end of file diff --git a/data/wrench/function/rotate/unique_blocks/grindstone/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/grindstone/rotate.mcfunction index 4ca7cd7..6c768e4 100644 --- a/data/wrench/function/rotate/unique_blocks/grindstone/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/grindstone/rotate.mcfunction @@ -1,6 +1,6 @@ ## Grindstone # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/grindstone/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/grindstone/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/grindstone/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/grindstone/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/grindstone/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/grindstone/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/hopper/click.mcfunction b/data/wrench/function/rotate/unique_blocks/hopper/click.mcfunction index 36527dd..6fc7f77 100644 --- a/data/wrench/function/rotate/unique_blocks/hopper/click.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/hopper/click.mcfunction @@ -16,4 +16,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success unless block ~ ~ ~ $(block)[facing=west] run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/hopper/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/hopper/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/hopper/player.mcfunction b/data/wrench/function/rotate/unique_blocks/hopper/player.mcfunction index 16e36ac..29dc1d9 100644 --- a/data/wrench/function/rotate/unique_blocks/hopper/player.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/hopper/player.mcfunction @@ -9,4 +9,4 @@ $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=135. $execute as @s[scores={lz_wrench_success=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s lz_wrench_success unless block ~ ~ ~ $(block)[facing=west] run execute if block ~ ~ ~ $(block) run setblock ~ ~ ~ $(block)[facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/hopper/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/hopper/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/hopper/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/hopper/rotate.mcfunction index c72ada7..0805c37 100644 --- a/data/wrench/function/rotate/unique_blocks/hopper/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/hopper/rotate.mcfunction @@ -1,7 +1,7 @@ ## Hopper # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/hopper/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/hopper/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/hopper/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/hopper/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/hopper/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/hopper/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/hopper/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/hopper/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/repeater/click.mcfunction b/data/wrench/function/rotate/unique_blocks/repeater/click.mcfunction index 8dee410..454df48 100644 --- a/data/wrench/function/rotate/unique_blocks/repeater/click.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/repeater/click.mcfunction @@ -25,4 +25,4 @@ $execute as @s[scores={lz_wrench_success=0}] if score pz lz_wrench_raycast match $execute as @s[scores={lz_wrench_success=0}] if score px lz_wrench_raycast matches 0 store result score @s lz_wrench_success run execute if block ~ ~ ~ $(block)[delay=4] run setblock ~ ~ ~ $(block)[delay=4,facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/repeater/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/repeater/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/repeater/player.mcfunction b/data/wrench/function/rotate/unique_blocks/repeater/player.mcfunction index 86742c6..80a9f75 100644 --- a/data/wrench/function/rotate/unique_blocks/repeater/player.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/repeater/player.mcfunction @@ -22,4 +22,4 @@ $execute as @s[scores={lz_wrench_success=0}, y_rotation=135..-135] store result $execute as @s[scores={lz_wrench_success=0}, y_rotation=-135..-45] store result score @s lz_wrench_success unless block ~ ~ ~ $(block)[facing=west] run execute if block ~ ~ ~ $(block)[delay=4] run setblock ~ ~ ~ $(block)[delay=4,facing=west] replace # Otherwise, Flip -execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/repeater/flip with storage lz:wrench +execute as @s[scores={lz_wrench_success=0}] store result score @s lz_wrench_success run function wrench:rotate/unique_blocks/repeater/flip with storage lzstools:wrench diff --git a/data/wrench/function/rotate/unique_blocks/repeater/rotate.mcfunction b/data/wrench/function/rotate/unique_blocks/repeater/rotate.mcfunction index e8c4a15..f916b44 100644 --- a/data/wrench/function/rotate/unique_blocks/repeater/rotate.mcfunction +++ b/data/wrench/function/rotate/unique_blocks/repeater/rotate.mcfunction @@ -1,7 +1,7 @@ ## Repeater # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/repeater/flip with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/repeater/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/repeater/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/repeater/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/unique_blocks/repeater/flip with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/unique_blocks/repeater/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/unique_blocks/repeater/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/unique_blocks/repeater/cycle with storage lzstools:wrench diff --git a/data/wrench/function/rotate/xyz/rotate.mcfunction b/data/wrench/function/rotate/xyz/rotate.mcfunction index 6fe7f60..281dd89 100644 --- a/data/wrench/function/rotate/xyz/rotate.mcfunction +++ b/data/wrench/function/rotate/xyz/rotate.mcfunction @@ -1,6 +1,6 @@ ## X Y Z # Rotate Based on Wrench Mode -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/xyz/player with storage lz:wrench -execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/xyz/click with storage lz:wrench -execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/xyz/cycle with storage lz:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/xyz/player with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/xyz/click with storage lzstools:wrench +execute as @s[scores={lz_wrench_success=0}] run function wrench:rotate/xyz/cycle with storage lzstools:wrench diff --git a/data/wrench/function/wrench/offhand.mcfunction b/data/wrench/function/wrench/offhand.mcfunction index 153ba05..af4e247 100644 --- a/data/wrench/function/wrench/offhand.mcfunction +++ b/data/wrench/function/wrench/offhand.mcfunction @@ -2,18 +2,18 @@ scoreboard players set @s lz_wrench_success 0 # Change wrench mode -execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Default"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_flip -execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Flip"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_face_player -execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Face Player"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_face_click -execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Face Click"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_terracotta_north +execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":"wrench"},"minecraft:lore":["Default"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_flip +execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":"wrench"},"minecraft:lore":["Flip"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_face_player +execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":"wrench"},"minecraft:lore":["Face Player"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_face_click +execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":"wrench"},"minecraft:lore":["Face Click"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_terracotta_north # Return to Default -execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Terracotta"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_default +execute as @s[scores={lz_wrench_success=0},nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstools":"wrench"},"minecraft:lore":["Terracotta"]}}}}] store result score @s lz_wrench_success run item modify entity @s weapon.offhand wrench:wrench_default # Confirm with action bar -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Default"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Flip"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Face Player"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"wrench"},"minecraft:lore":["Face Click"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}] -title @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{"lzstealth":"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: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 diff --git a/data/wrench/item_modifier/wrench_default.json b/data/wrench/item_modifier/wrench_default.json index 092b6c7..65b22df 100644 --- a/data/wrench/item_modifier/wrench_default.json +++ b/data/wrench/item_modifier/wrench_default.json @@ -13,8 +13,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_default" + "lzstools:wrench", + "lzstools:wrench_default" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_face_click.json b/data/wrench/item_modifier/wrench_face_click.json index dff840b..324e1cf 100644 --- a/data/wrench/item_modifier/wrench_face_click.json +++ b/data/wrench/item_modifier/wrench_face_click.json @@ -13,8 +13,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_face_click" + "lzstools:wrench", + "lzstools:wrench_face_click" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_face_player.json b/data/wrench/item_modifier/wrench_face_player.json index 0fca563..914b7bb 100644 --- a/data/wrench/item_modifier/wrench_face_player.json +++ b/data/wrench/item_modifier/wrench_face_player.json @@ -13,8 +13,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_face_player" + "lzstools:wrench", + "lzstools:wrench_face_player" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_flip.json b/data/wrench/item_modifier/wrench_flip.json index 27c2837..626b9c1 100644 --- a/data/wrench/item_modifier/wrench_flip.json +++ b/data/wrench/item_modifier/wrench_flip.json @@ -13,8 +13,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_flip" + "lzstools:wrench", + "lzstools:wrench_flip" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_terracotta_east.json b/data/wrench/item_modifier/wrench_terracotta_east.json index 7dcf748..86dfd82 100644 --- a/data/wrench/item_modifier/wrench_terracotta_east.json +++ b/data/wrench/item_modifier/wrench_terracotta_east.json @@ -16,8 +16,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_terracotta" + "lzstools:wrench", + "lzstools:wrench_terracotta" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_terracotta_north.json b/data/wrench/item_modifier/wrench_terracotta_north.json index 1391e15..8f7c23b 100644 --- a/data/wrench/item_modifier/wrench_terracotta_north.json +++ b/data/wrench/item_modifier/wrench_terracotta_north.json @@ -16,8 +16,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_terracotta" + "lzstools:wrench", + "lzstools:wrench_terracotta" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_terracotta_south.json b/data/wrench/item_modifier/wrench_terracotta_south.json index ae49859..fc0271c 100644 --- a/data/wrench/item_modifier/wrench_terracotta_south.json +++ b/data/wrench/item_modifier/wrench_terracotta_south.json @@ -16,8 +16,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_terracotta" + "lzstools:wrench", + "lzstools:wrench_terracotta" ], "mode": "replace_all" } diff --git a/data/wrench/item_modifier/wrench_terracotta_west.json b/data/wrench/item_modifier/wrench_terracotta_west.json index aa073ec..d7db287 100644 --- a/data/wrench/item_modifier/wrench_terracotta_west.json +++ b/data/wrench/item_modifier/wrench_terracotta_west.json @@ -16,8 +16,8 @@ "function": "minecraft:set_custom_model_data", "strings": { "values": [ - "lzstealth:wrench", - "lzstealth:wrench_terracotta" + "lzstools:wrench", + "lzstools:wrench_terracotta" ], "mode": "replace_all" } diff --git a/data/wrench/recipe/wrench.json b/data/wrench/recipe/wrench.json index e069471..35a2be9 100644 --- a/data/wrench/recipe/wrench.json +++ b/data/wrench/recipe/wrench.json @@ -23,12 +23,12 @@ ], "minecraft:custom_model_data": { "strings": [ - "lzstealth:wrench", - "lzstealth:wrench_default" + "lzstools:wrench", + "lzstools:wrench_default" ] }, "minecraft:custom_data": { - "lzstealth": "wrench" + "lzstools": "wrench" }, "minecraft:unbreakable": {}, "minecraft:tooltip_display": {