From 2a747e828aa523bdfd90582bec15a15d97435807 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 9 Jun 2017 20:20:29 +0200 Subject: [PATCH] Refactor flower on_place function --- mods/CORE/mcl_util/init.lua | 90 ++++++++++++++++----------------- mods/ITEMS/mcl_flowers/init.lua | 25 +++++++-- 2 files changed, 65 insertions(+), 50 deletions(-) diff --git a/mods/CORE/mcl_util/init.lua b/mods/CORE/mcl_util/init.lua index acfcd98f15..d919d93e67 100644 --- a/mods/CORE/mcl_util/init.lua +++ b/mods/CORE/mcl_util/init.lua @@ -229,56 +229,52 @@ function mcl_util.layer_to_y(layer, minecraft_dimension) return layer + mcl_vars.mg_overworld_min end --- on_place function for plants which can't grow on mycelium - -function mcl_util.on_place_non_mycelium_plant(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then - -- no interaction possible with entities - return itemstack - end - - -- Call on_rightclick if the pointed node defines it - local node = minetest.get_node(pointed_thing.under) - if placer and not placer:get_player_control().sneak then - if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then - return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack +-- Returns a on_place function for plants +-- * condition: function(pos, node) +-- * A function which is called by the on_place function to check if the node can be placed +-- * Must return true, if placement is allowed, false otherwise +-- * pos, node: Position and node table of plant node +function mcl_util.generate_on_place_plant_function(condition) + return function(itemstack, placer, pointed_thing) + if pointed_thing.type ~= "node" then + -- no interaction possible with entities + return itemstack end - end - local place_pos, soil_node - local def_under = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name] - local def_above = minetest.registered_nodes[minetest.get_node(pointed_thing.above).name] - if def_under.buildable_to then - place_pos = pointed_thing.under - elseif def_above.buildable_to then - place_pos = pointed_thing.above - else - return itemstack - end - soil_node = minetest.get_node({x=place_pos.x, y=place_pos.y-1, z=place_pos.z}) - - - local light_night = minetest.get_node_light(place_pos, 0.0) - local light_day = minetest.get_node_light(place_pos, 0.5) - local light_ok = false - if (light_night and light_night >= 8) or (light_day and light_day >= minetest.LIGHT_MAX) then - light_ok = true - end - - -- Placement rules: - -- * Allowed on dirt or grass block - -- * Only with light level >= 8 - if (soil_node.name == "mcl_core:dirt" or soil_node.name == "mcl_core:dirt_with_grass" or soil_node.name == "mcl_core:dirt_with_grass_snow") and light_ok then - local idef = itemstack:get_definition() - local new_itemstack, success = minetest.item_place_node(itemstack, placer, pointed_thing) - - if success then - if idef.sounds and idef.sounds.place then - minetest.sound_play(idef.sounds.place, {pos=above, gain=1}) + -- Call on_rightclick if the pointed node defines it + local node = minetest.get_node(pointed_thing.under) + if placer and not placer:get_player_control().sneak then + if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then + return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack end end - itemstack = new_itemstack - end - return itemstack + local place_pos + local def_under = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name] + local def_above = minetest.registered_nodes[minetest.get_node(pointed_thing.above).name] + if def_under.buildable_to then + place_pos = pointed_thing.under + elseif def_above.buildable_to then + place_pos = pointed_thing.above + else + return itemstack + end + + -- Check placement rules + if (condition(place_pos, node) == true) then + local idef = itemstack:get_definition() + local new_itemstack, success = minetest.item_place_node(itemstack, placer, pointed_thing) + + if success then + if idef.sounds and idef.sounds.place then + minetest.sound_play(idef.sounds.place, {pos=above, gain=1}) + end + end + itemstack = new_itemstack + end + + return itemstack + end end + + diff --git a/mods/ITEMS/mcl_flowers/init.lua b/mods/ITEMS/mcl_flowers/init.lua index ea0b30323a..255529939c 100644 --- a/mods/ITEMS/mcl_flowers/init.lua +++ b/mods/ITEMS/mcl_flowers/init.lua @@ -6,6 +6,25 @@ flower_tmp={} -- Simple flower template local smallflowerlongdesc = "This is a small flower. Small flowers are mainly used for dye production and can also be potted." +-- on_place function for flowers +local on_place_flower = mcl_util.generate_on_place_plant_function(function(pos, node) + local below = {x=pos.x, y=pos.y-1, z=pos.z} + local soil_node = minetest.get_node_or_nil(below) + if not soil_node then return end + +--[[ Placement requirements: + * Dirt or grass block + * Light level >= 8 at any time or exposed to sunlight at day +]] + local light_night = minetest.get_node_light(pos, 0.0) + local light_day = minetest.get_node_light(pos, 0.5) + local light_ok = false + if (light_night and light_night >= 8) or (light_day and light_day >= minetest.LIGHT_MAX) then + light_ok = true + end + return (soil_node.name == "mcl_core:dirt" or soil_node.name == "mcl_core:dirt_with_grass" or soil_node.name == "mcl_core:dirt_with_grass_snow") and light_ok +end) + local function add_simple_flower(name, desc, image, simple_selection_box) minetest.register_node("mcl_flowers:"..name, { description = desc, @@ -21,7 +40,7 @@ local function add_simple_flower(name, desc, image, simple_selection_box) groups = {dig_immediate=3,flammable=2,plant=1,flower=1,non_mycelium_plant=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults(), node_placement_prediction = "", - on_place = mcl_util.on_place_non_mycelium_plant, + on_place = on_place_flower, selection_box = { type = "fixed", fixed = simple_selection_box, @@ -82,7 +101,7 @@ minetest.register_node("mcl_flowers:tallgrass", { end end, node_placement_prediction = "", - on_place = mcl_util.on_place_non_mycelium_plant, + on_place = on_place_flower, _mcl_blast_resistance = 0, _mcl_hardness = 0, }) @@ -111,7 +130,7 @@ minetest.register_node("mcl_flowers:fern", { end, drop = wheat_seed_drop, node_placement_prediction = "", - on_place = mcl_util.on_place_non_mycelium_plant, + on_place = on_place_flower, selection_box = { type = "fixed", fixed = { -4/16, -0.5, -4/16, 4/16, 7/16, 4/16 },