Cleaned Config

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
 }

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)

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

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

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 = ''

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

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

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={},

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

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)

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

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

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)

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

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

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

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
 

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)

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

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

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

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

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

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

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

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

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

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

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 = {}

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

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 = {}
 

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)

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,

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})

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
 

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