Move stone and dirt nodes from australia to base mod

mods/ITEMS/base/crafting.lua

@@ -496,6 +496,50 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "base:red_stonebrick 4",
+	recipe = {
+		{"base:red_stone", "base:red_stone"},
+		{"base:red_stone", "base:red_stone"},
+	}
+})
+
+minetest.register_craft({
+	output = "base:bluestone_brick 4",
+	recipe = {
+		{"base:bluestone", "base:bluestone"},
+		{"base:bluestone", "base:bluestone"},
+	}
+})
+
+-- Small rocks can be used to create cobblestone.
+minetest.register_craft({
+	output = "base:red_cobble",
+	recipe = {
+		{"", "", ""},
+		{"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", ""},
+	}
+})
+
+minetest.register_craft({
+	output = "base:cobble",
+	recipe = {
+		{"", "", ""},
+		{"base:small_stone_rocks", "base:small_stone_rocks", ""},
+		{"base:small_stone_rocks", "base:small_stone_rocks", ""},
+	}
+})
+
 
 --
 -- Crafting (tool repair)
@@ -570,6 +614,18 @@ minetest.register_craft({
 	recipe = "base:clay_lump",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "base:bluestone",
+	recipe = "base:bluestone_cobble",
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "base:red_stone",
+	recipe = "base:red_cobble",
+})
+
 
 --
 -- Fuels

mods/ITEMS/base/nodes_base.lua

@@ -186,6 +186,62 @@ 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"},
+	groups = {crumbly = 1, cracky = 3, oddly_breakable_by_hand = 1},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_node("base:bluestone", {
+	description = "Bluestone (Basalt)",
+	tiles = {"base_bluestone.png"},
+	groups = {cracky = 2, stone = 1},
+	drop = "base:bluestone_cobble",
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_node("base:bluestone_cobble", {
+	description = "Bluestone (Basalt) Cobble",
+	tiles = {"base_bluestone_cobble.png"},
+	is_ground_content = false,
+	groups = {cracky = 2, stone = 2},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+minetest.register_node("base:bluestone_brick", {
+	description = "Bluestone Brick",
+	tiles = {"base_bluestone_brick.png"},
+	is_ground_content = false,
+	groups = {cracky = 1, stone = 1},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+
 --
 -- Soft / Non-Stone
 --
@@ -197,6 +253,13 @@ minetest.register_node("base:dirt", {
 	sounds = base.node_sound_dirt_defaults(),
 })
 
+minetest.register_node("base:red_dirt", {
+	description = "Red Dirt",
+	tiles = {"base_red_dirt.png"},
+	groups = {crumbly = 3, soil = 1},
+	sounds = base.node_sound_dirt_defaults(),
+})
+
 minetest.register_node("base:dirt_with_grass", {
 	description = "Dirt with Grass",
 	tiles = {"base_grass.png", "base_dirt.png",
@@ -282,6 +345,13 @@ minetest.register_node("base:silver_sand", {
 	sounds = base.node_sound_sand_defaults(),
 })
 
+minetest.register_node("base:red_sand", {
+	description = "Red Sand",
+	tiles = {"base_red_sand.png"},
+	groups = {crumbly = 3, falling_node = 1, sand = 1},
+	sounds = base.node_sound_sand_defaults(),
+})
+
 minetest.register_node("base:gravel", {
 	description = "Gravel",
 	tiles = {"base_gravel.png"},
@@ -296,6 +366,15 @@ minetest.register_node("base:gravel", {
 	}
 })
 
+minetest.register_node("base:red_gravel", {
+	description = "Red Gravel",
+	tiles = {"base_red_gravel.png"},
+	groups = {crumbly = 2, falling_node = 1},
+	sounds = base.node_sound_gravel_defaults(),
+	}),
+})
+
+
 minetest.register_node("base:clay", {
 	description = "Clay",
 	tiles = {"base_clay.png"},
@@ -371,13 +450,6 @@ minetest.register_node("base:mangrove_mud", {
 	}),
 })
 
-minetest.register_node("base:red_sand", {
-	description = "Red Sand",
-	tiles = {"base_red_sand.png"},
-	groups = {crumbly = 3, falling_node = 1, sand = 1},
-	sounds = base.node_sound_sand_defaults(),
-})
-
 minetest.register_node("base:mineral_salt", {
 	description = "Salt Mineral",
 	tiles = {"base_red_sand.png^base_mineral_salt.png"},
@@ -447,6 +519,14 @@ minetest.register_node("base:stone_with_copper", {
 	sounds = base.node_sound_stone_defaults(),
 })
 
+minetest.register_node("base:stone_with_opal", {
+	description = "Opal Ore",
+	tiles = {"base_stone.png^base_mineral_opal.png"},
+	groups = {cracky = 2},
+	drop = "base:opal",
+	sounds = base.node_sound_stone_defaults(),
+})
+
 minetest.register_node("base:copperblock", {
 	description = "Copper Block",
 	tiles = {"base_copper_block.png"},

mods/ITEMS/base/nodes_misc.lua

@@ -32,3 +32,238 @@ minetest.register_node("base:salt", {
 	},
 })
 
+minetest.register_node("base:opal",{
+	description = "Opal",
+	drawtype = "mesh",
+	mesh = "base_pebble.obj",
+	tiles = {"base_opal.png"},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {cracky=2, stone=1, dig_immediate = 1},
+	selection_box = {
+		type = "fixed",
+		fixed = {-5/16, -8/16, -6/16, 5/16, -1/32, 5/16},
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = {-5/16, -8/16, -6/16, 5/16, -1/32, 5/16},
+	},
+	sounds = base.node_sound_stone_defaults(),
+})
+
+
+--[[
+	Small Rocks
+--]]
+
+-- Place a small nodebox.
+local function small_cube(grid, pos, diameters)
+	local rock = {}
+
+	rock[1] = pos.x
+	rock[2] = pos.y
+	rock[3] = pos.z
+	rock[4] = pos.x + diameters.x
+	rock[5] = pos.y + diameters.y
+	rock[6] = pos.z + diameters.z
+	push(grid, rock)
+end
+
+-- Small red rocks
+local default_grid_red_rocks
+
+for grid_count = 1, 6 do
+	local grid = {}
+	for rock_count = 2, math.random(1, 4) + 1 do
+		local diameter = math.random(15, 25) / 100
+		local x = math.random(1, 80) / 100 - 0.5
+		local z = math.random(1, 80) / 100 - 0.5
+		small_cube(grid, {x = x, y = -0.5, z = z}, {x = diameter, y = diameter, z = diameter})
+	end
+
+	minetest.register_node("base:small_red_rocks"..grid_count, {
+		description = "Small Red Rocks",
+		tiles = {"base_red_stone.png"},
+		is_ground_content = true,
+		walkable = false,
+		paramtype = "light",
+		drawtype = "nodebox",
+		buildable_to = true,
+		node_box = {type = "fixed", fixed = grid},
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+		},
+		groups = {stone = 1, oddly_breakable_by_hand = 3},
+		drop = "base:small_red_rocks",
+		sounds = base.node_sound_stone_defaults(),
+	})
+
+	default_grid_red_rocks = grid
+end
+
+minetest.register_node("base:small_red_rocks", {
+	description = "Small Red Rocks",
+	tiles = {"base_red_stone.png"},
+	inventory_image = "base_small_red_rocks.png",
+	is_ground_content = true,
+	walkable = false,
+	paramtype = "light",
+	drawtype = "nodebox",
+	node_box = {type = "fixed", fixed = default_grid_red_rocks},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+	groups = {stone = 1, oddly_breakable_by_hand = 3},
+	sounds = base.node_sound_stone_defaults(),
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		local player_name = placer:get_player_name()
+		-- place a random small red rocks node
+		if not minetest.is_protected(pos, player_name) then
+			minetest.set_node(pos, {name = "base:small_red_rocks"..math.random(1, 6)})
+			if not minetest.setting_getbool("creative_mode") then
+				itemstack:take_item()
+			end
+		else
+			minetest.chat_send_player(player_name, "Node is protected")
+			minetest.record_protection_violation(pos, player_name)
+		end
+		
+		return itemstack
+	end
+})
+
+-- Small sandstone rocks
+local default_grid_sandstone_rocks
+
+for grid_count = 1, 6 do
+	local grid = {}
+	for rock_count = 2, math.random(1, 4) + 1 do
+		local diameter = math.random(15, 25) / 100
+		local x = math.random(1, 80) / 100 - 0.5
+		local z = math.random(1, 80) / 100 - 0.5
+		small_cube(grid, {x = x, y = -0.5, z = z}, {x = diameter, y = diameter, z = diameter})
+	end
+
+	minetest.register_node("base:small_sandstone_rocks"..grid_count, {
+		description = "Small Sandstone Rocks",
+		tiles = {"base_sandstone.png"},
+		is_ground_content = true,
+		walkable = false,
+		paramtype = "light",
+		drawtype = "nodebox",
+		buildable_to = true,
+		node_box = {type = "fixed", fixed = grid},
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+		},
+		groups = {stone = 1, oddly_breakable_by_hand = 3},
+		drop = "base:small_sandstone_rocks",
+		sounds = base.node_sound_stone_defaults(),
+	})
+
+	default_grid_sandstone_rocks = grid
+end
+
+minetest.register_node("base:small_sandstone_rocks", {
+	description = "Small Sandstone Rocks",
+	tiles = {"base_sandstone.png"},
+	inventory_image = "base_small_sandstone_rocks.png",
+	is_ground_content = true,
+	walkable = false,
+	paramtype = "light",
+	drawtype = "nodebox",
+	node_box = {type = "fixed", fixed = default_grid_sandstone_rocks},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+	groups = {stone = 1, oddly_breakable_by_hand = 3},
+	sounds = base.node_sound_stone_defaults(),
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		local player_name = placer:get_player_name()
+		-- place a random small sandstone rocks node
+		if not minetest.is_protected(pos, player_name) then
+			minetest.set_node(pos, {name = "base:small_sandstone_rocks"..math.random(1, 6)})
+			if not minetest.setting_getbool("creative_mode") then
+				itemstack:take_item()
+			end
+		else
+			minetest.chat_send_player(player_name, "Node is protected")
+			minetest.record_protection_violation(pos, player_name)
+		end
+		
+		return itemstack
+	end
+})
+
+-- Small stone rocks
+local default_grid_stone_rocks
+
+for grid_count = 1, 6 do
+	local grid = {}
+	for rock_count = 2, math.random(1, 4) + 1 do
+		local diameter = math.random(15, 25) / 100
+		local x = math.random(1, 80) / 100 - 0.5
+		local z = math.random(1, 80) / 100 - 0.5
+		small_cube(grid, {x = x, y = -0.5, z = z}, {x = diameter, y = diameter, z = diameter})
+	end
+
+	minetest.register_node("base:small_stone_rocks"..grid_count, {
+		description = "Small Stone Rocks",
+		tiles = {"base_stone.png"},
+		is_ground_content = true,
+		walkable = false,
+		paramtype = "light",
+		drawtype = "nodebox",
+		buildable_to = true,
+		node_box = {type = "fixed", fixed = grid},
+		selection_box = {
+			type = "fixed",
+			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+		},
+		groups = {stone = 1, oddly_breakable_by_hand = 3},
+		drop = "base:small_stone_rocks",
+		sounds = base.node_sound_stone_defaults(),
+	})
+
+	default_grid_stone_rocks = grid
+end
+
+minetest.register_node("base:small_stone_rocks", {
+	description = "Small Stone Rocks",
+	tiles = {"base_stone.png"},
+	inventory_image = "base_small_stone_rocks.png",
+	is_ground_content = true,
+	walkable = false,
+	paramtype = "light",
+	drawtype = "nodebox",
+	node_box = {type = "fixed", fixed = default_grid_stone_rocks},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+	groups = {stone = 1, oddly_breakable_by_hand = 3},
+	sounds = base.node_sound_stone_defaults(),
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		local player_name = placer:get_player_name()
+		-- place a random small stone rocks node
+		if not minetest.is_protected(pos, player_name) then
+			minetest.set_node(pos, {name = "base:small_stone_rocks"..math.random(1, 6)})
+			if not minetest.setting_getbool("creative_mode") then
+				itemstack:take_item()
+			end
+		else
+			minetest.chat_send_player(player_name, "Node is protected")
+			minetest.record_protection_violation(pos, player_name)
+		end
+		
+		return itemstack
+	end
+})
+

mods/ITEMS/bucket/init.lua

@@ -198,6 +198,15 @@ bucket.register_liquid(
 	true
 )
 
+bucket.register_liquid(
+	"base:muddy_water_source",
+	"base:muddy_water_flowing",
+	"bucket:bucket_muddy_water",
+	"bucket_muddy_water.png",
+	"Muddy Water Bucket",
+	{water_bucket = 1}
+)
+
 bucket.register_liquid(
 	"base:lava_source",
 	"base:lava_flowing",

mods/MAPGEN/australia/biome_australian_alps.lua

@@ -29,7 +29,7 @@ minetest.register_biome({
 -- Bluestone (Basalt)
 minetest.register_ore({
 	ore_type =                "sheet",
-	ore =                     "australia:bluestone",
+	ore =                     "base:bluestone",
 	wherein =                 "base:stone",
 	column_height_min =       2,
 	column_height_max =       4,

mods/MAPGEN/australia/biome_central_australia.lua

@@ -6,13 +6,13 @@ local math_random = math.random
 -- central australia
 minetest.register_biome({
 	name =              "central_australia",
-	node_top =          "australia:red_dirt",
+	node_top =          "base:red_dirt",
 	depth_top =         1,
-	node_filler =       "australia:red_stone",
+	node_filler =       "base:red_stone",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",
-	node_riverbed =     "australia:red_dirt",
+	node_riverbed =     "base:red_dirt",
 	depth_riverbed =    1,
 	y_min =             4,
 	y_max =             31000,
@@ -31,7 +31,7 @@ minetest.register_biome({
 -- Coober Pedy
 minetest.register_ore({
 	ore_type =         "vein",
-	ore =              "australia:stone_with_opal",
+	ore =              "base:stone_with_opal",
 	wherein =          "base:stone",
 	biomes =           {"central_australia"},
 	y_min =            -30,
@@ -179,9 +179,9 @@ aus.register_plant({
 local function register_small_red_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_red_rocks"..number,
+		decoration =  "base:small_red_rocks"..number,
 		sidelen =     80,
-		place_on =    {"australia:red_dirt"},
+		place_on =    {"base:red_dirt"},
 		fill_ratio =  0.002,
 		biomes =      {"central_australia"},
 		flags =       "place_center_x, place_center_z",

mods/MAPGEN/australia/biome_eastern_coasts.lua

@@ -30,7 +30,7 @@ minetest.register_biome({
 -- Bluestone (Basalt)
 minetest.register_ore({
 	ore_type =                "sheet",
-	ore =                     "australia:bluestone",
+	ore =                     "base:bluestone",
 	wherein =                 "base:stone",
 	column_height_min =       2,
 	column_height_max =       4,
@@ -156,7 +156,7 @@ minetest.register_decoration({
 local function register_small_stone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_stone_rocks"..number,
+		decoration =  "base:small_stone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_grass"},
 		fill_ratio =  0.003,

mods/MAPGEN/australia/biome_far_north_queensland.lua

@@ -116,7 +116,7 @@ aus.register_plant({
 local function register_small_stone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_stone_rocks"..number,
+		decoration =  "base:small_stone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_grass"},
 		fill_ratio =  0.001,

mods/MAPGEN/australia/biome_flinders_lofty.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =              "flinders_lofty",
 	node_top =          "base:dirt_with_dry_grass",
 	depth_top =         1,
-	node_filler =       "australia:red_dirt",
+	node_filler =       "base:red_dirt",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",
@@ -30,7 +30,7 @@ minetest.register_biome({
 -- Bluestone (Basalt)
 minetest.register_ore({
 	ore_type =         "blob",
-	ore =              "australia:bluestone",
+	ore =              "base:bluestone",
 	wherein =          {"base:stone"},
 	clust_scarcity =   24 * 24 * 24,
 	clust_size =       8,
@@ -50,7 +50,7 @@ minetest.register_ore({
 
 minetest.register_ore({
 	ore_type =                "sheet",
-	ore =                     "australia:bluestone",
+	ore =                     "base:bluestone",
 	wherein =                 "base:stone",
 	column_height_min =       2,
 	column_height_max =       4,

mods/MAPGEN/australia/biome_goldfields_esperence.lua

@@ -107,7 +107,7 @@ aus.register_plant({
 local function register_small_sandstone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_sandstone_rocks"..number,
+		decoration =  "base:small_sandstone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:desert_sand"},
 		fill_ratio =  0.002,

mods/MAPGEN/australia/biome_great_australian_bight.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =            "great_australian_bight",
 	node_top =        "base:sandstone",
 	depth_top =       3,
-	node_filler =     "australia:bluestone",
+	node_filler =     "base:bluestone",
 	depth_filler =    4,
 	node_stone =      "base:stone",
 	node_riverbed =   "base:sandstone",

mods/MAPGEN/australia/biome_great_barrier_reef.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =            "great_barrier_reef",
 	node_top =        "base:sand",
 	depth_top =       3,
-	node_filler =     "australia:bluestone",
+	node_filler =     "base:bluestone",
 	depth_filler =    4,
 	node_stone =      "base:stone",
 	node_riverbed =   "base:sand",

mods/MAPGEN/australia/biome_indian_ocean.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =            "indian_ocean",
 	node_top =        "base:sand",
 	depth_top =       3,
-	node_filler =     "australia:bluestone",
+	node_filler =     "base:bluestone",
 	depth_filler =    4,
 	node_stone =      "base:stone",
 	node_riverbed =   "base:sand",

mods/MAPGEN/australia/biome_jarrah_karri_forests.lua

@@ -30,7 +30,7 @@ minetest.register_biome({
 -- Bluestone (Basalt)
 minetest.register_ore({
 	ore_type =                "sheet",
-	ore =                     "australia:bluestone",
+	ore =                     "base:bluestone",
 	wherein =                 "base:stone",
 	column_height_min =       2,
 	column_height_max =       4,
@@ -177,7 +177,7 @@ aus.register_plant({
 local function register_small_stone_rocks(number)
 	minetest.register_decoration({
 		deco_type =  "simple",
-		decoration =  "australia:small_stone_rocks"..number,
+		decoration =  "base:small_stone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_grass"},
 		fill_ratio =  0.001,

mods/MAPGEN/australia/biome_mulga_lands.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =              "mulga_lands",
 	node_top =          "base:dirt_with_dry_grass",
 	depth_top =         1,
-	node_filler =       "australia:red_dirt",
+	node_filler =       "base:red_dirt",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",
@@ -101,7 +101,7 @@ aus.register_plant({
 local function register_small_stone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_stone_rocks"..number,
+		decoration =  "base:small_stone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_dry_grass"},
 		fill_ratio =  0.001,

mods/MAPGEN/australia/biome_murray_darling_basin.lua

@@ -29,7 +29,7 @@ minetest.register_biome({
 
 minetest.register_ore({
 	ore_type =                "sheet",
-	ore =                     "australia:bluestone",
+	ore =                     "base:bluestone",
 	wherein =                 "base:stone",
 	column_height_min =       2,
 	column_height_max =       4,

mods/MAPGEN/australia/biome_pilbara.lua

@@ -6,13 +6,13 @@ local math_random = math.random
 -- pilbara
 minetest.register_biome({
 	name =              "pilbara",
-	node_top =          "australia:red_gravel",
+	node_top =          "base:red_gravel",
 	depth_top =         2,
-	node_filler =       "australia:red_stone",
+	node_filler =       "base:red_stone",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",
-	node_riverbed =     "australia:red_gravel",
+	node_riverbed =     "base:red_gravel",
 	depth_riverbed =    1,
 	y_min =             4,
 	y_max =             31000,
@@ -57,7 +57,7 @@ minetest.register_ore({
 local function register_dry_grass_decoration(offset, scale, length)
 	minetest.register_decoration({
 		deco_type =     "simple",
-		place_on =      {"australia:red_gravel"},
+		place_on =      {"base:red_gravel"},
 		sidelen =       16,
 		noise_params =  {
 			offset =   offset,
@@ -126,9 +126,9 @@ aus.register_plant({
 local function register_small_red_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_red_rocks"..number,
+		decoration =  "base:small_red_rocks"..number,
 		sidelen =     80,
-		place_on =    {"australia:red_gravel"},
+		place_on =    {"base:red_gravel"},
 		fill_ratio =  0.003,
 		biomes =      {"pilbara"},
 		flags =       "place_center_x, place_center_z",

mods/MAPGEN/australia/biome_simpson_desert.lua

@@ -8,11 +8,11 @@ minetest.register_biome({
 	name =              "simpson_desert",
 	node_top =          "base:red_sand",
 	depth_top =         3,
-	node_filler =       "australia:red_stone",
+	node_filler =       "base:red_stone",
 	depth_filler =      2,
 	node_stone =        "base:stone",
 	node_river_water =  "base:muddy_water_source",
-	node_riverbed =     "australia:red_gravel",
+	node_riverbed =     "base:red_gravel",
 	depth_riverbed =    1,
 	y_min =             4,
 	y_max =             31000,
@@ -36,7 +36,7 @@ minetest.register_biome({
 local function register_small_red_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_red_rocks"..number,
+		decoration =  "base:small_red_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:red_sand"},
 		fill_ratio =  0.001,

mods/MAPGEN/australia/biome_tasman_sea.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =            "tasman_sea",
 	node_top =        "base:sand",
 	depth_top =       3,
-	node_filler =     "australia:bluestone",
+	node_filler =     "base:bluestone",
 	depth_filler =    4,
 	node_stone =      "base:stone",
 	node_riverbed =   "base:sand",

mods/MAPGEN/australia/biome_tasmania.lua

@@ -91,7 +91,7 @@ minetest.register_decoration({
 local function register_small_stone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_stone_rocks"..number,
+		decoration =  "base:small_stone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_grass"},
 		fill_ratio =  0.001,

mods/MAPGEN/australia/biome_timor_sea.lua

@@ -8,7 +8,7 @@ minetest.register_biome({
 	name =            "timor_sea",
 	node_top =        "base:sand",
 	depth_top =       3,
-	node_filler =     "australia:bluestone",
+	node_filler =     "base:bluestone",
 	depth_filler =    2,
 	node_stone =      "base:stone",
 	node_water =      "base:water_source",

mods/MAPGEN/australia/biome_top_end.lua

@@ -223,7 +223,7 @@ aus.register_plant({
 local function register_small_sandstone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_sandstone_rocks"..number,
+		decoration =  "base:small_sandstone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_grass"},
 		fill_ratio =  0.002,

mods/MAPGEN/australia/biome_victorian_forests.lua

@@ -30,7 +30,7 @@ minetest.register_biome({
 -- Bluestone (Basalt)
 minetest.register_ore({
 	ore_type =                "sheet",
-	ore =                     "australia:bluestone",
+	ore =                     "base:bluestone",
 	wherein =                 {"base:stone"},
 	column_height_min =       2,
 	column_height_max =       4,
@@ -177,7 +177,7 @@ minetest.register_decoration({
 local function register_small_stone_rocks(number)
 	minetest.register_decoration({
 		deco_type =   "simple",
-		decoration =  "australia:small_stone_rocks"..number,
+		decoration =  "base:small_stone_rocks"..number,
 		sidelen =     80,
 		place_on =    {"base:dirt_with_grass"},
 		fill_ratio =  0.003,

mods/MAPGEN/australia/crafting.lua

@@ -1,49 +1,5 @@
 -- mods/australia_modpack/australia/crafting.lua
 
-minetest.register_craft({
-	output = "australia:red_stonebrick 4",
-	recipe = {
-		{"australia:red_stone", "australia:red_stone"},
-		{"australia:red_stone", "australia:red_stone"},
-	}
-})
-
-minetest.register_craft({
-	output = "australia:bluestone_brick 4",
-	recipe = {
-		{"australia:bluestone", "australia:bluestone"},
-		{"australia:bluestone", "australia:bluestone"},
-	}
-})
-
--- Small rocks can be used to create cobblestone.
-minetest.register_craft({
-	output = "australia:red_cobble",
-	recipe = {
-		{"", "", ""},
-		{"australia:small_red_rocks", "australia:small_red_rocks", ""},
-		{"australia:small_red_rocks", "australia:small_red_rocks", ""},
-	}
-})
-
-minetest.register_craft({
-	output = "australia:sandstone_cobble",
-	recipe = {
-		{"", "", ""},
-		{"australia:small_sandstone_rocks", "australia:small_sandstone_rocks", ""},
-		{"australia:small_sandstone_rocks", "australia:small_sandstone_rocks", ""},
-	}
-})
-
-minetest.register_craft({
-	output = "base:cobble",
-	recipe = {
-		{"", "", ""},
-		{"australia:small_stone_rocks", "australia:small_stone_rocks", ""},
-		{"australia:small_stone_rocks", "australia:small_stone_rocks", ""},
-	}
-})
-
 
 --[[
 	Fences
@@ -452,19 +408,3 @@ minetest.register_craft({
 	}
 })
 
-
---[[
-	Cooking recipes
---]]
-
-minetest.register_craft({
-	type = "cooking",
-	output = "australia:bluestone",
-	recipe = "australia:bluestone_cobble",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "australia:red_stone",
-	recipe = "australia:red_cobble",
-})

mods/MAPGEN/australia/craftitems.lua

@@ -1,15 +1,5 @@
 -- mods/australia_modpack/australia/craftitems.lua
 
--- Bucket muddy_water
-bucket.register_liquid(
-	"base:muddy_water_source",
-	"base:muddy_water_flowing",
-	"australia:bucket_muddy_water",
-	"aus_bucket_muddy_water.png",
-	"Muddy Water Bucket",
-	{water_bucket = 1}
-)
-
 
 --[[
 	Stairs and slabs

mods/MAPGEN/australia/nodes.lua

@@ -1,6 +1,5 @@
 -- mods/australia_modpack/australia/nodes.lua
 
 dofile(aus.path .. "/nodes_plants.lua")
-dofile(aus.path .. "/nodes_other.lua")
 dofile(aus.path .. "/nodes_sea.lua")
 dofile(aus.path .. "/nodes_trees.lua")

mods/MAPGEN/australia/nodes_other.lua

@@ -1,317 +0,0 @@
--- mods/australia_modpack/australia/nodes_other.lua
-
-minetest.register_node("australia:red_stone", {
-	description = "Red Stone",
-	tiles = {"aus_red_stone.png"},
-	groups = {cracky = 3, stone = 1},
-	drop = "australia:red_cobble",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:red_cobble", {
-	description = "Red Cobblestone",
-	tiles = {"aus_red_cobble.png"},
-	is_ground_content = false,
-	groups = {cracky = 3, stone = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:red_stonebrick", {
-	description = "Red Stone Brick",
-	tiles = {"aus_red_stonebrick.png"},
-	is_ground_content = false,
-	groups = {cracky = 2, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:sandstone_cobble", {
-	description = "Sandstone Cobble",
-	tiles = {"aus_sandstone_cobble.png"},
-	groups = {crumbly = 1, cracky = 3, oddly_breakable_by_hand = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:bluestone", {
-	description = "Bluestone (Basalt)",
-	tiles = {"aus_bluestone.png"},
-	groups = {cracky = 2, stone = 1},
-	drop = "australia:bluestone_cobble",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:bluestone_cobble", {
-	description = "Bluestone (Basalt) Cobble",
-	tiles = {"aus_bluestone_cobble.png"},
-	is_ground_content = false,
-	groups = {cracky = 2, stone = 2},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:bluestone_brick", {
-	description = "Bluestone Brick",
-	tiles = {"aus_bluestone_brick.png"},
-	is_ground_content = false,
-	groups = {cracky = 1, stone = 1},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:red_dirt", {
-	description = "Red Dirt",
-	tiles = {"aus_red_dirt.png"},
-	groups = {crumbly = 3,soil = 1},
-	sounds = base.node_sound_dirt_defaults(),
-})
-
-minetest.register_node("australia:red_gravel", {
-	description = "Red Gravel",
-	tiles = {"aus_red_gravel.png"},
-	groups = {crumbly = 2, falling_node = 1},
-	sounds = base.node_sound_dirt_defaults({
-		footstep = {name = "base_gravel_footstep", gain = 0.5},
-		dug = {name = "base_gravel_footstep", gain = 1.0},
-	}),
-})
-
-minetest.register_node("australia:stone_with_opal", {
-	description = "Opal Ore",
-	tiles = {"base_stone.png^aus_mineral_opal.png"},
-	groups = {cracky = 2},
-	drop = "australia:opal",
-	sounds = base.node_sound_stone_defaults(),
-})
-
-minetest.register_node("australia:opal",{
-	description = "Opal",
-	drawtype = "mesh",
-	mesh = "cavestuff_pebble.obj",
-	tiles = {"aus_opal.png"},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	groups = {cracky=2, stone=1, dig_immediate = 1},
-	selection_box = {
-		type = "fixed",
-		fixed = {-5/16, -8/16, -6/16, 5/16, -1/32, 5/16},
-	},
-	collision_box = {
-		type = "fixed",
-		fixed = {-5/16, -8/16, -6/16, 5/16, -1/32, 5/16},
-	},
-	sounds = base.node_sound_stone_defaults(),
-})
-
-
---[[
-	Small Rocks
---]]
-
--- Place a small nodebox.
-local function small_cube(grid, pos, diameters)
-	local rock = {}
-
-	rock[1] = pos.x
-	rock[2] = pos.y
-	rock[3] = pos.z
-	rock[4] = pos.x + diameters.x
-	rock[5] = pos.y + diameters.y
-	rock[6] = pos.z + diameters.z
-	push(grid, rock)
-end
-
--- Small red rocks
-local default_grid_red_rocks
-
-for grid_count = 1, 6 do
-	local grid = {}
-	for rock_count = 2, math.random(1, 4) + 1 do
-		local diameter = math.random(15, 25) / 100
-		local x = math.random(1, 80) / 100 - 0.5
-		local z = math.random(1, 80) / 100 - 0.5
-		small_cube(grid, {x = x, y = -0.5, z = z}, {x = diameter, y = diameter, z = diameter})
-	end
-
-	minetest.register_node("australia:small_red_rocks"..grid_count, {
-		description = "Small Red Rocks",
-		tiles = {"aus_red_stone.png"},
-		is_ground_content = true,
-		walkable = false,
-		paramtype = "light",
-		drawtype = "nodebox",
-		buildable_to = true,
-		node_box = {type = "fixed", fixed = grid},
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-		},
-		groups = {stone = 1, oddly_breakable_by_hand = 3},
-		drop = "australia:small_red_rocks",
-		sounds = base.node_sound_stone_defaults(),
-	})
-
-	default_grid_red_rocks = grid
-end
-
-minetest.register_node("australia:small_red_rocks", {
-	description = "Small Red Rocks",
-	tiles = {"aus_red_stone.png"},
-	inventory_image = "aus_small_red_rocks.png",
-	is_ground_content = true,
-	walkable = false,
-	paramtype = "light",
-	drawtype = "nodebox",
-	node_box = {type = "fixed", fixed = default_grid_red_rocks},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-	groups = {stone = 1, oddly_breakable_by_hand = 3},
-	sounds = base.node_sound_stone_defaults(),
-	on_place = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.above
-		local player_name = placer:get_player_name()
-		-- place a random small red rocks node
-		if not minetest.is_protected(pos, player_name) then
-			minetest.set_node(pos, {name = "australia:small_red_rocks"..math.random(1, 6)})
-			if not minetest.setting_getbool("creative_mode") then
-				itemstack:take_item()
-			end
-		else
-			minetest.chat_send_player(player_name, "Node is protected")
-			minetest.record_protection_violation(pos, player_name)
-		end
-		
-		return itemstack
-	end
-})
-
--- Small sandstone rocks
-local default_grid_sandstone_rocks
-
-for grid_count = 1, 6 do
-	local grid = {}
-	for rock_count = 2, math.random(1, 4) + 1 do
-		local diameter = math.random(15, 25) / 100
-		local x = math.random(1, 80) / 100 - 0.5
-		local z = math.random(1, 80) / 100 - 0.5
-		small_cube(grid, {x = x, y = -0.5, z = z}, {x = diameter, y = diameter, z = diameter})
-	end
-
-	minetest.register_node("australia:small_sandstone_rocks"..grid_count, {
-		description = "Small Sandstone Rocks",
-		tiles = {"base_sandstone.png"},
-		is_ground_content = true,
-		walkable = false,
-		paramtype = "light",
-		drawtype = "nodebox",
-		buildable_to = true,
-		node_box = {type = "fixed", fixed = grid},
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-		},
-		groups = {stone = 1, oddly_breakable_by_hand = 3},
-		drop = "australia:small_sandstone_rocks",
-		sounds = base.node_sound_stone_defaults(),
-	})
-
-	default_grid_sandstone_rocks = grid
-end
-
-minetest.register_node("australia:small_sandstone_rocks", {
-	description = "Small Sandstone Rocks",
-	tiles = {"base_sandstone.png"},
-	inventory_image = "aus_small_sandstone_rocks.png",
-	is_ground_content = true,
-	walkable = false,
-	paramtype = "light",
-	drawtype = "nodebox",
-	node_box = {type = "fixed", fixed = default_grid_sandstone_rocks},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-	groups = {stone = 1, oddly_breakable_by_hand = 3},
-	sounds = base.node_sound_stone_defaults(),
-	on_place = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.above
-		local player_name = placer:get_player_name()
-		-- place a random small sandstone rocks node
-		if not minetest.is_protected(pos, player_name) then
-			minetest.set_node(pos, {name = "australia:small_sandstone_rocks"..math.random(1, 6)})
-			if not minetest.setting_getbool("creative_mode") then
-				itemstack:take_item()
-			end
-		else
-			minetest.chat_send_player(player_name, "Node is protected")
-			minetest.record_protection_violation(pos, player_name)
-		end
-		
-		return itemstack
-	end
-})
-
--- Small stone rocks
-local default_grid_stone_rocks
-
-for grid_count = 1, 6 do
-	local grid = {}
-	for rock_count = 2, math.random(1, 4) + 1 do
-		local diameter = math.random(15, 25) / 100
-		local x = math.random(1, 80) / 100 - 0.5
-		local z = math.random(1, 80) / 100 - 0.5
-		small_cube(grid, {x = x, y = -0.5, z = z}, {x = diameter, y = diameter, z = diameter})
-	end
-
-	minetest.register_node("australia:small_stone_rocks"..grid_count, {
-		description = "Small Stone Rocks",
-		tiles = {"base_stone.png"},
-		is_ground_content = true,
-		walkable = false,
-		paramtype = "light",
-		drawtype = "nodebox",
-		buildable_to = true,
-		node_box = {type = "fixed", fixed = grid},
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-		},
-		groups = {stone = 1, oddly_breakable_by_hand = 3},
-		drop = "australia:small_stone_rocks",
-		sounds = base.node_sound_stone_defaults(),
-	})
-
-	default_grid_stone_rocks = grid
-end
-
-minetest.register_node("australia:small_stone_rocks", {
-	description = "Small Stone Rocks",
-	tiles = {"base_stone.png"},
-	inventory_image = "aus_small_stone_rocks.png",
-	is_ground_content = true,
-	walkable = false,
-	paramtype = "light",
-	drawtype = "nodebox",
-	node_box = {type = "fixed", fixed = default_grid_stone_rocks},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-	groups = {stone = 1, oddly_breakable_by_hand = 3},
-	sounds = base.node_sound_stone_defaults(),
-	on_place = function(itemstack, placer, pointed_thing)
-		local pos = pointed_thing.above
-		local player_name = placer:get_player_name()
-		-- place a random small stone rocks node
-		if not minetest.is_protected(pos, player_name) then
-			minetest.set_node(pos, {name = "australia:small_stone_rocks"..math.random(1, 6)})
-			if not minetest.setting_getbool("creative_mode") then
-				itemstack:take_item()
-			end
-		else
-			minetest.chat_send_player(player_name, "Node is protected")
-			minetest.record_protection_violation(pos, player_name)
-		end
-		
-		return itemstack
-	end
-})
-

mods/MAPGEN/australia/voxel.lua

@@ -222,8 +222,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		node["snowblock"] = minetest.get_content_id("base:snowblock")
 		node["desert_sand"] = minetest.get_content_id("base:desert_sand")
 		node["sand"] = minetest.get_content_id("base:sand")
-		node["red_dirt"] = minetest.get_content_id("australia:red_dirt")
-		node["red_gravel"] = minetest.get_content_id("australia:red_gravel")
+		node["red_dirt"] = minetest.get_content_id("base:red_dirt")
+		node["red_gravel"] = minetest.get_content_id("base:red_gravel")
 		node["red_sand"] = minetest.get_content_id("base:red_sand")
 		node["mud"] = minetest.get_content_id("base:mangrove_mud")
 		node["salt"] = minetest.get_content_id("base:mineral_salt")