fixes

LTHCTheMaster · Jul 15, 2022 · d39bd82 · d39bd82
1 parent 5a1ece4
commit d39bd82
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 17 deletions.
diff --git a/...k/data/lthc.advancenergy/functions/controller/visual/advanced_carbon_generator.mcfunction b/...k/data/lthc.advancenergy/functions/controller/visual/advanced_carbon_generator.mcfunction
@@ -2,8 +2,8 @@ function lthc.advancenergy:controller/work/advanced_carbon_generator/main
 execute if predicate lthc.advancenergy:is_barrel_open run function lthc.advancenergy:controller/visual/carbon_generator_2
 
 #Update model depends on BurnTime (on/off)
-execute if score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170215
-execute unless score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170216
+execute if score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170215
+execute unless score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170216
 
 # Lock hopper
 execute positioned ~ ~-1 ~ if block ~ ~ ~ hopper run data modify block ~ ~ ~ TransferCooldown set value 100
diff --git a/Datapack/data/lthc.advancenergy/functions/controller/visual/carbon_generator.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/visual/carbon_generator.mcfunction
@@ -2,8 +2,8 @@ function lthc.advancenergy:controller/work/carbon_generator/main
 execute if predicate lthc.advancenergy:is_barrel_open run function lthc.advancenergy:controller/visual/carbon_generator_2
 
 #Update model depends on BurnTime (on/off)
-execute if score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170204
-execute unless score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170205
+execute if score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170204
+execute unless score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170205
 
 # Lock hopper
 execute positioned ~ ~-1 ~ if block ~ ~ ~ hopper run data modify block ~ ~ ~ TransferCooldown set value 100
diff --git a/Datapack/data/lthc.advancenergy/functions/controller/visual/dust_generator.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/visual/dust_generator.mcfunction
@@ -2,8 +2,8 @@ function lthc.advancenergy:controller/work/dust_generator/main
 execute if predicate lthc.advancenergy:is_barrel_open run function lthc.advancenergy:controller/visual/dust_generator_2
 
 #Update model depends on BurnTime (on/off)
-execute if score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170209
-execute unless score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170210
+execute if score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170209
+execute unless score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170210
 
 # Lock hopper
 execute positioned ~ ~-1 ~ if block ~ ~ ~ hopper run data modify block ~ ~ ~ TransferCooldown set value 100
diff --git a/Datapack/data/lthc.advancenergy/functions/controller/visual/potato_generator.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/visual/potato_generator.mcfunction
@@ -2,8 +2,8 @@ function lthc.advancenergy:controller/work/potato_generator/main
 execute if predicate lthc.advancenergy:is_barrel_open run function lthc.advancenergy:controller/visual/potato_generator_2
 
 #Update model depends on BurnTime (on/off)
-execute if score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170223
-execute unless score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170224
+execute if score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170223
+execute unless score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170224
 
 # Lock hopper
 execute positioned ~ ~-1 ~ if block ~ ~ ~ hopper run data modify block ~ ~ ~ TransferCooldown set value 100
diff --git a/Datapack/data/lthc.advancenergy/functions/controller/visual/refinery.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/visual/refinery.mcfunction
@@ -2,8 +2,8 @@ function lthc.advancenergy:controller/work/refinery/main
 execute if predicate lthc.advancenergy:is_barrel_open run function lthc.advancenergy:controller/visual/refinery_2
 
 #Update model depends on BurnTime (on/off)
-execute if score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170217
-execute unless score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170218
+execute if score @s lthc.advancenergy.working matches 0 unless entity @s[tag=lthc.advancenergy.just_end_process] run data modify entity @s Item.tag.CustomModelData set value 170217
+execute unless score @s lthc.advancenergy.working matches 0 run data modify entity @s Item.tag.CustomModelData set value 170218
 
 # Lock hopper
 execute positioned ~ ~-1 ~ if block ~ ~ ~ hopper run data modify block ~ ~ ~ TransferCooldown set value 100
diff --git a/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/out_scan.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/out_scan.mcfunction
@@ -31,5 +31,8 @@ data remove storage lthc.advancenergy:main RefineryCurrent
 # Modify the block
 data modify block ~ ~ ~ Items set from storage lthc.advancenergy:main Items
 
-# Update the GUI
+# Add a tag to avoid on/off/on blinking
+tag @s add lthc.advancenergy.just_end_process
+# Update the interface
+scoreboard players remove @s lthc.advancenergy.working 1
 function lthc.advancenergy:controller/visual/refinery_2
diff --git a/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/gold.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/gold.mcfunction
@@ -7,7 +7,7 @@ execute if score #success lthc.advancenergy.data matches 0 run data modify stora
 # 16b slot
 scoreboard players set #success lthc.advancenergy.data 0
 execute store success score #success lthc.advancenergy.data if data storage lthc.advancenergy:main Items[{Slot:16b,id:"minecraft:gold_ingot"}]
-execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:14b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
+execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:16b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
 execute if score #success lthc.advancenergy.data matches 0 run data modify storage lthc.advancenergy:main Items append value {Slot:16b,id:"minecraft:gold_ingot",Count:1b}
 
 # Reset the Storage

diff --git a/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/iron.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/iron.mcfunction
@@ -7,7 +7,7 @@ execute if score #success lthc.advancenergy.data matches 0 run data modify stora
 # 16b slot
 scoreboard players set #success lthc.advancenergy.data 0
 execute store success score #success lthc.advancenergy.data if data storage lthc.advancenergy:main Items[{Slot:16b,id:"minecraft:iron_ingot"}]
-execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:14b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
+execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:16b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
 execute if score #success lthc.advancenergy.data matches 0 run data modify storage lthc.advancenergy:main Items append value {Slot:16b,id:"minecraft:iron_ingot",Count:1b}
 
 # Reset the Storage

diff --git a/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/lead.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/lead.mcfunction
@@ -8,7 +8,7 @@ execute if score #success lthc.advancenergy.data matches 0 run function lthc.adv
 # 16b slot
 scoreboard players set #success lthc.advancenergy.data 0
 execute store success score #success lthc.advancenergy.data if data storage lthc.advancenergy:main Items[{Slot:16b,tag:{lthc_advancenergy:{lead_ingot:1b}}}]
-execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:14b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
+execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:16b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
 execute if score #success lthc.advancenergy.data matches 0 run function lthc.advancenergy:controller/work/refinery/output/sub_functions/edit/lead_ingot_2
 
 # Reset the Storage

diff --git a/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/silver.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/silver.mcfunction
@@ -8,7 +8,7 @@ execute if score #success lthc.advancenergy.data matches 0 run function lthc.adv
 # 16b slot
 scoreboard players set #success lthc.advancenergy.data 0
 execute store success score #success lthc.advancenergy.data if data storage lthc.advancenergy:main Items[{Slot:16b,tag:{lthc_advancenergy:{silver_ingot:1b}}}]
-execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:14b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
+execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:16b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
 execute if score #success lthc.advancenergy.data matches 0 run function lthc.advancenergy:controller/work/refinery/output/sub_functions/edit/silver_ingot_2
 
 # Reset the Storage

diff --git a/...ck/data/lthc.advancenergy/functions/controller/work/refinery/output/simplunium.mcfunction b/...ck/data/lthc.advancenergy/functions/controller/work/refinery/output/simplunium.mcfunction
@@ -8,7 +8,7 @@ execute if score #success lthc.advancenergy.data matches 0 run function lthc.adv
 # 16b slot
 scoreboard players set #success lthc.advancenergy.data 0
 execute store success score #success lthc.advancenergy.data if data storage lthc.advancenergy:main Items[{Slot:16b,tag:{ctc:{traits:{"metal/simplunium":1b,"ingot":1b}}}}]
-execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:14b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
+execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:16b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
 execute if score #success lthc.advancenergy.data matches 0 run function lthc.advancenergy:controller/work/refinery/output/sub_functions/edit/simplunium_ingot_2
 
 # Reset the Storage

diff --git a/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/tin.mcfunction b/Datapack/data/lthc.advancenergy/functions/controller/work/refinery/output/tin.mcfunction
@@ -8,7 +8,7 @@ execute if score #success lthc.advancenergy.data matches 0 run function lthc.adv
 # 16b slot
 scoreboard players set #success lthc.advancenergy.data 0
 execute store success score #success lthc.advancenergy.data if data storage lthc.advancenergy:main Items[{Slot:16b,tag:{lthc_advancenergy:{tin_ingot:1b}}}]
-execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:14b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
+execute if score #success lthc.advancenergy.data matches 1 store result storage lthc.advancenergy:main Items[{Slot:16b}].Count byte -1 run data get storage lthc.advancenergy:main Items[{Slot:16b}].Count -1.001
 execute if score #success lthc.advancenergy.data matches 0 run function lthc.advancenergy:controller/work/refinery/output/sub_functions/edit/tin_ingot_2
 
 # Reset the Storage