New cobblestone

mods/ITEMS/mcl_core/nodes_base.lua

@@ -422,17 +422,6 @@ minetest.register_node("mcl_core:bedrock", {
 	end,
 })
 
-minetest.register_node("mcl_core:cobble", {
-	description = S("Cobblestone"),
-	tiles = {"default_cobble.png"},
-	is_ground_content = false,
-	stack_max = 64,
-	groups = {pickaxey=1, building_block=1, material_stone=1, cobble=1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 2,
-})
-
 minetest.register_node("mcl_core:mossycobble", {
 	description = S("Mossy Cobblestone"),
 	tiles = {"default_mossycobble.png"},

mods/ITEMS/mcl_stairs/register.lua

@@ -30,18 +30,6 @@ for w=1, #woods do
 			wood[5])
 end
 
-mcl_stairs.register_stair("cobble", "mcl_core:cobble",
-		{pickaxey=1, material_stone=1},
-		{"default_cobble.png"},
-		S("Cobblestone Stairs"),
-		mcl_sounds.node_sound_stone_defaults(), 0.8, 0.8)
-mcl_stairs.register_slab("cobble", "mcl_core:cobble",
-		{pickaxey=1, material_stone=1},
-		{"default_cobble.png"},
-		S("Cobblestone Slab"),
-		mcl_sounds.node_sound_stone_defaults(), 6, 2,
-		S("Double Cobblestone Slab"))
-
 mcl_stairs.register_stair("mossycobble", "mcl_core:mossycobble",
 		{pickaxey=1, material_stone=1},
 		{"default_mossycobble.png"},

mods/ITEMS/mcl_walls/register.lua

@@ -1,6 +1,5 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
-mcl_walls.register_wall("mcl_walls:cobble", S("Cobblestone Wall"), "mcl_core:cobble", {"mcl_walls_cobble_wall_top.png", "default_cobble.png", "mcl_walls_cobble_wall_side.png"})
 mcl_walls.register_wall("mcl_walls:mossycobble", S("Mossy Cobblestone Wall"), "mcl_core:mossycobble", {"mcl_walls_cobble_mossy_wall_top.png", "default_mossycobble.png", "mcl_walls_cobble_mossy_wall_side.png"})
 mcl_walls.register_wall("mcl_walls:sandstone", S("Sandstone Wall"), "mcl_core:sandstone")
 mcl_walls.register_wall("mcl_walls:redsandstone", S("Red Sandstone Wall"), "mcl_core:redsandstone")

mods/MAPGEN/mcl_dungeons/init.lua

@@ -294,11 +294,11 @@ local function ecb_spawn_dungeon(blockpos, action, calls_remaining, param)
 		-- Exceptions: cobblestone and mossy cobblestone so neighborings dungeons nicely connect to each other
 		local name = get_node(p).name
 		local rn = registered_nodes[name]
-		if rn and rn.is_ground_content or name == "mcl_core:cobble" or name == "mcl_core:mossycobble" then
+		if rn and rn.is_ground_content or name == "blocks:cobblestone" or name == "mcl_core:mossycobble" then
 			-- Floor
 			if ty == y then
 				if pr:next(1,4) == 1 then
-					swap_node(p, {name = "mcl_core:cobble"})
+					swap_node(p, {name = "blocks:cobblestone"})
 				else
 					swap_node(p, {name = "mcl_core:mossycobble"})
 				end
@@ -312,14 +312,14 @@ local function ecb_spawn_dungeon(blockpos, action, calls_remaining, param)
 				-- Check if it's an opening first
 				if (ty == maxy) or (not (openings[tx] and openings[tx][tz]))  then
 					-- Place wall or ceiling
-					swap_node(p, {name = "mcl_core:cobble"})
+					swap_node(p, {name = "blocks:cobblestone"})
 				elseif ty < maxy - 1 then
 					-- Normally the openings are already clear, but not if it is a corner
 					-- widening. Make sure to clear at least the bottom 2 nodes of an opening.
 					if name ~= "air" then swap_node(p, {name = "air"}) end
 				elseif name ~= "air" then
 					-- This allows for variation between 2-node and 3-node high openings.
-					swap_node(p, {name = "mcl_core:cobble"})
+					swap_node(p, {name = "blocks:cobblestone"})
 				end
 				-- If it was an opening, the lower 3 blocks are not touched at all
 

mods/MAPGEN/mcl_mapgen_core/init.lua

@@ -30,7 +30,7 @@ minetest.register_alias("mapgen_sand", "mcl_core:sand")
 minetest.register_alias("mapgen_gravel", "mcl_core:gravel")
 minetest.register_alias("mapgen_clay", "mcl_core:clay")
 minetest.register_alias("mapgen_lava_source", "air") -- Built-in lava generator is too unpredictable, we generate lava on our own
-minetest.register_alias("mapgen_cobble", "mcl_core:cobble")
+minetest.register_alias("mapgen_cobble", "blocks:cobblestone")
 minetest.register_alias("mapgen_mossycobble", "mcl_core:mossycobble")
 minetest.register_alias("mapgen_junglegrass", "mcl_flowers:fern")
 minetest.register_alias("mapgen_stone_with_coal", "blocks:coal_ore")

mods/MAPGEN/mcl_villages/buildings.lua

@@ -294,7 +294,7 @@ function settlements.place_schematics(settlement_info, pr)
 				--schem_lua = schem_lua:gsub("mesecons_pressureplates:pressure_plate_wood_off", "mesecons_pressureplates:pressure_plate_sprucewood_off")
 			elseif platform_material == "mcl_core:sand" or platform_material == "mcl_core:redsand" then
 				schem_lua = schem_lua:gsub("mcl_core:tree", "mcl_core:sandstonecarved")
-				schem_lua = schem_lua:gsub("mcl_core:cobble", "mcl_core:sandstone")
+				schem_lua = schem_lua:gsub("blocks:cobblestone", "mcl_core:sandstone")
 				schem_lua = schem_lua:gsub("mcl_core:wood", "mcl_core:sandstonesmooth")
 				--schem_lua = schem_lua:gsub("mcl_fences:fence", "mcl_fences:birch_fence")
 				--schem_lua = schem_lua:gsub("mcl_stairs:slab_wood_top", "mcl_stairs:slab_birchwood_top")

mods/blocks/natural/stone.lua

@@ -20,6 +20,12 @@ local blocks = {
         groups = {natural_blocks = 1, pickaxey = 1},
         sounds = mcl_sounds.node_sound_stone_defaults()
     },
+    ["cobblestone"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 2,
+        groups = {building_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
     ["deepslate"] = {
         _mcl_blast_resistance = 6,
         _mcl_hardness = 3,