From c497b36e606440631b8e149dbc8e64cfce1c7487 Mon Sep 17 00:00:00 2001
From: jp <jeanpatrick.guerrero@gmail.com>
Date: Sun, 2 Aug 2015 02:00:29 +0200
Subject: [PATCH] Fix ndef error and prepare enchanting table

---
 crafts.lua      |   9 +++++++
 enchanting.lua  |  65 ++++++++++++++++++++++++++++++++++++++++++++++++
 init.lua        |   1 +
 textures/bg.png | Bin 0 -> 231 bytes
 worktable.lua   |  34 +++++++++++++------------
 5 files changed, 93 insertions(+), 16 deletions(-)
 create mode 100644 enchanting.lua
 create mode 100644 textures/bg.png

diff --git a/crafts.lua b/crafts.lua
index c584885..9e26ac6 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -131,6 +131,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "xdecor:enchantment_table",
+	recipe = {
+		{"", "default:book", ""},
+		{"default:diamond", "default:obsidian", "default:diamond"},
+		{"default:obsidian", "default:obsidian", "default:obsidian"}
+	}
+})
+
 minetest.register_craft({
 	output = "xdecor:fence_wrought_iron 2",
 	recipe = {
diff --git a/enchanting.lua b/enchanting.lua
new file mode 100644
index 0000000..119c02f
--- /dev/null
+++ b/enchanting.lua
@@ -0,0 +1,65 @@
+local function enchconstruct(pos)
+	local meta = minetest.get_meta(pos)
+	meta:set_string("formspec", "size[8,7;]"..xdecor.fancy_gui..
+		"label[0.65,-0.15;Enchant]"..
+		"image[0.4,0.2;2,2;default_book.png]"..
+		"list[current_name;tool;0.3,2;1,1;]"..
+		"list[current_name;mese;1.3,2;1,1;]"..
+		"image_button[2.5,0;5.3,1.1;bg.png;durable;Durable]"..
+		"image_button[2.5,1;5.3,1.1;bg.png;fast;Fast]"..
+		"image_button[2.5,2;5.3,1.1;bg.png;luck;Luck]"..
+		"list[current_player;main;0,3.3;8,4;]")
+	meta:set_string("infotext", "Enchantment Table")
+
+	local inv = meta:get_inventory()
+	inv:set_size("tool", 1)
+	inv:set_size("mese", 1)
+end
+
+local function enchdig(pos, player)
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+
+	if not inv:is_empty("tool") or not inv:is_empty("mese") then
+		return false
+	end
+	return true
+end
+
+local function enchput(pos, listname, index, stack, player)
+	local meta = minetest.get_meta(pos)
+	local inv = meta:get_inventory()
+
+	if listname == "mese" then
+		if stack:get_name() == "default:mese_crystal" then
+			return stack:get_count()
+		else
+			return 0
+		end
+	end
+	if listname == "tool" then
+		local tname = stack:get_name()
+		local tdef = minetest.registered_tools[tname]
+
+		if tdef then return 1 else return 0 end
+	end
+
+	return stack:get_count()
+end
+
+xdecor.register("enchantment_table", {
+	description = "Enchantment Table",
+	tiles = {
+		"xdecor_enchantment_top.png",
+		"xdecor_enchantment_bottom.png",
+		"xdecor_enchantment_side.png",
+		"xdecor_enchantment_side.png",
+		"xdecor_enchantment_side.png",
+		"xdecor_enchantment_side.png",
+	},
+	groups = {cracky=1},
+	sounds = xdecor.stone,
+	on_construct = enchconstruct,
+	can_dig = enchdig,
+	allow_metadata_inventory_put = enchput
+})
diff --git a/init.lua b/init.lua
index 95b37b2..0dbbf05 100644
--- a/init.lua
+++ b/init.lua
@@ -4,6 +4,7 @@ modpath = minetest.get_modpath("xdecor")
 dofile(modpath.."/handlers/nodeboxes.lua")
 dofile(modpath.."/handlers/registration.lua")
 dofile(modpath.."/crafts.lua")
+--dofile(modpath.."/enchanting.lua") -- In development.
 dofile(modpath.."/hive.lua")
 dofile(modpath.."/itemframe.lua")
 dofile(modpath.."/mailbox.lua")
diff --git a/textures/bg.png b/textures/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d025195530e5ed9775c22a43276f95b873d86107
GIT binary patch
literal 231
zcmV<D02u#?P)<h;3K|Lk000e1NJLTq003kF0015Y0{{R3D0Qa50000FP)t-sppkND
zUP@F<JK)NnT~a*Gh<oY)005IoL_t(I%gvIx4FXXRL!YU@);55s0Ergpzb4ob3E4PX
zYyOcuc`n|yI9{cm9F)3o2(<`E317vE_bx*7*&&V+sX(y7I(3@u5SXKRmo73&=JpEt
z*L9HJT#|lajJ60C8YEsL5Yr@vIK#-<B9qzarDpk^L9R7QJhiAnG{xJU%h<F?>++4N
h7A2xX`X=8Wtv)QyBu23vaNz&|002ovPDHLkV1n<dUG@L~

literal 0
HcmV?d00001

diff --git a/worktable.lua b/worktable.lua
index 1b96a46..062b2a1 100644
--- a/worktable.lua
+++ b/worktable.lua
@@ -1,7 +1,7 @@
 local material = {
 	"cloud", -- Only used for the formspec display.
-	"wood", "junglewood", "pinewood",
-	"tree", "jungletree", "pinetree",
+	"wood", "junglewood", "pinewood", "acacia_wood",
+	"tree", "jungletree", "pinetree", "acacia_tree",
 	"cobble", "mossycobble", "desert_cobble",
 	"stone", "sandstone", "desert_stone", "obsidian",
 	"stonebrick", "sandstonebrick", "desert_stonebrick", "obsidianbrick",
@@ -135,20 +135,22 @@ for m=1, #material do
 		local w = def[n]
 		local nodename = "default:"..v
 		local ndef = minetest.registered_nodes[nodename]
-
-		xdecor.register(w[1].."_"..v, {
-			description = string.sub(string.upper(w[1]), 0, 1)..
-					string.sub(w[1], 2),
-			light_source = ndef.light_source,
-			sounds = ndef.sounds,
-			tiles = ndef.tiles,
-			groups = {snappy=3, not_in_creative_inventory=1},
-			node_box = {
-				type = "fixed",
-				fixed = w[3]
-			},
-			on_place = minetest.rotate_node
-		})
+		
+		if ndef then
+			xdecor.register(w[1].."_"..v, {
+				description = string.sub(string.upper(w[1]), 0, 1)..
+						string.sub(w[1], 2),
+				light_source = ndef.light_source,
+				sounds = ndef.sounds,
+				tiles = ndef.tiles,
+				groups = {snappy=3, not_in_creative_inventory=1},
+				node_box = {
+					type = "fixed",
+					fixed = w[3]
+				},
+				on_place = minetest.rotate_node
+			})
+		end
 	end
 end