From bebe09cadca92a44d156026a9a304fc9c61689da Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Fri, 23 Dec 2016 12:17:44 +0100
Subject: [PATCH] added new mapgen structure + fixed crafting guide

---
 mods/crafting_guide/init.lua       |  19 ++++++++++++++-----
 mods/doors/init.lua                |  17 +++++++++++++++++
 mods/furnace/furnace.lua           |   5 +++++
 mods/stairs/init.lua               |   1 +
 mods/village/init.lua              |  14 ++++++++++++++
 mods/village/schematics/house2.mts | Bin 0 -> 540 bytes
 6 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 mods/village/schematics/house2.mts

diff --git a/mods/crafting_guide/init.lua b/mods/crafting_guide/init.lua
index a1ce201..7626d54 100644
--- a/mods/crafting_guide/init.lua
+++ b/mods/crafting_guide/init.lua
@@ -20,20 +20,29 @@ function crafting_guide.get_formspec(crafts,back_button)
 	local x = 1
 	local y = 1
 	local j = 1
-	for i=1,9 do
+	
+	local w = crafts[1].width
+	if w == 0 or w == nil then
+		w = 3
+	end
+	
+	local h = 3
+	
+	for i=1,w*h do
 		if (string.find((crafts[1].items[j] or ""),"group:") or 0) == 1 then
-			if crafts[1].items[j] then
+			if crafts[1].items[j] and crafts[1].items[j] ~= "" then
 				str = str .. ("button["..(x-1)..","..(y-1)..";1,1;group_"..i..";"..string.sub(crafts[1].items[j], 7).."]")
 			else
-				str = str .. ("button["..(x-1)..","..(y-1)..";1,1;;]")
+				--str = str .. ("button["..(x-1)..","..(y-1)..";1,1;;]")
 			end
-		else
+		elseif crafts[1].items[j] and crafts[1].items[j] ~= "" then
 			str = str .. ("item_image_button["..(x-1)..","..(y-1)..";1,1;"..(crafts[1].items[j] or "")..";"..(crafts[1].items[j] or "")..";]")
 		end
 		j = j + 1
 
 		x = x+1
-		if x > 3 then
+		
+		if x > w then
 			x = 1
 			y = y+1
 		end
diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index f268ab5..dfb2379 100644
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -91,28 +91,45 @@ function doors.register_door(name, def)
 			end
 		end,
 	})
+	
+	minetest.register_craft({
+		output = name .. " 8",
+		recipe = {
+			{def.material, def.material},
+			{def.material, def.material},
+			{def.material, def.material}
+		}
+	})
 end
 
 doors.register_door("doors:wood", {
 	description = "Wooden Door",
 	tiles = {"default_wooden_planks.png"},
 	groups = {choppy = 3},
+	
+	material = "default:wooden_planks"
 })
 
 doors.register_door("doors:jungle_wood", {
 	description = "Jungle Wood Door",
 	tiles = {"default_wooden_planks_jungle.png"},
 	groups = {choppy = 3},
+	
+	material = "default:wooden_planks_jungle"
 })
 
 doors.register_door("doors:glass", {
 	description = "Glass Door",
 	tiles = {"default_glass.png"},
 	groups = {snappy = 3},
+	
+	material = "default:glass"
 })
 
 doors.register_door("doors:stonebrick", {
 	description = "Stonebrick Door",
 	tiles = {"default_stonebrick.png"},
 	groups = {cracky = 3},
+	
+	material = "default:stonebrick"
 })
diff --git a/mods/furnace/furnace.lua b/mods/furnace/furnace.lua
index 5a1280e..09e98e6 100644
--- a/mods/furnace/furnace.lua
+++ b/mods/furnace/furnace.lua
@@ -142,6 +142,11 @@ furnace.register_recipe({
 	output = "default:glass",
 })
 
+furnace.register_recipe({
+	input = "default:cobble",
+	output = "default:stone",
+})
+
 -- items
 
 minetest.register_craftitem("furnace:iron_rod", {
diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index c51636a..07118f2 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -141,6 +141,7 @@ stairs.register_stair_and_slab("stairs:cobble", "default:cobble")
 stairs.register_stair_and_slab("stairs:brick", "default:brick")
 stairs.register_stair_and_slab("stairs:wood", "default:wood")
 stairs.register_stair_and_slab("stairs:wooden_planks", "default:wooden_planks")
+stairs.register_stair_and_slab("stairs:wooden_planks_jungle", "default:wooden_planks_jungle")
 
 stairs.register_stair_and_slab("stairs:grass", "default:grass")
 stairs.register_stair_and_slab("stairs:dirt", "default:dirt")
diff --git a/mods/village/init.lua b/mods/village/init.lua
index cc6956b..540f151 100644
--- a/mods/village/init.lua
+++ b/mods/village/init.lua
@@ -12,3 +12,17 @@ minetest.register_decoration({
 	flags = "place_center_x, place_center_z",
 	rotation = "random",
 })
+
+minetest.register_decoration({
+	deco_type = "schematic",
+	place_on = {"default:dry_grass"},
+	fill_ratio = 0.0005,
+	biomes = {
+		"savanna"
+	},
+	y_min = 6,
+	y_max = 20,
+	schematic = minetest.get_modpath("village").."/schematics/house2.mts",
+	flags = "place_center_x, place_center_z",
+	rotation = "random",
+})
diff --git a/mods/village/schematics/house2.mts b/mods/village/schematics/house2.mts
new file mode 100644
index 0000000000000000000000000000000000000000..58a386303c44a7c6aeecfe3a6cc78d77e6ad02d8
GIT binary patch
literal 540
zcmeYb3HD`RVc=rmWZ<la0S0ac=ETe*28H4hAXRKto}ZtRnipS?lbDxX9G_L1m!6Xv
zU!0Se#K4`BnwD6aQ(~2qpUxl&<D{kLC8xsFfiyF4m*f{EXIOzr1|g`i$@xi1FoR@Z
zda>EXAefS$4|E6AX0VBTFbz40DJiK%3}P^TNl|KIacNO%d~!x=aS2c>)P?2wMcGL}
zhh<dEc^i6BtVw}Kmf6_a?&smZRR(t?+Sq1&eRTBP2d3A%isv%aH)-}%C5UaDc-sBR
z8mTjuKkeP;R9fF&^piut%5;(4?6(^>`}G#2FJYUbnRPGxyRk|3*7+v)rA(glt#}-8
zMJ+$#X8OYO=d3<?d}4cl`CiAY{zv-`E?i|$TqbBb$$d*&?Dh8<_m~bb@Y|P|de6G6
zq-WavC_ARH`^K@%aD(O6Y{h&#l2y*`e<$I-al3J~jeg9IfX3puSf@W~N7bg>i=Wxc
zG9mA^xQ?&k8MQ;}!c0>X7frq(9=3hK)agd-7Q0p%t+x@BU6ggix7fF)nExsF%(Et;
zTJJX9bl9Jl8qU9HH=ElN>2q@qGuCTvH*SA^_-d%cQV|8!%_%(v=hlZwEKb<zT*2u4
HZ<-JQp~B-k

literal 0
HcmV?d00001