diff --git a/mods/ITEMS/mcl_cauldrons/init.lua b/mods/ITEMS/mcl_cauldrons/init.lua index d343e6881..6f59ede59 100644 --- a/mods/ITEMS/mcl_cauldrons/init.lua +++ b/mods/ITEMS/mcl_cauldrons/init.lua @@ -21,70 +21,6 @@ local function give_item(user, itemstack) return itemstack end --- Convenience function because the cauldron nodeboxes are very similar -local create_cauldron_nodebox = function(water_level) - local floor_y - if water_level == 0 then -- empty - floor_y = -0.1875 - elseif water_level == 1 then -- 1/3 filled - floor_y = 1/16 - elseif water_level == 2 then -- 2/3 filled - floor_y = 4/16 - elseif water_level == 3 then -- full - floor_y = 7/16 - end - return { - type = "fixed", - fixed = { - {-0.5, -0.1875, -0.5, -0.375, 0.5, 0.5}, -- Left wall - {0.375, -0.1875, -0.5, 0.5, 0.5, 0.5}, -- Right wall - {-0.375, -0.1875, 0.375, 0.375, 0.5, 0.5}, -- Back wall - {-0.375, -0.1875, -0.5, 0.375, 0.5, -0.375}, -- Front wall - {-0.5, -0.3125, -0.5, 0.5, floor_y, 0.5}, -- Floor - {-0.5, -0.5, -0.5, -0.375, -0.3125, -0.25}, -- Left front foot, part 1 - {-0.375, -0.5, -0.5, -0.25, -0.3125, -0.375}, -- Left front foot, part 2 - {-0.5, -0.5, 0.25, -0.375, -0.3125, 0.5}, -- Left back foot, part 1 - {-0.375, -0.5, 0.375, -0.25, -0.3125, 0.5}, -- Left back foot, part 2 - {0.375, -0.5, 0.25, 0.5, -0.3125, 0.5}, -- Right back foot, part 1 - {0.25, -0.5, 0.375, 0.375, -0.3125, 0.5}, -- Right back foot, part 2 - {0.375, -0.5, -0.5, 0.5, -0.3125, -0.25}, -- Right front foot, part 1 - {0.25, -0.5, -0.5, 0.375, -0.3125, -0.375}, -- Right front foot, part 2 - } - } -end - -local cauldron_nodeboxes = {} -for w=0,3 do - cauldron_nodeboxes[w] = create_cauldron_nodebox(w) -end - - ---local cauldrons_list = {} --- Empty cauldron -minetest.register_node("mcl_cauldrons:cauldron", { - description = S("Cauldron"), - _tt_help = S("Stores water"), - _doc_items_longdesc = S("Cauldrons are used to store water and slowly fill up under rain."), - _doc_items_usagehelp = S("Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water."), - wield_image = "mcl_cauldrons_cauldron.png", - inventory_image = "mcl_cauldrons_cauldron.png", - use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, - drawtype = "nodebox", - paramtype = "light", - is_ground_content = false, - groups = {pickaxey=1, deco_block=1, cauldron=1}, - node_box = cauldron_nodeboxes[0], - selection_box = { type = "regular" }, - tiles = { - "mcl_cauldrons_cauldron_inner.png^mcl_cauldrons_cauldron_top.png", - "mcl_cauldrons_cauldron_inner.png^mcl_cauldrons_cauldron_bottom.png", - "mcl_cauldrons_cauldron_side.png" - }, - sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_hardness = 2, - _mcl_blast_resistance = 2, -}) - function mcl_cauldrons.set_cauldron_level(pos, type, level) return minetest.set_node(pos, {name = mcl_cauldrons.get_cauldron_string(type, level)}) end diff --git a/mods/ITEMS/mcl_cauldrons/register.lua b/mods/ITEMS/mcl_cauldrons/register.lua index 3c1bb9e0e..0d1cafe8e 100644 --- a/mods/ITEMS/mcl_cauldrons/register.lua +++ b/mods/ITEMS/mcl_cauldrons/register.lua @@ -1,4 +1,5 @@ local S = minetest.get_translator(minetest.get_current_modname()) + mcl_cauldrons.register_cauldron_type({ name = "water", bucket = "mcl_buckets:bucket_water", diff --git a/mods/ITEMS/mcl_cauldrons/utils.lua b/mods/ITEMS/mcl_cauldrons/utils.lua index d80851529..145285632 100644 --- a/mods/ITEMS/mcl_cauldrons/utils.lua +++ b/mods/ITEMS/mcl_cauldrons/utils.lua @@ -1,3 +1,6 @@ +local S = minetest.get_translator(minetest.get_current_modname()) + +-- Convenience function because the cauldron nodeboxes are very similar local create_cauldron_nodebox = function(water_level) local floor_y if water_level == 0 then -- empty @@ -32,4 +35,29 @@ end mcl_cauldrons.cauldron_nodeboxes = {} for w=0,3 do mcl_cauldrons.cauldron_nodeboxes[w] = create_cauldron_nodebox(w) -end \ No newline at end of file +end + +-- Empty cauldron +minetest.register_node("mcl_cauldrons:cauldron", { + description = S("Cauldron"), + _tt_help = S("Stores water"), + _doc_items_longdesc = S("Cauldrons are used to store water and slowly fill up under rain."), + _doc_items_usagehelp = S("Place a water pucket into the cauldron to fill it with water. Place an empty bucket on a full cauldron to retrieve the water. Place a water bottle into the cauldron to fill the cauldron to one third with water. Place a glass bottle in a cauldron with water to retrieve one third of the water."), + wield_image = "mcl_cauldrons_cauldron.png", + inventory_image = "mcl_cauldrons_cauldron.png", + use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false, + drawtype = "nodebox", + paramtype = "light", + is_ground_content = false, + groups = {pickaxey=1, deco_block=1, cauldron=1}, + node_box = mcl_cauldrons.cauldron_nodeboxes[0], + selection_box = { type = "regular" }, + tiles = { + "mcl_cauldrons_cauldron_inner.png^mcl_cauldrons_cauldron_top.png", + "mcl_cauldrons_cauldron_inner.png^mcl_cauldrons_cauldron_bottom.png", + "mcl_cauldrons_cauldron_side.png" + }, + sounds = mcl_sounds.node_sound_metal_defaults(), + _mcl_hardness = 2, + _mcl_blast_resistance = 2, +}) \ No newline at end of file