Fix catch-all sorting. Change Barrier Blocks for Amethyst Blocks

Catch all sorting fix Modifying sorting pad requirements to amethyst block in place of barriers
isaaclepes · Jul 20, 2021 · 4e03f21 · 4e03f21
1 parent 7bea8b3
commit 4e03f21
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 20 deletions.
diff --git a/data/sss/functions/second.mcfunction b/data/sss/functions/second.mcfunction
@@ -3,16 +3,16 @@
 # Called by tick function
 
 # Primary routine
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:target if block ~ ~-2 ~ minecraft:barrier run function sss:sort
-execute as @e[type=item] at @s if block ~ ~-2 ~ minecraft:target if block ~ ~-3 ~ minecraft:barrier run function sss:sort
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:target if block ~ ~-2 ~ minecraft:amethyst_block run function sss:sort
+execute as @e[type=item] at @s if block ~ ~-2 ~ minecraft:target if block ~ ~-3 ~ minecraft:amethyst_block run function sss:sort
 
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:blast_furnace if block ~ ~-2 ~ minecraft:barrier run function sss:smelt
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:furnace if block ~ ~-2 ~ minecraft:barrier run function sss:furnace
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:smoker if block ~ ~-2 ~ minecraft:barrier run function sss:smoker
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:blast_furnace if block ~ ~-2 ~ minecraft:amethyst_block run function sss:smelt
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:furnace if block ~ ~-2 ~ minecraft:amethyst_block run function sss:furnace
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:smoker if block ~ ~-2 ~ minecraft:amethyst_block run function sss:smoker
 
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:coal_block if block ~ ~-2 ~ minecraft:furnace if block ~ ~-3 ~ minecraft:barrier run function sss:fuelfurnace
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:coal_block if block ~ ~-2 ~ minecraft:blast_furnace if block ~ ~-3 ~ minecraft:barrier run function sss:fuelsmelt
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:coal_block if block ~ ~-2 ~ minecraft:smoker if block ~ ~-3 ~ minecraft:barrier run function sss:fuelsmoker
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:coal_block if block ~ ~-2 ~ minecraft:furnace if block ~ ~-3 ~ minecraft:amethyst_block run function sss:fuelfurnace
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:coal_block if block ~ ~-2 ~ minecraft:blast_furnace if block ~ ~-3 ~ minecraft:amethyst_block run function sss:fuelsmelt
+execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:coal_block if block ~ ~-2 ~ minecraft:smoker if block ~ ~-3 ~ minecraft:amethyst_block run function sss:fuelsmoker
 
 # Kill Empty Warehouse Crates to prevent infinite shulker boxes
     #Known issues:

diff --git a/data/sss/functions/sort.mcfunction b/data/sss/functions/sort.mcfunction
@@ -1016,8 +1016,5 @@ execute as @s if entity @s[type=item,nbt={Item:{id:"minecraft:weathered_cut_copp
 execute as @s if entity @s[type=item,nbt={Item:{id:"minecraft:weathered_cut_copper_stairs"}}] run teleport @s @e[limit=1,sort=random,type=minecraft:item_frame,distance=..256,tag=sss_sort_target,nbt={Item:{id:"minecraft:weathered_cut_copper_stairs"}}]
 execute as @s if entity @s[type=item,nbt={Item:{id:"minecraft:white_candle"}}] run teleport @s @e[limit=1,sort=random,type=minecraft:item_frame,distance=..256,tag=sss_sort_target,nbt={Item:{id:"minecraft:white_candle"}}]
 execute as @s if entity @s[type=item,nbt={Item:{id:"minecraft:yellow_candle"}}] run teleport @s @e[limit=1,sort=random,type=minecraft:item_frame,distance=..256,tag=sss_sort_target,nbt={Item:{id:"minecraft:yellow_candle"}}]
-## Catch All Sorting
-execute as @e[type=item] at @s if block ~ ~-1 ~ minecraft:target if block ~ ~-2 ~ minecraft:barrier run teleport @s @e[limit=1,sort=random,type=minecraft:item_frame,distance=..256,tag=sss_sort_target,nbt={Item:{tag:{display:{Name:'{"text":"Catch All"}'}}}}]
-execute as @e[type=item] at @s if block ~ ~-2 ~ minecraft:target if block ~ ~-3 ~ minecraft:barrier run teleport @s @e[limit=1,sort=random,type=minecraft:item_frame,distance=..256,tag=sss_sort_target,nbt={Item:{tag:{display:{Name:'{"text":"Catch All"}'}}}}]
-
-
+## Catch All Sorting, if none of the above succeeded, attempt to send item to item frame tagged with Catch All
+execute as @s if entity @s[type=item] run teleport @s @e[limit=1,sort=random,type=minecraft:item_frame,distance=..256,tag=sss_sort_target]
diff --git a/data/sss/functions/tagger.mcfunction b/data/sss/functions/tagger.mcfunction
@@ -6,4 +6,5 @@ execute as @e[type=minecraft:item_frame,tag=!sss_smelt_target,nbt={Item:{tag:{di
 execute as @e[type=minecraft:item_frame,tag=!sss_smoker_target,nbt={Item:{tag:{display:{Name:'{"text":"Smoker Target"}'}}}}] run function sss:targetsmoker
 execute as @e[type=minecraft:item_frame,tag=!sss_furnace_fuel,nbt={Item:{tag:{display:{Name:'{"text":"Furnace Fuel"}'}}}}] run function sss:targetfuelfurnace
 execute as @e[type=minecraft:item_frame,tag=!sss_smelt_fuel,nbt={Item:{tag:{display:{Name:'{"text":"Smelt Fuel"}'}}}}] run function sss:targetfuelsmelt
-execute as @e[type=minecraft:item_frame,tag=!sss_smoker_fuel,nbt={Item:{tag:{display:{Name:'{"text":"Smoker Fuel"}'}}}}] run function sss:targetfuelsmoker
+execute as @e[type=minecraft:item_frame,tag=!sss_smoker_fuel,nbt={Item:{tag:{display:{Name:'{"text":"Smoker Fuel"}'}}}}] run function sss:targetfuelsmoker
+execute as @e[type=minecraft:item_frame,tag=!sss_smoker_fuel,nbt={Item:{tag:{display:{Name:'{"text":"Catch All"}'}}}}] run function sss:targetcatchall
diff --git a/data/sss/functions/targetcapture.mcfunction b/data/sss/functions/targetcapture.mcfunction
@@ -6,4 +6,5 @@ tag @s remove sss_smoker_target
 tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
-tag @s remove sss_furnace_fuel
+tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetcatchall.mcfunction b/data/sss/functions/targetcatchall.mcfunction
@@ -0,0 +1,9 @@
+tag @s remove sss_shulker_target
+tag @s remove sss_sort_target
+tag @s remove sss_smelt_target
+tag @s remove sss_smoker_target
+tag @s remove sss_furnace_target
+tag @s remove sss_smelt_fuel
+tag @s remove sss_smoker_fuel
+tag @s remove sss_furnace_fuel
+tag @s add sss_catchall
diff --git a/data/sss/functions/targetfuelfurnace.mcfunction b/data/sss/functions/targetfuelfurnace.mcfunction
@@ -5,4 +5,5 @@ tag @s remove sss_smoker_target
 tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
-tag @s add sss_furnace_fuel
+tag @s add sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetfuelsmelt.mcfunction b/data/sss/functions/targetfuelsmelt.mcfunction
@@ -5,4 +5,5 @@ tag @s remove sss_smoker_target
 tag @s remove sss_furnace_target
 tag @s remove sss_furnace_fuel
 tag @s remove sss_smoker_fuel
-tag @s add sss_smelt_fuel
+tag @s add sss_smelt_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetfuelsmoker.mcfunction b/data/sss/functions/targetfuelsmoker.mcfunction
@@ -5,4 +5,5 @@ tag @s remove sss_smoker_target
 tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s add sss_smoker_fuel
-tag @s remove sss_furnace_fuel
+tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetfurnace.mcfunction b/data/sss/functions/targetfurnace.mcfunction
@@ -5,4 +5,5 @@ tag @s remove sss_smoker_target
 tag @s add sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
-tag @s remove sss_furnace_fuel
+tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetshulker.mcfunction b/data/sss/functions/targetshulker.mcfunction
@@ -6,3 +6,4 @@ tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
 tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetsmelt.mcfunction b/data/sss/functions/targetsmelt.mcfunction
@@ -6,3 +6,4 @@ tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
 tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetsmoker.mcfunction b/data/sss/functions/targetsmoker.mcfunction
@@ -6,3 +6,4 @@ tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
 tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall
diff --git a/data/sss/functions/targetsort.mcfunction b/data/sss/functions/targetsort.mcfunction
@@ -5,4 +5,5 @@ tag @s remove sss_smoker_target
 tag @s remove sss_furnace_target
 tag @s remove sss_smelt_fuel
 tag @s remove sss_smoker_fuel
-tag @s remove sss_furnace_fuel
+tag @s remove sss_furnace_fuel
+tag @s remove sss_catchall