Skip to content

Commit

Permalink
1.16
Browse files Browse the repository at this point in the history
I'm making some changes to this repository
  • Loading branch information
ItsTrashPanda authored Dec 5, 2021
1 parent 8b98d51 commit bc98c18
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 38 deletions.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ cauldron
playsound minecraft:item.bucket.fill ambient @a[distance=..6]
kill @s
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
setblock ~ ~ ~ cauldron[level=3]
playsound minecraft:item.bucket.fill ambient @a[distance=..6]
kill @s
2 changes: 2 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/load.mcfunction
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
tellraw @a {"text": "Discauldron is now loaded", "color": "#0000FF"}
scoreboard objectives add disvar dummy "disvar"
scoreboard players set var1 disvar 0
45 changes: 45 additions & 0 deletions Dispenser cauldron/data/discauldron/functions/test.mcfunction
Original file line number Diff line number Diff line change
@@ -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 ~ ~ ~
15 changes: 2 additions & 13 deletions Dispenser cauldron/data/discauldron/functions/tick.mcfunction
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Dispenser cauldron/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"pack_format": 7,
"pack_format": 6,
"description": "Use dispenser on cauldron"
}
}

0 comments on commit bc98c18

Please sign in to comment.