From 2744350c47faac6679b09ab864498dc6ee4753aa Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Thu, 7 Jan 2016 18:22:35 +0100
Subject: [PATCH] added some craftings

---
 mods/default/craft.lua   | 95 ++++++++++++++++++++++++++++++++++++----
 mods/default/craft.lua~  | 95 ++++++++++++++++++++++++++++++++++++----
 mods/default/mapgen.lua  | 19 ++++++++
 mods/default/mapgen.lua~ | 19 ++++++++
 mods/default/player.lua  |  4 +-
 mods/default/player.lua~ |  4 +-
 6 files changed, 216 insertions(+), 20 deletions(-)

diff --git a/mods/default/craft.lua b/mods/default/craft.lua
index 00d255e..7f9ddae 100644
--- a/mods/default/craft.lua
+++ b/mods/default/craft.lua
@@ -18,12 +18,12 @@ default.craft_form_v2 = default.craft_form_v2..default.gui_colors
 default.craft_form_v2 = default.craft_form_v2..default.gui_bg
 default.craft_form_v2 = default.craft_form_v2.."list[current_player;main;0,3.5;8,4;]"
 default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(0,3.5,8,4)
-default.craft_form_v2 = default.craft_form_v2.."list[current_name;craftadd;0,0;1,3;]"
-default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(0,0,1,3)
-default.craft_form_v2 = default.craft_form_v2.."list[current_player;craft;1.5,0;3,3;]"
-default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(1.5,0,3,3)
-default.craft_form_v2 = default.craft_form_v2.."list[current_player;craftpreview;5,1;1,1;]"
-default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(5,1,1,1)
+default.craft_form_v2 = default.craft_form_v2.."list[current_name;main;0,0;2,3;]"
+default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(0,0,2,3)
+default.craft_form_v2 = default.craft_form_v2.."list[current_player;craft;2.5,0;3,3;]"
+default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(2.5,0,3,3)
+default.craft_form_v2 = default.craft_form_v2.."list[current_player;craftpreview;6,1;1,1;]"
+default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(6,1,1,1)
 
 minetest.register_node("default:workbench_v2", {
 	description = "Workbench V2",
@@ -34,12 +34,87 @@ minetest.register_node("default:workbench_v2", {
 		meta:set_string("formspec", default.craft_form_v2)
 		meta:set_string("infotext", "Workbench V2")
 		local inv = meta:get_inventory()
-		inv:set_size("craftadd", 3)
+		inv:set_size("main", 3*2)
 	end,
 })
 
 -- crafts
 
+-- wood
+
+minetest.register_craft({
+	output = "default:wood 3",
+	recipe = {
+		{"default:log_1"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:wood 2",
+	recipe = {
+		{"default:log_2"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:wood",
+	recipe = {
+		{"default:log_3"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:wooden_planks",
+	recipe = {
+		{"default:wood", "default:wood"},
+	}
+})
+
+-- stone
+
+minetest.register_craft({
+	output = "default:stone_tile",
+	recipe = {
+		{"default:stone_item", "default:stone_item"},
+		{"default:stone_item", "default:stone_item"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:small_stone_tiles 4",
+	recipe = {
+		{"default:stone_tile", "default:stone_tile"},
+		{"default:stone_tile", "default:stone_tile"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:stonebrick 4",
+	recipe = {
+		{"default:small_stone_tiles", "default:small_stone_tiles"},
+		{"default:small_stone_tiles", "default:small_stone_tiles"},
+	}
+})
+
+--workbench
+
+minetest.register_craft({
+	output = "default:workbench",
+	recipe = {
+		{"default:wood", "default:wood", "default:wood"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:workbench_v2",
+	recipe = {
+		{"default:stone_tile", "default:stone_tile", "default:stone_tile"},
+	}
+})
+
+
+-- string
+
 minetest.register_craft({
 	output = "default:string_strong",
 	recipe = {
@@ -54,13 +129,17 @@ minetest.register_craft({
 	}
 })
 
+-- grass
+
 minetest.register_craft({
-	output = "default:plant_grass",
+	output = "default:plant_grass 3",
 	recipe = {
 		{"default:grass"},
 	}
 })
 
+-- tools
+
 minetest.register_craft({
 	output = "default:basic_hammer",
 	recipe = {
diff --git a/mods/default/craft.lua~ b/mods/default/craft.lua~
index 00d255e..7f9ddae 100644
--- a/mods/default/craft.lua~
+++ b/mods/default/craft.lua~
@@ -18,12 +18,12 @@ default.craft_form_v2 = default.craft_form_v2..default.gui_colors
 default.craft_form_v2 = default.craft_form_v2..default.gui_bg
 default.craft_form_v2 = default.craft_form_v2.."list[current_player;main;0,3.5;8,4;]"
 default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(0,3.5,8,4)
-default.craft_form_v2 = default.craft_form_v2.."list[current_name;craftadd;0,0;1,3;]"
-default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(0,0,1,3)
-default.craft_form_v2 = default.craft_form_v2.."list[current_player;craft;1.5,0;3,3;]"
-default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(1.5,0,3,3)
-default.craft_form_v2 = default.craft_form_v2.."list[current_player;craftpreview;5,1;1,1;]"
-default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(5,1,1,1)
+default.craft_form_v2 = default.craft_form_v2.."list[current_name;main;0,0;2,3;]"
+default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(0,0,2,3)
+default.craft_form_v2 = default.craft_form_v2.."list[current_player;craft;2.5,0;3,3;]"
+default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(2.5,0,3,3)
+default.craft_form_v2 = default.craft_form_v2.."list[current_player;craftpreview;6,1;1,1;]"
+default.craft_form_v2 = default.craft_form_v2..default.itemslot_bg(6,1,1,1)
 
 minetest.register_node("default:workbench_v2", {
 	description = "Workbench V2",
@@ -34,12 +34,87 @@ minetest.register_node("default:workbench_v2", {
 		meta:set_string("formspec", default.craft_form_v2)
 		meta:set_string("infotext", "Workbench V2")
 		local inv = meta:get_inventory()
-		inv:set_size("craftadd", 3)
+		inv:set_size("main", 3*2)
 	end,
 })
 
 -- crafts
 
+-- wood
+
+minetest.register_craft({
+	output = "default:wood 3",
+	recipe = {
+		{"default:log_1"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:wood 2",
+	recipe = {
+		{"default:log_2"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:wood",
+	recipe = {
+		{"default:log_3"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:wooden_planks",
+	recipe = {
+		{"default:wood", "default:wood"},
+	}
+})
+
+-- stone
+
+minetest.register_craft({
+	output = "default:stone_tile",
+	recipe = {
+		{"default:stone_item", "default:stone_item"},
+		{"default:stone_item", "default:stone_item"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:small_stone_tiles 4",
+	recipe = {
+		{"default:stone_tile", "default:stone_tile"},
+		{"default:stone_tile", "default:stone_tile"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:stonebrick 4",
+	recipe = {
+		{"default:small_stone_tiles", "default:small_stone_tiles"},
+		{"default:small_stone_tiles", "default:small_stone_tiles"},
+	}
+})
+
+--workbench
+
+minetest.register_craft({
+	output = "default:workbench",
+	recipe = {
+		{"default:wood", "default:wood", "default:wood"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:workbench_v2",
+	recipe = {
+		{"default:stone_tile", "default:stone_tile", "default:stone_tile"},
+	}
+})
+
+
+-- string
+
 minetest.register_craft({
 	output = "default:string_strong",
 	recipe = {
@@ -54,13 +129,17 @@ minetest.register_craft({
 	}
 })
 
+-- grass
+
 minetest.register_craft({
-	output = "default:plant_grass",
+	output = "default:plant_grass 3",
 	recipe = {
 		{"default:grass"},
 	}
 })
 
+-- tools
+
 minetest.register_craft({
 	output = "default:basic_hammer",
 	recipe = {
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 8362835..1725888 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -164,6 +164,25 @@ minetest.register_decoration({
 	decoration = "default:plant_grass",
 })
 
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dry_grass", "default:grass", "default:sand"},
+	sidelen = 16,
+	noise_params = {
+		offset = -0.015,
+		scale = 0.03,
+		spread = {x=200, y=200, z=200},
+		seed = 333,
+		octaves = 3,
+		persist = 0.6
+	},
+	biomes = {
+		"beach", "grassland", "forest", "savanna"
+	},
+	y_min = 0,
+	y_max = 31000,
+	decoration = "default:stones_on_floor",
+})
 -- ores
 
 minetest.register_ore({
diff --git a/mods/default/mapgen.lua~ b/mods/default/mapgen.lua~
index 8362835..1725888 100644
--- a/mods/default/mapgen.lua~
+++ b/mods/default/mapgen.lua~
@@ -164,6 +164,25 @@ minetest.register_decoration({
 	decoration = "default:plant_grass",
 })
 
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dry_grass", "default:grass", "default:sand"},
+	sidelen = 16,
+	noise_params = {
+		offset = -0.015,
+		scale = 0.03,
+		spread = {x=200, y=200, z=200},
+		seed = 333,
+		octaves = 3,
+		persist = 0.6
+	},
+	biomes = {
+		"beach", "grassland", "forest", "savanna"
+	},
+	y_min = 0,
+	y_max = 31000,
+	decoration = "default:stones_on_floor",
+})
 -- ores
 
 minetest.register_ore({
diff --git a/mods/default/player.lua b/mods/default/player.lua
index 1623550..f46bec9 100644
--- a/mods/default/player.lua
+++ b/mods/default/player.lua
@@ -16,8 +16,8 @@ default.inv_form = default.inv_form..default.gui_colors
 default.inv_form = default.inv_form..default.gui_bg
 default.inv_form = default.inv_form.."list[current_player;main;0,3.5;8,4;]"
 default.inv_form = default.inv_form..default.itemslot_bg(0,3.5,8,4)
-default.inv_form = default.inv_form.."list[current_player;craft;1.5,0.5;2,2;]"
-default.inv_form = default.inv_form..default.itemslot_bg(1.5,0.5,2,2)
+default.inv_form = default.inv_form.."list[current_player;craft;1,1;3,1;]"
+default.inv_form = default.inv_form..default.itemslot_bg(1,1,3,1)
 default.inv_form = default.inv_form.."list[current_player;craftpreview;5,1;1,1;]"
 default.inv_form = default.inv_form..default.itemslot_bg(5,1,1,1)
 
diff --git a/mods/default/player.lua~ b/mods/default/player.lua~
index 1623550..f46bec9 100644
--- a/mods/default/player.lua~
+++ b/mods/default/player.lua~
@@ -16,8 +16,8 @@ default.inv_form = default.inv_form..default.gui_colors
 default.inv_form = default.inv_form..default.gui_bg
 default.inv_form = default.inv_form.."list[current_player;main;0,3.5;8,4;]"
 default.inv_form = default.inv_form..default.itemslot_bg(0,3.5,8,4)
-default.inv_form = default.inv_form.."list[current_player;craft;1.5,0.5;2,2;]"
-default.inv_form = default.inv_form..default.itemslot_bg(1.5,0.5,2,2)
+default.inv_form = default.inv_form.."list[current_player;craft;1,1;3,1;]"
+default.inv_form = default.inv_form..default.itemslot_bg(1,1,3,1)
 default.inv_form = default.inv_form.."list[current_player;craftpreview;5,1;1,1;]"
 default.inv_form = default.inv_form..default.itemslot_bg(5,1,1,1)