diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index 35a161238..44de7fa98 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -160,34 +160,6 @@ minetest.register_node("mcl_core:stone_with_lapis", { _mcl_fortune_drop = mcl_core.fortune_drop_ore, }) -minetest.register_node("mcl_core:stone_with_emerald", { - description = S("Emerald Ore"), - tiles = {"mcl_core_emerald_ore.png"}, - is_ground_content = true, - stack_max = 64, - groups = {pickaxey=4, building_block=1, material_stone=1, xp=6, blast_furnace_smeltable=1}, - drop = "mcl_core:emerald", - sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 3, - _mcl_hardness = 3, - _mcl_silk_touch_drop = true, - _mcl_fortune_drop = mcl_core.fortune_drop_ore, -}) - -minetest.register_node("mcl_core:stone_with_diamond", { - description = S("Diamond Ore"), - tiles = {"mcl_core_diamond_ore.png"}, - is_ground_content = true, - stack_max = 64, - groups = {pickaxey=4, building_block=1, material_stone=1, xp=4, blast_furnace_smeltable=1}, - drop = "mcl_core:diamond", - sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 3, - _mcl_hardness = 3, - _mcl_silk_touch_drop = true, - _mcl_fortune_drop = mcl_core.fortune_drop_ore, -}) - -- Grass Block minetest.register_node("mcl_core:dirt_with_grass", { description = S("Grass Block"), diff --git a/mods/ITEMS/mcl_deepslate/init.lua b/mods/ITEMS/mcl_deepslate/init.lua index a0bd36873..dcb952f5f 100644 --- a/mods/ITEMS/mcl_deepslate/init.lua +++ b/mods/ITEMS/mcl_deepslate/init.lua @@ -71,8 +71,6 @@ local lapis_drops = { local deepslate_ores = { { "Iron", "mcl_raw_ores:raw_iron", "mcl_core:iron_ingot", 3, 0 }, { "Gold", "mcl_raw_ores:raw_gold", "mcl_core:gold_ingot", 4, 0 }, - { "Emerald", "mcl_core:emerald", "mcl_core:emerald", 4, 6 }, - { "Diamond", "mcl_core:diamond", "mcl_core:diamond", 4, 4 }, { "Lapis Lazuli", lapis_drops, "mcl_core:lapis", 3, 6 }, } diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 723f3b943..1a10aeef9 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -2578,7 +2578,7 @@ local function register_biome_ores() -- Emeralds minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_emerald", + ore = "blocks:emerald_ore", wherein = stonelike, clust_scarcity = 16384, clust_num_ores = 1, @@ -2620,7 +2620,7 @@ local function register_biome_ores() if mg_name ~= "v6" then minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_gold", + ore = "blocks:gold_ore", wherein = stonelike, clust_scarcity = 3333, clust_num_ores = 5, diff --git a/mods/MAPGEN/mcl_mapgen_core/ores.lua b/mods/MAPGEN/mcl_mapgen_core/ores.lua index af8cc72c8..a26bce361 100644 --- a/mods/MAPGEN/mcl_mapgen_core/ores.lua +++ b/mods/MAPGEN/mcl_mapgen_core/ores.lua @@ -352,7 +352,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then -- Common spawn minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_gold", + ore = "blocks:gold_ore", wherein = stonelike, clust_scarcity = 4775, clust_num_ores = 5, @@ -362,7 +362,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then }) minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_gold", + ore = "blocks:gold_ore", wherein = stonelike, clust_scarcity = 6560, clust_num_ores = 7, @@ -374,7 +374,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then -- Rare spawn minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_gold", + ore = "blocks:gold_ore", wherein = stonelike, clust_scarcity = 13000, clust_num_ores = 4, @@ -390,7 +390,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then -- Common spawn minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_diamond", + ore = "blocks:diamond_ore", wherein = stonelike, clust_scarcity = 10000, clust_num_ores = 4, @@ -400,7 +400,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then }) minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_diamond", + ore = "blocks:diamond_ore", wherein = stonelike, clust_scarcity = 5000, clust_num_ores = 2, @@ -410,7 +410,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then }) minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_diamond", + ore = "blocks:diamond_ore", wherein = stonelike, clust_scarcity = 10000, clust_num_ores = 8, @@ -422,7 +422,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then -- Rare spawn minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_diamond", + ore = "blocks:diamond_ore", wherein = stonelike, clust_scarcity = 20000, clust_num_ores = 1, @@ -432,7 +432,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then }) minetest.register_ore({ ore_type = "scatter", - ore = "mcl_core:stone_with_diamond", + ore = "blocks:diamond_ore", wherein = stonelike, clust_scarcity = 20000, clust_num_ores = 2, @@ -691,13 +691,13 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then { "coal", 1530, 8, 3, deepslate_min, deepslate_max }, { "coal", 1500, 12, 3, deepslate_min, deepslate_max }, --{ "iron", 830, 5, 3, deepslate_min, deepslate_max }, - --{ "gold", 4775, 5, 3, deepslate_min, deepslate_max }, - --{ "gold", 6560, 7, 3, deepslate_min, deepslate_max }, - --{ "diamond", 10000, 4, 3, deepslate_min, mcl_worlds.layer_to_y(12) }, - --{ "diamond", 5000, 2, 3, deepslate_min, mcl_worlds.layer_to_y(12) }, - --{ "diamond", 10000, 8, 3, deepslate_min, mcl_worlds.layer_to_y(12) }, - --{ "diamond", 20000, 1, 1, mcl_worlds.layer_to_y(13), mcl_worlds.layer_to_y(15) }, - --{ "diamond", 20000, 2, 2, mcl_worlds.layer_to_y(13), mcl_worlds.layer_to_y(15) }, + { "gold", 4775, 5, 3, deepslate_min, deepslate_max }, + { "gold", 6560, 7, 3, deepslate_min, deepslate_max }, + { "diamond", 10000, 4, 3, deepslate_min, mcl_worlds.layer_to_y(12) }, + { "diamond", 5000, 2, 3, deepslate_min, mcl_worlds.layer_to_y(12) }, + { "diamond", 10000, 8, 3, deepslate_min, mcl_worlds.layer_to_y(12) }, + { "diamond", 20000, 1, 1, mcl_worlds.layer_to_y(13), mcl_worlds.layer_to_y(15) }, + { "diamond", 20000, 2, 2, mcl_worlds.layer_to_y(13), mcl_worlds.layer_to_y(15) }, --{ "redstone", 500, 4, 3, deepslate_min, mcl_worlds.layer_to_y(13) }, --{ "redstone", 800, 7, 4, deepslate_min, mcl_worlds.layer_to_y(13) }, --{ "redstone", 1000, 4, 3, mcl_worlds.layer_to_y(13), mcl_worlds.layer_to_y(15) }, @@ -712,9 +712,9 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then register_ore_mg("blocks:deepslate_"..o[1].."_ore", o[2], o[3], o[4], o[5], o[6]) end if minetest.get_mapgen_setting("mg_name") == "v6" then - --register_ore_mg("mcl_deepslate:deepslate_with_emerald", 14340, 1, 1, deepslate_min, deepslate_max) + register_ore_mg("mcl_deepslate:deepslate_emerald_ore", 14340, 1, 1, deepslate_min, deepslate_max) else - --register_ore_mg("mcl_deepslate:deepslate_with_emerald", 16384, 1, 1, mcl_worlds.layer_to_y(4), deepslate_max, mountains) + register_ore_mg("blocks:deepslate_emerald_ore", 16384, 1, 1, mcl_worlds.layer_to_y(4), deepslate_max, mountains) end if copper_mod then register_ore_mg("blocks:deepslate_copper_ore", 830, 5, 3, deepslate_min, deepslate_max) diff --git a/mods/blocks/natural/mineral.lua b/mods/blocks/natural/mineral.lua index b46e71c6a..1e00b9acb 100644 --- a/mods/blocks/natural/mineral.lua +++ b/mods/blocks/natural/mineral.lua @@ -31,7 +31,19 @@ local overworld_ores = { max_items = 1 }, groups = {copper_ores = 1, pickaxey = 3} - } + }, + ["diamond"] = { + drop = "items:diamond", + groups = {diamond_ores = 1, pickaxey = 4} + }, + ["emerald"] = { + drop = "items:emerald", + groups = {emerald_ores = 1, pickaxey = 4} + }, + ["gold"] = { + drop = "items:raw_gold", + groups = {gold_ores = 1, pickaxey = 4} + }, } for identifier, definitions in pairs(overworld_ores) do diff --git a/textures/natural/natural_deepslate_diamond_ore.png b/textures/natural/natural_deepslate_diamond_ore.png new file mode 100644 index 000000000..565348347 Binary files /dev/null and b/textures/natural/natural_deepslate_diamond_ore.png differ diff --git a/textures/natural/natural_deepslate_emerald_ore.png b/textures/natural/natural_deepslate_emerald_ore.png new file mode 100644 index 000000000..3041551c9 Binary files /dev/null and b/textures/natural/natural_deepslate_emerald_ore.png differ diff --git a/textures/natural/natural_deepslate_gold_ore.png b/textures/natural/natural_deepslate_gold_ore.png new file mode 100644 index 000000000..1cf0c8153 Binary files /dev/null and b/textures/natural/natural_deepslate_gold_ore.png differ diff --git a/textures/natural/natural_diamond_ore.png b/textures/natural/natural_diamond_ore.png new file mode 100644 index 000000000..e0941d55d Binary files /dev/null and b/textures/natural/natural_diamond_ore.png differ diff --git a/textures/natural/natural_emerald_ore.png b/textures/natural/natural_emerald_ore.png new file mode 100644 index 000000000..1bd0b55d0 Binary files /dev/null and b/textures/natural/natural_emerald_ore.png differ diff --git a/textures/natural/natural_gold_ore.png b/textures/natural/natural_gold_ore.png new file mode 100644 index 000000000..3d5a4c88d Binary files /dev/null and b/textures/natural/natural_gold_ore.png differ diff --git a/textures/natural/natural_nether_gold_ore.png b/textures/natural/natural_nether_gold_ore.png new file mode 100644 index 000000000..1b12b6753 Binary files /dev/null and b/textures/natural/natural_nether_gold_ore.png differ