From 080c6b1b713549e9583b5af237c7b23863451182 Mon Sep 17 00:00:00 2001 From: edayot Date: Tue, 27 Jun 2023 22:44:13 +0200 Subject: [PATCH] fix: variables are now set before auto_handled_output --- .../container/auto_handled_output/before.mcfunction | 12 ++++++++++++ .../container/auto_handled_output/repart.mcfunction | 9 --------- .../impl/container/output/repart_2.mcfunction | 12 ++++++++++-- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 data/itemio/functions/impl/container/auto_handled_output/before.mcfunction diff --git a/data/itemio/functions/impl/container/auto_handled_output/before.mcfunction b/data/itemio/functions/impl/container/auto_handled_output/before.mcfunction new file mode 100644 index 00000000..776aeb16 --- /dev/null +++ b/data/itemio/functions/impl/container/auto_handled_output/before.mcfunction @@ -0,0 +1,12 @@ +data remove storage itemio:main.output input +data modify storage itemio:main.output input set from storage itemio:io input +data remove storage itemio:io output + + +scoreboard players set #if_item_input itemio.math.output 0 +scoreboard players set #if_filter_define itemio.math.output 0 +execute store result score #if_item_input itemio.math.output if data storage itemio:main.output input +execute store result score #if_filter_define itemio.math.output if data storage itemio:io filter + +function #itemio:event/auto_handled_output + diff --git a/data/itemio/functions/impl/container/auto_handled_output/repart.mcfunction b/data/itemio/functions/impl/container/auto_handled_output/repart.mcfunction index 9ab3b18f..300755a4 100644 --- a/data/itemio/functions/impl/container/auto_handled_output/repart.mcfunction +++ b/data/itemio/functions/impl/container/auto_handled_output/repart.mcfunction @@ -1,15 +1,6 @@ # @public #A item arrive from : storage itemio:io Item_auto_output -data remove storage itemio:main.output input -data modify storage itemio:main.output input set from storage itemio:io input -data remove storage itemio:io output - - -scoreboard players set #if_item_input itemio.math.output 0 -scoreboard players set #if_filter_define itemio.math.output 0 -execute store result score #if_item_input itemio.math.output if data storage itemio:main.output input -execute store result score #if_filter_define itemio.math.output if data storage itemio:io filter execute if score #if_filter_define itemio.math.output matches 1 run function itemio:impl/container/auto_handled_output/test_filter diff --git a/data/itemio/functions/impl/container/output/repart_2.mcfunction b/data/itemio/functions/impl/container/output/repart_2.mcfunction index 2dd907ca..8882d6cf 100644 --- a/data/itemio/functions/impl/container/output/repart_2.mcfunction +++ b/data/itemio/functions/impl/container/output/repart_2.mcfunction @@ -1,5 +1,13 @@ execute align xyz positioned ~.5 ~.5 ~.5 run tag @e[type=#itemio:container,tag=itemio.container.initialised,distance=..0.5001,limit=1,sort=nearest] add itemio.selected.output execute as @e[tag=itemio.selected.output,tag=!itemio.container.nope,tag=!itemio.container.auto_handled_io] run function itemio:impl/container/output/custom/output execute unless entity @e[tag=itemio.selected.output,tag=!itemio.container.nope,tag=!itemio.container.auto_handled_io] if block ~ ~ ~ #itemio:container run function itemio:impl/container/output/vanilla/output -execute as @e[tag=itemio.selected.output,tag=itemio.container.auto_handled_io,tag=!itemio.container.nope] run function #itemio:event/auto_handled_output -tag @e[tag=itemio.selected.output] remove itemio.selected.output \ No newline at end of file +execute as @e[tag=itemio.selected.output,tag=itemio.container.auto_handled_io,tag=!itemio.container.nope] run function itemio:impl/container/auto_handled_output/before +tag @e[tag=itemio.selected.output] remove itemio.selected.output + + + + + + + +