lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Flower pot fixes' (#2731) from flowerpot-fixes into master

Browse Source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2731
Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
cora 2022-10-08 20:43:19 +00:00
commit 0c4edbc4ac
1 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
mods/ITEMS/mcl_flowerpots/init.lua
View File

@ -2,8 +2,18 @@ local S = minetest.get_translator(minetest.get_current_modname())
local has_doc = minetest.get_modpath("doc")
mcl_flowerpots = {}
---@type table<string, string>
mcl_flowerpots.registered_pots = {}
---@type nodebox
local pot_box = {
type = "fixed",
fixed = {
{ -0.1875, -0.5, -0.1875, 0.1875, -0.125, 0.1875 },
},
}
minetest.register_node("mcl_flowerpots:flower_pot", {
description = S("Flower Pot"),
_tt_help = S("Can hold a small flower or plant"),
@ -14,20 +24,13 @@ minetest.register_node("mcl_flowerpots:flower_pot", {
tiles = {
"mcl_flowerpots_flowerpot.png",
},
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
use_texture_alpha = "clip",
visual_scale = 0.5,
wield_image = "mcl_flowerpots_flowerpot_inventory.png",
wield_scale = {x=1.0, y=1.0, z=1.0},
paramtype = "light",
sunlight_propagates = true,
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
collision_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
selection_box = pot_box,
collision_box = pot_box,
is_ground_content = false,
inventory_image = "mcl_flowerpots_flowerpot_inventory.png",
groups = { dig_immediate = 3, deco_block = 1, attached_node = 1, dig_by_piston = 1, flower_pot = 1 },
@ -54,9 +57,11 @@ minetest.register_craft({
{ "mcl_core:brick", "", "mcl_core:brick" },
{ "", "mcl_core:brick", "" },
{ "", "", "" },
}
},
})
---@param name string
---@param def {name: string, desc: string, image: string}
function mcl_flowerpots.register_potted_flower(name, def)
mcl_flowerpots.registered_pots[name] = def.name
minetest.register_node(":mcl_flowerpots:flower_pot_" .. def.name, {
@ -67,19 +72,12 @@ function mcl_flowerpots.register_potted_flower(name, def)
tiles = {
"[combine:32x32:0,0=mcl_flowerpots_flowerpot.png:0,0=" .. def.image,
},
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
use_texture_alpha = "clip",
visual_scale = 0.5,
wield_scale = {x=1.0, y=1.0, z=1.0},
paramtype = "light",
sunlight_propagates = true,
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
collision_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
selection_box = pot_box,
collision_box = pot_box,
is_ground_content = false,
groups = { dig_immediate = 3, attached_node = 1, dig_by_piston = 1, not_in_creative_inventory = 1, flower_pot = 2 },
sounds = mcl_sounds.node_sound_stone_defaults(),
@ -89,13 +87,13 @@ function mcl_flowerpots.register_potted_flower(name, def)
minetest.record_protection_violation(pos, player_name)
return
end
minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, name)
minetest.add_item(vector.offset(pos, 0, 0.5, 0), name)
minetest.set_node(pos, { name = "mcl_flowerpots:flower_pot" })
end,
drop = {
items = {
{ items = { "mcl_flowerpots:flower_pot", name } }
}
{ items = { "mcl_flowerpots:flower_pot", name } },
},
},
})
-- Add entry alias for the Help
@ -104,6 +102,8 @@ function mcl_flowerpots.register_potted_flower(name, def)
end
end
---@param name string
---@param def {name: string, desc: string, image: string}
function mcl_flowerpots.register_potted_cube(name, def)
mcl_flowerpots.registered_pots[name] = def.name
minetest.register_node(":mcl_flowerpots:flower_pot_" .. def.name, {
@ -114,19 +114,12 @@ function mcl_flowerpots.register_potted_cube(name, def)
tiles = {
def.image,
},
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
use_texture_alpha = "clip",
visual_scale = 0.5,
wield_scale = {x=1.0, y=1.0, z=1.0},
paramtype = "light",
sunlight_propagates = true,
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
collision_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
selection_box = pot_box,
collision_box = pot_box,
is_ground_content = false,
groups = { dig_immediate = 3, attached_node = 1, dig_by_piston = 1, not_in_creative_inventory = 1, flower_pot = 2 },
sounds = mcl_sounds.node_sound_stone_defaults(),
@ -139,13 +132,13 @@ function mcl_flowerpots.register_potted_cube(name, def)
minetest.record_protection_violation(pos, player_name)
return
end
minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, name)
minetest.add_item(vector.offset(pos, 0, 0.5, 0), name)
minetest.set_node(pos, { name = "mcl_flowerpots:flower_pot" })
end,
drop = {
items = {
{ items = { "mcl_flowerpots:flower_pot", name } }
}
{ items = { "mcl_flowerpots:flower_pot", name } },
},
},
})
-- Add entry alias for the Help