diff --git a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/detect_heat.mcfunction b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/detect_heat.mcfunction index 7f0a056..2f7b426 100644 --- a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/detect_heat.mcfunction +++ b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/detect_heat.mcfunction @@ -3,7 +3,6 @@ execute if block ~ ~-1 ~ ice run scoreboard players set @s barrelHeat -15 execute if block ~ ~-1 ~ ice run scoreboard players set @s barrelHeat -10 execute if block ~ ~-1 ~ torch run scoreboard players set @s barrelHeat 1 execute if block ~ ~-1 ~ lava run scoreboard players set @s barrelHeat 2 -execute if block ~ ~-1 ~ flowing_lava run scoreboard players set @s barrelHeat 2 execute if block ~ ~-1 ~ fire run scoreboard players set @s barrelHeat 4 execute if block ~ ~-2 ~ netherrack if block ~ ~-1 ~ fire run advancement grant @a[distance=..4] only skymode4:nether_age/fire_heat # set extremely high for debugginng diff --git a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update.mcfunction b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update.mcfunction index cbbcb03..245ab2a 100644 --- a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update.mcfunction +++ b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update.mcfunction @@ -25,7 +25,5 @@ execute if entity @s[tag=barrelCast,scores={barrelContent=27},tag=barrelHopperOu tag @s add barrelBreak execute if block ~ ~ ~ barrier if block ~ ~1 ~ air run tag @s remove barrelBreak execute if block ~ ~ ~ barrier if block ~ ~1 ~ lava run tag @s remove barrelBreak -execute if block ~ ~ ~ barrier if block ~ ~1 ~ flowing_lava run tag @s remove barrelBreak execute if block ~ ~ ~ barrier if block ~ ~1 ~ water run tag @s remove barrelBreak -execute if block ~ ~ ~ barrier if block ~ ~1 ~ flowing_water run tag @s remove barrelBreak execute if entity @s[tag=barrelBreak] run function skymode4:modules/barrel/remove diff --git a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update/lava.mcfunction b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update/lava.mcfunction index 9f2eb0e..c7ccfda 100644 --- a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update/lava.mcfunction +++ b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update/lava.mcfunction @@ -1,6 +1,5 @@ ## convert lava to obsidian ## execute if block ~ ~1 ~ water run tag @s add barrelTemp -execute if block ~ ~1 ~ flowing_water run tag @s add barrelTemp scoreboard players set @s[tag=barrelTemp] barrelContent 5 scoreboard players set @s[tag=barrelTemp] barrelTime -1 tag @s[tag=barrelTemp] remove barrelTemp @@ -8,6 +7,6 @@ tag @s[tag=barrelTemp] remove barrelTemp ## convert lava destroy ## scoreboard players add @s[tag=barrelWooden] barrelTime 1 tag @s[tag=barrelWooden,scores={barrelTime=3..}] add barrelTemp -execute at @s[tag=barrelTemp] run setblock ~ ~ ~ flowing_lava +execute at @s[tag=barrelTemp] run setblock ~ ~ ~ lava execute at @s[tag=barrelTemp] run particle smoke ~ ~0.4 ~ 0.2 0.2 0.2 0.03 100 tag @s[tag=barrelTemp] remove barrelTemp diff --git a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update_tick.mcfunction b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update_tick.mcfunction index 6d740a5..75fb419 100644 --- a/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update_tick.mcfunction +++ b/datapacks/Skymode4/data/skymode4/functions/modules/barrel/update_tick.mcfunction @@ -3,8 +3,8 @@ execute positioned ~ ~0.5 ~ if entity @e[type=item,distance=..1] run function skymode4:modules/barrel/check_items ## add fluid ## -execute if entity @s[scores={barrelContent=0}] if block ~ ~1 ~ flowing_water run function skymode4:modules/barrel/add/water -execute if entity @s[scores={barrelContent=0}] if block ~ ~1 ~ flowing_lava run function skymode4:modules/barrel/add/lava +execute if entity @s[scores={barrelContent=0}] if block ~ ~1 ~ water run function skymode4:modules/barrel/add/water +execute if entity @s[scores={barrelContent=0}] if block ~ ~1 ~ lava run function skymode4:modules/barrel/add/lava ## remove items ## execute if entity @e[limit=1,distance=..1,type=slime,tag=barrelTop,nbt={HurtTime:9s}] run function skymode4:modules/barrel/top/click