Skip to content

Commit

Permalink
1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
@ItsTrashPanda
ItsTrashPanda committed Dec 5, 2021
1 parent 963c612 commit 3481e7d
Show file tree
Hide file tree
Showing 24 changed files with 183 additions and 28 deletions.
17 changes: 17 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/checkfordisdrainlava.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/checkfordisdrainsnow.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
24 changes: 12 additions & 12 deletions Dispenser cauldron/data/discauldron/functions/checkfordisdrainwater.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/checkfordisdrainwaterbottle.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/checkfordisfilllava.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
18 changes: 18 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/checkfordisfillsnow.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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

24 changes: 12 additions & 12 deletions Dispenser cauldron/data/discauldron/functions/checkfordisfillwater.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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

18 changes: 18 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/checkfordisfillwaterbottle.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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

3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/draincalwaterlevel0.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ cauldron
playsound minecraft:item.bottle.fill ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/draincalwaterlevel1.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ water_cauldron[level=1]
playsound minecraft:item.bottle.fill ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/draincalwaterlevel2.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ water_cauldron[level=2]
playsound minecraft:item.bottle.fill ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/emptycallava.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ minecraft:cauldron
playsound minecraft:item.bucket.fill_lava ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/emptycalsnow.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ minecraft:cauldron
playsound minecraft:item.bucket.fill_powder_snow ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/emptycalwater.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ minecraft:cauldron
playsound minecraft:item.bucket.fill ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/emptycalwithbottle.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcalfrombottle.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcallava.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ lava_cauldron
playsound minecraft:item.bucket.empty_lava ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcalsnow.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ powder_snow_cauldron[level=3]
playsound minecraft:item.bucket.empty_powder_snow ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcalwater.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ water_cauldron[level=3]
playsound minecraft:item.bucket.empty ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel1.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ water_cauldron[level=1]
playsound minecraft:item.bottle.empty ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel2.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ water_cauldron[level=2]
playsound minecraft:item.bottle.empty ambient @a[distance=..6]
kill @s
3 changes: 3 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/fillcalwaterlevel3.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ water_cauldron[level=3]
playsound minecraft:item.bottle.empty ambient @a[distance=..6]
kill @s
2 changes: 0 additions & 2 deletions Dispenser cauldron/data/discauldron/functions/load.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
tellraw @a {"text": "Discauldron is now loaded", "color": "#0000FF"}
scoreboard objectives add disvar dummy "disvar"
scoreboard players set var1 disvar 0
15 changes: 13 additions & 2 deletions Dispenser cauldron/data/discauldron/functions/tick.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -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
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

0 comments on commit 3481e7d

Please sign in to comment.