Merge branch 'master' of https://github.com/minetest-mods/drawersHEADmaster

1 files changed, 24 insertions, 1 deletions

diff --git a/init.lua b/init.lua
index fd66846..ebdf5fb 100755
--- a/init.lua
+++ b/init.lua
@@ -57,8 +57,12 @@ drawers.enable_2x2 = not core.settings:get_bool("drawers_disable_2x2")
 --
 
 drawers.gui_bg = "bgcolor[#080808BB;true]"
-drawers.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]"
 drawers.gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]"
+if (core.get_modpath("mcl_core")) and mcl_core then -- MCL2
+	drawers.gui_bg_img = "background[5,5;1,1;crafting_creative_bg.png;true]"
+else
+	drawers.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]"
+end
 
 --
 -- Load API
@@ -67,6 +71,7 @@ drawers.gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]"
 dofile(MP .. "/lua/helpers.lua")
 dofile(MP .. "/lua/visual.lua")
 dofile(MP .. "/lua/api.lua")
+dofile(MP .. "/lua/controller.lua")
 
 
 --
@@ -309,6 +314,24 @@ elseif core.get_modpath("mcl_core") and mcl_core then
 	})
 end
 
+--
+-- Register drawer trim
+--
+
+core.register_node("drawers:trim", {
+	description = S("Wooden Trim"),
+	tiles = {"drawers_trim.png"},
+	groups = {drawer = 1, choppy = 3, oddly_breakable_by_hand = 2}
+})
+
+core.register_craft({
+	output = "drawers:trim 6",
+	recipe = {
+		{"group:stick", "group:wood", "group:stick"},
+		{"group:wood",  "group:wood",  "group:wood"},
+		{"group:stick", "group:wood", "group:stick"}
+	}
+})
 
 --
 -- Register drawer upgrade template