Add new rock types

mods/ITEMS/base/crafting.lua

@@ -500,38 +500,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "base:silver_sandstone",
-	recipe = {
-		{"base:silver_sand", "base:silver_sand"},
-		{"base:silver_sand", "base:silver_sand"},
-	}
-})
-
-minetest.register_craft({
-	output = "base:silver_sand 4",
-	recipe = {
-		{"base:silver_sandstone"},
-	}
-})
-
-minetest.register_craft({
-	output = "base:silver_sandstone_brick 4",
-	recipe = {
-		{"base:silver_sandstone", "base:silver_sandstone"},
-		{"base:silver_sandstone", "base:silver_sandstone"},
-	}
-})
-
-minetest.register_craft({
-	output = "base:silver_sandstone_block 9",
-	recipe = {
-		{"base:silver_sandstone", "base:silver_sandstone", "base:silver_sandstone"},
-		{"base:silver_sandstone", "base:silver_sandstone", "base:silver_sandstone"},
-		{"base:silver_sandstone", "base:silver_sandstone", "base:silver_sandstone"},
-	}
-})
-
 minetest.register_craft({
 	output = 'base:clay',
 	recipe = {
@@ -753,29 +721,29 @@ minetest.register_craft({
 
 -- Small rocks can be used to create cobblestone.
 minetest.register_craft({
-	output = "base:red_cobble",
+	output = "base:granite",
 	recipe = {
-		{"", "", ""},
-		{"base:small_red_rocks", "base:small_red_rocks", ""},
-		{"base:small_red_rocks", "base:small_red_rocks", ""},
+		{"base:small_red_rocks", "base:small_red_rocks", "base:small_red_rocks"},
+		{"base:small_red_rocks", "base:small_red_rocks", "base:small_red_rocks"},
+		{"base:small_red_rocks", "base:small_red_rocks", "base:small_red_rocks"},
 	}
 })
 
 minetest.register_craft({
 	output = "base:sandstone_cobble",
 	recipe = {
-		{"", "", ""},
-		{"base:small_sandstone_rocks", "base:small_sandstone_rocks", ""},
-		{"base:small_sandstone_rocks", "base:small_sandstone_rocks", ""},
+		{"base:small_sandstone_rocks", "base:small_sandstone_rocks", "base:small_sandstone_rocks"},
+		{"base:small_sandstone_rocks", "base:small_sandstone_rocks", "base:small_sandstone_rocks"},
+		{"base:small_sandstone_rocks", "base:small_sandstone_rocks", "base:small_sandstone_rocks"},
 	}
 })
 
 minetest.register_craft({
 	output = "base:cobble",
 	recipe = {
-		{"", "", ""},
-		{"base:small_stone_rocks", "base:small_stone_rocks", ""},
-		{"base:small_stone_rocks", "base:small_stone_rocks", ""},
+		{"base:small_stone_rocks", "base:small_stone_rocks", "base:small_stone_rocks"},
+		{"base:small_stone_rocks", "base:small_stone_rocks", "base:small_stone_rocks"},
+		{"base:small_stone_rocks", "base:small_stone_rocks", "base:small_stone_rocks"},
 	}
 })
 

mods/ITEMS/base/nodes_base.lua

@@ -50,42 +50,6 @@ minetest.register_node("base:mossycobble", {
 	sounds = base.node_sound_stone_defaults(),
 })
 
-
-minetest.register_node("base:desert_stone", {
-	description = "Desert Stone",
-	tiles = {"base_desert_stone.png"},
-	groups = {cracky = 3, stone = 1},
-	drop = 'base:desert_cobble',
-	legacy_mineral = true,
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:desert_cobble", {
-	description = "Desert Cobblestone",
-	tiles = {"base_desert_cobble.png"},
-	is_ground_content = false,
-	groups = {cracky = 3, stone = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:desert_stonebrick", {
-	description = "Desert Stone Brick",
-	paramtype2 = "facedir",
-	place_param2 = 0,
-	tiles = {"base_desert_stone_brick.png"},
-	is_ground_content = false,
-	groups = {cracky = 2, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:desert_stone_block", {
-	description = "Desert Stone Block",
-	tiles = {"base_desert_stone_block.png"},
-	is_ground_content = false,
-	groups = {cracky = 2, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
 minetest.register_node("base:sandstone", {
 	description = "Sandstone",
 	tiles = {"base_sandstone.png"},
@@ -136,31 +100,6 @@ minetest.register_node("base:desert_sandstone_block", {
 	sounds = base.node_sound_stone_defaults(),
 })
 
-minetest.register_node("base:silver_sandstone", {
-	description = "Silver Sandstone",
-	tiles = {"base_silver_sandstone.png"},
-	groups = {crumbly = 1, cracky = 3},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:silver_sandstone_brick", {
-	description = "Silver Sandstone Brick",
-	paramtype2 = "facedir",
-	place_param2 = 0,
-	tiles = {"base_silver_sandstone_brick.png"},
-	is_ground_content = false,
-	groups = {cracky = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:silver_sandstone_block", {
-	description = "Silver Sandstone Block",
-	tiles = {"base_silver_sandstone_block.png"},
-	is_ground_content = false,
-	groups = {cracky = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
 minetest.register_node("base:obsidian", {
 	description = "Obsidian",
 	tiles = {"base_obsidian.png"},
@@ -186,30 +125,6 @@ minetest.register_node("base:obsidian_block", {
 	groups = {cracky = 1, level = 2},
 })
 
-minetest.register_node("base:red_stone", {
-	description = "Red Stone",
-	tiles = {"base_red_stone.png"},
-	groups = {cracky = 3, stone = 1},
-	drop = "base:red_cobble",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:red_cobble", {
-	description = "Red Cobblestone",
-	tiles = {"base_red_cobble.png"},
-	is_ground_content = false,
-	groups = {cracky = 3, stone = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("base:red_stonebrick", {
-	description = "Red Stone Brick",
-	tiles = {"base_red_stonebrick.png"},
-	is_ground_content = false,
-	groups = {cracky = 2, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
 minetest.register_node("base:sandstone_cobble", {
 	description = "Sandstone Cobble",
 	tiles = {"base_sandstone_cobble.png"},
@@ -241,6 +156,41 @@ minetest.register_node("base:bluestone_brick", {
 	sounds = base.node_sound_stone_defaults(),
 })
 
+minetest.register_node("base:diorite", {
+	description = "Diorite",
+	tiles = {"base_diorite.png"},
+	groups = {cracky = 2, stone = 1},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_node("base:granite", {
+	description = "Granite",
+	tiles = {"base_granite.png"},
+	groups = {cracky = 2, stone = 1},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_node("base:limestone", {
+	description = "Limestone",
+	tiles = {"base_limestone.png"},
+	groups = {cracky = 3, stone = 1},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_node("base:marble", {
+	description = "Marble",
+	tiles = {"base_marble.png"},
+	groups = {cracky = 3, stone = 1},
+	sounds = base.node_sound_stone_defaults(),
+}) 
+
+minetest.register_node("base:marble_brick", {
+	description = "Marble Brick",
+	tiles = {"base_marble_brick.png"},
+	groups = {cracky = 3, stone = 1},
+	sounds = base.node_sound_stone_defaults(),
+}) 
+
 
 --
 -- Soft / Non-Stone
@@ -338,13 +288,6 @@ minetest.register_node("base:desert_sand", {
 	sounds = base.node_sound_sand_defaults(),
 })
 
-minetest.register_node("base:silver_sand", {
-	description = "Silver Sand",
-	tiles = {"base_silver_sand.png"},
-	groups = {crumbly = 3, falling_node = 1, sand = 1},
-	sounds = base.node_sound_sand_defaults(),
-})
-
 minetest.register_node("base:red_sand", {
 	description = "Red Sand",
 	tiles = {"base_red_sand.png"},

mods/ITEMS/base/nodes_misc.lua

@@ -83,7 +83,7 @@ for grid_count = 1, 6 do
 
 	minetest.register_node("base:small_red_rocks"..grid_count, {
 		description = "Small Red Rocks",
-		tiles = {"base_red_stone.png"},
+		tiles = {"base_granite.png"},
 		is_ground_content = true,
 		walkable = false,
 		paramtype = "light",
@@ -104,7 +104,7 @@ end
 
 minetest.register_node("base:small_red_rocks", {
 	description = "Small Red Rocks",
-	tiles = {"base_red_stone.png"},
+	tiles = {"base_granite.png"},
 	inventory_image = "base_small_red_rocks.png",
 	is_ground_content = true,
 	walkable = false,

mods/ITEMS/stairs/init.lua

@@ -369,42 +369,42 @@ stairs.register_stair_and_slab(
 )
 
 stairs.register_stair_and_slab(
-	"desert_stone",
-	"base:desert_stone",
-	{cracky = 3},
-	{"base_desert_stone.png"},
-	"Desert Stone Stair",
-	"Desert Stone Slab",
-	base.node_sound_stone_defaults()
-)
-
-stairs.register_stair_and_slab(
-	"desert_cobble",
-	"base:desert_cobble",
-	{cracky = 3},
-	{"base_desert_cobble.png"},
-	"Desert Cobblestone Stair",
-	"Desert Cobblestone Slab",
-	base.node_sound_stone_defaults()
-)
-
-stairs.register_stair_and_slab(
-	"desert_stonebrick",
-	"base:desert_stonebrick",
+	"diorite",
+	"base:diorite",
 	{cracky = 2},
-	{"base_desert_stone_brick.png"},
-	"Desert Stone Brick Stair",
-	"Desert Stone Brick Slab",
+	{"base_diorite.png"},
+	"Diorite Stair",
+	"Diorite Slab",
 	base.node_sound_stone_defaults()
 )
 
 stairs.register_stair_and_slab(
-	"desert_stone_block",
-	"base:desert_stone_block",
+	"granite",
+	"base:granite",
 	{cracky = 2},
-	{"base_desert_stone_block.png"},
-	"Desert Stone Block Stair",
-	"Desert Stone Block Slab",
+	{"base_granite.png"},
+	"Granite Stair",
+	"Granite Slab",
+	base.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"marble",
+	"base:marble",
+	{cracky = 2},
+	{"base_marble.png"},
+	"Marble Stair",
+	"Marble Slab",
+	base.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"marble_brick",
+	"base:marble_brick",
+	{cracky = 2},
+	{"base_marble_brick.png"},
+	"Marble Brick Stair",
+	"Marble Brick Slab",
 	base.node_sound_stone_defaults()
 )
 
@@ -468,36 +468,6 @@ stairs.register_stair_and_slab(
 	base.node_sound_stone_defaults()
 )
 
-stairs.register_stair_and_slab(
-	"silver_sandstone",
-	"base:silver_sandstone",
-	{crumbly = 1, cracky = 3},
-	{"base_silver_sandstone.png"},
-	"Silver Sandstone Stair",
-	"Silver Sandstone Slab",
-	base.node_sound_stone_defaults()
-)
-
-stairs.register_stair_and_slab(
-	"silver_sandstone_brick",
-	"base:silver_sandstone_brick",
-	{cracky = 2},
-	{"base_silver_sandstone_brick.png"},
-	"Silver Sandstone Brick Stair",
-	"Silver Sandstone Brick Slab",
-	base.node_sound_stone_defaults()
-)
-
-stairs.register_stair_and_slab(
-	"silver_sandstone_block",
-	"base:silver_sandstone_block",
-	{cracky = 2},
-	{"base_silver_sandstone_block.png"},
-	"Silver Sandstone Block Stair",
-	"Silver Sandstone Block Slab",
-	base.node_sound_stone_defaults()
-)
-
 stairs.register_stair_and_slab(
 	"obsidian",
 	"base:obsidian",

mods/ITEMS/walls/init.lua

@@ -46,9 +46,6 @@ walls.register("walls:cobble", "Cobblestone Wall", "base_cobble.png",
 walls.register("walls:mossycobble", "Mossy Cobblestone Wall", "base_mossycobble.png",
 		"base:mossycobble", base.node_sound_stone_defaults())
 
-walls.register("walls:desertcobble", "Desert Cobblestone Wall", "base_desert_cobble.png",
-		"base:desert_cobble", base.node_sound_stone_defaults())
-
 walls.register("walls:bluestone", "Bluestone Cobble Wall", "base_bluestone_cobble.png",
 		"base:bluestone_cobble", base.node_sound_stone_defaults())
 
@@ -58,23 +55,26 @@ walls.register("walls:bluestone_cobble", "Bluestone Wall", "base_bluestone.png",
 walls.register("walls:bluestone_brick", "Bluestone Brick Wall", "base_bluestone_brick.png",
 		"base:bluestone_brick", base.node_sound_stone_defaults())
 
+walls.register("walls:diorite", "Diorite Wall", "base_diorite.png",
+		"base:diorite", base.node_sound_stone_defaults())
+
+walls.register("walls:granite", "Granite Wall", "base_granite.png",
+		"base:granite", base.node_sound_stone_defaults())
+
+walls.register("walls:marble", "Marble Wall", "base_marble.png",
+		"base:marble", base.node_sound_stone_defaults())
+
+walls.register("walls:marble_brick", "Marble Brick Wall", "base_marble_brick.png",
+		"base:marble_brick", base.node_sound_stone_defaults())
+
 walls.register("walls:brick", "Brick Wall", "base_brick.png",
 		"base:brick", base.node_sound_stone_defaults())
 
-walls.register("walls:desert_stone", "Desert Stone Wall", "base_desert_stone.png",
-		"base:desert_stone", base.node_sound_stone_defaults())
+walls.register("walls:desert_sandstone", "Desert Sandstone Wall", "base_desert_sandstone.png",
+		"base:desert_sandstone", base.node_sound_stone_defaults())
 
-walls.register("walls:desert_stonebrick", "Desert Stone Brick Wall", "base_desert_stone_brick.png",
-		"base:desert_stonebrick", base.node_sound_stone_defaults())
-
-walls.register("walls:red_stone", "Red Cobblestone Wall", "base_red_cobble.png",
-		"base:red_cobble", base.node_sound_stone_defaults())
-
-walls.register("walls:red_cobble", "Red Stone Wall", "base_red_stone.png",
-		"base:red_stone", base.node_sound_stone_defaults())
-
-walls.register("walls:red_stonebrick", "Red Stone Brick Wall", "base_red_stonebrick.png",
-		"base:red_stonebrick", base.node_sound_stone_defaults())
+walls.register("walls:desert_sandstone_brick", "Desert Sandstone Brick Wall", "base_desert_sandstone_brick.png",
+		"base:desert_sandstonebrick", base.node_sound_stone_defaults())
 
 walls.register("walls:sandstone", "Sandstone Wall", "base_sandstone.png",
 		"base:sandstone", base.node_sound_stone_defaults())

mods/MAPGEN/australia/biome_central_australia.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =              "central_australia",
 	node_top =          "base:red_dirt",
 	depth_top =         1,
-	node_filler =       "base:red_stone",
+	node_filler =       "base:granite",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",

mods/MAPGEN/australia/biome_far_north_queensland.lua

@@ -27,6 +27,20 @@ minetest.register_biome({
 
 -- Blob ore first to avoid other ores inside blobs
 
+minetest.register_ore({
+	ore_type       = "sheet",
+	ore            = "base:marble",
+	wherein        = "base:stone",
+	clust_scarcity = 1,
+	clust_num_ores = 1,
+	clust_size     = 3,
+	biomes         = {"far_north_queensland"},
+	y_min          = -1000,
+	y_max          = -5,
+	noise_threshold = 0.4,
+	noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70}
+})
+
 
 --[[
 	Decorations

mods/MAPGEN/australia/biome_flinders_lofty.lua

@@ -48,6 +48,20 @@ minetest.register_ore({
 	},
 })
 
+minetest.register_ore({
+	ore_type       = "sheet",
+	ore            = "base:marble",
+	wherein        = "base:stone",
+	clust_scarcity = 1,
+	clust_num_ores = 1,
+	clust_size     = 3,
+	biomes         = {"flinders_lofty"},
+	y_min          = -1000,
+	y_max          = -5,
+	noise_threshold = 0.4,
+	noise_params = {offset=0, scale=15, spread={x=150, y=150, z=150}, seed=23, octaves=3, persist=0.70}
+})
+
 minetest.register_ore({
 	ore_type =                "sheet",
 	ore =                     "base:bluestone",

mods/MAPGEN/australia/biome_great_australian_bight.lua

@@ -6,12 +6,12 @@ local math_random = math.random
 -- great australian bight
 minetest.register_biome({
 	name =            "great_australian_bight",
-	node_top =        "base:sandstone",
+	node_top =        "base:limestone",
 	depth_top =       3,
 	node_filler =     "base:bluestone",
 	depth_filler =    4,
 	node_stone =      "base:stone",
-	node_riverbed =   "base:sandstone",
+	node_riverbed =   "base:limestone",
 	depth_riverbed =  1,
 	y_min =           -192,
 	y_max =           3,

mods/MAPGEN/australia/biome_pilbara.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =              "pilbara",
 	node_top =          "base:red_gravel",
 	depth_top =         2,
-	node_filler =       "base:red_stone",
+	node_filler =       "base:granite",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",

mods/MAPGEN/australia/biome_simpson_desert.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =              "simpson_desert",
 	node_top =          "base:red_sand",
 	depth_top =         3,
-	node_filler =       "base:red_stone",
+	node_filler =       "base:granite",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",

mods/MAPGEN/australia/voxel.lua

@@ -155,7 +155,7 @@ end
 
 -- Rocky beaches
 function rock_beach(x, y, z, a, data)
-	local c_granite = minetest.get_content_id("technic:granite")
+	local c_granite = minetest.get_content_id("base:granite")
 	local dx = math.random() * 15 + 1
 	local dy = math.random() * 15 + 1
 	local dz = math.random() * 15 + 1

mods/MAPGEN/mapgen_core/init.lua

@@ -133,6 +133,52 @@ minetest.register_ore({
 	},
 })
 
+-- Diorite
+minetest.register_ore({
+	ore_type       = "blob",
+	ore            = "base:diorite",
+	wherein        = {"base:stone"},
+	clust_scarcity = 15*15*15,
+	clust_num_ores = 33,
+	clust_size     = 5,
+	y_min          = -31000,
+	y_max          = 31000,
+})
+
+minetest.register_ore({
+	ore_type       = "blob",
+	ore            = "base:diorite",
+	wherein        = {"base:stone"},
+	clust_scarcity = 10*10*10,
+	clust_num_ores = 58,
+	clust_size     = 7,
+	y_min          = -31000,
+	y_max          = 31000,
+})
+
+-- Granite
+minetest.register_ore({
+	ore_type       = "blob",
+	ore            = "base:granite",
+	wherein        = {"base:stone"},
+	clust_scarcity = 15*15*15,
+	clust_num_ores = 33,
+	clust_size     = 5,
+	y_min          = -31000,
+	y_max          = 31000,
+})
+
+minetest.register_ore({
+	ore_type       = "blob",
+	ore            = "base:granite",
+	wherein        = {"base:stone"},
+	clust_scarcity = 10*10*10,
+	clust_num_ores = 58,
+	clust_size     = 7,
+	y_min          = -31000,
+	y_max          = 31000,
+})
+
 -- Coal
 minetest.register_ore({
 	ore_type        = "scatter",