From 4fbdc312ae2635bed2551f432a69184d7ba3d472 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sat, 13 Mar 2021 20:39:56 +0100 Subject: [PATCH] Separate elidragon_worlds mod --- config/multiserver.yml | 2 +- mods/elidragon_commands/mod.conf | 4 ---- mods/{elidragon_commands => elidragon_worlds}/init.lua | 5 ++++- mods/elidragon_worlds/mod.conf | 4 ++++ worlds/creative/world.mt | 2 +- worlds/lobby/world.mt | 2 +- worlds/skyblock/world.mt | 2 +- worlds/survival/world.mt | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 mods/elidragon_commands/mod.conf rename mods/{elidragon_commands => elidragon_worlds}/init.lua (78%) create mode 100644 mods/elidragon_worlds/mod.conf diff --git a/config/multiserver.yml b/config/multiserver.yml index ee07d5e..c751bb9 100644 --- a/config/multiserver.yml +++ b/config/multiserver.yml @@ -12,7 +12,7 @@ default_server: lobby force_default_server: true admin: "Elidragon" server_reintergration_interval: 15 -disable_builtin: false +disable_builtin: true serverlist_url: "https://servers.minetest.net" serverlist_address: "zap.elidragon.com" serverlist_name: "Elidragon v2 [alpha]" diff --git a/mods/elidragon_commands/mod.conf b/mods/elidragon_commands/mod.conf deleted file mode 100644 index 880d56f..0000000 --- a/mods/elidragon_commands/mod.conf +++ /dev/null @@ -1,4 +0,0 @@ -name = elidragon_commands -author = Fleckenstein -description = Various commands for Elidragon v2 -depends = elidragon, multiserver, mcl_colors diff --git a/mods/elidragon_commands/init.lua b/mods/elidragon_worlds/init.lua similarity index 78% rename from mods/elidragon_commands/init.lua rename to mods/elidragon_worlds/init.lua index 6ef447e..9f32e2a 100644 --- a/mods/elidragon_commands/init.lua +++ b/mods/elidragon_worlds/init.lua @@ -5,6 +5,7 @@ for _, world in ipairs(elidragon.WORLDS) do if world ~= current_world then local desc = world:sub(1, 1):upper() .. world:sub(2) descriptions[world] = desc + minetest.register_chatcommand(world, { description = "Join " .. desc, func = function(name) @@ -16,6 +17,8 @@ end multiserver.register_on_redirect_done(function(name, world, success) if not success then - minetest.send_chat_message(name, minetest.colorize(mcl_colors.RED, descriptions[world] .. " is down.")) + minetest.chat_send_player(name, minetest.colorize(mcl_colors.RED, descriptions[world] .. " is down.")) end end) + +elidragon.worlds = {} diff --git a/mods/elidragon_worlds/mod.conf b/mods/elidragon_worlds/mod.conf new file mode 100644 index 0000000..0fe1cfa --- /dev/null +++ b/mods/elidragon_worlds/mod.conf @@ -0,0 +1,4 @@ +name = elidragon_worlds +author = Fleckenstein +description = World management for Elidragon v2 +depends = elidragon, multiserver, mcl_colors diff --git a/worlds/creative/world.mt b/worlds/creative/world.mt index 85e021d..bcbd92a 100644 --- a/worlds/creative/world.mt +++ b/worlds/creative/world.mt @@ -7,7 +7,6 @@ player_backend = sqlite3 load_mod_default = false load_mod_elidragon = true load_mod_elidragon_class = true -load_mod_elidragon_commands = true load_mod_elidragon_creative = true load_mod_elidragon_db = true load_mod_elidragon_grouplist = false @@ -22,6 +21,7 @@ load_mod_elidragon_schems = true load_mod_elidragon_skyblock = false load_mod_elidragon_tp = true load_mod_elidragon_util = true +load_mod_elidragon_worlds = true load_mod_lucky_block = false load_mod_mcl_wither_spawning = true load_mod_multiserver = true diff --git a/worlds/lobby/world.mt b/worlds/lobby/world.mt index e255869..294446a 100644 --- a/worlds/lobby/world.mt +++ b/worlds/lobby/world.mt @@ -7,7 +7,6 @@ player_backend = sqlite3 load_mod_default = false load_mod_elidragon = true load_mod_elidragon_class = true -load_mod_elidragon_commands = true load_mod_elidragon_creative = false load_mod_elidragon_db = true load_mod_elidragon_grouplist = false @@ -22,6 +21,7 @@ load_mod_elidragon_schems = false load_mod_elidragon_skyblock = false load_mod_elidragon_tp = false load_mod_elidragon_util = false +load_mod_elidragon_worlds = true load_mod_lucky_block = false load_mod_mcl_wither_spawning = true load_mod_multiserver = true diff --git a/worlds/skyblock/world.mt b/worlds/skyblock/world.mt index 3540b6c..0b6118e 100644 --- a/worlds/skyblock/world.mt +++ b/worlds/skyblock/world.mt @@ -7,7 +7,6 @@ player_backend = sqlite3 load_mod_default = true load_mod_elidragon = true load_mod_elidragon_class = true -load_mod_elidragon_commands = true load_mod_elidragon_creative = false load_mod_elidragon_db = true load_mod_elidragon_grouplist = true @@ -22,6 +21,7 @@ load_mod_elidragon_schems = true load_mod_elidragon_skyblock = true load_mod_elidragon_tp = true load_mod_elidragon_util = true +load_mod_elidragon_worlds = true load_mod_lucky_block = true load_mod_mcl_wither_spawning = true load_mod_multiserver = true diff --git a/worlds/survival/world.mt b/worlds/survival/world.mt index e7044af..d8c12bf 100644 --- a/worlds/survival/world.mt +++ b/worlds/survival/world.mt @@ -7,7 +7,6 @@ player_backend = sqlite3 load_mod_default = false load_mod_elidragon = true load_mod_elidragon_class = true -load_mod_elidragon_commands = true load_mod_elidragon_creative = false load_mod_elidragon_db = true load_mod_elidragon_grouplist = false @@ -22,6 +21,7 @@ load_mod_elidragon_schems = false load_mod_elidragon_skyblock = false load_mod_elidragon_tp = true load_mod_elidragon_util = true +load_mod_elidragon_worlds = true load_mod_lucky_block = false load_mod_mcl_wither_spawning = true load_mod_multiserver = true -- 2.44.0