From 02a8a2ca97e30f80fb66a01e323ab44ac2dda4eb Mon Sep 17 00:00:00 2001 From: Mark Rapson Date: Wed, 2 Apr 2025 18:39:07 +0100 Subject: [PATCH] Updated to 1.21.5 and added model names for resource packs. --- .../function/config/pillars/main.mcfunction | 4 +-- .../function/config/rails/main.mcfunction | 4 +-- .../function/config/redstone/main.mcfunction | 4 +-- .../function/config/rods/main.mcfunction | 4 +-- .../function/config/slabs/main.mcfunction | 4 +-- .../function/config/stairs/main.mcfunction | 4 +-- .../config/terracotta/main.mcfunction | 4 +-- .../rotate/glazed_terracotta.mcfunction | 2 +- .../rotate/glazed_terracotta_mode.mcfunction | 8 ++--- .../wrench/function/rotate/pillars.mcfunction | 4 +-- data/wrench/function/rotate/rails.mcfunction | 2 +- .../function/rotate/redstone.mcfunction | 8 ++--- data/wrench/function/rotate/stairs.mcfunction | 6 ++-- data/wrench/function/use.mcfunction | 5 ++-- .../wrench/function/wrench/convert.mcfunction | 4 +-- data/wrench/function/wrench/give.mcfunction | 2 +- .../wrench/function/wrench/offhand.mcfunction | 29 +++++++++++-------- .../function/wrench/terracotta.mcfunction | 8 ++--- pack.mcmeta | 2 +- 19 files changed, 57 insertions(+), 51 deletions(-) diff --git a/data/wrench/function/config/pillars/main.mcfunction b/data/wrench/function/config/pillars/main.mcfunction index b5c49ac..c29c622 100644 --- a/data/wrench/function/config/pillars/main.mcfunction +++ b/data/wrench/function/config/pillars/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchPillars WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/pillars/enable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}] +execute if score WrenchPillars WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/pillars/enable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}] -execute if score WrenchPillars WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/pillars/disable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}] \ No newline at end of file +execute if score WrenchPillars WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/pillars/disable"}},{"text":" Pillars & Logs","hoverEvent":{"action":"show_text","value":"Wether Pillars & Logs should be rotated"}}] \ No newline at end of file diff --git a/data/wrench/function/config/rails/main.mcfunction b/data/wrench/function/config/rails/main.mcfunction index 13b6db3..f614bb0 100644 --- a/data/wrench/function/config/rails/main.mcfunction +++ b/data/wrench/function/config/rails/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchRails WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/rails/enable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}] +execute if score WrenchRails WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/rails/enable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}] -execute if score WrenchRails WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/rails/disable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}] \ No newline at end of file +execute if score WrenchRails WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/rails/disable"}},{"text":" Rails","hoverEvent":{"action":"show_text","value":"Wether Rails should be rotated"}}] \ No newline at end of file diff --git a/data/wrench/function/config/redstone/main.mcfunction b/data/wrench/function/config/redstone/main.mcfunction index 4852220..1e0795c 100644 --- a/data/wrench/function/config/redstone/main.mcfunction +++ b/data/wrench/function/config/redstone/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchRedstone WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/redstone/enable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}] +execute if score WrenchRedstone WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/redstone/enable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}] -execute if score WrenchRedstone WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/redstone/disable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}] \ No newline at end of file +execute if score WrenchRedstone WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/redstone/disable"}},{"text":" Redstone","hoverEvent":{"action":"show_text","value":"Wether Redstone Components should be rotated"}}] \ No newline at end of file diff --git a/data/wrench/function/config/rods/main.mcfunction b/data/wrench/function/config/rods/main.mcfunction index 8d77027..4627810 100644 --- a/data/wrench/function/config/rods/main.mcfunction +++ b/data/wrench/function/config/rods/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchRods WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/rods/enable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}] +execute if score WrenchRods WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/rods/enable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}] -execute if score WrenchRods WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/rods/disable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}] \ No newline at end of file +execute if score WrenchRods WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/rods/disable"}},{"text":" End Rods","hoverEvent":{"action":"show_text","value":"Wether End Rods should be flippable"}}] \ No newline at end of file diff --git a/data/wrench/function/config/slabs/main.mcfunction b/data/wrench/function/config/slabs/main.mcfunction index 1f9d374..4ab725a 100644 --- a/data/wrench/function/config/slabs/main.mcfunction +++ b/data/wrench/function/config/slabs/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchSlabs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/slabs/enable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}] +execute if score WrenchSlabs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/slabs/enable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}] -execute if score WrenchSlabs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/slabs/disable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}] \ No newline at end of file +execute if score WrenchSlabs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/slabs/disable"}},{"text":" Slabs","hoverEvent":{"action":"show_text","value":"Wether Slabs should be rotated"}}] \ No newline at end of file diff --git a/data/wrench/function/config/stairs/main.mcfunction b/data/wrench/function/config/stairs/main.mcfunction index 0627792..44c12c9 100644 --- a/data/wrench/function/config/stairs/main.mcfunction +++ b/data/wrench/function/config/stairs/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchStairs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/stairs/enable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}] +execute if score WrenchStairs WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/stairs/enable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}] -execute if score WrenchStairs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/stairs/disable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}] \ No newline at end of file +execute if score WrenchStairs WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/stairs/disable"}},{"text":" Stairs","hoverEvent":{"action":"show_text","value":"Wether Stairs should be rotated"}}] \ No newline at end of file diff --git a/data/wrench/function/config/terracotta/main.mcfunction b/data/wrench/function/config/terracotta/main.mcfunction index 772c63f..aba19d0 100644 --- a/data/wrench/function/config/terracotta/main.mcfunction +++ b/data/wrench/function/config/terracotta/main.mcfunction @@ -1,6 +1,6 @@ #Enabled = 600 #Disabled = 601 -execute if score WrenchTerracotta WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","clickEvent":{"action":"run_command","value":"/function wrench:config/terracotta/enable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}] +execute if score WrenchTerracotta WrenchConfig matches 0 run tellraw @s ["",{"text":"[ ❌ ]","color":"red","click_event":{"action":"run_command","command":"/function wrench:config/terracotta/enable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}] -execute if score WrenchTerracotta WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","clickEvent":{"action":"run_command","value":"/function wrench:config/terracotta/disable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}] \ No newline at end of file +execute if score WrenchTerracotta WrenchConfig matches 1 run tellraw @s ["",{"text":"[ ✔ ]","color":"green","click_event":{"action":"run_command","command":"/function wrench:config/terracotta/disable"}},{"text":" Terracotta","hoverEvent":{"action":"show_text","value":"Wether Terracotta should be rotated"}}] \ No newline at end of file diff --git a/data/wrench/function/rotate/glazed_terracotta.mcfunction b/data/wrench/function/rotate/glazed_terracotta.mcfunction index 1372782..73436f4 100644 --- a/data/wrench/function/rotate/glazed_terracotta.mcfunction +++ b/data/wrench/function/rotate/glazed_terracotta.mcfunction @@ -1,3 +1,3 @@ ### Glazed Terracotta -execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"Terracotta"']}}}] run function wrench:rotate/glazed_terracotta_mode +execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":["Terracotta"]}}}] run function wrench:rotate/glazed_terracotta_mode execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/glazed_terracotta_cycle diff --git a/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction b/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction index 7fab3b9..7b24d99 100644 --- a/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction +++ b/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction @@ -1,10 +1,10 @@ ### Rotate Glazed Terracotta # Terracotta Mode Rotation -execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"North"']}}}] run tag @s add TerracottaNORTH -execute as @s[nbt={SelectedItem:{components:{"minecraft:lore":['"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: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 ## Shades diff --git a/data/wrench/function/rotate/pillars.mcfunction b/data/wrench/function/rotate/pillars.mcfunction index dfb1272..549ea91 100644 --- a/data/wrench/function/rotate/pillars.mcfunction +++ b/data/wrench/function/rotate/pillars.mcfunction @@ -1,6 +1,6 @@ ### Pillars # Rotate Based on Wrench Mode -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/pillars_player -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/pillars_click +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/pillars_player +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/pillars_click execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/pillars_cycle diff --git a/data/wrench/function/rotate/rails.mcfunction b/data/wrench/function/rotate/rails.mcfunction index 7e95803..b0f3692 100644 --- a/data/wrench/function/rotate/rails.mcfunction +++ b/data/wrench/function/rotate/rails.mcfunction @@ -1,5 +1,5 @@ ### Rails # Rotate Based on Wrench Mode -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/rails_player +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/rails_player execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/rails_cycle diff --git a/data/wrench/function/rotate/redstone.mcfunction b/data/wrench/function/rotate/redstone.mcfunction index 24e72ab..18385a3 100644 --- a/data/wrench/function/rotate/redstone.mcfunction +++ b/data/wrench/function/rotate/redstone.mcfunction @@ -4,11 +4,11 @@ execute if block ~ ~ ~ #wrench:redstone{Items:[{}]} run scoreboard players set @s WrenchSuccess -1 # Rotate Based on Wrench Mode -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Flip"']}}}] run function wrench:rotate/redstone_flip -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/redstone_player -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/redstone_click +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/redstone_flip +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/redstone_player +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/redstone_click execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/redstone_cycle # Container Full Show Error execute as @s[scores={WrenchSuccess=-1}] run playsound minecraft:entity.item_frame.break block @s ~ ~ ~ -execute as @s[scores={WrenchSuccess=-1}] run title @s actionbar [{"text":"Rotate Failed, "},{"text":"Container must be empty!","color":"red"}] +execute as @s[scores={WrenchSuccess=-1}] run title @s actionbar [{"text":"Rotate Failed: ","color":"red"},{"text":"Container must be empty!","color":"white"}] diff --git a/data/wrench/function/rotate/stairs.mcfunction b/data/wrench/function/rotate/stairs.mcfunction index e02356d..7b36fd9 100644 --- a/data/wrench/function/rotate/stairs.mcfunction +++ b/data/wrench/function/rotate/stairs.mcfunction @@ -1,7 +1,7 @@ ### Stairs # Rotate Based on Wrench Mode -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Flip"']}}}] run function wrench:rotate/stairs_flip -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Player"']}}}] run function wrench:rotate/stairs_player -execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":['"Face Click"']}}}] run function wrench:rotate/stairs_click +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Flip"]}}}] run function wrench:rotate/stairs_flip +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Player"]}}}] run function wrench:rotate/stairs_player +execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{components:{"minecraft:lore":["Face Click"]}}}] run function wrench:rotate/stairs_click execute as @s[scores={WrenchSuccess=0}] run function wrench:rotate/stairs_cycle diff --git a/data/wrench/function/use.mcfunction b/data/wrench/function/use.mcfunction index afaa13e..79bf14d 100644 --- a/data/wrench/function/use.mcfunction +++ b/data/wrench/function/use.mcfunction @@ -1,6 +1,7 @@ #Check for wrench input -execute if entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{Wrench:597832584}}}}] run function wrench:rotate -execute if entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_data":{Wrench:597832584}}}]}] run function wrench:wrench/offhand +execute if entity @s[nbt={SelectedItem:{components:{"minecraft:custom_data":{lzstealth:"wrench"}}}}] run function wrench:rotate +execute if entity @s[nbt={equipment:{offhand:{components:{"minecraft:custom_data":{lzstealth:"wrench"}}}}}] run function wrench:wrench/offhand + #Check if wrench has been crafted execute as @s[scores={WrenchInput=1..}] run function wrench:wrench/convert diff --git a/data/wrench/function/wrench/convert.mcfunction b/data/wrench/function/wrench/convert.mcfunction index 7d251cb..3059ab6 100644 --- a/data/wrench/function/wrench/convert.mcfunction +++ b/data/wrench/function/wrench/convert.mcfunction @@ -1,3 +1,3 @@ #Check if wrench has been crafted -item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":'"Wrench"'}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] +item replace entity @s[nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":"Wrench"}}}] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=[{"text":"Default"}],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] +item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",components:{"minecraft:custom_name":"Wrench"}}]}] weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=[{"text":"Default"}],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] diff --git a/data/wrench/function/wrench/give.mcfunction b/data/wrench/function/wrench/give.mcfunction index 146088f..9015b1e 100644 --- a/data/wrench/function/wrench/give.mcfunction +++ b/data/wrench/function/wrench/give.mcfunction @@ -1 +1 @@ -give @s minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] +give @s minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] \ No newline at end of file diff --git a/data/wrench/function/wrench/offhand.mcfunction b/data/wrench/function/wrench/offhand.mcfunction index c080971..8332efd 100644 --- a/data/wrench/function/wrench/offhand.mcfunction +++ b/data/wrench/function/wrench/offhand.mcfunction @@ -2,22 +2,27 @@ scoreboard players set @s WrenchSuccess 0 #Change wrench mode -execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Flip"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Player"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Face Click"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] +execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Default"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Flip"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_flip"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] + +execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Flip"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Face Player"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_face_player"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] + +execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Player"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Face Click"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_face_click"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] + # Only allow Terracotta more if terracotta rotating is enabled -execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 0 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] +execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Click"]}}}}] unless score WrenchTerracotta WrenchConfig matches 0 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta","North"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] + # Retun to Default -execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Default"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] +execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Terracotta"]}}}}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] + +execute as @s[scores={WrenchSuccess=0},nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Click"]}}}}] unless score WrenchTerracotta WrenchConfig matches 1 store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Default"],minecraft:custom_data={lzstealth:"wrench"},minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_default"]},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] #Confirm with action bar -title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Default"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}] -title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Flip"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}] -title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Player"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}] -title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Face Click"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}] -title @s[nbt={Inventory:[{Slot:-106b, components:{"minecraft:lore":['"Terracotta"']}}]}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Default"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Default","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Flip"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Flip","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Player"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Player","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Face Click"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Face Click","color":"white"}] +title @s[nbt={equipment:{offhand:{components:{"minecraft:lore":["Terracotta"]}}}}] actionbar [{"text":"Mode: ","color":"red"},{"text":"Terracotta","color":"white"}] #Reset input -scoreboard players set @s WrenchInput 0 +scoreboard players set @s WrenchInput 0 \ No newline at end of file diff --git a/data/wrench/function/wrench/terracotta.mcfunction b/data/wrench/function/wrench/terracotta.mcfunction index 8feebf7..55607ba 100644 --- a/data/wrench/function/wrench/terracotta.mcfunction +++ b/data/wrench/function/wrench/terracotta.mcfunction @@ -1,8 +1,8 @@ #Advance terracotta mode rotation, show title -item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"East"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"South"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"West"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] -item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name='{"text":"Rotator Wrench","color":"aqua"}',minecraft:lore=['{"text":"Terracotta"}', '{"text":"North"}'],minecraft:unbreakable={show_in_tooltip:false},minecraft:custom_data={"Wrench":597832584},minecraft:enchantment_glint_override=true] +item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "East"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] +item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "South"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] +item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "West"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] +item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick[minecraft:custom_name={"text":"Rotator Wrench","color":"aqua"},minecraft:lore=["Terracotta", "North"],minecraft:custom_model_data={strings:["lzstealth:wrench","lzstealth:wrench_terracotta"]},minecraft:custom_data={lzstealth:"wrench"},minecraft:unbreakable={},minecraft:enchantment_glint_override=true,minecraft:tooltip_display={hidden_components:["minecraft:unbreakable"]}] title @s[tag=TerracottaNORTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"East","color":"white"}] title @s[tag=TerracottaEAST] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"South","color":"white"}] title @s[tag=TerracottaSOUTH] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"West","color":"white"}] diff --git a/pack.mcmeta b/pack.mcmeta index 33624b7..5de800a 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 41, + "pack_format": 71, "description": "Wrench pack to allow easy rotation of blocks. Configurable." } } \ No newline at end of file