From 2ba067be865184cdb6622410f133ca2a8b14f3c6 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 8 Feb 2017 18:54:56 +0100 Subject: [PATCH] Move all Nether stuff to new mod mcl_nether --- mods/mcl_core/crafting.lua | 56 +-------- mods/mcl_core/craftitems.lua | 13 -- mods/mcl_core/mapgen.lua | 16 --- mods/mcl_core/nodes.lua | 57 --------- mods/mcl_craftguide/init.lua | 1 + mods/mcl_nether/depends.txt | 1 + mods/mcl_nether/init.lua | 114 ++++++++++++++++++ mods/mcl_nether/mod.conf | 1 + .../textures/mcl_nether_glowstone.png} | Bin .../textures/mcl_nether_glowstone_dust.png} | Bin .../textures/mcl_nether_quartz.png} | Bin .../mcl_nether_quartz_block_bottom.png} | Bin .../mcl_nether_quartz_block_side.png} | Bin .../textures/mcl_nether_quartz_block_top.png} | Bin .../mcl_nether_quartz_chiseled_side.png} | Bin .../mcl_nether_quartz_chiseled_top.png} | Bin .../textures/mcl_nether_quartz_ore.png} | Bin .../mcl_nether_quartz_pillar_side.png} | Bin .../mcl_nether_quartz_pillar_top.png} | Bin mods/mcl_temp_helper_recipes/init.lua | 2 +- mods/redstone/mesecons_lightstone/init.lua | 2 +- mods/redstone/mesecons_solarpanel/init.lua | 2 +- mods/stairs/depends.txt | 2 + mods/stairs/init.lua | 4 +- 24 files changed, 129 insertions(+), 142 deletions(-) create mode 100644 mods/mcl_nether/depends.txt create mode 100644 mods/mcl_nether/init.lua create mode 100644 mods/mcl_nether/mod.conf rename mods/{mcl_core/textures/default_glowstone.png => mcl_nether/textures/mcl_nether_glowstone.png} (100%) rename mods/{mcl_core/textures/default_glowstone_dust.png => mcl_nether/textures/mcl_nether_glowstone_dust.png} (100%) rename mods/{mcl_core/textures/default_quartz_crystal.png => mcl_nether/textures/mcl_nether_quartz.png} (100%) rename mods/{mcl_core/textures/default_quartz_block_bottom.png => mcl_nether/textures/mcl_nether_quartz_block_bottom.png} (100%) rename mods/{mcl_core/textures/default_quartz_block_side.png => mcl_nether/textures/mcl_nether_quartz_block_side.png} (100%) rename mods/{mcl_core/textures/default_quartz_block_top.png => mcl_nether/textures/mcl_nether_quartz_block_top.png} (100%) rename mods/{mcl_core/textures/default_quartz_chiseled_side.png => mcl_nether/textures/mcl_nether_quartz_chiseled_side.png} (100%) rename mods/{mcl_core/textures/default_quartz_chiseled_top.png => mcl_nether/textures/mcl_nether_quartz_chiseled_top.png} (100%) rename mods/{mcl_core/textures/default_quartz_ore.png => mcl_nether/textures/mcl_nether_quartz_ore.png} (100%) rename mods/{mcl_core/textures/default_quartz_pillar_side.png => mcl_nether/textures/mcl_nether_quartz_pillar_side.png} (100%) rename mods/{mcl_core/textures/default_quartz_pillar_top.png => mcl_nether/textures/mcl_nether_quartz_pillar_top.png} (100%) diff --git a/mods/mcl_core/crafting.lua b/mods/mcl_core/crafting.lua index 4aa0aeea3a..1586f500fb 100644 --- a/mods/mcl_core/crafting.lua +++ b/mods/mcl_core/crafting.lua @@ -116,7 +116,7 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = 'mcl_core:granite', - recipe = {'mcl_core:diorite', 'mcl_core:quartz_crystal'}, + recipe = {'mcl_core:diorite', 'mcl_nether:quartz'}, }) minetest.register_craft({ @@ -128,15 +128,15 @@ minetest.register_craft({ minetest.register_craft({ output = 'mcl_core:diorite 2', recipe = { - {'mcl_core:cobble', 'mcl_core:quartz_crystal'}, - {'mcl_core:quartz_crystal', 'mcl_core:cobble'}, + {'mcl_core:cobble', 'mcl_nether:quartz'}, + {'mcl_nether:quartz', 'mcl_core:cobble'}, } }) minetest.register_craft({ output = 'mcl_core:diorite 2', recipe = { - {'mcl_core:quartz_crystal', 'mcl_core:cobble'}, - {'mcl_core:cobble', 'mcl_core:quartz_crystal'}, + {'mcl_nether:quartz', 'mcl_core:cobble'}, + {'mcl_core:cobble', 'mcl_nether:quartz'}, } }) @@ -648,21 +648,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "mcl_core:glowstone", - recipe = { - {'mcl_core:glowstone_dust', 'mcl_core:glowstone_dust'}, - {'mcl_core:glowstone_dust', 'mcl_core:glowstone_dust'}, - } -}) - -minetest.register_craft({ - output = 'mcl_core:glowstone_dust 4', - recipe = { - {'mcl_core:glowstone'}, - } -}) - minetest.register_craft({ output = "mcl_core:apple_gold", recipe = { @@ -702,30 +687,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = 'mcl_core:quartz_block', - recipe = { - {'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal'}, - {'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal'}, - } -}) - -minetest.register_craft({ - output = 'mcl_core:quartz_chiseled 2', - recipe = { - {'stairs:slab_quartzblock'}, - {'stairs:slab_quartzblock'}, - } -}) - -minetest.register_craft({ - output = 'mcl_core:quartz_pillar 2', - recipe = { - {'mcl_core:quartz_block'}, - {'mcl_core:quartz_block'}, - } -}) - -- -- Crafting (tool repair) @@ -774,13 +735,6 @@ minetest.register_craft({ cooktime = 10, }) -minetest.register_craft({ - type = "cooking", - output = "mcl_core:quartz_crystal", - recipe = "mcl_core:quartz_ore", - cooktime = 10, -}) - minetest.register_craft({ type = "cooking", output = "mcl_core:brick", diff --git a/mods/mcl_core/craftitems.lua b/mods/mcl_core/craftitems.lua index 5d329f3e0b..606bd2571d 100644 --- a/mods/mcl_core/craftitems.lua +++ b/mods/mcl_core/craftitems.lua @@ -104,12 +104,6 @@ minetest.register_craftitem("mcl_core:gunpowder", { groups = { craftitem=1 }, }) -minetest.register_craftitem("mcl_core:glowstone_dust", { - description = "Glowstone Dust", - inventory_image = "default_glowstone_dust.png", - stack_max = 64, - groups = { craftitem=1 }, -}) minetest.register_craftitem("mcl_core:sugar", { description = "Sugar", @@ -139,13 +133,6 @@ minetest.register_craftitem("mcl_core:prismarine_shard", { groups = { craftitem = 1 }, }) -minetest.register_craftitem("mcl_core:quartz_crystal", { - description = "Nether Quartz", - inventory_image = "default_quartz_crystal.png", - stack_max = 64, - groups = { craftitem = 1 }, -}) - minetest.register_craftitem("mcl_core:apple", { description = "Apple", wield_image = "default_apple.png", diff --git a/mods/mcl_core/mapgen.lua b/mods/mcl_core/mapgen.lua index aaabeed91e..4dd6a85f80 100644 --- a/mods/mcl_core/mapgen.lua +++ b/mods/mcl_core/mapgen.lua @@ -259,22 +259,6 @@ minetest.register_ore({ y_max = -50, }) - - --- --- Glowstone --- -minetest.register_ore({ - ore_type = "scatter", - ore = "mcl_core:glowstone", - wherein = "mcl_core:stone", - clust_scarcity = 50000, - clust_num_ores = 10, - clust_size = 5, - y_min = -59, - y_max = -0, -}) - function mcl_core.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, chunk_size, ore_per_chunk, y_min, y_max) minetest.log('action', "WARNING: mcl_core.generate_ore is deprecated") diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua index 76a5437333..67a5284a2a 100644 --- a/mods/mcl_core/nodes.lua +++ b/mods/mcl_core/nodes.lua @@ -953,44 +953,6 @@ minetest.register_node("mcl_core:reeds", { }) -minetest.register_node("mcl_core:quartz_ore", { - description = "Nether Quartz Ore", - stack_max = 64, - tiles = {"default_quartz_ore.png"}, - is_ground_content = false, - groups = {cracky=3,building_block=1}, - drop = 'mcl_core:quartz_crystal', - sounds = mcl_core.node_sound_stone_defaults(), -}) - -minetest.register_node("mcl_core:quartz_block", { - description = "Block of Quartz", - stack_max = 64, - tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"}, - groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), -}) - -minetest.register_node("mcl_core:quartz_chiseled", { - description = "Chiseled Quartz Block", - stack_max = 64, - is_ground_content = false, - tiles = {"default_quartz_chiseled_top.png", "default_quartz_chiseled_top.png", "default_quartz_chiseled_side.png"}, - groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), -}) - -minetest.register_node("mcl_core:quartz_pillar", { - description = "Pillar Quartz Block", - stack_max = 64, - paramtype2 = "facedir", - is_ground_content = true, - on_place = minetest.rotate_node, - tiles = {"default_quartz_pillar_top.png", "default_quartz_pillar_top.png", "default_quartz_pillar_side.png"}, - groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, - sounds = mcl_core.node_sound_stone_defaults(), -}) - minetest.register_node("mcl_core:bedrock", { description = "Bedrock", tiles = {"default_bedrock.png"}, @@ -1443,25 +1405,6 @@ minetest.register_node("mcl_core:grass", { end }) -minetest.register_node("mcl_core:glowstone", { - description = "Glowstone", - tiles = {"default_glowstone.png"}, - is_ground_content = true, - stack_max = 64, - groups = {oddly_breakable_by_hand=3,building_block=1}, - drop = { - max_items = 1, - items = { - {items = {'mcl_core:glowdust 4'},rarity = 3}, - {items = {'mcl_core:glowdust 3'},rarity = 3}, - {items = {'mcl_core:glowdust 2'}}, - } - }, - -- Real light level: 15 (but Minetest caps at 14) - light_source = 14, - sounds = mcl_core.node_sound_glass_defaults(), -}) - minetest.register_node("mcl_core:sponge", { description = "Sponge", drawtype = "normal", diff --git a/mods/mcl_craftguide/init.lua b/mods/mcl_craftguide/init.lua index 4a0388aa04..ca8250af72 100644 --- a/mods/mcl_craftguide/init.lua +++ b/mods/mcl_craftguide/init.lua @@ -22,6 +22,7 @@ local group_stereotypes = { wood_stairs = "stairs:stairs_wood", coal = "mcl_core:coal_lump", shulker_box = "mcl_chests:violet_shulker_box", + quartz_block = "mcl_nether:quartz_block", mesecon_conductor_craftable = "mesecons:wire_00000000_off", } diff --git a/mods/mcl_nether/depends.txt b/mods/mcl_nether/depends.txt new file mode 100644 index 0000000000..315237e07b --- /dev/null +++ b/mods/mcl_nether/depends.txt @@ -0,0 +1 @@ +mcl_core diff --git a/mods/mcl_nether/init.lua b/mods/mcl_nether/init.lua new file mode 100644 index 0000000000..9ec5f2dff5 --- /dev/null +++ b/mods/mcl_nether/init.lua @@ -0,0 +1,114 @@ +minetest.register_node("mcl_nether:glowstone", { + description = "Glowstone", + tiles = {"mcl_nether_glowstone.png"}, + is_ground_content = true, + stack_max = 64, + groups = {oddly_breakable_by_hand=3,building_block=1}, + drop = { + max_items = 1, + items = { + {items = {'mcl_nether:glowstone_dust 4'},rarity = 3}, + {items = {'mcl_nether:glowstone_dust 3'},rarity = 3}, + {items = {'mcl_nether:glowstone_dust 2'}}, + } + }, + -- Real light level: 15 (but Minetest caps at 14) + light_source = 14, + sounds = mcl_core.node_sound_glass_defaults(), +}) + +minetest.register_node("mcl_nether:quartz_ore", { + description = "Nether Quartz Ore", + stack_max = 64, + tiles = {"mcl_nether_quartz_ore.png"}, + is_ground_content = false, + groups = {cracky=3,building_block=1}, + drop = 'mcl_nether:quartz_crystal', + sounds = mcl_core.node_sound_stone_defaults(), +}) + +minetest.register_node("mcl_nether:quartz_block", { + description = "Block of Quartz", + stack_max = 64, + tiles = {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, + groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, + sounds = mcl_core.node_sound_stone_defaults(), +}) + +minetest.register_node("mcl_nether:quartz_chiseled", { + description = "Chiseled Quartz Block", + stack_max = 64, + is_ground_content = false, + tiles = {"mcl_nether_quartz_chiseled_top.png", "mcl_nether_quartz_chiseled_top.png", "mcl_nether_quartz_chiseled_side.png"}, + groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, + sounds = mcl_core.node_sound_stone_defaults(), +}) + +minetest.register_node("mcl_nether:quartz_pillar", { + description = "Pillar Quartz Block", + stack_max = 64, + paramtype2 = "facedir", + is_ground_content = true, + on_place = minetest.rotate_node, + tiles = {"mcl_nether_quartz_pillar_top.png", "mcl_nether_quartz_pillar_top.png", "mcl_nether_quartz_pillar_side.png"}, + groups = {snappy=1,cracky=1,level=2,quartz_block=1,building_block=1}, + sounds = mcl_core.node_sound_stone_defaults(), +}) + + + +minetest.register_craftitem("mcl_nether:glowstone_dust", { + description = "Glowstone Dust", + inventory_image = "mcl_nether_glowstone_dust.png", + stack_max = 64, + groups = { craftitem=1 }, +}) + +minetest.register_craftitem("mcl_nether:quartz", { + description = "Nether Quartz", + inventory_image = "mcl_nether_quartz.png", + stack_max = 64, + groups = { craftitem = 1 }, +}) + + + +minetest.register_craft({ + type = "cooking", + output = "mcl_nether:quartz", + recipe = "mcl_nether:quartz_ore", + cooktime = 10, +}) + +minetest.register_craft({ + output = 'mcl_nether:quartz_block', + recipe = { + {'mcl_nether:quartz', 'mcl_nether:quartz'}, + {'mcl_nether:quartz', 'mcl_nether:quartz'}, + } +}) + +minetest.register_craft({ + output = 'mcl_nether:quartz_chiseled 2', + recipe = { + {'stairs:slab_quartzblock'}, + {'stairs:slab_quartzblock'}, + } +}) + +minetest.register_craft({ + output = 'mcl_nether:quartz_pillar 2', + recipe = { + {'mcl_nether:quartz_block'}, + {'mcl_nether:quartz_block'}, + } +}) + +minetest.register_craft({ + output = "mcl_nether:glowstone", + recipe = { + {'mcl_nether:glowstone_dust', 'mcl_nether:glowstone_dust'}, + {'mcl_nether:glowstone_dust', 'mcl_nether:glowstone_dust'}, + } +}) + diff --git a/mods/mcl_nether/mod.conf b/mods/mcl_nether/mod.conf new file mode 100644 index 0000000000..2b6c641afe --- /dev/null +++ b/mods/mcl_nether/mod.conf @@ -0,0 +1 @@ +name = mcl_nether diff --git a/mods/mcl_core/textures/default_glowstone.png b/mods/mcl_nether/textures/mcl_nether_glowstone.png similarity index 100% rename from mods/mcl_core/textures/default_glowstone.png rename to mods/mcl_nether/textures/mcl_nether_glowstone.png diff --git a/mods/mcl_core/textures/default_glowstone_dust.png b/mods/mcl_nether/textures/mcl_nether_glowstone_dust.png similarity index 100% rename from mods/mcl_core/textures/default_glowstone_dust.png rename to mods/mcl_nether/textures/mcl_nether_glowstone_dust.png diff --git a/mods/mcl_core/textures/default_quartz_crystal.png b/mods/mcl_nether/textures/mcl_nether_quartz.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_crystal.png rename to mods/mcl_nether/textures/mcl_nether_quartz.png diff --git a/mods/mcl_core/textures/default_quartz_block_bottom.png b/mods/mcl_nether/textures/mcl_nether_quartz_block_bottom.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_block_bottom.png rename to mods/mcl_nether/textures/mcl_nether_quartz_block_bottom.png diff --git a/mods/mcl_core/textures/default_quartz_block_side.png b/mods/mcl_nether/textures/mcl_nether_quartz_block_side.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_block_side.png rename to mods/mcl_nether/textures/mcl_nether_quartz_block_side.png diff --git a/mods/mcl_core/textures/default_quartz_block_top.png b/mods/mcl_nether/textures/mcl_nether_quartz_block_top.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_block_top.png rename to mods/mcl_nether/textures/mcl_nether_quartz_block_top.png diff --git a/mods/mcl_core/textures/default_quartz_chiseled_side.png b/mods/mcl_nether/textures/mcl_nether_quartz_chiseled_side.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_chiseled_side.png rename to mods/mcl_nether/textures/mcl_nether_quartz_chiseled_side.png diff --git a/mods/mcl_core/textures/default_quartz_chiseled_top.png b/mods/mcl_nether/textures/mcl_nether_quartz_chiseled_top.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_chiseled_top.png rename to mods/mcl_nether/textures/mcl_nether_quartz_chiseled_top.png diff --git a/mods/mcl_core/textures/default_quartz_ore.png b/mods/mcl_nether/textures/mcl_nether_quartz_ore.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_ore.png rename to mods/mcl_nether/textures/mcl_nether_quartz_ore.png diff --git a/mods/mcl_core/textures/default_quartz_pillar_side.png b/mods/mcl_nether/textures/mcl_nether_quartz_pillar_side.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_pillar_side.png rename to mods/mcl_nether/textures/mcl_nether_quartz_pillar_side.png diff --git a/mods/mcl_core/textures/default_quartz_pillar_top.png b/mods/mcl_nether/textures/mcl_nether_quartz_pillar_top.png similarity index 100% rename from mods/mcl_core/textures/default_quartz_pillar_top.png rename to mods/mcl_nether/textures/mcl_nether_quartz_pillar_top.png diff --git a/mods/mcl_temp_helper_recipes/init.lua b/mods/mcl_temp_helper_recipes/init.lua index b47308a364..98e9e77688 100644 --- a/mods/mcl_temp_helper_recipes/init.lua +++ b/mods/mcl_temp_helper_recipes/init.lua @@ -130,7 +130,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "mcl_core:quartz_crystal", + output = "mcl_nether:quartz", recipe = { {"group:sand", "group:sand", "group:sand"}, {"group:sand", "group:sand", "group:sand"}, diff --git a/mods/redstone/mesecons_lightstone/init.lua b/mods/redstone/mesecons_lightstone/init.lua index 49a053adbc..74ce271a04 100644 --- a/mods/redstone/mesecons_lightstone/init.lua +++ b/mods/redstone/mesecons_lightstone/init.lua @@ -32,7 +32,7 @@ minetest.register_craft({ output = "node mesecons_lightstone:lightstone_off", recipe = { {'',"mesecons:redstone",''}, - {"mesecons:redstone",'mcl_core:glowstone',"mesecons:redstone"}, + {"mesecons:redstone",'mcl_nether:glowstone',"mesecons:redstone"}, {'','mesecons:redstone',''}, } }) diff --git a/mods/redstone/mesecons_solarpanel/init.lua b/mods/redstone/mesecons_solarpanel/init.lua index 52c1a6a912..03ed743feb 100644 --- a/mods/redstone/mesecons_solarpanel/init.lua +++ b/mods/redstone/mesecons_solarpanel/init.lua @@ -63,7 +63,7 @@ minetest.register_craft({ output = 'mesecons_solarpanel:solar_panel_off', recipe = { {'mcl_core:glass', 'mcl_core:glass', 'mcl_core:glass'}, - {'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal', 'mcl_core:quartz_crystal'}, + {'mcl_nether:quartz', 'mcl_nether:quartz', 'mcl_nether:quartz'}, {'group:wood_slab', 'group:wood_slab', 'group:wood_slab'}, } }) diff --git a/mods/stairs/depends.txt b/mods/stairs/depends.txt index 315237e07b..3dd42799b5 100644 --- a/mods/stairs/depends.txt +++ b/mods/stairs/depends.txt @@ -1 +1,3 @@ mcl_core +mcl_nether +mcl_end diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index 6ae80f1264..1163ce113d 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -336,10 +336,10 @@ stairs.register_stair_and_slab("stonebrick", "group:stonebrick", stairs.register_stair_and_slab("quartzblock", "group:quartz_block", {snappy=1,cracky=1,level=2}, - {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"}, + {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, "Quartz Stairs", "Quartz Slab", - mcl_core.node_sound_stone_defaults(), nil, "mcl_core:quartz_block" + mcl_core.node_sound_stone_defaults(), nil, "mcl_nether:quartz_block" ) stairs.register_stair_and_slab("purpur_block", "mcl_end:purpur_block",