From ec06b8eddeaba78d1d11b8bad1ffc8ef6935213f Mon Sep 17 00:00:00 2001 From: ANAND Date: Tue, 22 Sep 2020 21:06:01 +0530 Subject: [PATCH] MTG: Trim out the remaining bloat from default (#639) --- mods/ctf/ctf_map/ctf_map_core/chest.lua | 3 - mods/mtg/default/functions.lua | 72 -- mods/mtg/default/init.lua | 2 - mods/mtg/default/legacy.lua | 46 - mods/mtg/default/mapgen.lua | 1520 ----------------------- mods/mtg/furnace/init.lua | 6 - mods/other/tsm_chests/init.lua | 3 - 7 files changed, 1652 deletions(-) delete mode 100644 mods/mtg/default/legacy.lua delete mode 100644 mods/mtg/default/mapgen.lua diff --git a/mods/ctf/ctf_map/ctf_map_core/chest.lua b/mods/ctf/ctf_map/ctf_map_core/chest.lua index 6a58672..7d878c3 100644 --- a/mods/ctf/ctf_map/ctf_map_core/chest.lua +++ b/mods/ctf/ctf_map/ctf_map_core/chest.lua @@ -73,9 +73,6 @@ for _, chest_color in pairs(colors) do local formspec = table.concat({ "size[8,12]", - default.gui_bg, - default.gui_bg_img, - default.gui_slots, default.get_hotbar_bg(0,7.85), "list[current_player;main;0,7.85;8,1;]", "list[current_player;main;0,9.08;8,3;8]", diff --git a/mods/mtg/default/functions.lua b/mods/mtg/default/functions.lua index 6aef656..9792297 100644 --- a/mods/mtg/default/functions.lua +++ b/mods/mtg/default/functions.lua @@ -130,21 +130,6 @@ function default.node_sound_snow_defaults(table) end --- --- Lavacooling --- - -default.cool_lava = function(pos, node) - if node.name == "default:lava_source" then - minetest.set_node(pos, {name = "default:obsidian"}) - else -- Lava flowing - minetest.set_node(pos, {name = "default:stone"}) - end - minetest.sound_play("default_cool_lava", - {pos = pos, max_hear_distance = 16, gain = 0.25}) -end - - -- -- Optimized helper to put all items in an inventory into a drops list -- @@ -162,63 +147,6 @@ function default.get_inventory_drops(pos, inventory, drops) end --- --- Papyrus and cactus growing --- - --- Wrapping the functions in ABM action is necessary to make overriding them possible - -function default.grow_cactus(pos, node) - if node.param2 >= 4 then - return - end - pos.y = pos.y - 1 - if minetest.get_item_group(minetest.get_node(pos).name, "sand") == 0 then - return - end - pos.y = pos.y + 1 - local height = 0 - while node.name == "default:cactus" and height < 4 do - height = height + 1 - pos.y = pos.y + 1 - node = minetest.get_node(pos) - end - if height == 4 or node.name ~= "air" then - return - end - if minetest.get_node_light(pos) < 13 then - return - end - minetest.set_node(pos, {name = "default:cactus"}) - return true -end - -function default.grow_papyrus(pos, node) - pos.y = pos.y - 1 - local name = minetest.get_node(pos).name - if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then - return - end - if not minetest.find_node_near(pos, 3, {"group:water"}) then - return - end - pos.y = pos.y + 1 - local height = 0 - while node.name == "default:papyrus" and height < 4 do - height = height + 1 - pos.y = pos.y + 1 - node = minetest.get_node(pos) - end - if height == 4 or node.name ~= "air" then - return - end - if minetest.get_node_light(pos) < 13 then - return - end - minetest.set_node(pos, {name = "default:papyrus"}) - return true -end - -- -- Dig upwards -- diff --git a/mods/mtg/default/init.lua b/mods/mtg/default/init.lua index 6938f28..9e4fa13 100644 --- a/mods/mtg/default/init.lua +++ b/mods/mtg/default/init.lua @@ -44,6 +44,4 @@ dofile(default_path.."/tools.lua") dofile(default_path.."/item_entity.lua") dofile(default_path.."/craftitems.lua") dofile(default_path.."/crafting.lua") -dofile(default_path.."/mapgen.lua") dofile(default_path.."/aliases.lua") -dofile(default_path.."/legacy.lua") diff --git a/mods/mtg/default/legacy.lua b/mods/mtg/default/legacy.lua deleted file mode 100644 index dee4ee3..0000000 --- a/mods/mtg/default/legacy.lua +++ /dev/null @@ -1,46 +0,0 @@ --- mods/default/legacy.lua - --- Horrible stuff to support old code registering falling nodes --- Don't use this and never do what this does, it's completely wrong! --- (More specifically, the client and the C++ code doesn't get the group) -function default.register_falling_node(nodename, texture) - minetest.log("error", debug.traceback()) - minetest.log('error', "WARNING: default.register_falling_node is deprecated") - if minetest.registered_nodes[nodename] then - minetest.registered_nodes[nodename].groups.falling_node = 1 - end -end - -function default.spawn_falling_node(p, nodename) - spawn_falling_node(p, nodename) -end - --- Liquids -WATER_ALPHA = minetest.registered_nodes["default:water_source"].alpha -WATER_VISC = minetest.registered_nodes["default:water_source"].liquid_viscosity -LAVA_VISC = minetest.registered_nodes["default:lava_source"].liquid_viscosity -LIGHT_MAX = default.LIGHT_MAX - --- Formspecs -default.gui_suvival_form = default.gui_survival_form -default.gui_bg = "" -default.gui_bg_img = "" -default.gui_slots = "" - --- Players -if minetest.get_modpath("player_api") then - default.registered_player_models = player_api.registered_models - default.player_register_model = player_api.register_model - default.player_attached = player_api.player_attached - default.player_get_animation = player_api.get_animation - default.player_set_model = player_api.set_model - default.player_set_textures = player_api.set_textures - default.player_set_animation = player_api.set_animation -end - --- Check for a volume intersecting protection -function default.intersects_protection(minp, maxp, player_name, interval) - minetest.log("warning", "default.intersects_protection() is " .. - "deprecated, use minetest.is_area_protected() instead.") - minetest.is_area_protected(minp, maxp, player_name, interval) -end diff --git a/mods/mtg/default/mapgen.lua b/mods/mtg/default/mapgen.lua deleted file mode 100644 index dd713ad..0000000 --- a/mods/mtg/default/mapgen.lua +++ /dev/null @@ -1,1520 +0,0 @@ --- --- Aliases for map generators --- - -minetest.register_alias("mapgen_stone", "default:stone") -minetest.register_alias("mapgen_dirt", "default:dirt") -minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") -minetest.register_alias("mapgen_sand", "default:sand") -minetest.register_alias("mapgen_water_source", "default:water_source") -minetest.register_alias("mapgen_river_water_source", "default:river_water_source") -minetest.register_alias("mapgen_lava_source", "default:lava_source") -minetest.register_alias("mapgen_gravel", "default:gravel") -minetest.register_alias("mapgen_desert_stone", "default:desert_stone") -minetest.register_alias("mapgen_desert_sand", "default:desert_sand") -minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow") -minetest.register_alias("mapgen_snowblock", "default:snowblock") -minetest.register_alias("mapgen_snow", "default:snow") -minetest.register_alias("mapgen_ice", "default:ice") -minetest.register_alias("mapgen_sandstone", "default:sandstone") - --- Flora - -minetest.register_alias("mapgen_tree", "default:tree") -minetest.register_alias("mapgen_leaves", "default:leaves") -minetest.register_alias("mapgen_jungletree", "default:jungletree") -minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves") -minetest.register_alias("mapgen_junglegrass", "default:junglegrass") -minetest.register_alias("mapgen_pine_tree", "default:pine_tree") -minetest.register_alias("mapgen_pine_needles", "default:pine_needles") - --- Dungeons - -minetest.register_alias("mapgen_cobble", "default:cobble") -minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble") -minetest.register_alias("mapgen_mossycobble", "default:mossycobble") -minetest.register_alias("mapgen_stair_desert_stone", "stairs:stair_desert_stone") -minetest.register_alias("mapgen_sandstonebrick", "default:sandstonebrick") -minetest.register_alias("mapgen_stair_sandstone_block", "stairs:stair_sandstone_block") - - --- --- Register ores --- - --- Mgv6 - -function default.register_mgv6_ores() - - -- Blob ore - -- These first to avoid other ores in blobs - - -- Clay - -- This first to avoid clay in sand blobs - - minetest.register_ore({ - ore_type = "blob", - ore = "default:clay", - wherein = {"default:sand"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 0, - y_min = -15, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = -316, - octaves = 1, - persist = 0.0 - }, - }) - - -- Sand - - minetest.register_ore({ - ore_type = "blob", - ore = "default:sand", - wherein = {"default:stone", "default:desert_stone"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 0, - y_min = -31, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = 2316, - octaves = 1, - persist = 0.0 - }, - }) - - -- Dirt - - minetest.register_ore({ - ore_type = "blob", - ore = "default:dirt", - wherein = {"default:stone"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 31000, - y_min = -31, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = 17676, - octaves = 1, - persist = 0.0 - }, - }) - - -- Gravel - - minetest.register_ore({ - ore_type = "blob", - ore = "default:gravel", - wherein = {"default:stone"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 31000, - y_min = -31000, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = 766, - octaves = 1, - persist = 0.0 - }, - }) - - -- Scatter ores - - -- Coal - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 8 * 8 * 8, - clust_num_ores = 9, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 8 * 8 * 8, - clust_num_ores = 8, - clust_size = 3, - y_max = 64, - y_min = -31000, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 24 * 24 * 24, - clust_num_ores = 27, - clust_size = 6, - y_max = 0, - y_min = -31000, - }) - - -- Iron - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 12, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 7 * 7 * 7, - clust_num_ores = 5, - clust_size = 3, - y_max = 0, - y_min = -31000, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 24 * 24 * 24, - clust_num_ores = 27, - clust_size = 6, - y_max = -64, - y_min = -31000, - }) - - -- Copper - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 12 * 12 * 12, - clust_num_ores = 4, - clust_size = 3, - y_max = -16, - y_min = -63, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 5, - clust_size = 3, - y_max = -64, - y_min = -31000, - }) - - -- Tin - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 4, - clust_size = 3, - y_max = -32, - y_min = -127, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - y_max = -128, - y_min = -31000, - }) - - -- Gold - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 3, - clust_size = 2, - y_max = -64, - y_min = -255, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 5, - clust_size = 3, - y_max = -256, - y_min = -31000, - }) - - -- Mese crystal - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 18 * 18 * 18, - clust_num_ores = 3, - clust_size = 2, - y_max = -64, - y_min = -255, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 5, - clust_size = 3, - y_max = -256, - y_min = -31000, - }) - - -- Diamond - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 4, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 17 * 17 * 17, - clust_num_ores = 4, - clust_size = 3, - y_max = -128, - y_min = -255, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 4, - clust_size = 3, - y_max = -256, - y_min = -31000, - }) - - -- Mese block - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 36 * 36 * 36, - clust_num_ores = 3, - clust_size = 2, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 36 * 36 * 36, - clust_num_ores = 3, - clust_size = 2, - y_max = -1024, - y_min = -31000, - }) -end - - --- All mapgens except mgv6 - -function default.register_ores() - - -- Stratum ores. - -- These obviously first. - - -- Silver sandstone - - minetest.register_ore({ - ore_type = "stratum", - ore = "default:silver_sandstone", - wherein = {"default:stone"}, - clust_scarcity = 1, - y_max = 46, - y_min = 10, - noise_params = { - offset = 28, - scale = 16, - spread = {x = 128, y = 128, z = 128}, - seed = 90122, - octaves = 1, - }, - stratum_thickness = 4, - biomes = {"cold_desert"}, - }) - - minetest.register_ore({ - ore_type = "stratum", - ore = "default:silver_sandstone", - wherein = {"default:stone"}, - clust_scarcity = 1, - y_max = 42, - y_min = 6, - noise_params = { - offset = 24, - scale = 16, - spread = {x = 128, y = 128, z = 128}, - seed = 90122, - octaves = 1, - }, - stratum_thickness = 2, - biomes = {"cold_desert"}, - }) - - -- Desert sandstone - - minetest.register_ore({ - ore_type = "stratum", - ore = "default:desert_sandstone", - wherein = {"default:desert_stone"}, - clust_scarcity = 1, - y_max = 46, - y_min = 10, - noise_params = { - offset = 28, - scale = 16, - spread = {x = 128, y = 128, z = 128}, - seed = 90122, - octaves = 1, - }, - stratum_thickness = 4, - biomes = {"desert"}, - }) - - minetest.register_ore({ - ore_type = "stratum", - ore = "default:desert_sandstone", - wherein = {"default:desert_stone"}, - clust_scarcity = 1, - y_max = 42, - y_min = 6, - noise_params = { - offset = 24, - scale = 16, - spread = {x = 128, y = 128, z = 128}, - seed = 90122, - octaves = 1, - }, - stratum_thickness = 2, - biomes = {"desert"}, - }) - - -- Sandstone - - minetest.register_ore({ - ore_type = "stratum", - ore = "default:sandstone", - wherein = {"default:desert_stone"}, - clust_scarcity = 1, - y_max = 39, - y_min = 3, - noise_params = { - offset = 21, - scale = 16, - spread = {x = 128, y = 128, z = 128}, - seed = 90122, - octaves = 1, - }, - stratum_thickness = 2, - biomes = {"desert"}, - }) - - -- Blob ore. - -- These before scatter ores to avoid other ores in blobs. - - -- Clay - - minetest.register_ore({ - ore_type = "blob", - ore = "default:clay", - wherein = {"default:sand"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 0, - y_min = -15, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = -316, - octaves = 1, - persist = 0.0 - }, - }) - - -- Silver sand - - minetest.register_ore({ - ore_type = "blob", - ore = "default:silver_sand", - wherein = {"default:stone"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 31000, - y_min = -31000, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = 2316, - octaves = 1, - persist = 0.0 - }, - biomes = {"icesheet_ocean", "tundra", "tundra_beach", "tundra_ocean", - "taiga", "taiga_ocean", "snowy_grassland", "snowy_grassland_ocean", - "grassland", "grassland_dunes", "grassland_ocean", "coniferous_forest", - "coniferous_forest_dunes", "coniferous_forest_ocean", "deciduous_forest", - "deciduous_forest_shore", "deciduous_forest_ocean", "cold_desert", - "cold_desert_ocean", "savanna", "savanna_shore", "savanna_ocean", - "rainforest", "rainforest_swamp", "rainforest_ocean", "underground", - "floatland_coniferous_forest", "floatland_coniferous_forest_ocean"} - }) - - -- Dirt - - minetest.register_ore({ - ore_type = "blob", - ore = "default:dirt", - wherein = {"default:stone"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 31000, - y_min = -31, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = 17676, - octaves = 1, - persist = 0.0 - }, - biomes = {"taiga", "snowy_grassland", "grassland", "coniferous_forest", - "deciduous_forest", "deciduous_forest_shore", "savanna", "savanna_shore", - "rainforest", "rainforest_swamp", "floatland_coniferous_forest"} - }) - - -- Gravel - - minetest.register_ore({ - ore_type = "blob", - ore = "default:gravel", - wherein = {"default:stone"}, - clust_scarcity = 16 * 16 * 16, - clust_size = 5, - y_max = 31000, - y_min = -31000, - noise_threshold = 0.0, - noise_params = { - offset = 0.5, - scale = 0.2, - spread = {x = 5, y = 5, z = 5}, - seed = 766, - octaves = 1, - persist = 0.0 - }, - biomes = {"icesheet_ocean", "tundra", "tundra_beach", "tundra_ocean", - "taiga", "taiga_ocean", "snowy_grassland", "snowy_grassland_ocean", - "grassland", "grassland_dunes", "grassland_ocean", "coniferous_forest", - "coniferous_forest_dunes", "coniferous_forest_ocean", "deciduous_forest", - "deciduous_forest_shore", "deciduous_forest_ocean", "cold_desert", - "cold_desert_ocean", "savanna", "savanna_shore", "savanna_ocean", - "rainforest", "rainforest_swamp", "rainforest_ocean", "underground", - "floatland_coniferous_forest", "floatland_coniferous_forest_ocean"} - }) - - -- Scatter ores - - -- Coal - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 8 * 8 * 8, - clust_num_ores = 9, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 8 * 8 * 8, - clust_num_ores = 8, - clust_size = 3, - y_max = 64, - y_min = -127, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_coal", - wherein = "default:stone", - clust_scarcity = 12 * 12 * 12, - clust_num_ores = 30, - clust_size = 5, - y_max = -128, - y_min = -31000, - }) - - -- Tin - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 4, - clust_size = 3, - y_max = -64, - y_min = -127, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_tin", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - y_max = -128, - y_min = -31000, - }) - - -- Copper - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 12 * 12 * 12, - clust_num_ores = 4, - clust_size = 3, - y_max = -64, - y_min = -127, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_copper", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 5, - clust_size = 3, - y_max = -128, - y_min = -31000, - }) - - -- Iron - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 9 * 9 * 9, - clust_num_ores = 12, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 7 * 7 * 7, - clust_num_ores = 5, - clust_size = 3, - y_max = -128, - y_min = -255, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_iron", - wherein = "default:stone", - clust_scarcity = 12 * 12 * 12, - clust_num_ores = 29, - clust_size = 5, - y_max = -256, - y_min = -31000, - }) - - -- Gold - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 3, - clust_size = 2, - y_max = -256, - y_min = -511, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_gold", - wherein = "default:stone", - clust_scarcity = 13 * 13 * 13, - clust_num_ores = 5, - clust_size = 3, - y_max = -512, - y_min = -31000, - }) - - -- Mese crystal - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 5, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 18 * 18 * 18, - clust_num_ores = 3, - clust_size = 2, - y_max = -512, - y_min = -1023, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_mese", - wherein = "default:stone", - clust_scarcity = 14 * 14 * 14, - clust_num_ores = 5, - clust_size = 3, - y_max = -1024, - y_min = -31000, - }) - - -- Diamond - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 4, - clust_size = 3, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 17 * 17 * 17, - clust_num_ores = 4, - clust_size = 3, - y_max = -1024, - y_min = -2047, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:stone_with_diamond", - wherein = "default:stone", - clust_scarcity = 15 * 15 * 15, - clust_num_ores = 4, - clust_size = 3, - y_max = -2048, - y_min = -31000, - }) - - -- Mese block - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 36 * 36 * 36, - clust_num_ores = 3, - clust_size = 2, - y_max = 31000, - y_min = 1025, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 36 * 36 * 36, - clust_num_ores = 3, - clust_size = 2, - y_max = -2048, - y_min = -4095, - }) - - minetest.register_ore({ - ore_type = "scatter", - ore = "default:mese", - wherein = "default:stone", - clust_scarcity = 28 * 28 * 28, - clust_num_ores = 5, - clust_size = 3, - y_max = -4096, - y_min = -31000, - }) -end - - --- --- Register biomes --- - --- All mapgens except mgv6 - -function default.register_biomes(upper_limit) - - -- Icesheet - - minetest.register_biome({ - name = "icesheet", - node_dust = "default:snowblock", - node_top = "default:snowblock", - depth_top = 1, - node_filler = "default:snowblock", - depth_filler = 3, - node_stone = "default:cave_ice", - node_water_top = "default:ice", - depth_water_top = 10, - node_river_water = "default:ice", - node_riverbed = "default:gravel", - depth_riverbed = 2, - y_max = upper_limit, - y_min = -8, - heat_point = 0, - humidity_point = 73, - }) - - minetest.register_biome({ - name = "icesheet_ocean", - node_dust = "default:snowblock", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_water_top = "default:ice", - depth_water_top = 10, - y_max = -9, - y_min = -112, - heat_point = 0, - humidity_point = 73, - }) - - -- Tundra - - minetest.register_biome({ - name = "tundra_highland", - node_dust = "default:snow", - node_riverbed = "default:gravel", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 47, - heat_point = 0, - humidity_point = 40, - }) - - minetest.register_biome({ - name = "tundra", - node_top = "default:permafrost_with_stones", - depth_top = 1, - node_filler = "default:permafrost", - depth_filler = 1, - node_riverbed = "default:gravel", - depth_riverbed = 2, - vertical_blend = 4, - y_max = 46, - y_min = 2, - heat_point = 0, - humidity_point = 40, - }) - - minetest.register_biome({ - name = "tundra_beach", - node_top = "default:gravel", - depth_top = 1, - node_filler = "default:gravel", - depth_filler = 2, - node_riverbed = "default:gravel", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 1, - y_min = -3, - heat_point = 0, - humidity_point = 40, - }) - - minetest.register_biome({ - name = "tundra_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:gravel", - depth_riverbed = 2, - vertical_blend = 1, - y_max = -4, - y_min = -112, - heat_point = 0, - humidity_point = 40, - }) - - -- Taiga - - minetest.register_biome({ - name = "taiga", - node_dust = "default:snow", - node_top = "default:dirt_with_snow", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 4, - heat_point = 25, - humidity_point = 70, - }) - - minetest.register_biome({ - name = "taiga_ocean", - node_dust = "default:snow", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 3, - y_min = -112, - heat_point = 25, - humidity_point = 70, - }) - - -- Snowy grassland - - minetest.register_biome({ - name = "snowy_grassland", - node_dust = "default:snow", - node_top = "default:dirt_with_snow", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 1, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 4, - heat_point = 20, - humidity_point = 35, - }) - - minetest.register_biome({ - name = "snowy_grassland_ocean", - node_dust = "default:snow", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 3, - y_min = -112, - heat_point = 20, - humidity_point = 35, - }) - - -- Grassland - - minetest.register_biome({ - name = "grassland", - node_top = "default:dirt_with_grass", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 1, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 6, - heat_point = 50, - humidity_point = 35, - }) - - minetest.register_biome({ - name = "grassland_dunes", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 2, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 5, - y_min = 4, - heat_point = 50, - humidity_point = 35, - }) - - minetest.register_biome({ - name = "grassland_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = 3, - y_min = -112, - heat_point = 50, - humidity_point = 35, - }) - - -- Coniferous forest - - minetest.register_biome({ - name = "coniferous_forest", - node_top = "default:dirt_with_coniferous_litter", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 6, - heat_point = 45, - humidity_point = 70, - }) - - minetest.register_biome({ - name = "coniferous_forest_dunes", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 5, - y_min = 4, - heat_point = 45, - humidity_point = 70, - }) - - minetest.register_biome({ - name = "coniferous_forest_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = 3, - y_min = -112, - heat_point = 45, - humidity_point = 70, - }) - - -- Deciduous forest - - minetest.register_biome({ - name = "deciduous_forest", - node_top = "default:dirt_with_grass", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 1, - heat_point = 60, - humidity_point = 68, - }) - - minetest.register_biome({ - name = "deciduous_forest_shore", - node_top = "default:dirt", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = 0, - y_min = -1, - heat_point = 60, - humidity_point = 68, - }) - - minetest.register_biome({ - name = "deciduous_forest_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = -2, - y_min = -112, - heat_point = 60, - humidity_point = 68, - }) - - -- Desert - - minetest.register_biome({ - name = "desert", - node_top = "default:desert_sand", - depth_top = 1, - node_filler = "default:desert_sand", - depth_filler = 1, - node_stone = "default:desert_stone", - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 4, - heat_point = 92, - humidity_point = 16, - }) - - minetest.register_biome({ - name = "desert_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_stone = "default:desert_stone", - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 3, - y_min = -112, - heat_point = 92, - humidity_point = 16, - }) - - -- Sandstone desert - - minetest.register_biome({ - name = "sandstone_desert", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 1, - node_stone = "default:sandstone", - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 4, - heat_point = 60, - humidity_point = 0, - }) - - minetest.register_biome({ - name = "sandstone_desert_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_stone = "default:sandstone", - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = 3, - y_min = -112, - heat_point = 60, - humidity_point = 0, - }) - - -- Cold desert - - minetest.register_biome({ - name = "cold_desert", - node_top = "default:silver_sand", - depth_top = 1, - node_filler = "default:silver_sand", - depth_filler = 1, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 4, - heat_point = 40, - humidity_point = 0, - }) - - minetest.register_biome({ - name = "cold_desert_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = 3, - y_min = -112, - heat_point = 40, - humidity_point = 0, - }) - - -- Savanna - - minetest.register_biome({ - name = "savanna", - node_top = "default:dirt_with_dry_grass", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 1, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 1, - heat_point = 89, - humidity_point = 42, - }) - - minetest.register_biome({ - name = "savanna_shore", - node_top = "default:dirt", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = 0, - y_min = -1, - heat_point = 89, - humidity_point = 42, - }) - - minetest.register_biome({ - name = "savanna_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = -2, - y_min = -112, - heat_point = 89, - humidity_point = 42, - }) - - -- Rainforest - - minetest.register_biome({ - name = "rainforest", - node_top = "default:dirt_with_rainforest_litter", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = upper_limit, - y_min = 1, - heat_point = 86, - humidity_point = 65, - }) - - minetest.register_biome({ - name = "rainforest_swamp", - node_top = "default:dirt", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - y_max = 0, - y_min = -1, - heat_point = 86, - humidity_point = 65, - }) - - minetest.register_biome({ - name = "rainforest_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - node_riverbed = "default:sand", - depth_riverbed = 2, - vertical_blend = 1, - y_max = -2, - y_min = -112, - heat_point = 86, - humidity_point = 65, - }) - - -- Underground - - minetest.register_biome({ - name = "underground", - y_max = -113, - y_min = -31000, - heat_point = 50, - humidity_point = 50, - }) -end - - --- Biomes for floatlands - --- TODO Temporary simple biomes to be replaced by special floatland biomes later. - -function default.register_floatland_biomes(floatland_level, shadow_limit) - - minetest.register_biome({ - name = "floatland_grassland", - node_top = "default:dirt_with_grass", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 1, - y_max = 31000, - y_min = floatland_level + 2, - heat_point = 50, - humidity_point = 25, - }) - - minetest.register_biome({ - name = "floatland_coniferous_forest", - node_top = "default:dirt_with_coniferous_litter", - depth_top = 1, - node_filler = "default:dirt", - depth_filler = 3, - y_max = 31000, - y_min = floatland_level + 2, - heat_point = 50, - humidity_point = 75, - }) - - minetest.register_biome({ - name = "floatland_ocean", - node_top = "default:sand", - depth_top = 1, - node_filler = "default:sand", - depth_filler = 3, - y_max = floatland_level + 1, - y_min = shadow_limit, - heat_point = 50, - humidity_point = 50, - }) -end - - --- --- Register decorations --- - --- Mgv6 - -function default.register_mgv6_decorations() - -end - - --- All mapgens except mgv6 - -local function register_grass_decoration(offset, scale, length) - -end - -local function register_dry_grass_decoration(offset, scale, length) - -end - -local function register_fern_decoration(seed, length) - -end - - -function default.register_decorations() - -end - - --- --- Detect mapgen, flags and parameters to select functions --- - --- Get setting or default -local mgv7_spflags = minetest.get_mapgen_setting("mgv7_spflags") or - "mountains, ridges, nofloatlands, caverns" -local captures_float = string.match(mgv7_spflags, "floatlands") -local captures_nofloat = string.match(mgv7_spflags, "nofloatlands") - --- Get setting or default --- Make global for mods to use to register floatland biomes -default.mgv7_floatland_level = - minetest.get_mapgen_setting("mgv7_floatland_level") or 1280 -default.mgv7_shadow_limit = - minetest.get_mapgen_setting("mgv7_shadow_limit") or 1024 - -minetest.clear_registered_biomes() -minetest.clear_registered_ores() -minetest.clear_registered_decorations() - -local mg_name = minetest.get_mapgen_setting("mg_name") - -if mg_name == "v6" then - default.register_mgv6_ores() - default.register_mgv6_decorations() --- Need to check for 'nofloatlands' because that contains --- 'floatlands' which makes the second condition true. -elseif mg_name == "v7" and - captures_float == "floatlands" and - captures_nofloat ~= "nofloatlands" then - -- Mgv7 with floatlands and floatland biomes - default.register_biomes(default.mgv7_shadow_limit - 1) - default.register_floatland_biomes( - default.mgv7_floatland_level, default.mgv7_shadow_limit) - default.register_ores() - default.register_decorations() -else - default.register_biomes(31000) - default.register_ores() - default.register_decorations() -end diff --git a/mods/mtg/furnace/init.lua b/mods/mtg/furnace/init.lua index 6d84402..811e7c6 100644 --- a/mods/mtg/furnace/init.lua +++ b/mods/mtg/furnace/init.lua @@ -5,9 +5,6 @@ function default.get_furnace_active_formspec(fuel_percent, item_percent) return "size[8,8.5]".. - default.gui_bg.. - default.gui_bg_img.. - default.gui_slots.. "list[context;src;2.75,0.5;1,1;]".. "list[context;fuel;2.75,2.5;1,1;]".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. @@ -28,9 +25,6 @@ end function default.get_furnace_inactive_formspec() return "size[8,8.5]".. - default.gui_bg.. - default.gui_bg_img.. - default.gui_slots.. "list[context;src;2.75,0.5;1,1;]".. "list[context;fuel;2.75,2.5;1,1;]".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. diff --git a/mods/other/tsm_chests/init.lua b/mods/other/tsm_chests/init.lua index 83e3ec2..8a35b1e 100755 --- a/mods/other/tsm_chests/init.lua +++ b/mods/other/tsm_chests/init.lua @@ -27,9 +27,6 @@ local non_ground_nodes = { local chest_formspec = "size[8,9]" .. - default.gui_bg .. - default.gui_bg_img .. - default.gui_slots .. "list[current_name;main;0,0.3;8,4;]" .. "list[current_player;main;0,4.85;8,1;]" .. "list[current_player;main;0,6.08;8,3;8]" ..