From 9c0020415400298e969abe980337a1aa4925015d Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 1 May 2023 10:00:03 +0100 Subject: [PATCH] cows can be milked using both wooden bucket mods --- cow.lua | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/cow.lua b/cow.lua index b838421..9e4d57c 100644 --- a/cow.lua +++ b/cow.lua @@ -93,7 +93,8 @@ mobs:register_mob("mobs_animal:cow", { -- milk cow with empty bucket if item == "bucket:bucket_empty" - or item == "wooden_bucket:bucket_wood_empty" then + or item == "wooden_bucket:bucket_wood_empty" + or item == "bucket_wooden:bucket_empty" then --if self.gotten == true if self.child == true then @@ -115,7 +116,8 @@ mobs:register_mob("mobs_animal:cow", { -- which bucket are we using local ret_item = "mobs:bucket_milk" - if item == "wooden_bucket:bucket_wood_empty" then + if item == "wooden_bucket:bucket_wood_empty" + or item == "bucket_wooden:bucket_empty" then ret_item = "mobs:wooden_bucket_milk" end @@ -270,14 +272,20 @@ minetest.register_craft({ }) --- check for wooden bucket mod and add compatibility -if minetest.get_modpath("wooden_bucket") then +-- check for either of the wood bucket mods and add compatibility +local wb = minetest.get_modpath("wooden_bucket") +local bw = minetest.get_modpath("bucket_wooden") + +if wb or bw then + + local return_item = wb and "wooden_bucket:bucket_wood_empty" + or "bucket_wooden:bucket_empty" minetest.register_craftitem(":mobs:wooden_bucket_milk", { description = S("Wooden Bucket of Milk"), inventory_image = "mobs_wooden_bucket_milk.png", stack_max = 1, - on_use = minetest.item_eat(8, "wooden_bucket:bucket_wood_empty"), + on_use = minetest.item_eat(8, return_item), groups = {food_milk = 1, flammable = 3, drink = 1} }) @@ -288,7 +296,7 @@ if minetest.get_modpath("wooden_bucket") then {"vessels:drinking_glass", "vessels:drinking_glass"}, {"mobs:wooden_bucket_milk", ""} }, - replacements = {{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}} + replacements = {{"mobs:wooden_bucket_milk", return_item}} }) minetest.register_craft({ @@ -296,7 +304,7 @@ if minetest.get_modpath("wooden_bucket") then recipe = { {"group:food_milk_glass", "group:food_milk_glass"}, {"group:food_milk_glass", "group:food_milk_glass"}, - {"wooden_bucket:bucket_wood_empty", ""} + {return_item, ""} }, replacements = { {"group:food_milk_glass", "vessels:drinking_glass 4"} @@ -306,6 +314,6 @@ if minetest.get_modpath("wooden_bucket") then minetest.register_craft({ output = "mobs:butter", recipe = {{"mobs:wooden_bucket_milk", salt_item}}, - replacements = {{"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}} + replacements = {{"mobs:wooden_bucket_milk", return_item}} }) end