diff --git a/mods/ITEMS/mcl_cauldrons/cauldron_lava.lua b/mods/ITEMS/mcl_cauldrons/cauldron_lava.lua index 042551beb..596bfcca7 100644 --- a/mods/ITEMS/mcl_cauldrons/cauldron_lava.lua +++ b/mods/ITEMS/mcl_cauldrons/cauldron_lava.lua @@ -67,10 +67,6 @@ function BucketProxy.make_lava(old_itemstack, cauldron_node) return ItemStack("mcl_buckets:bucket_lava") end --- full lava cauldron + empty bucket = empty cauldron, lava bucket -BucketProxy:add_basic_rule("lava", true, BucketProxy.is_empty, nil, 0, BucketProxy.make_lava, BucketProxy.sound_lava) --- any lava cauldron + lava bucket = full lava cauldron, empty bucket (may waste bucket) -BucketProxy:add_basic_rule("lava", nil, BucketProxy.is_lava, "lava", true, "mcl_buckets:bucket_empty", BucketProxy.sound_lava) --- empty cauldron + lava bucket = full lava cauldron, empty bucket -BucketProxy:add_basic_rule(nil, 0, BucketProxy.is_lava, "lava", true, "mcl_buckets:bucket_empty", BucketProxy.sound_lava) + +BucketProxy:add_bucket_rules("lava", BucketProxy.is_lava, BucketProxy.make_lava, BucketProxy.sound_lava) diff --git a/mods/ITEMS/mcl_cauldrons/cauldron_river_water.lua b/mods/ITEMS/mcl_cauldrons/cauldron_river_water.lua index 5a0763a0b..c43722456 100644 --- a/mods/ITEMS/mcl_cauldrons/cauldron_river_water.lua +++ b/mods/ITEMS/mcl_cauldrons/cauldron_river_water.lua @@ -52,12 +52,8 @@ function BucketProxy.make_river_water(itemstack, cauldron_node) end end --- full river water cauldron + empty bucket -> empty cauldron, river water bucket -BucketProxy:add_basic_rule("river_water", 3, BucketProxy.is_empty, nil, 0, "mcl_buckets:bucket_river_water", BucketProxy.sound_water) --- any river water cauldron + river water bucket -> full river water cauldron, empty bucket (may waste bucket) -BucketProxy:add_basic_rule("river_water", nil, BucketProxy.is_river_water, "river_water", true, "mcl_buckets:bucket_empty", BucketProxy.sound_water) --- empty cauldron + river water bucket -> full river water cauldron, empty bucket -BucketProxy:add_basic_rule(nil, 0, BucketProxy.is_river_water, "river_water", true, "mcl_buckets:bucket_empty", BucketProxy.sound_water) + +BucketProxy:add_bucket_rules("river_water", BucketProxy.is_river_water, "mcl_buckets:bucket_river_water", BucketProxy.sound_water) @@ -74,13 +70,6 @@ function BottleProxy.make_river_water(old_itemstack, cauldron_node) return ItemStack("mcl_potions:river_water") end --- river water cauldron + empty bottle -> river water cauldron less 1, river water bottle -BottleProxy:add_basic_rule("river_water", 3, BottleProxy.is_empty, "river_water", 2, BottleProxy.make_river_water, BottleProxy.sound_water) -BottleProxy:add_basic_rule("river_water", 2, BottleProxy.is_empty, "river_water", 1, BottleProxy.make_river_water, BottleProxy.sound_water) -BottleProxy:add_basic_rule("river_water", 1, BottleProxy.is_empty, nil, 0, BottleProxy.make_river_water, BottleProxy.sound_water) --- empty cauldron + water bottle -> river water cauldron 1, empty bottle -BottleProxy:add_basic_rule(nil, 0, BottleProxy.is_river_water, "river_water", 1, BottleProxy.make_empty, BottleProxy.sound_water) --- river water cauldron + river water bottle -> river water cauldron plus 1, empty bottle -BottleProxy:add_basic_rule("river_water", 1, BottleProxy.is_river_water, "river_water", 2, BottleProxy.make_empty, BottleProxy.sound_water) -BottleProxy:add_basic_rule("river_water", 2, BottleProxy.is_river_water, "river_water", 3, BottleProxy.make_empty, BottleProxy.sound_water) + +BottleProxy:add_bottle_rules("river_water", BottleProxy.is_river_water, "mcl_potions:bottle_river_water", BottleProxy.sound_water) diff --git a/mods/ITEMS/mcl_cauldrons/doc/index.html b/mods/ITEMS/mcl_cauldrons/doc/index.html index d18e30be2..80347e3b7 100644 --- a/mods/ITEMS/mcl_cauldrons/doc/index.html +++ b/mods/ITEMS/mcl_cauldrons/doc/index.html @@ -62,7 +62,7 @@