From 9e64f909fa09c3a3ba70c4340679c74dcf816d91 Mon Sep 17 00:00:00 2001 From: JoseDouglas26 Date: Fri, 14 Jun 2024 19:51:37 -0300 Subject: [PATCH] New cobblestone --- mods/ITEMS/mcl_core/nodes_base.lua | 11 ----------- mods/ITEMS/mcl_stairs/register.lua | 12 ------------ mods/ITEMS/mcl_walls/register.lua | 1 - mods/MAPGEN/mcl_dungeons/init.lua | 8 ++++---- mods/MAPGEN/mcl_mapgen_core/init.lua | 2 +- mods/MAPGEN/mcl_villages/buildings.lua | 2 +- mods/blocks/natural/stone.lua | 6 ++++++ textures/natural/natural_cobblestone.png | Bin 0 -> 7478 bytes 8 files changed, 12 insertions(+), 30 deletions(-) create mode 100644 textures/natural/natural_cobblestone.png diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index 3d795452d..b1b83f2ce 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/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"}, diff --git a/mods/ITEMS/mcl_stairs/register.lua b/mods/ITEMS/mcl_stairs/register.lua index 934716743..07dfcb1f1 100644 --- a/mods/ITEMS/mcl_stairs/register.lua +++ b/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"}, diff --git a/mods/ITEMS/mcl_walls/register.lua b/mods/ITEMS/mcl_walls/register.lua index 8ff4af0ce..1b8b10303 100644 --- a/mods/ITEMS/mcl_walls/register.lua +++ b/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") diff --git a/mods/MAPGEN/mcl_dungeons/init.lua b/mods/MAPGEN/mcl_dungeons/init.lua index 479052d2c..dcce1e6f2 100644 --- a/mods/MAPGEN/mcl_dungeons/init.lua +++ b/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 diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua index 9cd6fd3d7..3ed376894 100644 --- a/mods/MAPGEN/mcl_mapgen_core/init.lua +++ b/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") diff --git a/mods/MAPGEN/mcl_villages/buildings.lua b/mods/MAPGEN/mcl_villages/buildings.lua index 1b8ce3cba..1c3810282 100644 --- a/mods/MAPGEN/mcl_villages/buildings.lua +++ b/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") diff --git a/mods/blocks/natural/stone.lua b/mods/blocks/natural/stone.lua index 5047cfd0b..d3bdbdf56 100644 --- a/mods/blocks/natural/stone.lua +++ b/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, diff --git a/textures/natural/natural_cobblestone.png b/textures/natural/natural_cobblestone.png new file mode 100644 index 0000000000000000000000000000000000000000..72396c4d805d578f1e31dea296e034e7b067dbfc GIT binary patch literal 7478 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 literal 0 HcmV?d00001