From 95af6cfc34a03c44688e6f634bb04fc3e31b019b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 29 Mar 2020 23:39:24 +0100 Subject: [PATCH] Cleaned Config --- config/_file_loader.lua | 10 +++++----- config/chat_reply.lua | 2 +- .../command_auth_admin.lua} | 0 .../command_auth_roles.lua} | 0 .../command_general_parse.lua} | 0 .../command_role_parse.lua} | 4 ++-- .../command_runtime_disable.lua} | 0 config/{ => expcore}/permission_groups.lua | 0 config/{ => expcore}/roles.lua | 14 -------------- .../player_list_actions.lua} | 2 +- config/{ => gui}/rockets.lua | 0 config/{ => gui}/science.lua | 0 config/{ => gui}/tasks.lua | 0 config/{ => gui}/warps.lua | 0 expcore/commands.lua | 2 +- expcore/common.lua | 13 ------------- expcore/roles.lua | 2 +- modules/addons/death-logger.lua | 2 +- modules/addons/discord-alerts.lua | 2 +- modules/addons/scorched-earth.lua | 2 +- modules/commands/admin-chat.lua | 4 ++-- modules/commands/bonus.lua | 2 +- modules/commands/cheat-mode.lua | 2 +- modules/commands/clear-inventory.lua | 4 ++-- modules/commands/find.lua | 2 +- modules/commands/help.lua | 2 +- modules/commands/home.lua | 2 +- modules/commands/jail.lua | 4 ++-- modules/commands/kill.lua | 4 ++-- modules/commands/rainbow.lua | 2 +- modules/commands/repair.lua | 2 +- modules/commands/reports.lua | 4 ++-- modules/commands/roles.lua | 5 +---- modules/commands/tag.lua | 4 ++-- modules/commands/teleport.lua | 2 +- modules/commands/warnings.lua | 4 ++-- modules/control/jail.lua | 2 +- modules/control/production.lua | 2 +- modules/control/rockets.lua | 2 +- modules/control/warps.lua | 2 +- modules/gui/player-list.lua | 4 ++-- modules/gui/rocket-info.lua | 4 ++-- modules/gui/science-info.lua | 4 ++-- modules/gui/task-list.lua | 2 +- modules/gui/warp-list.lua | 2 +- 45 files changed, 49 insertions(+), 79 deletions(-) rename config/{expcore-commands/auth_admin.lua => expcore/command_auth_admin.lua} (100%) rename config/{expcore-commands/auth_roles.lua => expcore/command_auth_roles.lua} (100%) rename config/{expcore-commands/parse_general.lua => expcore/command_general_parse.lua} (100%) rename config/{expcore-commands/parse_roles.lua => expcore/command_role_parse.lua} (92%) rename config/{expcore-commands/auth_runtime_disable.lua => expcore/command_runtime_disable.lua} (100%) rename config/{ => expcore}/permission_groups.lua (100%) rename config/{ => expcore}/roles.lua (95%) rename config/{action_buttons.lua => gui/player_list_actions.lua} (98%) rename config/{ => gui}/rockets.lua (100%) rename config/{ => gui}/science.lua (100%) rename config/{ => gui}/tasks.lua (100%) rename config/{ => gui}/warps.lua (100%) diff --git a/config/_file_loader.lua b/config/_file_loader.lua index 452be0a1..c78f6bde 100644 --- a/config/_file_loader.lua +++ b/config/_file_loader.lua @@ -52,9 +52,9 @@ return { 'modules.gui.server-ups', 'modules.commands.debug', -- Config Files - 'config.expcore-commands.auth_admin', -- commands tagged with admin_only are blocked for non admins - 'config.expcore-commands.auth_roles', -- commands must be allowed via the role config - 'config.expcore-commands.auth_runtime_disable', -- allows commands to be enabled and disabled during runtime - 'config.permission_groups', -- loads some predefined permission groups - 'config.roles', -- loads some predefined roles + 'config.expcore.command_auth_admin', -- commands tagged with admin_only are blocked for non admins + 'config.expcore.command_auth_roles', -- commands must be allowed via the role config + 'config.expcore.command_runtime_disable', -- allows commands to be enabled and disabled during runtime + 'config.expcore.permission_groups', -- loads some predefined permission groups + 'config.expcore.roles', -- loads some predefined roles } \ No newline at end of file diff --git a/config/chat_reply.lua b/config/chat_reply.lua index 52eb80be..d4b66a16 100644 --- a/config/chat_reply.lua +++ b/config/chat_reply.lua @@ -2,7 +2,7 @@ -- @config Chat-Reply local Async = require 'expcore.async' -local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common +local format_time = _C.format_time --- @dep expcore.common local async_message = Async.register(function(player, message) player.print(message) diff --git a/config/expcore-commands/auth_admin.lua b/config/expcore/command_auth_admin.lua similarity index 100% rename from config/expcore-commands/auth_admin.lua rename to config/expcore/command_auth_admin.lua diff --git a/config/expcore-commands/auth_roles.lua b/config/expcore/command_auth_roles.lua similarity index 100% rename from config/expcore-commands/auth_roles.lua rename to config/expcore/command_auth_roles.lua diff --git a/config/expcore-commands/parse_general.lua b/config/expcore/command_general_parse.lua similarity index 100% rename from config/expcore-commands/parse_general.lua rename to config/expcore/command_general_parse.lua diff --git a/config/expcore-commands/parse_roles.lua b/config/expcore/command_role_parse.lua similarity index 92% rename from config/expcore-commands/parse_roles.lua rename to config/expcore/command_role_parse.lua index f6923404..12e76bbc 100644 --- a/config/expcore-commands/parse_roles.lua +++ b/config/expcore/command_role_parse.lua @@ -9,8 +9,8 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Roles = require 'expcore.roles' --- @dep expcore.roles -local auto_complete = _C.ext_require('expcore.common','auto_complete') --- @dep expcore.common -require 'config.expcore-commands.parse_general' +local auto_complete = _C.auto_complete --- @dep expcore.common +require 'config.expcore.command_general_parse' Commands.add_parse('role',function(input,player,reject) if not input then return end diff --git a/config/expcore-commands/auth_runtime_disable.lua b/config/expcore/command_runtime_disable.lua similarity index 100% rename from config/expcore-commands/auth_runtime_disable.lua rename to config/expcore/command_runtime_disable.lua diff --git a/config/permission_groups.lua b/config/expcore/permission_groups.lua similarity index 100% rename from config/permission_groups.lua rename to config/expcore/permission_groups.lua diff --git a/config/roles.lua b/config/expcore/roles.lua similarity index 95% rename from config/roles.lua rename to config/expcore/roles.lua index 943e3709..ef3e1c51 100644 --- a/config/roles.lua +++ b/config/expcore/roles.lua @@ -3,20 +3,6 @@ local Roles = require 'expcore.roles' --- @dep expcore.roles --- Use these to adjust for ticks ie game.tick < 5*minutes -local seconds, minutes, hours = 60, 3600, 216000 - ---[[ - -- cant use a factory as it has up values ;-; - local function playtime(time_required) - return function(player) - if player.online_time > time_required then - return true - end - end - end -]] - --- Role flags that will run when a player changes roles Roles.define_flag_trigger('is_admin',function(player,state) player.admin = state diff --git a/config/action_buttons.lua b/config/gui/player_list_actions.lua similarity index 98% rename from config/action_buttons.lua rename to config/gui/player_list_actions.lua index 77ad6b9d..1bd19bbf 100644 --- a/config/action_buttons.lua +++ b/config/gui/player_list_actions.lua @@ -13,7 +13,7 @@ local Reports = require 'modules.control.reports' --- @dep modules.control.repor local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings local Jail = require 'modules.control.jail' --- @dep modules.control.jail local Colors = require 'utils.color_presets' --- @dep utils.color_presets -local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common +local format_chat_player_name = _C.format_chat_player_name --- @dep expcore.common local selected_player_store = '' local selected_action_store = '' diff --git a/config/rockets.lua b/config/gui/rockets.lua similarity index 100% rename from config/rockets.lua rename to config/gui/rockets.lua diff --git a/config/science.lua b/config/gui/science.lua similarity index 100% rename from config/science.lua rename to config/gui/science.lua diff --git a/config/tasks.lua b/config/gui/tasks.lua similarity index 100% rename from config/tasks.lua rename to config/gui/tasks.lua diff --git a/config/warps.lua b/config/gui/warps.lua similarity index 100% rename from config/warps.lua rename to config/gui/warps.lua diff --git a/expcore/commands.lua b/expcore/commands.lua index a64370ef..b84adea4 100644 --- a/expcore/commands.lua +++ b/expcore/commands.lua @@ -196,7 +196,7 @@ ]] local Game = require 'utils.game' --- @dep utils.game -local player_return,write_json = _C.ext_require('expcore.common','player_return','write_json') --- @dep expcore.common +local player_return,write_json = _C.player_return, _C.write_json --- @dep expcore.common local Commands = { defines={ -- common values are stored error like signals diff --git a/expcore/common.lua b/expcore/common.lua index fd87f65f..983cae4d 100644 --- a/expcore/common.lua +++ b/expcore/common.lua @@ -192,19 +192,6 @@ function Common.opt_require(path) else return nil,rtn end end ---- Calls a require and returns only the keys given, file must return a table --- @usage local extract, param_check = _C.ext_require('expcore.common','extract','param_check') --- @dep expcore.common --- @tparam string path the path that you want to require --- @tparam string ... the name of the keys that you want returned --- @return the keys in the order given -function Common.ext_require(path,...) - local rtn = require(path) - if type(rtn) ~= 'table' then - error('File did not return a table, can not extract keys.',2) - end - return table.extract_keys(rtn,...) -end - --- Returns a desync safe file path for the current file -- @tparam[opt=0] number offset the offset in the stack to get, 0 is current file -- @treturn string the file path diff --git a/expcore/roles.lua b/expcore/roles.lua index aefa06a7..8c245ec8 100644 --- a/expcore/roles.lua +++ b/expcore/roles.lua @@ -118,7 +118,7 @@ local Event = require 'utils.event' --- @dep utils.event local Groups = require 'expcore.permission_groups' --- @dep expcore.permission_groups local Async = require 'expcore.async' --- @dep expcore.async local Colours = require 'utils.color_presets' --- @dep utils.color_presets -local write_json = _C.ext_require('expcore.common','write_json') --- @dep expcore.common +local write_json = _C.write_json --- @dep expcore.common local Roles = { _prototype={}, diff --git a/modules/addons/death-logger.lua b/modules/addons/death-logger.lua index 6f4be5d7..2e6d90d0 100644 --- a/modules/addons/death-logger.lua +++ b/modules/addons/death-logger.lua @@ -5,7 +5,7 @@ local Event = require 'utils.event' --- @dep utils.event local Game = require 'utils.game' --- @dep utils.game local Global = require 'utils.global' --- @dep utils.global local config = require 'config.death_logger' --- @dep config.death_logger -local format_time,move_items = _C.ext_require('expcore.common','format_time','move_items') --- @dep expcore.common +local format_time,move_items = _C.format_time, _C.move_items --- @dep expcore.common local deaths = { archive={} -- deaths moved here after body is gone diff --git a/modules/addons/discord-alerts.lua b/modules/addons/discord-alerts.lua index 22bba566..f50271aa 100644 --- a/modules/addons/discord-alerts.lua +++ b/modules/addons/discord-alerts.lua @@ -4,7 +4,7 @@ local Event = require 'utils.event' --- @dep utils.event local Game = require 'utils.game' --- @dep utils.game local Colors = require 'utils.color_presets' --- @dep utils.color_presets -local write_json,format_time = _C.ext_require('expcore.common','write_json','format_time') --- @dep expcore.common +local write_json,format_time = _C.write_json, _C.format_time --- @dep expcore.common local config = require 'config.discord_alerts' --- @dep config.discord_alerts local function get_player_name(event) diff --git a/modules/addons/scorched-earth.lua b/modules/addons/scorched-earth.lua index 9ae946f5..c6c822c5 100644 --- a/modules/addons/scorched-earth.lua +++ b/modules/addons/scorched-earth.lua @@ -4,7 +4,7 @@ local Event = require 'utils.event' --- @dep utils.event local Game = require 'utils.game' --- @dep utils.game local Global = require 'utils.global' --- @dep utils.global -local print_grid_value, clear_flying_text = _C.ext_require('expcore.common','print_grid_value','clear_flying_text') --- @dep expcore.common +local print_grid_value, clear_flying_text = _C.print_grid_value, _C.clear_flying_text --- @dep expcore.common local config = require 'config.scorched_earth' --- @dep config.scorched_earth -- Loops over the config and finds the wile which has the highest value for strength diff --git a/modules/commands/admin-chat.lua b/modules/commands/admin-chat.lua index 9a8182cb..faf239f7 100644 --- a/modules/commands/admin-chat.lua +++ b/modules/commands/admin-chat.lua @@ -4,8 +4,8 @@ ]] local Commands = require 'expcore.commands' --- @dep expcore.commands -local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common -require 'config.expcore-commands.parse_general' +local format_chat_player_name = _C.format_chat_player_name --- @dep expcore.common +require 'config.expcore.command_general_parse' --- Sends a message in chat that only admins can see -- @command admin-chat diff --git a/modules/commands/bonus.lua b/modules/commands/bonus.lua index 2a63c6d5..b39fc1f1 100644 --- a/modules/commands/bonus.lua +++ b/modules/commands/bonus.lua @@ -9,7 +9,7 @@ local Event = require 'utils.event' --- @dep utils.event local Game = require 'utils.game' --- @dep utils.game local Store = require 'expcore.store' --- @dep expcore.store local config = require 'config.bonuses' --- @dep config.bonuses -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' -- Store bonus percentages keyed by player name local bonus_store = Store.register(function(player) diff --git a/modules/commands/cheat-mode.lua b/modules/commands/cheat-mode.lua index caef97c9..f3f525df 100644 --- a/modules/commands/cheat-mode.lua +++ b/modules/commands/cheat-mode.lua @@ -4,7 +4,7 @@ ]] local Commands = require 'expcore.commands' --- @dep expcore.commands -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' --- Toggles cheat mode for your player, or another player. -- @command toggle-cheat-mode diff --git a/modules/commands/clear-inventory.lua b/modules/commands/clear-inventory.lua index 91e6c7e5..e684fb5e 100644 --- a/modules/commands/clear-inventory.lua +++ b/modules/commands/clear-inventory.lua @@ -4,8 +4,8 @@ ]] local Commands = require 'expcore.commands' --- @dep expcore.commands -local move_items = _C.ext_require('expcore.common','move_items') --- @dep expcore.common -require 'config.expcore-commands.parse_roles' +local move_items = _C.move_items --- @dep expcore.common +require 'config.expcore.command_role_parse' --- Clears a players inventory -- @command clear-inventory diff --git a/modules/commands/find.lua b/modules/commands/find.lua index f2770ab6..58ab5530 100644 --- a/modules/commands/find.lua +++ b/modules/commands/find.lua @@ -4,7 +4,7 @@ ]] local Commands = require 'expcore.commands' --- @dep expcore.commands -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' --- Find a player on your map. -- @command find-on-map diff --git a/modules/commands/help.lua b/modules/commands/help.lua index 62dac168..af43910d 100644 --- a/modules/commands/help.lua +++ b/modules/commands/help.lua @@ -5,7 +5,7 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Global = require 'utils.global' --- @dep utils.global -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' local results_per_page = 5 diff --git a/modules/commands/home.lua b/modules/commands/home.lua index 0d0dd92a..c6ce9078 100644 --- a/modules/commands/home.lua +++ b/modules/commands/home.lua @@ -5,7 +5,7 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Global = require 'utils.global' --- @dep utils.global -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' local homes = {} Global.register(homes,function(tbl) diff --git a/modules/commands/jail.lua b/modules/commands/jail.lua index 279eb373..cea441d8 100644 --- a/modules/commands/jail.lua +++ b/modules/commands/jail.lua @@ -5,8 +5,8 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Jail = require 'modules.control.jail' --- @dep modules.control.jail -local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common -require 'config.expcore-commands.parse_roles' +local format_chat_player_name = _C.format_chat_player_name --- @dep expcore.common +require 'config.expcore.command_role_parse' --- Puts a player into jail and removes all other roles. -- @command jail diff --git a/modules/commands/kill.lua b/modules/commands/kill.lua index 2396be52..3fea3e9a 100644 --- a/modules/commands/kill.lua +++ b/modules/commands/kill.lua @@ -5,8 +5,8 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Roles = require 'expcore.roles' --- @dep expcore.roles -require 'config.expcore-commands.parse_general' -require 'config.expcore-commands.parse_roles' +require 'config.expcore.command_general_parse' +require 'config.expcore.command_role_parse' --- Kills yourself or another player. -- @command kill diff --git a/modules/commands/rainbow.lua b/modules/commands/rainbow.lua index 4a29fe6a..350e0ae6 100644 --- a/modules/commands/rainbow.lua +++ b/modules/commands/rainbow.lua @@ -4,7 +4,7 @@ ]] local Commands = require 'expcore.commands' --- @dep expcore.commands -local format_chat_colour = _C.ext_require('expcore.common','format_chat_colour') --- @dep expcore.common +local format_chat_colour = _C.format_chat_colour --- @dep expcore.common local function step_component(c1,c2) if c1 < 0 then diff --git a/modules/commands/repair.lua b/modules/commands/repair.lua index cd7d67d6..f7ff434c 100644 --- a/modules/commands/repair.lua +++ b/modules/commands/repair.lua @@ -5,7 +5,7 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local config = require 'config.repair' --- @dep config.repair -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' local max_time_to_live = 4294967295 -- unit32 max --- Repairs entities on your force around you diff --git a/modules/commands/reports.lua b/modules/commands/reports.lua index 51f2f493..93ab6008 100644 --- a/modules/commands/reports.lua +++ b/modules/commands/reports.lua @@ -6,8 +6,8 @@ local Roles = require 'expcore.roles' --- @dep expcore.roles local Commands = require 'expcore.commands' --- @dep expcore.commands local Reports = require 'modules.control.reports' --- @dep modules.control.reports -local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common -require 'config.expcore-commands.parse_general' +local format_chat_player_name = _C.format_chat_player_name--- @dep expcore.common +require 'config.expcore.command_general_parse' --- Reports a player and notifies moderators -- @command report diff --git a/modules/commands/roles.lua b/modules/commands/roles.lua index 448109f0..af36302a 100644 --- a/modules/commands/roles.lua +++ b/modules/commands/roles.lua @@ -6,10 +6,7 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Roles = require 'expcore.roles' --- @dep expcore.roles local Colours = require 'utils.color_presets' --- @dep utils.color_presets -local format_chat_player_name, format_chat_colour_localized = _C.ext_require('expcore.common', - 'format_chat_player_name', - 'format_chat_colour_localized' -) +local format_chat_player_name, format_chat_colour_localized = _C.format_chat_player_name, _C.format_chat_colour_localized --- Assigns a role to a player -- @command assign-role diff --git a/modules/commands/tag.lua b/modules/commands/tag.lua index e8c51e9b..a0400cf2 100644 --- a/modules/commands/tag.lua +++ b/modules/commands/tag.lua @@ -5,8 +5,8 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Roles = require 'expcore.roles' --- @dep expcore.roles -require 'config.expcore-commands.parse_general' -require 'config.expcore-commands.parse_roles' +require 'config.expcore.command_general_parse' +require 'config.expcore.command_role_parse' --- Sets your player tag. -- @command tag diff --git a/modules/commands/teleport.lua b/modules/commands/teleport.lua index 2117f18d..f5e88906 100644 --- a/modules/commands/teleport.lua +++ b/modules/commands/teleport.lua @@ -4,7 +4,7 @@ ]] local Commands = require 'expcore.commands' --- @dep expcore.commands -require 'config.expcore-commands.parse_general' +require 'config.expcore.command_general_parse' local function teleport(from_player,to_player) local surface = to_player.surface diff --git a/modules/commands/warnings.lua b/modules/commands/warnings.lua index 9c1dfcef..42f7b868 100644 --- a/modules/commands/warnings.lua +++ b/modules/commands/warnings.lua @@ -5,9 +5,9 @@ local Commands = require 'expcore.commands' --- @dep expcore.commands local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings -local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common +local format_chat_player_name = _C.format_chat_player_name --- @dep expcore.common local config = require 'config.warnings' --- @dep config.warnings -require 'config.expcore-commands.parse_roles' +require 'config.expcore.command_role_parse' --- Gives a warning to a player; may lead to automatic script action. -- @command give-warning diff --git a/modules/control/jail.lua b/modules/control/jail.lua index 10a387a1..e0cfe837 100644 --- a/modules/control/jail.lua +++ b/modules/control/jail.lua @@ -23,7 +23,7 @@ local Roles = require 'expcore.roles' --- @dep expcore.roles local Game = require 'utils.game' --- @dep utils.game local Global = require 'utils.global' --- @dep utils.global -local move_items = _C.ext_require('expcore.common','move_items') --- @dep expcore.common +local move_items = _C.move_items --- @dep expcore.common local valid_player = Game.get_player_from_any local assign_roles = Roles.assign_player diff --git a/modules/control/production.lua b/modules/control/production.lua index 16eb97b9..f6e6c1c2 100644 --- a/modules/control/production.lua +++ b/modules/control/production.lua @@ -33,7 +33,7 @@ ]] local Colors = require 'utils.color_presets' --- @dep utils.color_presets -local format_number = _C.ext_require('util','format_number') --- @dep util +local format_number = _C.format_number --- @dep util local precision_index = defines.flow_precision_index local Production = {} diff --git a/modules/control/rockets.lua b/modules/control/rockets.lua index 63e4928e..0dff7f84 100644 --- a/modules/control/rockets.lua +++ b/modules/control/rockets.lua @@ -27,7 +27,7 @@ local Event = require 'utils.event' --- @dep utils.event local Global = require 'utils.global' --- @dep utils.global -local config = require 'config.rockets' --- @dep config.rockets +local config = require 'config.gui.rockets' --- @dep config.rockets local largest_rolling_avg = 0 for _,avg_over in pairs(config.stats.rolling_avg) do diff --git a/modules/control/warps.lua b/modules/control/warps.lua index 93bf0ea2..897b2bc1 100644 --- a/modules/control/warps.lua +++ b/modules/control/warps.lua @@ -24,7 +24,7 @@ Warps.make_warp_tag(warp_id) local Store = require 'expcore.store' --- @dep expcore.store local Global = require 'utils.global' --- @dep utils.global local Token = require 'utils.token' --- @dep utils.token -local config = require 'config.warps' --- @dep config.warps +local config = require 'config.gui.warps' --- @dep config.warps local Warps = {} diff --git a/modules/gui/player-list.lua b/modules/gui/player-list.lua index beecb309..d16acd5e 100644 --- a/modules/gui/player-list.lua +++ b/modules/gui/player-list.lua @@ -9,9 +9,9 @@ local Roles = require 'expcore.roles' --- @dep expcore.roles local Store = require 'expcore.store' --- @dep expcore.store local Game = require 'utils.game' --- @dep utils.game local Event = require 'utils.event' --- @dep utils.event -local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common -local config = require 'config.action_buttons' --- @dep config.action_buttons +local config = require 'config.gui.player_list_actions' --- @dep config.gui.player_list_actions local Colors = require 'utils.color_presets' --- @dep utils.color_presets +local format_time = _C.format_time --- @dep expcore.common -- Stores the name of the player a player has selected local selected_player_store = Store.register(function(player) diff --git a/modules/gui/rocket-info.lua b/modules/gui/rocket-info.lua index 197699fc..40656e79 100644 --- a/modules/gui/rocket-info.lua +++ b/modules/gui/rocket-info.lua @@ -7,10 +7,10 @@ local Gui = require 'expcore.gui' --- @dep expcore.gui local Roles = require 'expcore.roles' --- @dep expcore.roles local Event = require 'utils.event' --- @dep utils.event -local config = require 'config.rockets' --- @dep config.rockets -local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common +local config = require 'config.gui.rockets' --- @dep config.gui.rockets local Colors = require 'utils.color_presets' --- @dep utils.color_presets local Rockets = require 'modules.control.rockets' --- @dep modules.control.rockets +local format_time = _C.format_time --- @dep expcore.common local time_formats = { caption = function(value) return format_time(value, {minutes=true, seconds=true}) end, diff --git a/modules/gui/science-info.lua b/modules/gui/science-info.lua index 9c6b794f..da43c749 100644 --- a/modules/gui/science-info.lua +++ b/modules/gui/science-info.lua @@ -7,9 +7,9 @@ local Gui = require 'expcore.gui' --- @dep expcore.gui local Roles = require 'expcore.roles' --- @dep expcore.gui local Event = require 'utils.event' --- @dep utils.event -local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common -local config = require 'config.science' --- @dep config.science +local config = require 'config.gui.science' --- @dep config.gui.science local Production = require 'modules.control.production' --- @dep modules.control.production +local format_time = _C.format_time --- @dep expcore.common local null_time_short = {'science-info.eta-time',format_time(0,{hours=true,minutes=true,seconds=true,time=true,null=true})} local null_time_long = format_time(0,{hours=true,minutes=true,seconds=true,long=true,null=true}) diff --git a/modules/gui/task-list.lua b/modules/gui/task-list.lua index 702f3499..19c3906d 100644 --- a/modules/gui/task-list.lua +++ b/modules/gui/task-list.lua @@ -7,7 +7,7 @@ local Gui = require 'expcore.gui' --- @dep expcore.gui local Event = require 'utils.event' --- @dep utils.event local Roles = require 'expcore.roles' --- @dep expcore.roles -local config = require 'config.tasks' --- @dep config.tasks +local config = require 'config.gui.tasks' --- @dep config.gui.tasks local Tasks = require 'modules.control.tasks' --- @dep modules.control.tasks local format_time = _C.format_time --- @dep expcore.common diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua index 52b711da..6f25fac1 100644 --- a/modules/gui/warp-list.lua +++ b/modules/gui/warp-list.lua @@ -11,7 +11,7 @@ local Event = require 'utils.event' --- @dep utils.event local Game = require 'utils.game' --- @dep utils.game local Roles = require 'expcore.roles' --- @dep expcore.roles local Colors = require 'utils.color_presets' --- @dep utils.color_presets -local config = require 'config.warps' --- @dep config.warps +local config = require 'config.gui.warps' --- @dep config.gui.warps local Warps = require 'modules.control.warps' --- @dep modules.control.warps local format_time = _C.format_time --- @dep expcore.common