Fix Naming causing functions to fail

Removed Vertical Requirement from Sculk

.github/workflows/main.yml

@@ -1,22 +0,0 @@
-name: Create release
-
-on:
-  release:
-    types:
-      - created
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Zip Folder
-      run: zip -r ${{ github.event.repository.name }}.zip ./Wrench/
-
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: ${{ github.event.repository.name }}.zip
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -15,12 +15,14 @@ The wrench can currently rotate these blocks:
 * The following redstone components:
     * pistons
     * sticky pistons
+    * barrel
     * dispensers
     * droppers
     * observers
     * hoppers
     * repeaters
     * comparators
+    * calibrated sculk sensor
 * Glazed terracotta
 * Rails
 * End rods

Wrench/data/wrench/functions/config.mcfunction

@@ -1,5 +1,5 @@
 # Config
-tellraw @s [{"text":"                        ","strikethrough":true},{"text":" LZ's Wrench Config ","color":"gold","strikethrough":false,"bold":true},{"text":"                         ","strikethrough":true}]
+tellraw @s [{"text":"                     ","strikethrough":true},{"text":" Rotator Wrench Config ","color":"gold","strikethrough":false,"bold":true},{"text":"                       ","strikethrough":true}]
 tellraw @s {"text":"Which catagories should be wrenchable?"}
 function wrench:config/pillars/main
 function wrench:config/redstone/main

Wrench/data/wrench/functions/raycast/partialbox.mcfunction

@@ -31,6 +31,7 @@ execute if block ~ ~ ~ #minecraft:rails unless score WrenchRails WrenchConfig ma
 #Redstone
 execute if block ~ ~ ~ minecraft:repeater unless score WrenchRedstone WrenchConfig matches 0 if score py WrenchRaycast matches ..1 run function wrench:rotate/redstone
 execute if block ~ ~ ~ minecraft:comparator unless score WrenchRedstone WrenchConfig matches 0 if score py WrenchRaycast matches ..1 run function wrench:rotate/redstone
+execute if block ~ ~ ~ minecraft:calibrated_sculk_sensor unless score WrenchRedstone WrenchConfig matches 0 if score py WrenchRaycast matches ..7 run function wrench:rotate/redstone
 execute if block ~ ~ ~ minecraft:piston unless score WrenchRedstone WrenchConfig matches 0 run function wrench:raycast/partialbox/pistons
 execute if block ~ ~ ~ minecraft:sticky_piston unless score WrenchRedstone WrenchConfig matches 0 run function wrench:raycast/partialbox/sticky_pistons
 execute if block ~ ~ ~ minecraft:hopper unless score WrenchRedstone WrenchConfig matches 0 run function wrench:raycast/partialbox/hoppers

Wrench/data/wrench/functions/raycast/rayloop.mcfunction

@@ -16,5 +16,5 @@ execute as @s[scores={WrenchSuccess=1..}] run playsound minecraft:entity.item_fr
 execute if score WrenchDebug WrenchConfig matches 1 run summon area_effect_cloud ~ ~ ~ {Particle:happy_villager,Radius:0.01,Duration:2}
 
 # Advance forward and if nothing found
-scoreboard players add #distance raycast 1
-execute if score @s WrenchSuccess matches 0 if score #distance raycast matches ..350 positioned ^ ^ ^0.01 run function wrench:raycast/rayloop
+scoreboard players add #distance WrenchRaycast 1
+execute if score @s WrenchSuccess matches 0 if score #distance WrenchRaycast matches ..350 positioned ^ ^ ^0.01 run function wrench:raycast/rayloop

Wrench/data/wrench/functions/raycast/start.mcfunction

@@ -1,7 +1,7 @@
 #Setting up the raycasting data.
 
 tag @s add raycast
-scoreboard players set #distance raycast 0
+scoreboard players set #distance WrenchRaycast 0
 
 #Activating the raycast. This function will call itself until it is done.
 

Wrench/data/wrench/functions/rotate/glazed_terracotta.mcfunction

@@ -1,3 +1,3 @@
 ### Glazed Terracotta
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}']}}}}] 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

Wrench/data/wrench/functions/rotate/glazed_terracotta_mode.mcfunction

@@ -1,10 +1,10 @@
 ### Rotate Glazed Terracotta
 
 # Terracotta Mode Rotation
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"North"}']}}}}] run tag @s add TerracottaNORTH
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"East"}']}}}}] run tag @s add TerracottaEAST
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"South"}']}}}}] run tag @s add TerracottaSOUTH
-execute as @s[nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Terracotta mode"}', '{"text":"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
 

Wrench/data/wrench/functions/rotate/pillars.mcfunction

@@ -1,6 +1,6 @@
 ### Pillars
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/pillars_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"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

Wrench/data/wrench/functions/rotate/pillars_click.mcfunction

@@ -65,6 +65,27 @@ execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1.
 execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_birch_wood[axis=y] replace minecraft:stripped_birch_wood
 execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_birch_wood[axis=x] replace minecraft:stripped_birch_wood
 
+# Cherry Log
+execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=z] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=y] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=x] replace minecraft:cherry_log
+
+# Cherry Log (Stripped)
+execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=z] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=y] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=x] replace minecraft:stripped_cherry_log
+
+# Cherry Wood
+execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=z] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=y] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=x] replace minecraft:cherry_wood
+
+# Cherry Wood (Stripped)
+execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=z] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=y] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=x] replace minecraft:stripped_cherry_wood
+
+
 # Dark Oak Log
 execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dark_oak_log[axis=z] replace minecraft:dark_oak_log
 execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dark_oak_log[axis=y] replace minecraft:dark_oak_log

Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction

@@ -42,6 +42,26 @@ 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:stripped_birch_wood[axis=y] replace minecraft:stripped_birch_wood[axis=x]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_birch_wood[axis=x] replace minecraft:stripped_birch_wood[axis=z]
 
+# Cherry Log
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=z] replace minecraft:cherry_log[axis=y]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=y] replace minecraft:cherry_log[axis=x]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=x] replace minecraft:cherry_log[axis=z]
+
+# Cherry Log (Stripped)
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=z] replace minecraft:stripped_cherry_log[axis=y]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=y] replace minecraft:stripped_cherry_log[axis=x]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=x] replace minecraft:stripped_cherry_log[axis=z]
+
+# Cherry Wood
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=z] replace minecraft:cherry_wood[axis=y]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=y] replace minecraft:cherry_wood[axis=x]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=x] replace minecraft:cherry_wood[axis=z]
+
+# Cherry Wood (Stripped)
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=z] replace minecraft:stripped_cherry_wood[axis=y]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=y] replace minecraft:stripped_cherry_wood[axis=x]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=x] replace minecraft:stripped_cherry_wood[axis=z]
+
 # Dark Oak Log
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dark_oak_log[axis=z] replace minecraft:dark_oak_log[axis=y]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dark_oak_log[axis=y] replace minecraft:dark_oak_log[axis=x]

Wrench/data/wrench/functions/rotate/pillars_player.mcfunction

@@ -66,6 +66,38 @@ execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_birch_wood[axis=x] replace minecraft:stripped_birch_wood
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_birch_wood[axis=x] replace minecraft:stripped_birch_wood
 
+# Cherry Log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=y] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=y] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=z] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=z] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=x] replace minecraft:cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_log[axis=x] replace minecraft:cherry_log
+
+# Cherry Log (Stripped)
+execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=y] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=y] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=z] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=z] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=x] replace minecraft:stripped_cherry_log
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_log[axis=x] replace minecraft:stripped_cherry_log
+
+# Cherry Wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=y] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=y] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=z] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=z] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=x] replace minecraft:cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:cherry_wood[axis=x] replace minecraft:cherry_wood
+
+# Cherry Wood (Stripped)
+execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=y] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=y] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=z] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=z] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=x] replace minecraft:stripped_cherry_wood
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_cherry_wood[axis=x] replace minecraft:stripped_cherry_wood
+
 # Dark Oak Log
 execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dark_oak_log[axis=y] replace minecraft:dark_oak_log
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:dark_oak_log[axis=y] replace minecraft:dark_oak_log

Wrench/data/wrench/functions/rotate/rails.mcfunction

@@ -1,6 +1,5 @@
 ### Rails
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/rails_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Click"}']}}}}] 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

Wrench/data/wrench/functions/rotate/rails_cycle.mcfunction

@@ -3,75 +3,127 @@
 ## Normal Rails
 
 # Convert to Sloped
-execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_west] replace minecraft:rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_east] replace minecraft:rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_east] replace minecraft:rail[shape=ascending_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_north] replace minecraft:rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_south] replace minecraft:rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_south] replace minecraft:rail[shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_west] replace minecraft:rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_east] replace minecraft:rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_east] replace minecraft:rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_north] replace minecraft:rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_south] replace minecraft:rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_south] replace minecraft:rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=ascending_west] replace minecraft:rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=ascending_east] replace minecraft:rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=ascending_east] replace minecraft:rail[waterlogged=false,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=ascending_north] replace minecraft:rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=ascending_south] replace minecraft:rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=ascending_south] replace minecraft:rail[waterlogged=false,shape=ascending_north]
 # Convert to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_south] replace minecraft:rail[shape=north_west]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_west] replace minecraft:rail[shape=north_east]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_east] replace minecraft:rail[shape=south_west]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_west] replace minecraft:rail[shape=south_east]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail[shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=east_west] replace minecraft:rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_south] replace minecraft:rail[waterlogged=true,shape=north_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_west] replace minecraft:rail[waterlogged=true,shape=north_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_east] replace minecraft:rail[waterlogged=true,shape=south_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_west] replace minecraft:rail[waterlogged=true,shape=south_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_east] replace minecraft:rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=east_west] replace minecraft:rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=north_south] replace minecraft:rail[waterlogged=false,shape=north_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=north_west] replace minecraft:rail[waterlogged=false,shape=north_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=north_east] replace minecraft:rail[waterlogged=false,shape=south_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=south_west] replace minecraft:rail[waterlogged=false,shape=south_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=south_east] replace minecraft:rail[waterlogged=false,shape=east_west]
 # Convert Sloped to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail[shape=ascending_north]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail[shape=ascending_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail[shape=ascending_east]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail[shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=east_west] replace minecraft:rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=east_west] replace minecraft:rail[waterlogged=true,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_east] replace minecraft:rail[waterlogged=true,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_east] replace minecraft:rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=east_west] replace minecraft:rail[waterlogged=false,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=east_west] replace minecraft:rail[waterlogged=false,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=south_east] replace minecraft:rail[waterlogged=false,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=false,shape=south_east] replace minecraft:rail[waterlogged=false,shape=ascending_west]
 
 ## Powered Rails
 
 # Convert to Sloped
-execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_west] replace minecraft:powered_rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_east] replace minecraft:powered_rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_east] replace minecraft:powered_rail[shape=ascending_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_north] replace minecraft:powered_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_south] replace minecraft:powered_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_south] replace minecraft:powered_rail[shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_west] replace minecraft:powered_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_east] replace minecraft:powered_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_east] replace minecraft:powered_rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_north] replace minecraft:powered_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_south] replace minecraft:powered_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_south] replace minecraft:powered_rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=ascending_west] replace minecraft:powered_rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=ascending_east] replace minecraft:powered_rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=ascending_east] replace minecraft:powered_rail[waterlogged=false,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=ascending_north] replace minecraft:powered_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=ascending_south] replace minecraft:powered_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=ascending_south] replace minecraft:powered_rail[waterlogged=false,shape=ascending_north]
 # Convert to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail[shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=east_west] replace minecraft:powered_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=north_south] replace minecraft:powered_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=east_west] replace minecraft:powered_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=north_south] replace minecraft:powered_rail[waterlogged=false,shape=east_west]
 # Convert Sloped to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail[shape=ascending_north]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail[shape=ascending_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail[shape=ascending_east]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail[shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=east_west] replace minecraft:powered_rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=east_west] replace minecraft:powered_rail[waterlogged=true,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=north_south] replace minecraft:powered_rail[waterlogged=true,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=north_south] replace minecraft:powered_rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=east_west] replace minecraft:powered_rail[waterlogged=false,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=east_west] replace minecraft:powered_rail[waterlogged=false,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=north_south] replace minecraft:powered_rail[waterlogged=false,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=false,shape=north_south] replace minecraft:powered_rail[waterlogged=false,shape=ascending_west]
 
 ## Activator Rails
 
 # Convert to Sloped
-execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_west] replace minecraft:activator_rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_east] replace minecraft:activator_rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_east] replace minecraft:activator_rail[shape=ascending_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_north] replace minecraft:activator_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_south] replace minecraft:activator_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_south] replace minecraft:activator_rail[shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_west] replace minecraft:activator_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_east] replace minecraft:activator_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_east] replace minecraft:activator_rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_north] replace minecraft:activator_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_south] replace minecraft:activator_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_south] replace minecraft:activator_rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=ascending_west] replace minecraft:activator_rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=ascending_east] replace minecraft:activator_rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=ascending_east] replace minecraft:activator_rail[waterlogged=false,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=ascending_north] replace minecraft:activator_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=ascending_south] replace minecraft:activator_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=ascending_south] replace minecraft:activator_rail[waterlogged=false,shape=ascending_north]
 # Convert to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail[shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=east_west] replace minecraft:activator_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=north_south] replace minecraft:activator_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=east_west] replace minecraft:activator_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=north_south] replace minecraft:activator_rail[waterlogged=false,shape=east_west]
 # Convert Sloped to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail[shape=ascending_north]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail[shape=ascending_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail[shape=ascending_east]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail[shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=east_west] replace minecraft:activator_rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=east_west] replace minecraft:activator_rail[waterlogged=true,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=north_south] replace minecraft:activator_rail[waterlogged=true,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=north_south] replace minecraft:activator_rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=east_west] replace minecraft:activator_rail[waterlogged=false,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=east_west] replace minecraft:activator_rail[waterlogged=false,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=north_south] replace minecraft:activator_rail[waterlogged=false,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=false,shape=north_south] replace minecraft:activator_rail[waterlogged=false,shape=ascending_west]
 
 ## Detector Rails
 
 # Convert to Sloped
-execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_west] replace minecraft:detector_rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_east] replace minecraft:detector_rail[shape=east_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_east] replace minecraft:detector_rail[shape=ascending_west]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_north] replace minecraft:detector_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_south] replace minecraft:detector_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_south] replace minecraft:detector_rail[shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_west] replace minecraft:detector_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_east] replace minecraft:detector_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_east] replace minecraft:detector_rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_north] replace minecraft:detector_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_south] replace minecraft:detector_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_south] replace minecraft:detector_rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=ascending_west] replace minecraft:detector_rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=ascending_east] replace minecraft:detector_rail[waterlogged=false,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=ascending_east] replace minecraft:detector_rail[waterlogged=false,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=ascending_north] replace minecraft:detector_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=ascending_south] replace minecraft:detector_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=ascending_south] replace minecraft:detector_rail[waterlogged=false,shape=ascending_north]
 # Convert to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail[shape=north_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail[shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=east_west] replace minecraft:detector_rail[waterlogged=true,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=north_south] replace minecraft:detector_rail[waterlogged=true,shape=east_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=east_west] replace minecraft:detector_rail[waterlogged=false,shape=north_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=north_south] replace minecraft:detector_rail[waterlogged=false,shape=east_west]
 # Convert Sloped to Non-Sloped
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail[shape=ascending_north]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail[shape=ascending_south]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail[shape=ascending_east]
-execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail[shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=east_west] replace minecraft:detector_rail[waterlogged=true,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=east_west] replace minecraft:detector_rail[waterlogged=true,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=north_south] replace minecraft:detector_rail[waterlogged=true,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=north_south] replace minecraft:detector_rail[waterlogged=true,shape=ascending_west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=east_west] replace minecraft:detector_rail[waterlogged=false,shape=ascending_north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=east_west] replace minecraft:detector_rail[waterlogged=false,shape=ascending_south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=north_south] replace minecraft:detector_rail[waterlogged=false,shape=ascending_east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=false,shape=north_south] replace minecraft:detector_rail[waterlogged=false,shape=ascending_west]

Wrench/data/wrench/functions/rotate/rails_player.mcfunction

@@ -3,82 +3,138 @@
 ## Normal Rails
 
 # Sloped up
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_south] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_west] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_north] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_east] replace minecraft:rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_south] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_north] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_east] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_south] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_west] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_north] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_east] replace minecraft:rail[waterlogged=false]
 # Sloped down
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_north] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_east] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_south] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_west] replace minecraft:rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_north] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_east] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_south] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=ascending_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_north] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_east] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_south] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=ascending_west] replace minecraft:rail[waterlogged=false]
 # Straight
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_south] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_south] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_south] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=east_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_south] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=east_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_south] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_south] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=east_west] replace minecraft:rail[waterlogged=false]
 # Curved
-execute as @s[scores={WrenchSuccess=0}, y_rotation=0..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_west] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=90..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_east] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..180] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_west] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=180..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_west] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_west] replace minecraft:rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..-0] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_east] replace minecraft:rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=0..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_east] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=90..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_east] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..180] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=180..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_east] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=south_west] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..-0] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[waterlogged=true,shape=north_east] replace minecraft:rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=0..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_west] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=90..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_east] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..180] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_west] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=180..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_east] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_west] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=south_west] replace minecraft:rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..-0] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:rail[shape=north_east] replace minecraft:rail[waterlogged=false]
 
 ## Powered Rails
 
 # Sloped up
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_south] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_west] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_north] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_east] replace minecraft:powered_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_south] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_west] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_north] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_east] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_south] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_west] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_north] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_east] replace minecraft:powered_rail[waterlogged=false]
 # Sloped down
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_north] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_east] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_south] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_west] replace minecraft:powered_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_north] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_east] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_south] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=ascending_west] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_north] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_east] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_south] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=ascending_west] replace minecraft:powered_rail[waterlogged=false]
 # Straight
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=north_south] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=east_west] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=north_south] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[waterlogged=true,shape=east_west] replace minecraft:powered_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=north_south] replace minecraft:powered_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:powered_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:powered_rail[shape=east_west] replace minecraft:powered_rail[waterlogged=false]
 
 ## Activator Rails
 
 # Sloped up
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_south] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_west] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_north] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_east] replace minecraft:activator_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_south] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_west] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_north] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_east] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_south] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_west] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_north] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_east] replace minecraft:activator_rail[waterlogged=false]
 # Sloped down
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_north] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_east] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_south] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_west] replace minecraft:activator_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_north] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_east] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_south] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=ascending_west] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_north] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_east] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_south] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=ascending_west] replace minecraft:activator_rail[waterlogged=false]
 # Straight
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=north_south] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=east_west] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=north_south] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[waterlogged=true,shape=east_west] replace minecraft:activator_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=north_south] replace minecraft:activator_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:activator_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:activator_rail[shape=east_west] replace minecraft:activator_rail[waterlogged=false]
 
 ## Detector Rails
 # Sloped up
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_south] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_west] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_north] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_east] replace minecraft:detector_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_south] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_west] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_north] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_east] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_south] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_west] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_north] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_east] replace minecraft:detector_rail[waterlogged=false]
 # Sloped down
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_north] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_east] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_south] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_west] replace minecraft:detector_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_north] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_east] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_south] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=ascending_west] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] if block ~ ~1 ~-1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_north] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_north] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] if block ~1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_east] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_east] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] if block ~ ~1 ~1 #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_south] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] if block ~-1 ~1 ~ #minecraft:rails store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=ascending_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=ascending_west] replace minecraft:detector_rail[waterlogged=false]
 # Straight
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail
-execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=north_south] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=east_west] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=north_south] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[waterlogged=true,shape=east_west] replace minecraft:detector_rail[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=north_south] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=north_south] replace minecraft:detector_rail[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess unless block ~ ~ ~ minecraft:detector_rail[shape=east_west] run fill ~ ~ ~ ~ ~ ~ minecraft:detector_rail[shape=east_west] replace minecraft:detector_rail[waterlogged=false]
 
 ## Non-processed
 

Wrench/data/wrench/functions/rotate/redstone.mcfunction

@@ -4,9 +4,9 @@
 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:{tag:{display:{Lore:['{"text":"Flip"}']}}}}] run function wrench:rotate/redstone_flip
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/redstone_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"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

Wrench/data/wrench/functions/rotate/redstone_click.mcfunction

@@ -29,6 +29,14 @@ execute if block ~ ~ ~ minecraft:hopper if score py WrenchRaycast matches 10 run
 
 ## Standard Redstone Components
 
+# Barrel
+execute as @s[scores={WrenchSuccess=0}] if score py WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=up] replace minecraft:barrel
+execute as @s[scores={WrenchSuccess=0}] if score py WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=down] replace minecraft:barrel
+execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=north] replace minecraft:barrel
+execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=east] replace minecraft:barrel
+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
+
 # 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
@@ -77,6 +85,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:sticky_piston[facing=south] replace minecraft:sticky_piston
 execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:sticky_piston[facing=west] replace minecraft:sticky_piston
 
+## Redstone Components Waterlog-able
+
+# Calibrated Sculk Sensor
+execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 15 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+
+## Redstone Components with Properties
+
 # Repeater
 #	Delay 1
 execute as @s[scores={WrenchSuccess=0}] if score pz WrenchRaycast matches 0 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:repeater[delay=1,facing=north] replace minecraft:repeater[delay=1]
@@ -114,6 +136,7 @@ execute as @s[scores={WrenchSuccess=0}] if score px WrenchRaycast matches 0 stor
 ## Non-processed
 
 # Process Non-Full Blocks
+execute as @s[scores={WrenchSuccess=-2}] if block ~ ~ ~ minecraft:calibrated_sculk_sensor store result score @s WrenchSuccess run function wrench:rotate/redstone_player
 execute as @s[scores={WrenchSuccess=-2}] if block ~ ~ ~ minecraft:repeater store result score @s WrenchSuccess run function wrench:rotate/redstone_player
 execute as @s[scores={WrenchSuccess=-2}] if block ~ ~ ~ minecraft:comparator store result score @s WrenchSuccess run function wrench:rotate/redstone_player
 execute as @s[scores={WrenchSuccess=-2}] if block ~ ~ ~ minecraft:hopper store result score @s WrenchSuccess run function wrench:rotate/redstone_player

Wrench/data/wrench/functions/rotate/redstone_cycle.mcfunction

@@ -2,6 +2,14 @@
 
 ## Standard Redstone Components
 
+# Barrel
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=east] replace minecraft:barrel[facing=up]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=up] replace minecraft:barrel[facing=north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=north] replace minecraft:barrel[facing=west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=west] replace minecraft:barrel[facing=down]
+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]
+
 # 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]
@@ -49,6 +57,18 @@ 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:sticky_piston[facing=down] replace minecraft:sticky_piston[facing=south]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:sticky_piston[facing=south] replace minecraft:sticky_piston[facing=east]
 
+## Redstone Components Waterlog-able
+
+# Calibrated Sculk Sensor
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=east]
+
 ## Redstone Components with Properties
 
 # Repeater

Wrench/data/wrench/functions/rotate/redstone_flip.mcfunction

@@ -8,6 +8,14 @@ execute as @s[scores={WrenchSuccess=0}] if block ~ ~ ~ minecraft:hopper[facing=d
 
 ## Standard Redstone Components
 
+# Barrel
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=east] replace minecraft:barrel[facing=west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=up] replace minecraft:barrel[facing=down]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=north] replace minecraft:barrel[facing=south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=west] replace minecraft:barrel[facing=east]
+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]
+
 # 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]
@@ -38,7 +46,7 @@ execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:observer[facing=down] replace minecraft:observer[facing=up]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:observer[facing=south] replace minecraft:observer[facing=north]
 
- #Piston
+# Piston
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:piston[facing=east] replace minecraft:piston[facing=west]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:piston[facing=up] replace minecraft:piston[facing=down]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:piston[facing=north] replace minecraft:piston[facing=south]
@@ -54,6 +62,18 @@ 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:sticky_piston[facing=down] replace minecraft:sticky_piston[facing=up]
 execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:sticky_piston[facing=south] replace minecraft:sticky_piston[facing=north]
 
+## Redstone Components Waterlog-able
+
+# Calibrated Sculk Sensor
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=true,facing=north]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=west]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=south]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=east]
+execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=false,facing=north]
+
 ## Redstone Components with Properties
 
 # Repeater

Wrench/data/wrench/functions/rotate/redstone_player.mcfunction

@@ -5,6 +5,14 @@ execute as @s[scores={WrenchSuccess=-2}] run scoreboard players set @s WrenchSuc
 
 ## Redstone Components
 
+# Barrel
+execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=up] replace minecraft:barrel
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=down] replace minecraft:barrel
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=north] replace minecraft:barrel
+execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:barrel[facing=east] replace minecraft:barrel
+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
+
 # 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
@@ -53,6 +61,18 @@ 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:sticky_piston[facing=south] replace minecraft:sticky_piston
 execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:sticky_piston[facing=west] replace minecraft:sticky_piston
 
+## Redstone Components Waterlog-able
+
+# Calibrated Sculk Sensor
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=true,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=true]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=south] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=west] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=north] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+execute as @s[scores={WrenchSuccess=0}, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:calibrated_sculk_sensor[waterlogged=false,facing=east] replace minecraft:calibrated_sculk_sensor[waterlogged=false]
+
 ## Redstone Components with Properties
 
 # Repeater

Wrench/data/wrench/functions/rotate/stairs.mcfunction

@@ -1,7 +1,7 @@
 ### Stairs
 
 # Rotate Based on Wrench Mode
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Flip"}']}}}}] run function wrench:rotate/stairs_flip
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"Face Player"}']}}}}] run function wrench:rotate/stairs_player
-execute as @s[scores={WrenchSuccess=0},nbt={SelectedItem:{tag:{display:{Lore:['{"text":"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

Wrench/data/wrench/functions/use.mcfunction

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

Wrench/data/wrench/functions/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",tag:{display:{Name:'"Wrench"'}}}}] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[nbt={Inventory:[{Slot:-106b, id:"minecraft:carrot_on_a_stick",tag:{display:{Name:'"Wrench"'}}}]}] weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
+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]

Wrench/data/wrench/functions/wrench/give.mcfunction

@@ -1 +1 @@
-give @s minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
+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]

Wrench/data/wrench/functions/wrench/offhand.mcfunction

@@ -2,18 +2,22 @@
 scoreboard players set @s WrenchSuccess 0
 
 #Change wrench mode
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Default"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Flip"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Flip"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Face Player"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Player"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Face Click"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Click"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"North"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-execute as @s[scores={WrenchSuccess=0},nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Terracotta mode"}']}}}]}] store result score @s WrenchSuccess run item replace entity @s weapon.offhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Default"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
+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]
+# 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]
+# 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]
+
 
 #Confirm with action bar
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Default"}']}}}]}] actionbar {"text":"Mode: Default"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Flip"}']}}}]}] actionbar {"text":"Mode: Flip"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Player"}']}}}]}] actionbar {"text":"Mode: Face Player"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Face Click"}']}}}]}] actionbar {"text":"Mode: Face Click"}
-title @s[nbt={Inventory:[{Slot:-106b, tag:{display:{Lore:['{"text":"Terracotta mode"}']}}}]}] actionbar {"text":"Mode: Terracotta"}
+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"}]
 
 #Reset input
 scoreboard players set @s WrenchInput 0

Wrench/data/wrench/functions/wrench/terracotta.mcfunction

@@ -1,9 +1,9 @@
 #Advance terracotta mode rotation, show title
-item replace entity @s[tag=TerracottaNORTH] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"East"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[tag=TerracottaEAST] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"South"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[tag=TerracottaSOUTH] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"West"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-item replace entity @s[tag=TerracottaWEST] weapon.mainhand with minecraft:carrot_on_a_stick{Wrench: 597832584, HideFlags: 1, display: {Lore: ['{"text":"Terracotta mode"}', '{"text":"North"}'], Name: '{"italic":false,"text":"LZ\'s Wrench"}'}, Enchantments: [{lvl: 1s, id: "minecraft:unbreaking"}]}
-title @s[tag=TerracottaNORTH] actionbar {"text":"Terracotta Mode: East"}
-title @s[tag=TerracottaEAST] actionbar {"text":"Terracotta Mode: South"}
-title @s[tag=TerracottaSOUTH] actionbar {"text":"Terracotta Mode: West"}
-title @s[tag=TerracottaWEST] actionbar {"text":"Terracotta Mode: North"}
+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]
+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"}]
+title @s[tag=TerracottaWEST] actionbar [{"text":"Terracotta Mode: ","color":"green"},{"text":"North","color":"white"}]

Wrench/data/wrench/tags/blocks/partialbox.json

@@ -5,6 +5,7 @@
         "minecraft:hopper",
         "minecraft:repeater",
         "minecraft:comparator",
+        "minecraft:calibrated_sculk_sensor",
         "#minecraft:slabs",
         "#minecraft:stairs",
         "minecraft:end_rod",

Wrench/data/wrench/tags/blocks/redstone.json

@@ -1,6 +1,7 @@
 {
     "replace": false,
     "values": [
+        "minecraft:barrel",
         "minecraft:dispenser",
         "minecraft:dropper",
         "minecraft:piston",

Wrench/pack.mcmeta

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