From 779e0973a609697bebc7915ef58cd02d16f0315f Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Tue, 22 Sep 2020 15:48:35 -0700 Subject: [PATCH] Re-add MTG: Trim out the remaining bloat from default --- mods/ctf/ctf_map/ctf_map_core/chest.lua | 3 -- mods/ctf/ctf_map/map_maker/gui.lua | 5 +- mods/ctf/ctf_stats/gui.lua | 1 - mods/mtg/default/functions.lua | 72 ------------------------- mods/mtg/default/init.lua | 2 - mods/mtg/furnace/init.lua | 6 --- mods/other/tsm_chests/init.lua | 3 -- 7 files changed, 1 insertion(+), 91 deletions(-) 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/ctf/ctf_map/map_maker/gui.lua b/mods/ctf/ctf_map/map_maker/gui.lua index c4b45ab..5084b49 100644 --- a/mods/ctf/ctf_map/map_maker/gui.lua +++ b/mods/ctf/ctf_map/map_maker/gui.lua @@ -5,8 +5,6 @@ function map_maker.show_gui(name) local formspec = { "size[9,9.5]", "bgcolor[#080808BB;true]", - default.gui_bg, - default.gui_bg_img, "label[0,0;1. Select Area]", "field[0.4,1;1,1;posx;X;", context.center.x, "]", @@ -57,8 +55,7 @@ end function map_maker.show_progress_formspec(name, text) minetest.show_formspec(name, "ctf_map:progress", "size[6,1]bgcolor[#080808BB;true]" .. - default.gui_bg .. - default.gui_bg_img .. "label[0,0;" .. + "label[0,0;" .. minetest.formspec_escape(text) .. "]") end diff --git a/mods/ctf/ctf_stats/gui.lua b/mods/ctf/ctf_stats/gui.lua index fd26da5..2d08ead 100644 --- a/mods/ctf/ctf_stats/gui.lua +++ b/mods/ctf/ctf_stats/gui.lua @@ -102,7 +102,6 @@ function ctf_stats.get_formspec(title, players, header, target) end) local ret = "size[14," .. 7 + header .. "]" - ret = ret .. default.gui_bg .. default.gui_bg_img ret = ret .. "container[0," .. header .. "]" ret = ret .. "vertlabel[0,1;" .. title .. "]" 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/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]" ..