diff --git a/Wrench/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json similarity index 100% rename from Wrench/data/minecraft/tags/function/load.json rename to data/minecraft/tags/function/load.json diff --git a/Wrench/data/minecraft/tags/function/tick.json b/data/minecraft/tags/function/tick.json similarity index 100% rename from Wrench/data/minecraft/tags/function/tick.json rename to data/minecraft/tags/function/tick.json diff --git a/Wrench/data/wrench/function/config.mcfunction b/data/wrench/function/config.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config.mcfunction rename to data/wrench/function/config.mcfunction diff --git a/Wrench/data/wrench/function/config/pillars/disable.mcfunction b/data/wrench/function/config/pillars/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/pillars/disable.mcfunction rename to data/wrench/function/config/pillars/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/pillars/enable.mcfunction b/data/wrench/function/config/pillars/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/pillars/enable.mcfunction rename to data/wrench/function/config/pillars/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/pillars/main.mcfunction b/data/wrench/function/config/pillars/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/pillars/main.mcfunction rename to data/wrench/function/config/pillars/main.mcfunction diff --git a/Wrench/data/wrench/function/config/rails/disable.mcfunction b/data/wrench/function/config/rails/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/rails/disable.mcfunction rename to data/wrench/function/config/rails/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/rails/enable.mcfunction b/data/wrench/function/config/rails/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/rails/enable.mcfunction rename to data/wrench/function/config/rails/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/rails/main.mcfunction b/data/wrench/function/config/rails/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/rails/main.mcfunction rename to data/wrench/function/config/rails/main.mcfunction diff --git a/Wrench/data/wrench/function/config/redstone/disable.mcfunction b/data/wrench/function/config/redstone/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/redstone/disable.mcfunction rename to data/wrench/function/config/redstone/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/redstone/enable.mcfunction b/data/wrench/function/config/redstone/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/redstone/enable.mcfunction rename to data/wrench/function/config/redstone/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/redstone/main.mcfunction b/data/wrench/function/config/redstone/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/redstone/main.mcfunction rename to data/wrench/function/config/redstone/main.mcfunction diff --git a/Wrench/data/wrench/function/config/rods/disable.mcfunction b/data/wrench/function/config/rods/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/rods/disable.mcfunction rename to data/wrench/function/config/rods/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/rods/enable.mcfunction b/data/wrench/function/config/rods/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/rods/enable.mcfunction rename to data/wrench/function/config/rods/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/rods/main.mcfunction b/data/wrench/function/config/rods/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/rods/main.mcfunction rename to data/wrench/function/config/rods/main.mcfunction diff --git a/Wrench/data/wrench/function/config/slabs/disable.mcfunction b/data/wrench/function/config/slabs/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/slabs/disable.mcfunction rename to data/wrench/function/config/slabs/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/slabs/enable.mcfunction b/data/wrench/function/config/slabs/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/slabs/enable.mcfunction rename to data/wrench/function/config/slabs/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/slabs/main.mcfunction b/data/wrench/function/config/slabs/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/slabs/main.mcfunction rename to data/wrench/function/config/slabs/main.mcfunction diff --git a/Wrench/data/wrench/function/config/stairs/disable.mcfunction b/data/wrench/function/config/stairs/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/stairs/disable.mcfunction rename to data/wrench/function/config/stairs/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/stairs/enable.mcfunction b/data/wrench/function/config/stairs/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/stairs/enable.mcfunction rename to data/wrench/function/config/stairs/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/stairs/main.mcfunction b/data/wrench/function/config/stairs/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/stairs/main.mcfunction rename to data/wrench/function/config/stairs/main.mcfunction diff --git a/Wrench/data/wrench/function/config/terracotta/disable.mcfunction b/data/wrench/function/config/terracotta/disable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/terracotta/disable.mcfunction rename to data/wrench/function/config/terracotta/disable.mcfunction diff --git a/Wrench/data/wrench/function/config/terracotta/enable.mcfunction b/data/wrench/function/config/terracotta/enable.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/terracotta/enable.mcfunction rename to data/wrench/function/config/terracotta/enable.mcfunction diff --git a/Wrench/data/wrench/function/config/terracotta/main.mcfunction b/data/wrench/function/config/terracotta/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/config/terracotta/main.mcfunction rename to data/wrench/function/config/terracotta/main.mcfunction diff --git a/Wrench/data/wrench/function/load.mcfunction b/data/wrench/function/load.mcfunction similarity index 100% rename from Wrench/data/wrench/function/load.mcfunction rename to data/wrench/function/load.mcfunction diff --git a/Wrench/data/wrench/function/main.mcfunction b/data/wrench/function/main.mcfunction similarity index 100% rename from Wrench/data/wrench/function/main.mcfunction rename to data/wrench/function/main.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox.mcfunction b/data/wrench/function/raycast/partialbox.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox.mcfunction rename to data/wrench/function/raycast/partialbox.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/end_rods.mcfunction b/data/wrench/function/raycast/partialbox/end_rods.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/end_rods.mcfunction rename to data/wrench/function/raycast/partialbox/end_rods.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/hoppers.mcfunction b/data/wrench/function/raycast/partialbox/hoppers.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/hoppers.mcfunction rename to data/wrench/function/raycast/partialbox/hoppers.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/pistons.mcfunction b/data/wrench/function/raycast/partialbox/pistons.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/pistons.mcfunction rename to data/wrench/function/raycast/partialbox/pistons.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/rails.mcfunction b/data/wrench/function/raycast/partialbox/rails.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/rails.mcfunction rename to data/wrench/function/raycast/partialbox/rails.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/slabs.mcfunction b/data/wrench/function/raycast/partialbox/slabs.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/slabs.mcfunction rename to data/wrench/function/raycast/partialbox/slabs.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/stairs.mcfunction b/data/wrench/function/raycast/partialbox/stairs.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/stairs.mcfunction rename to data/wrench/function/raycast/partialbox/stairs.mcfunction diff --git a/Wrench/data/wrench/function/raycast/partialbox/sticky_pistons.mcfunction b/data/wrench/function/raycast/partialbox/sticky_pistons.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/partialbox/sticky_pistons.mcfunction rename to data/wrench/function/raycast/partialbox/sticky_pistons.mcfunction diff --git a/Wrench/data/wrench/function/raycast/rayloop.mcfunction b/data/wrench/function/raycast/rayloop.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/rayloop.mcfunction rename to data/wrench/function/raycast/rayloop.mcfunction diff --git a/Wrench/data/wrench/function/raycast/start.mcfunction b/data/wrench/function/raycast/start.mcfunction similarity index 100% rename from Wrench/data/wrench/function/raycast/start.mcfunction rename to data/wrench/function/raycast/start.mcfunction diff --git a/Wrench/data/wrench/function/rotate.mcfunction b/data/wrench/function/rotate.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate.mcfunction rename to data/wrench/function/rotate.mcfunction diff --git a/Wrench/data/wrench/function/rotate/end_rod_flip.mcfunction b/data/wrench/function/rotate/end_rod_flip.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/end_rod_flip.mcfunction rename to data/wrench/function/rotate/end_rod_flip.mcfunction diff --git a/Wrench/data/wrench/function/rotate/glazed_terracotta.mcfunction b/data/wrench/function/rotate/glazed_terracotta.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/glazed_terracotta.mcfunction rename to data/wrench/function/rotate/glazed_terracotta.mcfunction diff --git a/Wrench/data/wrench/function/rotate/glazed_terracotta_cycle.mcfunction b/data/wrench/function/rotate/glazed_terracotta_cycle.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/glazed_terracotta_cycle.mcfunction rename to data/wrench/function/rotate/glazed_terracotta_cycle.mcfunction diff --git a/Wrench/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction b/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/glazed_terracotta_mode.mcfunction rename to data/wrench/function/rotate/glazed_terracotta_mode.mcfunction diff --git a/Wrench/data/wrench/function/rotate/pillars.mcfunction b/data/wrench/function/rotate/pillars.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/pillars.mcfunction rename to data/wrench/function/rotate/pillars.mcfunction diff --git a/Wrench/data/wrench/function/rotate/pillars_click.mcfunction b/data/wrench/function/rotate/pillars_click.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/pillars_click.mcfunction rename to data/wrench/function/rotate/pillars_click.mcfunction diff --git a/Wrench/data/wrench/function/rotate/pillars_cycle.mcfunction b/data/wrench/function/rotate/pillars_cycle.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/pillars_cycle.mcfunction rename to data/wrench/function/rotate/pillars_cycle.mcfunction diff --git a/Wrench/data/wrench/function/rotate/pillars_player.mcfunction b/data/wrench/function/rotate/pillars_player.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/pillars_player.mcfunction rename to data/wrench/function/rotate/pillars_player.mcfunction diff --git a/Wrench/data/wrench/function/rotate/rails.mcfunction b/data/wrench/function/rotate/rails.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/rails.mcfunction rename to data/wrench/function/rotate/rails.mcfunction diff --git a/Wrench/data/wrench/function/rotate/rails_cycle.mcfunction b/data/wrench/function/rotate/rails_cycle.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/rails_cycle.mcfunction rename to data/wrench/function/rotate/rails_cycle.mcfunction diff --git a/Wrench/data/wrench/function/rotate/rails_player.mcfunction b/data/wrench/function/rotate/rails_player.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/rails_player.mcfunction rename to data/wrench/function/rotate/rails_player.mcfunction diff --git a/Wrench/data/wrench/function/rotate/redstone.mcfunction b/data/wrench/function/rotate/redstone.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/redstone.mcfunction rename to data/wrench/function/rotate/redstone.mcfunction diff --git a/Wrench/data/wrench/function/rotate/redstone_click.mcfunction b/data/wrench/function/rotate/redstone_click.mcfunction similarity index 87% rename from Wrench/data/wrench/function/rotate/redstone_click.mcfunction rename to data/wrench/function/rotate/redstone_click.mcfunction index c3b2b57..0a50aa9 100644 --- a/Wrench/data/wrench/function/rotate/redstone_click.mcfunction +++ b/data/wrench/function/rotate/redstone_click.mcfunction @@ -37,6 +37,20 @@ execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 15 sto execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=south] replace minecraft:barrel execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=west] replace minecraft:barrel +# Crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if score py WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_south] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if score py WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_west] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if score py WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_north] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if score py WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_east] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if score py WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_north] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if score py WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_east] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if score py WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_south] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if score py WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_west] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=north_up] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=east_up] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=south_up] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=west_up] replace minecraft:crafter + # Dispenser execute as @s[scores={WrenchSuccess=0}] if score py WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=up] replace minecraft:dispenser execute as @s[scores={WrenchSuccess=0}] if score py WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=down] replace minecraft:dispenser diff --git a/Wrench/data/wrench/function/rotate/redstone_cycle.mcfunction b/data/wrench/function/rotate/redstone_cycle.mcfunction similarity index 86% rename from Wrench/data/wrench/function/rotate/redstone_cycle.mcfunction rename to data/wrench/function/rotate/redstone_cycle.mcfunction index e02eaa1..2cd3157 100644 --- a/Wrench/data/wrench/function/rotate/redstone_cycle.mcfunction +++ b/data/wrench/function/rotate/redstone_cycle.mcfunction @@ -10,6 +10,20 @@ execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=down] replace minecraft:barrel[facing=south] execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=south] replace minecraft:barrel[facing=east] +# Crafter +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_north] replace minecraft:crafter[orientation=down_west] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_east] replace minecraft:crafter[orientation=up_north] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_south] replace minecraft:crafter[orientation=up_east] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_west] replace minecraft:crafter[orientation=up_south] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=north_up] replace minecraft:crafter[orientation=up_west] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=east_up] replace minecraft:crafter[orientation=north_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=south_up] replace minecraft:crafter[orientation=east_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=west_up] replace minecraft:crafter[orientation=south_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_north] replace minecraft:crafter[orientation=west_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_east] replace minecraft:crafter[orientation=down_north] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_south] replace minecraft:crafter[orientation=down_east] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_west] replace minecraft:crafter[orientation=down_south] + # Dispenser execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=east] replace minecraft:dispenser[facing=up] execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=up] replace minecraft:dispenser[facing=north] diff --git a/Wrench/data/wrench/function/rotate/redstone_flip.mcfunction b/data/wrench/function/rotate/redstone_flip.mcfunction similarity index 86% rename from Wrench/data/wrench/function/rotate/redstone_flip.mcfunction rename to data/wrench/function/rotate/redstone_flip.mcfunction index 6f4b3dd..4f9c009 100644 --- a/Wrench/data/wrench/function/rotate/redstone_flip.mcfunction +++ b/data/wrench/function/rotate/redstone_flip.mcfunction @@ -16,6 +16,20 @@ execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=down] replace minecraft:barrel[facing=up] execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=south] replace minecraft:barrel[facing=north] +# Crafter +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_north] replace minecraft:crafter[orientation=down_north] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_east] replace minecraft:crafter[orientation=down_east] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_south] replace minecraft:crafter[orientation=down_south] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_west] replace minecraft:crafter[orientation=down_west] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=north_up] replace minecraft:crafter[orientation=south_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=east_up] replace minecraft:crafter[orientation=west_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=south_up] replace minecraft:crafter[orientation=north_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=west_up] replace minecraft:crafter[orientation=east_up] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_north] replace minecraft:crafter[orientation=up_north] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_east] replace minecraft:crafter[orientation=up_east] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_south] replace minecraft:crafter[orientation=up_south] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_west] replace minecraft:crafter[orientation=up_west] + # Dispenser execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=east] replace minecraft:dispenser[facing=west] execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=up] replace minecraft:dispenser[facing=down] diff --git a/Wrench/data/wrench/function/rotate/redstone_player.mcfunction b/data/wrench/function/rotate/redstone_player.mcfunction similarity index 87% rename from Wrench/data/wrench/function/rotate/redstone_player.mcfunction rename to data/wrench/function/rotate/redstone_player.mcfunction index 3fca483..e778da1 100644 --- a/Wrench/data/wrench/function/rotate/redstone_player.mcfunction +++ b/data/wrench/function/rotate/redstone_player.mcfunction @@ -13,6 +13,20 @@ execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=south] replace minecraft:barrel execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=west] replace minecraft:barrel +# Crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_south] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_west] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_north] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=up_east] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_north] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_east] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_south] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=down_west] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=north_up] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=east_up] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=south_up] replace minecraft:crafter +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:crafter[orientation=west_up] replace minecraft:crafter + # Dispenser execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=up] replace minecraft:dispenser execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dispenser[facing=down] replace minecraft:dispenser diff --git a/Wrench/data/wrench/function/rotate/slabs_flip.mcfunction b/data/wrench/function/rotate/slabs_flip.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/slabs_flip.mcfunction rename to data/wrench/function/rotate/slabs_flip.mcfunction diff --git a/Wrench/data/wrench/function/rotate/stairs.mcfunction b/data/wrench/function/rotate/stairs.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/stairs.mcfunction rename to data/wrench/function/rotate/stairs.mcfunction diff --git a/Wrench/data/wrench/function/rotate/stairs_click.mcfunction b/data/wrench/function/rotate/stairs_click.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/stairs_click.mcfunction rename to data/wrench/function/rotate/stairs_click.mcfunction diff --git a/Wrench/data/wrench/function/rotate/stairs_cycle.mcfunction b/data/wrench/function/rotate/stairs_cycle.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/stairs_cycle.mcfunction rename to data/wrench/function/rotate/stairs_cycle.mcfunction diff --git a/Wrench/data/wrench/function/rotate/stairs_flip.mcfunction b/data/wrench/function/rotate/stairs_flip.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/stairs_flip.mcfunction rename to data/wrench/function/rotate/stairs_flip.mcfunction diff --git a/Wrench/data/wrench/function/rotate/stairs_player.mcfunction b/data/wrench/function/rotate/stairs_player.mcfunction similarity index 100% rename from Wrench/data/wrench/function/rotate/stairs_player.mcfunction rename to data/wrench/function/rotate/stairs_player.mcfunction diff --git a/Wrench/data/wrench/function/uninstall.mcfunction b/data/wrench/function/uninstall.mcfunction similarity index 100% rename from Wrench/data/wrench/function/uninstall.mcfunction rename to data/wrench/function/uninstall.mcfunction diff --git a/Wrench/data/wrench/function/use.mcfunction b/data/wrench/function/use.mcfunction similarity index 100% rename from Wrench/data/wrench/function/use.mcfunction rename to data/wrench/function/use.mcfunction diff --git a/Wrench/data/wrench/function/wrench/convert.mcfunction b/data/wrench/function/wrench/convert.mcfunction similarity index 100% rename from Wrench/data/wrench/function/wrench/convert.mcfunction rename to data/wrench/function/wrench/convert.mcfunction diff --git a/Wrench/data/wrench/function/wrench/give.mcfunction b/data/wrench/function/wrench/give.mcfunction similarity index 100% rename from Wrench/data/wrench/function/wrench/give.mcfunction rename to data/wrench/function/wrench/give.mcfunction diff --git a/Wrench/data/wrench/function/wrench/offhand.mcfunction b/data/wrench/function/wrench/offhand.mcfunction similarity index 100% rename from Wrench/data/wrench/function/wrench/offhand.mcfunction rename to data/wrench/function/wrench/offhand.mcfunction diff --git a/Wrench/data/wrench/function/wrench/terracotta.mcfunction b/data/wrench/function/wrench/terracotta.mcfunction similarity index 100% rename from Wrench/data/wrench/function/wrench/terracotta.mcfunction rename to data/wrench/function/wrench/terracotta.mcfunction diff --git a/Wrench/data/wrench/tags/block/glazed_terracotta.json b/data/wrench/tags/block/glazed_terracotta.json similarity index 100% rename from Wrench/data/wrench/tags/block/glazed_terracotta.json rename to data/wrench/tags/block/glazed_terracotta.json diff --git a/Wrench/data/wrench/tags/block/partialbox.json b/data/wrench/tags/block/partialbox.json similarity index 100% rename from Wrench/data/wrench/tags/block/partialbox.json rename to data/wrench/tags/block/partialbox.json diff --git a/Wrench/data/wrench/tags/block/pillars.json b/data/wrench/tags/block/pillars.json similarity index 100% rename from Wrench/data/wrench/tags/block/pillars.json rename to data/wrench/tags/block/pillars.json diff --git a/Wrench/data/wrench/tags/block/redstone.json b/data/wrench/tags/block/redstone.json similarity index 82% rename from Wrench/data/wrench/tags/block/redstone.json rename to data/wrench/tags/block/redstone.json index baba992..4819c71 100644 --- a/Wrench/data/wrench/tags/block/redstone.json +++ b/data/wrench/tags/block/redstone.json @@ -9,6 +9,7 @@ "minecraft:observer", "minecraft:hopper", "minecraft:repeater", - "minecraft:comparator" + "minecraft:comparator", + "minecraft:crafter" ] } diff --git a/Wrench/data/wrench/tags/block/updates.json b/data/wrench/tags/block/updates.json similarity index 100% rename from Wrench/data/wrench/tags/block/updates.json rename to data/wrench/tags/block/updates.json diff --git a/Wrench/pack.mcmeta b/pack.mcmeta similarity index 100% rename from Wrench/pack.mcmeta rename to pack.mcmeta