From c62560b8ffd09f2aca74e59733c915565c7b4b40 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Thu, 16 Mar 2017 14:21:11 +0100 Subject: [PATCH 1/2] Add Call on_rightclick in builtin_failling mod into bucket rewrite function (needed by witchcraft) --- mods/builtin_falling/func.lua | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mods/builtin_falling/func.lua b/mods/builtin_falling/func.lua index 92988a54..da854793 100755 --- a/mods/builtin_falling/func.lua +++ b/mods/builtin_falling/func.lua @@ -154,7 +154,21 @@ function add_protected_bukket_liquid(nameofbukket,liquidsourcename) return itemstack end - if minetest.registered_nodes[n.name].buildable_to then + local ndef + if n then + ndef = minetest.registered_nodes[n.name] + end + + -- Call on_rightclick if the pointed node defines it + if ndef and ndef.on_rightclick and + user and not user:get_player_control().sneak + then + return ndef.on_rightclick( + pointed_thing.under, + n, user, itemstack) or itemstack + end + + if ndef and ndef.buildable_to then -- buildable; replace the node minetest.log("action", user:get_player_name().. " use "..nameofbukket.." at ".. minetest.pos_to_string(pointed_thing.under)) minetest.add_node(pointed_thing.under, {name=liquidsourcename}) From 6b4cc9c12a9c5be89c7c8f4491e7fedea1613929 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Thu, 16 Mar 2017 15:15:38 +0100 Subject: [PATCH 2/2] Add craft recipe for bones:bones with 9 bonemeal:bone Override craft recipe of witchcraft:shelf --- mods/nalc/depends.txt | 4 +++- mods/nalc/init.lua | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/mods/nalc/depends.txt b/mods/nalc/depends.txt index b09c83d8..0d6ec581 100644 --- a/mods/nalc/depends.txt +++ b/mods/nalc/depends.txt @@ -1,3 +1,5 @@ default witchcraft? - +bones? +bonemeal? +vessels? diff --git a/mods/nalc/init.lua b/mods/nalc/init.lua index 36f29471..71a5284e 100644 --- a/mods/nalc/init.lua +++ b/mods/nalc/init.lua @@ -1,4 +1,4 @@ --- Change craft recipe of Witchcraft:tooth +-- Change some craft recipe of Witchcraft if minetest.get_modpath("witchcraft") then -- clear crafts with this particular recipe @@ -24,5 +24,41 @@ if minetest.get_modpath("witchcraft") then {"default:sand", "", "default:sand"}, {"", "default:sand", ""}, } - }) + }) + + -- Register craft recipe of bones:bones with bonemeal:bone + if minetest.get_modpath("bones") + and minetest.get_modpath("bonemeal") and bonemeal + then + minetest.register_craft( + { + output = "bones:bones", + recipe = { + {"bonemeal:bone", "bonemeal:bone", "bonemeal:bone"}, + {"bonemeal:bone", "bonemeal:bone", "bonemeal:bone"}, + {"bonemeal:bone", "bonemeal:bone", "bonemeal:bone"}, + } + }) + end + + -- Override craft recipe of witchcraft:shelf + if minetest.get_modpath("vessels") then + minetest.clear_craft( + { + recipe = { + {"group:wood", "group:wood", "group:wood"}, + {"group:potion", "group:potion", "group:potion"}, + {"group:wood", "group:wood", "group:wood"}, + } + }) + + minetest.register_craft( + { + output = "witchcraft:shelf", + recipe = { + {"", "group:potion", ""}, + {"group:potion", "vessels:shelf", "group:potion"}, + } + }) + end end