Generalize fences code and add new fence types

mods/mcl_fences/init.lua

@@ -18,19 +18,27 @@ local cx2 = {2/16, -1/2+6/16, -2/16, 1/2, 1, 2/16} --unten(quer) x
 local cz1 = {2/16, -1/2+6/16, -2/16, -2/16, 1, -1/2} --unten(quer) -z
 local cz2 = {-2/16, -1/2+6/16, 2/16, 2/16, 1, 1/2} --unten(quer) z
 
-minetest.register_node("mcl_fences:fence", {
+mcl_fences = {}
-	description = "Oak Fence",
+mcl_fences.register_fence = function(id, fence_name, fence_gate_name, texture, fence_image, gate_image, groups, connects_to, sounds)
-	tiles = {"default_wood.png"},
+	if groups == nil then groups = {} end
-	inventory_image = "default_fence.png",
+	groups.fence = 1
-	wield_image = "default_fence.png",
+	if connects_to == nil then connects_to = {} end
+	table.insert(connects_to, "group:solid")
+	table.insert(connects_to, "group:fence")
+	local id_gate = id .. "_gate"
+	minetest.register_node("mcl_fences:"..id, {
+		description = fence_name,
+		tiles = {texture},
+		inventory_image = fence_image,
+		wield_image = fence_image,
 		paramtype = "light",
 		is_ground_content = false,
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,fence=1},
+		groups = groups,
 		stack_max = 64,
 		sunlight_propagates = true,
 		drawtype = "nodebox",
 		connect_sides = { "front", "back", "left", "right" },
-	connects_to = { "group:solid", "group:fence" },
+		connects_to = connects_to,
 		node_box = {
 			type = "connected",
 			fixed = {p},
@@ -47,44 +55,17 @@ minetest.register_node("mcl_fences:fence", {
 			connect_left = {cx1},
 			connect_right = {cx2},
 		},
-	sounds = default.node_sound_wood_defaults(),
+		sounds = sounds,
-})
+	})
 
-minetest.register_craft({
+	local meta2
-	output = 'mcl_fences:fence 3',
+	local state2 = 0
-	recipe = {
-		{'default:wood', 'default:stick', 'default:wood'},
-		{'default:wood', 'default:stick', 'default:wood'},
-	}
-})
 
-minetest.register_craft({
+	local function update_gate(pos, node) 
-	output = 'mcl_fences:fence_gate',
-	recipe = {
-		{'default:stick', 'default:wood', 'default:stick'},
-		{'default:stick', 'default:wood', 'default:stick'},
-	}
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "mcl_fences:fence",
-	burntime = 15,
-})
-minetest.register_craft({
-	type = "fuel",
-	recipe = "mcl_fences:fence_gate",
-	burntime = 15,
-})
-
-local meta2
-local state2 = 0
-
-local function update_gate(pos, node) 
 		minetest.set_node(pos, node)
-end
+	end
 
-local function punch_gate(pos, node)
+	local function punch_gate(pos, node)
 		meta2 = minetest.get_meta(pos)
 		state2 = meta2:get_int("state")
 		local tmp_node2
@@ -99,18 +80,19 @@ local function punch_gate(pos, node)
 		end
 		update_gate(pos, tmp_node2)
 		meta2:set_int("state", state2)
-end
+	end
 
-minetest.register_node("mcl_fences:fence_gate_open", {
+	groups.mesecon_effector_on = 1
-	tiles = {"default_wood.png"},
+	minetest.register_node("mcl_fences:"..id_gate.."_open", {
-	inventory_image = "default_fence.png",
+		tiles = {texture},
-	wield_image = "default_fence.png",
+		inventory_image = gate_image,
+		wield_image = gate_image,
 		paramtype = "light",
 		paramtype2 = "facedir",
 		is_ground_content = false,
 		sunlight_propagates = true,
 		walkable = true,
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,fence=1,not_in_inventory=1,mesecon_effector_on=1},
+		groups = groups,
 		drop = 'mcl_fences:fence_gate',
 		drawtype = "nodebox",
 		node_box = {
@@ -132,7 +114,6 @@ minetest.register_node("mcl_fences:fence_gate_open", {
 					{-1/2, -1/2+5/16, -1/16, 1/2, 1/2, 1/16},   --gate
 				}
 		},
-	--on_punch = function(pos, node, puncher)
 		on_rightclick = function(pos, node, clicker)
 			punch_gate(pos, node)
 		end,
@@ -141,20 +122,22 @@ minetest.register_node("mcl_fences:fence_gate_open", {
 				punch_gate(pos, node)
 			end),
 		}},
-})
+	})
 
-minetest.register_node("mcl_fences:fence_gate", {
+	groups.mesecon_effector_on = nil
-	description = "Oak Fence Gate",
+	groups.mesecon_effector_off = nil
-	tiles = {"default_wood.png"},
+	minetest.register_node("mcl_fences:"..id_gate, {
-	inventory_image = "mcl_fences_fence_gate.png",
+		description = fence_gate_name,
-	wield_image = "mcl_fences_fence_gate.png",
+		tiles = {texture},
+		inventory_image = gate_image,
+		wield_image = gate_image,
 		paramtype = "light",
 		is_ground_content = false,
-	stack_max = 16,
+		stack_max = 64,
 		paramtype2 = "facedir",
 		sunlight_propagates = true,
 		walkable = true,
-	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,mesecon_effector_on=1,fence=1},
+		groups = groups,
 		drawtype = "nodebox",
 		node_box = {
 			type = "fixed",
@@ -178,7 +161,6 @@ minetest.register_node("mcl_fences:fence_gate", {
 			}
 		},
 		on_construct = function(pos)
-		me2 = minetest.get_node(pos)
 			meta2 = minetest.get_meta(pos)
 			meta2:set_int("state", 0)
 			state2 = 0
@@ -191,7 +173,58 @@ minetest.register_node("mcl_fences:fence_gate", {
 		on_rightclick = function(pos, node, clicker)
 			punch_gate(pos, node)
 		end,
+	})
+
+end
+
+local wood_groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,fence_wood=1}
+local wood_connect = {}
+local wood_sounds = default.node_sound_wood_defaults()
+
+local woods = {
+	{"", "Oak Fence", "Oak Fence Gate", "default_wood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:wood"},
+	{"spruce", "Spruce Fence", "Spruce Fence Gate", "default_sprucewood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:sprucewood"},
+	{"birch", "Birch Fence", "Birch Fence Gate", "default_planks_birch.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:birchwood"},
+	{"jungle", "Jungle Fence", "Jungle Fence Gate", "default_junglewood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:junglewood"},
+	{"dark_oak", "Dark Oak Fence", "Dark Oak Fence Gate", "default_planks_big_oak.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:darkwood"},
+	{"acacia", "Acacia Fence", "Acacia Fence Gate", "default_acaciawood.png", "default_fence.png", "mcl_fences_fence_gate.png", "default:acaciawood"},
+}
+
+for w=1, #woods do
+	local wood = woods[w]
+	local id, id_gate
+	if wood[1] == "" then
+		id = "fence"
+		id_gate = "fence_gate"
+	else
+		id = wood[1].."_fence"
+		id_gate = wood[1].."_fence_gate"
+	end
+	mcl_fences.register_fence(id, wood[2], wood[3], wood[4], wood[5], wood[6], wood_groups, wood_connect, wood_sounds)
+
+	minetest.register_craft({
+		output = 'mcl_fences:'..id..' 3',
+		recipe = {
+			{wood[7], 'default:stick', wood[7]},
+			{wood[7], 'default:stick', wood[7]},
+		}
+	})
+	minetest.register_craft({
+		output = 'mcl_fences:'..id_gate,
+		recipe = {
+			{'default:stick', wood[7], 'default:stick'},
+			{'default:stick', wood[7], 'default:stick'},
+		}
+	})
+end
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:fence_wood",
+	burntime = 15,
 })
 
 local time_to_load= os.clock() - init
 print(string.format("[MOD] "..minetest.get_current_modname().." loaded in %.4f s", time_to_load))
+
+