Fix advanced blast furnace fuel and progress

data/galaxy/functions/block/advanced_blast_furnace/main.mcfunction

@@ -7,8 +7,5 @@ execute unless predicate galaxy:block/advanced_blast_furnace run function galaxy
 # block working
 function galaxy:block/advanced_blast_furnace/work/main
 
-# block states
-# function galaxy:block/advanced_blast_furnace/states/main
-
 # gui function
 execute if predicate minecraft:block_states/open run function galaxy:gui/advanced_blast_furnace/main

data/galaxy/functions/block/advanced_blast_furnace/work/get-processor_status.mcfunction

@@ -1,19 +1,31 @@
-scoreboard players set @s workProcStatus 0
+scoreboard players set @s workProcStatus 10
+scoreboard players set @s workProcStatus-1 0
 scoreboard players set @s workProcStatus0 0
 scoreboard players set @s workProcStatus1 0
-scoreboard players set @s workProcStatus-1 0
+scoreboard players set @s workProcStatus2 0
+scoreboard players set @s workProcStatus3 0
+
+execute if score @s workProc1CanWork matches -1 run scoreboard players add @s workProcStatus-1 1
+# execute if score @s workProc2CanWork matches -1 run scoreboard players add @s workProcStatus-1 1
 
 execute if score @s workProc1CanWork matches 0 if score @s workProc1Burn matches 0 run scoreboard players add @s workProcStatus0 1
-# execute if score @s workProc2Status matches 0 if score @s workProc2Burn matches 0 run scoreboard players add @s workProcStatus0 1
+# execute if score @s workProc2CanWork matches 0 if score @s workProc2Burn matches 0 run scoreboard players add @s workProcStatus0 1
 
-execute if score @s workProc1CanWork matches 1 if score @s workProc1Burn matches 1.. run scoreboard players add @s workProcStatus1 1
-# execute if score @s workProc2Status matches 1 if score @s workProc2Burn matches 1.. run scoreboard players add @s workProcStatus1 1
+execute if score @s workProc1CanWork matches 1 if score @s workProc1Burn matches 0 run scoreboard players add @s workProcStatus1 1
+# execute if score @s workProc2CanWork matches 1 if score @s workProc2Burn matches 0 run scoreboard players add @s workProcStatus1 1
 
-execute if score @s workProc1CanWork matches -1 run scoreboard players add @s workProcStatus-1 1
-# execute if score @s workProc2Status matches -1 run scoreboard players add @s workProcStatus 1
+execute if score @s workProc1CanWork matches 1 if score @s workProc1Burn matches 1.. run scoreboard players add @s workProcStatus2 1
+# execute if score @s workProc2CanWork matches 1 if score @s workProc2Burn matches 1.. run scoreboard players add @s workProcStatus2 1
 
-scoreboard players operation @s workProcStatus += @s workProcStatus-1
+execute if score @s workProc1CanWork matches 0 if score @s workProc1Burn matches 1.. run scoreboard players add @s workProcStatus3 1
+# execute if score @s workProc2CanWork matches 0 if score @s workProc2Burn matches 1.. run scoreboard players add @s workProcStatus3 1
+
+scoreboard players operation @s workProcStatus += @s workProcStatus3
+scoreboard players operation @s workProcStatus *= #10 num
+scoreboard players operation @s workProcStatus += @s workProcStatus2
 scoreboard players operation @s workProcStatus *= #10 num
 scoreboard players operation @s workProcStatus += @s workProcStatus1
 scoreboard players operation @s workProcStatus *= #10 num
 scoreboard players operation @s workProcStatus += @s workProcStatus0
+scoreboard players operation @s workProcStatus *= #10 num
+scoreboard players operation @s workProcStatus += @s workProcStatus-1

data/galaxy/functions/block/advanced_blast_furnace/work/main.mcfunction

@@ -4,6 +4,7 @@ function galaxy:block/advanced_blast_furnace/work/check-processor_status
 execute if entity @s[tag=workProcStatusUpdate] run function galaxy:gui/advanced_blast_furnace/update-process
 tag @s[tag=workProcStatusUpdate] remove workProcStatusUpdate
 
-execute if predicate minecraft:block_states/open if score @s workProcStatus1 matches 1..9 run function galaxy:gui/advanced_blast_furnace/update-process
-
-function galaxy:block/advanced_blast_furnace/work/get-status
+scoreboard players set #1 calcu_temp 0
+execute if score @s workProcStatus2 matches 1..9 run scoreboard players set #1 calcu_temp 1
+execute if score @s workProcStatus3 matches 1..9 run scoreboard players set #1 calcu_temp 1
+execute if predicate minecraft:block_states/open if score #1 calcu_temp matches 1 run function galaxy:gui/advanced_blast_furnace/update-process

data/galaxy/functions/block/advanced_blast_furnace/work/processor1/main.mcfunction

@@ -14,4 +14,5 @@ execute if score @s workProc1CanWork matches 1 if score @s workProc1 >= #advance
 
 scoreboard players remove @s[scores={workProc1Burn=1..}] workProc1Burn 1
 
-execute if score @s workProc1CanWork matches 1 run function galaxy:block/advanced_blast_furnace/work/processor1/get-progress
+execute unless score @s workProc1Burn matches 1.. if score @s workProc1 matches 1.. run function galaxy:block/advanced_blast_furnace/work/processor1/burn/check-fuel
+execute unless score @s workProc1Burn matches 1.. if score @s workProc1 matches 1.. unless score @s workProc1CanFuel matches 1 run scoreboard players set @s workProc1 0

data/galaxy/functions/block/coke_furnace/work/get-processor_status.mcfunction

@@ -1,19 +1,19 @@
-scoreboard players set @s workProcStatus 0
+scoreboard players set @s workProcStatus 10
+scoreboard players set @s workProcStatus-1 0
 scoreboard players set @s workProcStatus0 0
 scoreboard players set @s workProcStatus1 0
-scoreboard players set @s workProcStatus-1 0
+
+execute if score @s workProc1CanWork matches -1 run scoreboard players add @s workProcStatus-1 1
+# execute if score @s workProc2CanWork matches -1 run scoreboard players add @s workProcStatus-1 1
 
 execute if score @s workProc1CanWork matches 0 run scoreboard players add @s workProcStatus0 1
-# execute if score @s workProc2Status matches 0 run scoreboard players add @s workProcStatus0 1
+# execute if score @s workProc2CanWork matches 0 run scoreboard players add @s workProcStatus0 1
 
 execute if score @s workProc1CanWork matches 1 run scoreboard players add @s workProcStatus1 1
-# execute if score @s workProc2Status matches 1 run scoreboard players add @s workProcStatus1 1
-
-execute if score @s workProc1CanWork matches -1 run scoreboard players add @s workProcStatus-1 1
-# execute if score @s workProc2Status matches -1 run scoreboard players add @s workProcStatus 1
+# execute if score @s workProc2CanWork matches 1 run scoreboard players add @s workProcStatus1 1
 
-scoreboard players operation @s workProcStatus += @s workProcStatus-1
-scoreboard players operation @s workProcStatus *= #10 num
 scoreboard players operation @s workProcStatus += @s workProcStatus1
 scoreboard players operation @s workProcStatus *= #10 num
 scoreboard players operation @s workProcStatus += @s workProcStatus0
+scoreboard players operation @s workProcStatus *= #10 num
+scoreboard players operation @s workProcStatus += @s workProcStatus-1

data/galaxy/functions/block/meta/scoreboard/register.mcfunction

@@ -4,6 +4,8 @@ scoreboard objectives add workStatus dummy "num-Block work status"
 scoreboard objectives add workProcStatus dummy "num-Block work processor status"
 scoreboard objectives add workProcStatus0 dummy "num-Block work processor status 0"
 scoreboard objectives add workProcStatus1 dummy "num-Block work processor status 1"
+scoreboard objectives add workProcStatus2 dummy "num-Block work processor status 2"
+scoreboard objectives add workProcStatus3 dummy "num-Block work processor status 3"
 scoreboard objectives add workProcStatus-1 dummy "num-Block work processor status -1"
 
 scoreboard objectives add workProc1 dummy "num-Block work processor1"

data/galaxy/functions/block/placer/advanced_blast_furnace.mcfunction

@@ -10,6 +10,8 @@ scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workStatus 0
 scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProcStatus 0
 scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProcStatus0 0
 scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProcStatus1 0
+scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProcStatus2 0
+scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProcStatus3 0
 scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProcStatus-1 0
 scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProc1 0
 scoreboard players set @e[tag=advanced_blast_furnace,tag=init] workProc1CanWork 0