add lapis; update dyes, carpet, and clays

mods/carpet/depends.txt

@@ -0,0 +1,3 @@
+default
+dye
+

mods/carpet/init.lua

@@ -3,265 +3,36 @@
 -- License LGPL
 -- This mod adds carpets into Minetest.
 
-minetest.register_node("carpet:red", {
-	description = "Red Carpet",
+for _, row in ipairs(dye.dyes) do
+	local name = row[1]
+	local cname = "carpet:"..name
+	local wname = "wool:"..name
+	local img = "wool_"..name..".png"
+	local str = name.." Carpet"
+	str = string.gsub(str, "_", " ")
+	local desc = string.gsub(" "..str, "%W%l", string.upper):sub(2)
+minetest.register_node(cname, {
+	description = desc,
 	drawtype = "raillike",
-	tiles = {"carpet_red_out.png"},
-	inventory_image = "carpet_red_out.png",
-	wield_image = "carpet_red_out.png",
+	tiles = {img},
+	inventory_image = img,
+	wield_image = img,
 	paramtype = "light",
 	is_ground_content = true,
 	walkable = false,
 	buildable_to = true,
 	selection_box = {
-		type = "fixed",
-                
+		type = "fixed", 
                 fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
 	},
 	groups = {dig_immediate=2},
 })
-
-minetest.register_node("carpet:orange", {
-	description = "Orange Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_orange_out.png"},
-	inventory_image = "carpet_orange_out.png",
-	wield_image = "carpet_orange_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:yellow", {
-	description = "Yellow Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_yellow_out.png"},
-	inventory_image = "carpet_yellow_out.png",
-	wield_image = "carpet_yellow_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:green", {
-	description = "Green Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_green_out.png"},
-	inventory_image = "carpet_green_out.png",
-	wield_image = "carpet_green_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:cyan", {
-	description = "Cyan Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_cyan_out.png"},
-	inventory_image = "carpet_cyan_out.png",
-	wield_image = "carpet_cyan_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:blue", {
-	description = "Blue Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_blue_out.png"},
-	inventory_image = "carpet_blue_out.png",
-	wield_image = "carpet_blue_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:pink", {
-	description = "Pink Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_pink_out.png"},
-	inventory_image = "carpet_pink_out.png",
-	wield_image = "carpet_pink_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-
-minetest.register_node("carpet:black", {
-	description = "Black Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_black_out.png"},
-	inventory_image = "carpet_black_out.png",
-	wield_image = "carpet_black_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:magenta", {
-	description = "Magenta Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_magenta_out.png"},
-	inventory_image = "carpet_magenta_out.png",
-	wield_image = "carpet_magenta_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
-minetest.register_node("carpet:white", {
-	description = "White Carpet",
-	drawtype = "raillike",
-	tiles = {"carpet_white_out.png"},
-	inventory_image = "carpet_white_out.png",
-	wield_image = "carpet_white_out.png",
-	paramtype = "light",
-	is_ground_content = true,
-	walkable = false,
-	buildable_to = true,
-	selection_box = {
-		type = "fixed",
-                
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	groups = {dig_immediate=2},
-})
-
--- Crafing
-
 minetest.register_craft({
-	output = 'carpet:red 64',
+	output = cname..' 3',
 	recipe = {
-		{'wool:red', 'wool:red', 'wool:red'},
-		{'wool:red', 'wool:red', 'wool:red'},
+		{wname, wname},
 	}
 })
+end
 
-minetest.register_craft({
-	output = 'carpet:orange 64',
-	recipe = {
-		{'wool:orange', 'wool:orange', 'wool:orange'},
-		{'wool:orange', 'wool:orange', 'wool:orange'},
-	}
-})
 
-minetest.register_craft({
-	output = 'carpetyellow 64',
-	recipe = {
-		{'wool:yellow', 'wool:yellow', 'wool:yellow'},
-		{'wool:yellow', 'wool:yellow', 'wool:yellow'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:green 64',
-	recipe = {
-		{'wool:green', 'wool:green', 'wool:green'},
-		{'wool:green', 'wool:green', 'wool:green'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:cyan 64',
-	recipe = {
-		{'wool:cyan', 'wool:cyan', 'wool:cyan'},
-		{'wool:cyan', 'wool:cyan', 'wool:cyan'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:blue 64',
-	recipe = {
-		{'wool:blue', 'wool:blue', 'wool:blue'},
-		{'wool:blue', 'wool:blue', 'wool:blue'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:pink 64',
-	recipe = {
-		{'wool:pink', 'wool:pink', 'wool:pink'},
-		{'wool:pink', 'wool:pink', 'wool:pink'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:magenta 64',
-	recipe = {
-		{'wool:magenta', 'wool:megenta', 'wool:magenta'},
-		{'wool:magenta', 'wool:magenta', 'wool:magenta'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:white 64',
-	recipe = {
-		{'wool:white', 'wool:white', 'wool:white'},
-		{'wool:white', 'wool:white', 'wool:white'},
-	}
-})
-
-minetest.register_craft({
-	output = 'carpet:black 64',
-	recipe = {
-		{'wool:black', 'wool:black', 'wool:black'},
-		{'wool:black', 'wool:black', 'wool:black'},
-	}
-})

mods/carpet/textures/.directory

@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2014,5,12,13,13,14
-Version=3

mods/default/crafting.lua

@@ -485,6 +485,22 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:lapisblock',
+	recipe = {
+		{'dye:blue', 'dye:blue', 'dye:blue'},
+		{'dye:blue', 'dye:blue', 'dye:blue'},
+		{'dye:blue', 'dye:blue', 'dye:blue'},
+	}
+})
+
+minetest.register_craft({
+	output = 'dye:blue 9',
+	recipe = {
+		{'default:lapisblock'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:sandstone',
 	recipe = {
@@ -716,6 +732,30 @@ minetest.register_craft({
 	recipe = "default:stone_with_gold",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "dye:blue",
+	recipe = "default:stone_with_lapis",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:emerald",
+	recipe = "default:stone_with_emerald",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:diamond",
+	recipe = "default:stone_with_diamond",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "default:coal_lump",
+	recipe = "default:stone_with_coal",
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:clay_brick",

mods/default/mapgen.lua

@@ -240,8 +240,19 @@ function default.register_ores()
 		ore_type       = "scatter",
 		ore            = "default:stone_with_emerald",
 		wherein        = "default:stone",
-		clust_scarcity = 14*14*14,
-		clust_num_ores = 5,
+		clust_scarcity = 15*15*15,
+		clust_num_ores = 3,
+		clust_size     = 3,
+		y_min          = -31000,
+		y_max          = -25,
+	})
+
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "default:stone_with_lapis",
+		wherein        = "default:stone",
+		clust_scarcity = 12*12*12,
+		clust_num_ores = 4,
 		clust_size     = 3,
 		y_min          = -31000,
 		y_max          = -25,

mods/default/nodes.lua

@@ -637,7 +637,23 @@ minetest.register_node("default:stone_with_coal", {
 	tiles = {"default_stone.png^default_mineral_coal.png"},
 	is_ground_content = true,
 	groups = {cracky=3},
-	drop = 'default:coal_lump',
+	drop = {
+		max_items = 3,
+		items = {
+			{
+				items = {'default:coal_lump'},
+				rarity = 1,
+			},
+			{
+				items = {'default:coal_lump'},
+				rarity = 2,
+			},
+			{
+				items = {'default:coal_lump'},
+				rarity = 2,
+			},
+		}
+	},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -742,7 +758,23 @@ minetest.register_node("default:stone_with_diamond", {
 	tiles = {"default_stone.png^default_mineral_diamond.png"},
 	is_ground_content = true,
 	groups = {cracky=1},
-	drop = "default:diamond",
+	drop = {
+		max_items = 3,
+		items = {
+			{
+				items = {'default:diamond'},
+				rarity = 1,
+			},
+			{
+				items = {'default:diamond'},
+				rarity = 3,
+			},
+			{
+				items = {'default:diamond'},
+				rarity = 4,
+			},
+		}
+	},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -754,13 +786,32 @@ minetest.register_node("default:diamondblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-
 minetest.register_node("default:stone_with_emerald", {
 	description = "Emerald Ore",
 	tiles = {"emerald_ore.png"},
 	is_ground_content = true,
 	groups = {cracky=1},
-	drop = "default:emerald",
+	drop = {
+		max_items = 4,
+		items = {
+			{
+				items = {'default:emerald'},
+				rarity = 1,
+			},
+			{
+				items = {'default:emerald'},
+				rarity = 2,
+			},
+			{
+				items = {'default:emerald'},
+				rarity = 2,
+			},
+			{
+				items = {'default:emerald'},
+				rarity = 2,
+			},
+		}
+	},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -773,6 +824,44 @@ minetest.register_node("default:emeraldblock", {
 })
 
 
+minetest.register_node("default:stone_with_lapis", {
+	description = "Lapis Lazuli Ore",
+	tiles = {"lapis_ore.png"},
+	is_ground_content = true,
+	groups = {cracky=1},
+	drop = {
+		max_items = 4,
+		items = {
+			{
+				items = {'dye:blue'},
+				rarity = 1,
+			},
+			{
+				items = {'dye:blue'},
+				rarity = 1,
+			},
+			{
+				items = {'dye:blue'},
+				rarity = 2,
+			},
+			{
+				items = {'dye:blue'},
+				rarity = 2,
+			},
+		}
+	},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:lapisblock", {
+	description = "Lapis Lazuli Block",
+	tiles = {"lapis_block.png"},
+	is_ground_content = true,
+	groups = {cracky=1,level=3},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+
 --
 -- Plantlife (non-cubic)
 --

mods/dye/init.lua

@@ -10,22 +10,24 @@ local dyelocal = {}
 
 -- This collection of colors is partly a historic thing, partly something else.
 dyelocal.dyes = {
-	{"white",      "White dye",     {dye=1, basecolor_white=1,   excolor_white=1,     unicolor_white=1}},
-	{"grey",       "Grey dye",      {dye=1, basecolor_grey=1,    excolor_grey=1,      unicolor_grey=1}},
-	{"dark_grey",  "Dark grey dye", {dye=1, basecolor_grey=1,    excolor_darkgrey=1,  unicolor_darkgrey=1}},
-	{"black",      "Black dye",     {dye=1, basecolor_black=1,   excolor_black=1,     unicolor_black=1}},
-	{"violet",     "Violet dye",    {dye=1, basecolor_magenta=1, excolor_violet=1,    unicolor_violet=1}},
-	{"blue",       "Blue dye",      {dye=1, basecolor_blue=1,    excolor_blue=1,      unicolor_blue=1}},
-	{"cyan",       "Cyan dye",      {dye=1, basecolor_cyan=1,    excolor_cyan=1,      unicolor_cyan=1}},
-	{"dark_green", "Dark green dye",{dye=1, basecolor_green=1,   excolor_green=1,     unicolor_dark_green=1}},
-	{"green",      "Green dye",     {dye=1, basecolor_green=1,   excolor_green=1,     unicolor_green=1}},
-	{"yellow",     "Yellow dye",    {dye=1, basecolor_yellow=1,  excolor_yellow=1,    unicolor_yellow=1}},
-	{"brown",      "Brown dye",     {dye=1, basecolor_brown=1,   excolor_orange=1,    unicolor_dark_orange=1}},
-	{"orange",     "Orange dye",    {dye=1, basecolor_orange=1,  excolor_orange=1,    unicolor_orange=1}},
-	{"red",        "Red dye",       {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_red=1}},
-	{"magenta",    "Magenta dye",   {dye=1, basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}},
-	{"pink",       "Pink dye",      {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_light_red=1}},
+	{"white",      "Bone Meal",     {dye=1, basecolor_white=1,   excolor_white=1,     unicolor_white=1}},
+	{"grey",       "Light Gray Dye",{dye=1, basecolor_grey=1,    excolor_grey=1,      unicolor_grey=1}},
+	{"dark_grey",  "Gray Dye",      {dye=1, basecolor_grey=1,    excolor_darkgrey=1,  unicolor_darkgrey=1}},
+	{"black",      "Ink Sac",       {dye=1, basecolor_black=1,   excolor_black=1,     unicolor_black=1}},
+	{"violet",     "Purple Dye",    {dye=1, basecolor_magenta=1, excolor_violet=1,    unicolor_violet=1}},
+	{"blue",       "Lapis Lazuli",  {dye=1, basecolor_blue=1,    excolor_blue=1,      unicolor_blue=1}},
+	{"light_blue", "Light Blue Dye",{dye=1, basecolor_blue=1,    excolor_blue=1,      unicolor_light_blue=1}},
+	{"cyan",       "Cyan Dye",      {dye=1, basecolor_cyan=1,    excolor_cyan=1,      unicolor_cyan=1}},
+	{"dark_green", "Cactus Green",  {dye=1, basecolor_green=1,   excolor_green=1,     unicolor_dark_green=1}},
+	{"green",      "Lime Dye",      {dye=1, basecolor_green=1,   excolor_green=1,     unicolor_green=1}},
+	{"yellow",     "Dandelion Yellow",    {dye=1, basecolor_yellow=1,  excolor_yellow=1,    unicolor_yellow=1}},
+	{"brown",      "Cocoa Beans",   {dye=1, basecolor_brown=1,   excolor_orange=1,    unicolor_dark_orange=1}},
+	{"orange",     "Orange Dye",    {dye=1, basecolor_orange=1,  excolor_orange=1,    unicolor_orange=1}},
+	{"red",        "Rose Red",      {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_red=1}},
+	{"magenta",    "Magenta Dye",   {dye=1, basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}},
+	{"pink",       "Pink Dye",      {dye=1, basecolor_red=1,     excolor_red=1,       unicolor_light_red=1}},
 }
+dye.dyes = dyelocal.dyes
 
 -- Define items
 for _, row in ipairs(dyelocal.dyes) do

mods/fertiliser/init.lua

@@ -173,11 +173,18 @@ minetest.register_craft({
     output = 'fertiliser:fertiliser 9',
     recipe = {
         {'default:dirt',	'default:dirt',			'default:dirt'},
-        {'default:dirt',	'bones:single_bone',	'default:dirt'},
+        {'default:dirt',	'bones:single_bone',	        'default:dirt'},
         {'default:dirt',	'default:dirt',			'default:dirt'},
     },
 })
 
+minetest.register_craft({
+    output = 'dye:white 3',
+    recipe = {
+        {'bones:single_bone'},
+    },
+})
+
 minetest.register_craft({
     output = 'bones:bones',
     recipe = {

mods/hardenedclay/init.lua

@@ -25,9 +25,11 @@ for _, color in pairs(colors) do
 	})
 	minetest.register_craft({
 		type = "shapeless",
-		output = 'hardenedclay:hardened_clay_'..nodecolor,
+		output = 'hardenedclay:hardened_clay_'..nodecolor.." 8",
 		recipe = {
-			'dye:'..nodecolor, 'hardenedclay:hardened_clay',
+			'hardenedclay:hardened_clay', 'hardenedclay:hardened_clay', 'hardenedclay:hardened_clay',
+			'hardenedclay:hardened_clay', 'dye:'..nodecolor, 'hardenedclay:hardened_clay',
+			'hardenedclay:hardened_clay', 'hardenedclay:hardened_clay', 'hardenedclay:hardened_clay',
 		}
 	})
 	minetest.register_alias("hardenedclay:"..nodecolor.."_hardened_clay",