From 3481e7d151b45413f929ba91e07d782ac9ae7fff Mon Sep 17 00:00:00 2001 From: ItsTrashPanda Date: Sat, 4 Dec 2021 21:16:24 -0800 Subject: [PATCH] 1.17 --- .../functions/checkfordisdrainlava.mcfunction | 17 +++++++++++++ .../functions/checkfordisdrainsnow.mcfunction | 17 +++++++++++++ .../checkfordisdrainwater.mcfunction | 24 +++++++++---------- .../checkfordisdrainwaterbottle.mcfunction | 17 +++++++++++++ .../functions/checkfordisfilllava.mcfunction | 17 +++++++++++++ .../functions/checkfordisfillsnow.mcfunction | 18 ++++++++++++++ .../functions/checkfordisfillwater.mcfunction | 24 +++++++++---------- .../checkfordisfillwaterbottle.mcfunction | 18 ++++++++++++++ .../functions/draincalwaterlevel0.mcfunction | 3 +++ .../functions/draincalwaterlevel1.mcfunction | 3 +++ .../functions/draincalwaterlevel2.mcfunction | 3 +++ .../functions/emptycallava.mcfunction | 3 +++ .../functions/emptycalsnow.mcfunction | 3 +++ .../functions/emptycalwater.mcfunction | 3 +++ .../functions/emptycalwithbottle.mcfunction | 3 +++ .../functions/fillcalfrombottle.mcfunction | 3 +++ .../functions/fillcallava.mcfunction | 3 +++ .../functions/fillcalsnow.mcfunction | 3 +++ .../functions/fillcalwater.mcfunction | 3 +++ .../functions/fillcalwaterlevel1.mcfunction | 3 +++ .../functions/fillcalwaterlevel2.mcfunction | 3 +++ .../functions/fillcalwaterlevel3.mcfunction | 3 +++ .../discauldron/functions/load.mcfunction | 2 -- .../discauldron/functions/tick.mcfunction | 15 ++++++++++-- 24 files changed, 183 insertions(+), 28 deletions(-) create mode 100644 Dispenser cauldron/data/discauldron/functions/checkfordisdrainlava.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/checkfordisdrainsnow.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/checkfordisdrainwaterbottle.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/checkfordisfilllava.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/checkfordisfillsnow.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/checkfordisfillwaterbottle.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/draincalwaterlevel0.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/draincalwaterlevel1.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/draincalwaterlevel2.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/emptycallava.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/emptycalsnow.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/emptycalwater.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/emptycalwithbottle.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcalfrombottle.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcallava.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcalsnow.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcalwater.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel1.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel2.mcfunction create mode 100644 Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel3.mcfunction diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisdrainlava.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainlava.mcfunction new file mode 100644 index 0000000..9db4738 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainlava.mcfunction @@ -0,0 +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:fillcallava + +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:fillcallava + +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:fillcallava + +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:fillcallava + +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:fillcallava + +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:fillcallava diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisdrainsnow.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainsnow.mcfunction new file mode 100644 index 0000000..cfc62ba --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainsnow.mcfunction @@ -0,0 +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:fillcalsnow + +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:fillcalsnow + +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:fillcalsnow + +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:fillcalsnow + +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:fillcalsnow + +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:fillcalsnow diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction index 209cc66..b2ad6fd 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 replaceitem block ~1 ~ ~ hotbar.8 bucket -execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:fillcal +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=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=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=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=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=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=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=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=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=south] run replaceitem block ~ ~ ~-1 hotbar.8 bucket -execute if block ~ ~ ~-1 dispenser[facing=south] 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 diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwaterbottle.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwaterbottle.mcfunction new file mode 100644 index 0000000..590ee99 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisdrainwaterbottle.mcfunction @@ -0,0 +1,17 @@ +execute if block ~1 ~ ~ dispenser[facing=west] run item replace block ~1 ~ ~ container.8 with glass_bottle +execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:fillcalfrombottle + +execute if block ~-1 ~ ~ dispenser[facing=east] run item replace block ~-1 ~ ~ container.8 with glass_bottle +execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:fillcalfrombottle + +execute if block ~ ~1 ~ dispenser[facing=down] run item replace block ~ ~1 ~ container.8 with glass_bottle +execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:fillcalfrombottle + +execute if block ~ ~-1 ~ dispenser[facing=up] run item replace block ~ ~-1 ~ container.8 with glass_bottle +execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:fillcalfrombottle + +execute if block ~ ~ ~1 dispenser[facing=north] run item replace block ~ ~ ~1 container.8 with glass_bottle +execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:fillcalfrombottle + +execute if block ~ ~ ~-1 dispenser[facing=south] run item replace block ~ ~ ~-1 container.8 with glass_bottle +execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:fillcalfrombottle diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisfilllava.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisfilllava.mcfunction new file mode 100644 index 0000000..1b4e3d9 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisfilllava.mcfunction @@ -0,0 +1,17 @@ +execute if block ~1 ~ ~ dispenser[facing=west] run item replace block ~1 ~ ~ container.8 with lava_bucket +execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:emptycallava + +execute if block ~-1 ~ ~ dispenser[facing=east] run item replace block ~-1 ~ ~ container.8 with lava_bucket +execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:emptycallava + +execute if block ~ ~1 ~ dispenser[facing=down] run item replace block ~ ~1 ~ container.8 with lava_bucket +execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:emptycallava + +execute if block ~ ~-1 ~ dispenser[facing=up] run item replace block ~ ~-1 ~ container.8 with lava_bucket +execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:emptycallava + +execute if block ~ ~ ~1 dispenser[facing=north] run item replace block ~ ~ ~1 container.8 with lava_bucket +execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:emptycallava + +execute if block ~ ~ ~-1 dispenser[facing=south] run item replace block ~ ~ ~-1 container.8 with lava_bucket +execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:emptycallava diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisfillsnow.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisfillsnow.mcfunction new file mode 100644 index 0000000..5bf6f23 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisfillsnow.mcfunction @@ -0,0 +1,18 @@ +execute if block ~1 ~ ~ dispenser[facing=west] run item replace block ~1 ~ ~ container.8 with powder_snow_bucket +execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:emptycalsnow + +execute if block ~-1 ~ ~ dispenser[facing=east] run item replace block ~-1 ~ ~ container.8 with powder_snow_bucket +execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:emptycalsnow + +execute if block ~ ~1 ~ dispenser[facing=down] run item replace block ~ ~1 ~ container.8 with powder_snow_bucket +execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:emptycalsnow + +execute if block ~ ~-1 ~ dispenser[facing=up] run item replace block ~ ~-1 ~ container.8 with powder_snow_bucket +execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:emptycalsnow + +execute if block ~ ~ ~1 dispenser[facing=north] run item replace block ~ ~ ~1 container.8 with powder_snow_bucket +execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:emptycalsnow + +execute if block ~ ~ ~-1 dispenser[facing=south] run item replace block ~ ~ ~-1 container.8 with powder_snow_bucket +execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:emptycalsnow + diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction index 2b516c0..9e5c89a 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 replaceitem block ~1 ~ ~ hotbar.8 water_bucket -execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:emptycal +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=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=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=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=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=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=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=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=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=south] run replaceitem block ~ ~ ~-1 hotbar.8 water_bucket -execute if block ~ ~ ~-1 dispenser[facing=south] 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 diff --git a/Dispenser cauldron/data/discauldron/functions/checkfordisfillwaterbottle.mcfunction b/Dispenser cauldron/data/discauldron/functions/checkfordisfillwaterbottle.mcfunction new file mode 100644 index 0000000..4c3f6de --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/checkfordisfillwaterbottle.mcfunction @@ -0,0 +1,18 @@ +execute if block ~1 ~ ~ dispenser[facing=west] run item replace block ~1 ~ ~ container.8 with potion{Potion:"minecraft:water"} +execute if block ~1 ~ ~ dispenser[facing=west] run function discauldron:emptycalwithbottle + +execute if block ~-1 ~ ~ dispenser[facing=east] run item replace block ~-1 ~ ~ container.8 with potion{Potion:"minecraft:water"} +execute if block ~-1 ~ ~ dispenser[facing=east] run function discauldron:emptycalwithbottle + +execute if block ~ ~1 ~ dispenser[facing=down] run item replace block ~ ~1 ~ container.8 with potion{Potion:"minecraft:water"} +execute if block ~ ~1 ~ dispenser[facing=down] run function discauldron:emptycalwithbottle + +execute if block ~ ~-1 ~ dispenser[facing=up] run item replace block ~ ~-1 ~ container.8 with potion{Potion:"minecraft:water"} +execute if block ~ ~-1 ~ dispenser[facing=up] run function discauldron:emptycalwithbottle + +execute if block ~ ~ ~1 dispenser[facing=north] run item replace block ~ ~ ~1 container.8 with potion{Potion:"minecraft:water"} +execute if block ~ ~ ~1 dispenser[facing=north] run function discauldron:emptycalwithbottle + +execute if block ~ ~ ~-1 dispenser[facing=south] run item replace block ~ ~ ~-1 container.8 with potion{Potion:"minecraft:water"} +execute if block ~ ~ ~-1 dispenser[facing=south] run function discauldron:emptycalwithbottle + diff --git a/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel0.mcfunction b/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel0.mcfunction new file mode 100644 index 0000000..517b1ec --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel0.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ cauldron +playsound minecraft:item.bottle.fill ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel1.mcfunction b/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel1.mcfunction new file mode 100644 index 0000000..550d9e8 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel1.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ water_cauldron[level=1] +playsound minecraft:item.bottle.fill ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel2.mcfunction b/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel2.mcfunction new file mode 100644 index 0000000..de9ea1d --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/draincalwaterlevel2.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ water_cauldron[level=2] +playsound minecraft:item.bottle.fill ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/emptycallava.mcfunction b/Dispenser cauldron/data/discauldron/functions/emptycallava.mcfunction new file mode 100644 index 0000000..a238c8d --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/emptycallava.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ minecraft:cauldron +playsound minecraft:item.bucket.fill_lava ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/emptycalsnow.mcfunction b/Dispenser cauldron/data/discauldron/functions/emptycalsnow.mcfunction new file mode 100644 index 0000000..cbbb4ea --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/emptycalsnow.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ minecraft:cauldron +playsound minecraft:item.bucket.fill_powder_snow ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/emptycalwater.mcfunction b/Dispenser cauldron/data/discauldron/functions/emptycalwater.mcfunction new file mode 100644 index 0000000..45949d5 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/emptycalwater.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ minecraft:cauldron +playsound minecraft:item.bucket.fill ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/emptycalwithbottle.mcfunction b/Dispenser cauldron/data/discauldron/functions/emptycalwithbottle.mcfunction new file mode 100644 index 0000000..4db31d9 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/emptycalwithbottle.mcfunction @@ -0,0 +1,3 @@ +execute if block ~ ~ ~ water_cauldron[level=1] align xyz run function discauldron:draincalwaterlevel0 +execute if block ~ ~ ~ water_cauldron[level=2] align xyz run function discauldron:draincalwaterlevel1 +execute if block ~ ~ ~ water_cauldron[level=3] align xyz run function discauldron:draincalwaterlevel2 diff --git a/Dispenser cauldron/data/discauldron/functions/fillcalfrombottle.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcalfrombottle.mcfunction new file mode 100644 index 0000000..60658d6 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcalfrombottle.mcfunction @@ -0,0 +1,3 @@ +execute if block ~ ~ ~ water_cauldron[level=2] align xyz run function discauldron:fillcalwaterlevel3 +execute if block ~ ~ ~ water_cauldron[level=1] align xyz run function discauldron:fillcalwaterlevel2 +execute if block ~ ~ ~ cauldron align xyz run function discauldron:fillcalwaterlevel1 diff --git a/Dispenser cauldron/data/discauldron/functions/fillcallava.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcallava.mcfunction new file mode 100644 index 0000000..c2e1c52 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcallava.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ lava_cauldron +playsound minecraft:item.bucket.empty_lava ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/fillcalsnow.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcalsnow.mcfunction new file mode 100644 index 0000000..ad8ee59 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcalsnow.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ powder_snow_cauldron[level=3] +playsound minecraft:item.bucket.empty_powder_snow ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/fillcalwater.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcalwater.mcfunction new file mode 100644 index 0000000..5d7f3a8 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcalwater.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ water_cauldron[level=3] +playsound minecraft:item.bucket.empty ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel1.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel1.mcfunction new file mode 100644 index 0000000..c27b031 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel1.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ water_cauldron[level=1] +playsound minecraft:item.bottle.empty ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel2.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel2.mcfunction new file mode 100644 index 0000000..ec3a741 --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel2.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ water_cauldron[level=2] +playsound minecraft:item.bottle.empty ambient @a[distance=..6] +kill @s diff --git a/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel3.mcfunction b/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel3.mcfunction new file mode 100644 index 0000000..da0f0ca --- /dev/null +++ b/Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel3.mcfunction @@ -0,0 +1,3 @@ +setblock ~ ~ ~ water_cauldron[level=3] +playsound minecraft:item.bottle.empty 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 ffe3cd6..0e3c61c 100644 --- a/Dispenser cauldron/data/discauldron/functions/load.mcfunction +++ b/Dispenser cauldron/data/discauldron/functions/load.mcfunction @@ -1,3 +1 @@ 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/tick.mcfunction b/Dispenser cauldron/data/discauldron/functions/tick.mcfunction index 91fc8e9..d21dc8a 100644 --- a/Dispenser cauldron/data/discauldron/functions/tick.mcfunction +++ b/Dispenser cauldron/data/discauldron/functions/tick.mcfunction @@ -1,2 +1,13 @@ -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 +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