From bc98c189718d63cc83a422527e740ec0a6b248b3 Mon Sep 17 00:00:00 2001 From: ItsTrashPanda <72630588+ItsTrashPanda@users.noreply.github.com> Date: Sat, 4 Dec 2021 21:05:25 -0800 Subject: [PATCH] 1.16 I'm making some changes to this repository --- .../checkfordisdrainwater.mcfunction | 24 +++++----- .../functions/checkfordisfillwater.mcfunction | 24 +++++----- .../discauldron/functions/emptycal.mcfunction | 3 ++ .../discauldron/functions/fillcal.mcfunction | 3 ++ .../discauldron/functions/load.mcfunction | 2 + .../discauldron/functions/test.mcfunction | 45 +++++++++++++++++++ .../discauldron/functions/tick.mcfunction | 15 +------ Dispenser cauldron/pack.mcmeta | 2 +- 8 files changed, 80 insertions(+), 38 deletions(-) create mode 100644 Dispenser cauldron/data/discauldron/functions/emptycal.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcal.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/test.mcfunction diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction index b2ad6fd..209cc66 100644 --- a/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction @@ -1,17 +1,17 @@ -execute if block ~1 ~ ~ dispenser[facing=west] run item replace block ~1 ~ ~ container.8 with bucket -execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:fillcalwater +execute if block ~1 ~ ~ dispenser[facing=west] run replaceitem block ~1 ~ ~ hotbar.8 bucket +execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:fillcal -execute if block ~-1 ~ ~ dispenser[facing=east] run item replace block ~-1 ~ ~ container.8 with bucket -execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:fillcalwater +execute if block ~-1 ~ ~ dispenser[facing=east] run replaceitem block ~-1 ~ ~ hotbar.8 bucket +execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:fillcal -execute if block ~ ~1 ~ dispenser[facing=down] run item replace block ~ ~1 ~ container.8 with bucket -execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:fillcalwater +execute if block ~ ~1 ~ dispenser[facing=down] run replaceitem block ~ ~1 ~ hotbar.8 bucket +execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:fillcal -execute if block ~ ~-1 ~ dispenser[facing=up] run item replace block ~ ~-1 ~ container.8 with bucket -execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:fillcalwater +execute if block ~ ~-1 ~ dispenser[facing=up] run replaceitem block ~ ~-1 ~ hotbar.8 bucket +execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:fillcal -execute if block ~ ~ ~1 dispenser[facing=north] run item replace block ~ ~ ~1 container.8 with bucket -execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:fillcalwater +execute if block ~ ~ ~1 dispenser[facing=north] run replaceitem block ~ ~ ~1 hotbar.8 bucket +execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:fillcal -execute if block ~ ~ ~-1 dispenser[facing=south] run item replace block ~ ~ ~-1 container.8 with bucket -execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:fillcalwater +execute if block ~ ~ ~-1 dispenser[facing=south] run replaceitem block ~ ~ ~-1 hotbar.8 bucket +execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:fillcal diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction index 9e5c89a..2b516c0 100644 --- a/Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction @@ -1,18 +1,18 @@ -execute if block ~1 ~ ~ dispenser[facing=west] run item replace block ~1 ~ ~ container.8 with water_bucket -execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:emptycalwater +execute if block ~1 ~ ~ dispenser[facing=west] run replaceitem block ~1 ~ ~ hotbar.8 water_bucket +execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:emptycal -execute if block ~-1 ~ ~ dispenser[facing=east] run item replace block ~-1 ~ ~ container.8 with water_bucket -execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:emptycalwater +execute if block ~-1 ~ ~ dispenser[facing=east] run replaceitem block ~-1 ~ ~ hotbar.8 water_bucket +execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:emptycal -execute if block ~ ~1 ~ dispenser[facing=down] run item replace block ~ ~1 ~ container.8 with water_bucket -execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:emptycalwater +execute if block ~ ~1 ~ dispenser[facing=down] run replaceitem block ~ ~1 ~ hotbar.8 water_bucket +execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:emptycal -execute if block ~ ~-1 ~ dispenser[facing=up] run item replace block ~ ~-1 ~ container.8 with water_bucket -execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:emptycalwater +execute if block ~ ~-1 ~ dispenser[facing=up] run replaceitem block ~ ~-1 ~ hotbar.8 water_bucket +execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:emptycal -execute if block ~ ~ ~1 dispenser[facing=north] run item replace block ~ ~ ~1 container.8 with water_bucket -execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:emptycalwater +execute if block ~ ~ ~1 dispenser[facing=north] run replaceitem block ~ ~ ~1 hotbar.8 water_bucket +execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:emptycal -execute if block ~ ~ ~-1 dispenser[facing=south] run item replace block ~ ~ ~-1 container.8 with water_bucket -execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:emptycalwater +execute if block ~ ~ ~-1 dispenser[facing=south] run replaceitem block ~ ~ ~-1 hotbar.8 water_bucket +execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:emptycal diff --git a/Dispenser cauldron/data/discauldron/functions/emptycal.mcfunction b/Dispenser cauldron/data/discauldron/functions/emptycal.mcfunction new file mode 100644 index 0000000..2fac5d9 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/emptycal.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ cauldron +playsound minecraft:item.bucket.fill ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/fillcal.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcal.mcfunction new file mode 100644 index 0000000..d1482eb --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcal.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ cauldron[level=3] +playsound minecraft:item.bucket.fill ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/load.mcfunction b/Dispenser cauldron/data/discauldron/functions/load.mcfunction index 0e3c61c..ffe3cd6 100644 --- a/Dispenser cauldron/data/discauldron/functions/load.mcfunction +++ b/Dispenser cauldron/data/discauldron/functions/load.mcfunction @@ -1 +1,3 @@ tellraw @a {"text": "Discauldron is now loaded", "color": "#0000FF"} +scoreboard objectives add disvar dummy "disvar" +scoreboard players set var1 disvar 0 \ No newline at end of file diff --git a/Dispenser cauldron/data/discauldron/functions/test.mcfunction b/Dispenser cauldron/data/discauldron/functions/test.mcfunction new file mode 100644 index 0000000..a8c2a7e --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/test.mcfunction @@ -0,0 +1,45 @@ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ +execute at @s run summon sheep ~ ~ ~ diff --git a/Dispenser cauldron/data/discauldron/functions/tick.mcfunction b/Dispenser cauldron/data/discauldron/functions/tick.mcfunction index d21dc8a..91fc8e9 100644 --- a/Dispenser cauldron/data/discauldron/functions/tick.mcfunction +++ b/Dispenser cauldron/data/discauldron/functions/tick.mcfunction @@ -1,13 +1,2 @@ -execute as @e[type=item,nbt={Item:{id:"minecraft:bucket"}}] at @s if block ~ ~ ~ water_cauldron[level=3] align xyz run function discauldron:checkfordisfillwater -execute as @e[type=item,nbt={Item:{id:"minecraft:water_bucket"}}] at @s if block ~ ~ ~ cauldron align xyz run function discauldron:checkfordisdrainwater - -execute as @e[type=item,nbt={Item:{id:"minecraft:bucket"}}] at @s if block ~ ~ ~ lava_cauldron align xyz run function discauldron:checkfordisfilllava -execute as @e[type=item,nbt={Item:{id:"minecraft:lava_bucket"}}] at @s if block ~ ~ ~ cauldron align xyz run function discauldron:checkfordisdrainlava - -execute as @e[type=item,nbt={Item:{id:"minecraft:bucket"}}] at @s if block ~ ~ ~ powder_snow_cauldron[level=3] align xyz run function discauldron:checkfordisfillsnow -execute as @e[type=item,nbt={Item:{id:"minecraft:powder_snow_bucket"}}] at @s if block ~ ~ ~ cauldron align xyz run function discauldron:checkfordisdrainsnow - -execute as @e[type=item,nbt={Item:{id:"minecraft:glass_bottle"}}] at @s if block ~ ~ ~ water_cauldron align xyz run function discauldron:checkfordisfillwaterbottle -execute as @e[type=item,nbt={Item:{id:"minecraft:potion",tag:{Potion:"minecraft:water"}}}] at @s if block ~ ~ ~ cauldron align xyz run function discauldron:checkfordisdrainwaterbottle -execute as @e[type=item,nbt={Item:{id:"minecraft:potion",tag:{Potion:"minecraft:water"}}}] at @s if block ~ ~ ~ water_cauldron[level=1] align xyz run function discauldron:checkfordisdrainwaterbottle -execute as @e[type=item,nbt={Item:{id:"minecraft:potion",tag:{Potion:"minecraft:water"}}}] at @s if block ~ ~ ~ water_cauldron[level=2] align xyz run function discauldron:checkfordisdrainwaterbottle +execute as @e[type=item,nbt={Item:{id:"minecraft:bucket"}}] at @s if block ~ ~ ~ cauldron[level=3] align xyz run function discauldron:checkfordisfillwater +execute as @e[type=item,nbt={Item:{id:"minecraft:water_bucket"}}] at @s if block ~ ~ ~ cauldron[level=0] align xyz run function discauldron:checkfordisdrainwater \ No newline at end of file diff --git a/Dispenser cauldron/pack.mcmeta b/Dispenser cauldron/pack.mcmeta index d0a393c..4036aa3 100644 --- a/Dispenser cauldron/pack.mcmeta +++ b/Dispenser cauldron/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 7, + "pack_format": 6, "description": "Use dispenser on cauldron" } } \ No newline at end of file