Removed useless files

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 = ext_require('expcore.common','format_time','move_items') --- @dep expcore.common
+local format_time,move_items = _C.ext_require('expcore.common','format_time','move_items') --- @dep expcore.common
 
 local deaths = {
     archive={} -- deaths moved here after body is gone

modules/addons/discord-alerts.lua

@@ -3,8 +3,8 @@
 
 local Event = require 'utils.event' --- @dep utils.event
 local Game = require 'utils.game' --- @dep utils.game
-local Colors = require 'resources.color_presets' --- @dep resources.color_presets
-local write_json,format_time = ext_require('expcore.common','write_json','format_time') --- @dep expcore.common
+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 config = require 'config.discord_alerts' --- @dep config.discord_alerts
 
 local function get_player_name(event)

modules/addons/greetings.lua

@@ -4,7 +4,7 @@ local Event = require 'utils.event' --- @dep utils.event
 local Game = require 'utils.game' --- @dep utils.event
 local config = require 'config.join_messages' --- @dep config.join_messages
 local Global = require 'utils.global' --- @dep utils.global
-require 'utils.table'
+require 'overrides.table'
 
 Global.register(config,function(tbl)
     config = tbl

modules/addons/random-player-colours.lua

@@ -1,12 +1,12 @@
 --- Gives players random colours when they join, also applies preset colours to those who have them
 -- @addon Player-Colours
 
-local Colours = require 'resources.color_presets' --- @dep resources.color_presets
+local Colours = require 'utils.color_presets' --- @dep utils.color_presets
 local Game = require 'utils.game' --- @dep utils.game
 local Event = require 'utils.event' --- @dep utils.event
 local config = require 'config.preset_player_colours' --- @dep config.preset_player_colours
 local Global = require 'utils.global' --- @dep utils.global
-require 'utils.table'
+require 'overrides.table'
 
 Global.register(config,function(tbl)
     config = tbl

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 = ext_require('expcore.common','print_grid_value','clear_flying_text') --- @dep expcore.common
+local print_grid_value, clear_flying_text = _C.ext_require('expcore.common','print_grid_value','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,7 +4,7 @@
 ]]
 
 local Commands = require 'expcore.commands' --- @dep expcore.commands
-local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
+local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
 require 'config.expcore-commands.parse_general'
 
 --- Sends a message in chat that only admins can see

modules/commands/clear-inventory.lua

@@ -4,7 +4,7 @@
 ]]
 
 local Commands = require 'expcore.commands' --- @dep expcore.commands
-local move_items = ext_require('expcore.common','move_items') --- @dep expcore.common
+local move_items = _C.ext_require('expcore.common','move_items') --- @dep expcore.common
 require 'config.expcore-commands.parse_roles'
 
 --- Clears a players inventory

modules/commands/jail.lua

@@ -5,7 +5,7 @@
 
 local Commands = require 'expcore.commands' --- @dep expcore.commands
 local Jail = require 'modules.control.jail' --- @dep modules.control.jail
-local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
+local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
 require 'config.expcore-commands.parse_roles'
 
 --- Puts a player into jail and removes all other roles.

modules/commands/rainbow.lua

@@ -4,7 +4,7 @@
 ]]
 
 local Commands = require 'expcore.commands' --- @dep expcore.commands
-local format_chat_colour = ext_require('expcore.common','format_chat_colour') --- @dep expcore.common
+local format_chat_colour = _C.ext_require('expcore.common','format_chat_colour') --- @dep expcore.common
 
 local function step_component(c1,c2)
     if c1 < 0 then

modules/commands/reports.lua

@@ -6,7 +6,7 @@
 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 = ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
+local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
 require 'config.expcore-commands.parse_general'
 
 --- Reports a player and notifies moderators

modules/commands/roles.lua

@@ -5,8 +5,8 @@
 
 local Commands = require 'expcore.commands' --- @dep expcore.commands
 local Roles = require 'expcore.roles' --- @dep expcore.roles
-local Colours = require 'resources.color_presets' --- @dep resources.color_presets
-local format_chat_player_name, format_chat_colour_localized = ext_require('expcore.common',
+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'
 )

modules/commands/warnings.lua

@@ -5,7 +5,7 @@
 
 local Commands = require 'expcore.commands' --- @dep expcore.commands
 local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings
-local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
+local format_chat_player_name = _C.ext_require('expcore.common','format_chat_player_name') --- @dep expcore.common
 local config = require 'config.warnings' --- @dep config.warnings
 require 'config.expcore-commands.parse_roles'
 

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 = ext_require('expcore.common','move_items') --- @dep expcore.common
+local move_items = _C.ext_require('expcore.common','move_items') --- @dep expcore.common
 
 local valid_player = Game.get_player_from_any
 local assign_roles = Roles.assign_player

modules/control/production.lua

@@ -32,8 +32,8 @@
 
 ]]
 
-local Colors = require 'resources.color_presets' --- @dep resources.color_presets
-local format_number = ext_require('util','format_number') --- @dep util
+local Colors = require 'utils.color_presets' --- @dep utils.color_presets
+local format_number = _C.ext_require('util','format_number') --- @dep util
 
 local precision_index = defines.flow_precision_index
 local Production = {}

modules/control/warps.lua

@@ -25,7 +25,6 @@ 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 table_values,table_keysort = ext_require('expcore.common','table_values','table_keysort') --- @dep expcore.common
 
 local Warps = {}
 
@@ -64,7 +63,7 @@ Store.watch(warp_store,function(warp,warp_id)
         end
 
         -- Sort the warp names in alphabetical order
-        local new_warp_ids = table_values(table_keysort(warp_names))
+        local new_warp_ids = table.get_values(table.keysort(warp_names))
         table.insert(new_warp_ids,1,spawn_id)
         new_warp_ids.spawn = spawn_id
         force_warps[force_name] = new_warp_ids

modules/gui/debug/_g_view.lua

@@ -1,6 +1,6 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
 local Model = require 'modules.gui.debug.model' --- @dep modules.gui.debug.model
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 
 local dump = Model.dump
 

modules/gui/debug/event_view.lua

@@ -1,5 +1,5 @@
 local Event = require 'utils.event'
-local table = require 'utils.table'
+local table = require 'overrides.table'
 local Gui = require 'utils.gui'
 local Model = require 'modules.gui.debug.model'
 

modules/gui/debug/expcore_gui_view.lua

@@ -1,6 +1,6 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
 local ExpGui = require 'expcore.gui' --- @dep utils.global
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 local Model = require 'modules.gui.debug.model' --- @dep modules.gui.debug.model
 
 local dump = Model.dump

modules/gui/debug/expcore_store_view.lua

@@ -1,6 +1,6 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
 local Store = require 'expcore.store' --- @dep utils.global
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 local Model = require 'modules.gui.debug.model' --- @dep modules.gui.debug.model
 
 local dump = Model.dump

modules/gui/debug/global_view.lua

@@ -1,6 +1,6 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
 local Model = require 'modules.gui.debug.model' --- @dep modules.gui.debug.model
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 
 local dump = Model.dump
 local dump_text = Model.dump_text

modules/gui/debug/main_view.lua

@@ -1,5 +1,5 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 
 local Public = {}
 

modules/gui/debug/model.lua

@@ -1,5 +1,5 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
-local table = require 'utils.table' --- @dep utils.table
+local table = require 'overrides.table' --- @dep overrides.table
 
 local gui_names = Gui.names
 local type = type

modules/gui/debug/package_view.lua

@@ -1,5 +1,5 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 local Model = require 'modules.gui.debug.model' --- @dep modules.gui.debug.model
 
 local dump_function = Model.dump_function
@@ -17,9 +17,9 @@ local ignore = {
     math = true,
     debug = true,
     serpent = true,
-    ['utils.math'] = true,
+    ['overrides.math'] = true,
     util = true,
-    ['utils.inspect'] = true,
+    ['overrides.inspect'] = true,
     ['mod-gui'] = true
 }
 

modules/gui/debug/redmew_global_view.lua

@@ -1,7 +1,7 @@
 local Gui = require 'utils.gui' --- @dep utils.gui
 local Global = require 'utils.global' --- @dep utils.global
 local Token = require 'utils.token' --- @dep utils.token
-local Color = require 'resources.color_presets' --- @dep resources.color_presets
+local Color = require 'utils.color_presets' --- @dep utils.color_presets
 local Model = require 'modules.gui.debug.model' --- @dep modules.gui.debug.model
 
 local dump = Model.dump

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 = ext_require('expcore.common','format_time') --- @dep expcore.common
+local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common
 local config = require 'config.action_buttons' --- @dep config.action_buttons
-local Colors = require 'resources.color_presets' --- @dep resources.color_presets
+local Colors = require 'utils.color_presets' --- @dep utils.color_presets
 
 -- Stores the name of the player a player has selected
 local selected_player_store = Store.register(function(player)

modules/gui/rocket-info.lua

@@ -8,8 +8,8 @@ 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 = ext_require('expcore.common','format_time') --- @dep expcore.common
-local Colors = require 'resources.color_presets' --- @dep resources.color_presets
+local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common
+local Colors = require 'utils.color_presets' --- @dep utils.color_presets
 local Rockets = require 'modules.control.rockets' --- @dep modules.control.rockets
 
 local time_formats = {

modules/gui/science-info.lua

@@ -7,7 +7,7 @@
 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 = ext_require('expcore.common','format_time') --- @dep expcore.common
+local format_time = _C.ext_require('expcore.common','format_time') --- @dep expcore.common
 local config = require 'config.science' --- @dep config.science
 local Production = require 'modules.control.production' --- @dep modules.control.production
 

modules/gui/task-list.lua

@@ -8,8 +8,8 @@ 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 format_time,table_keys = ext_require('expcore.common','format_time','table_keys') --- @dep expcore.common
 local Tasks = require 'modules.control.tasks' --- @dep modules.control.tasks
+local format_time = _C.format_time --- @dep expcore.common
 
 -- Styles used for sprite buttons
 local Styles = {
@@ -223,7 +223,7 @@ end)
 local function update_task(player,task_table,task_id)
     local task = Tasks.get_task(task_id)
     local task_ids = Tasks.get_force_task_ids(player.force.name)
-    local task_number = table.index_of(task_ids, task_id)
+    local task_number = table.get_index(task_ids, task_id)
 
     -- Task no longer exists so should be removed from the list
     if not task then
@@ -240,7 +240,7 @@ local function update_task(player,task_table,task_id)
     -- Update the edit flow
     local edit_flow = task_table['edit-'..task_id]
     local player_allowed_edit = check_player_permissions(player,task)
-    local players_editing = table_keys(task.curently_editing)
+    local players_editing = table.get_keys(task.curently_editing)
     local edit_task_element = edit_flow[edit_task.name]
     local discard_task_element = edit_flow[discard_task.name]
 

modules/gui/warp-list.lua

@@ -10,10 +10,10 @@ local Global = require 'utils.global' --- @dep utils.global
 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 'resources.color_presets' --- @dep resources.color_presets
+local Colors = require 'utils.color_presets' --- @dep utils.color_presets
 local config = require 'config.warps' --- @dep config.warps
-local format_time,table_keys = ext_require('expcore.common','format_time','table_keys') --- @dep expcore.common
 local Warps = require 'modules.control.warps' --- @dep modules.control.warps
+local format_time = _C.format_time --- @dep expcore.common
 
 -- Stores a boolean value indexed by player name
 local player_in_range_store = Store.register(function(player)
@@ -319,7 +319,7 @@ local function update_warp(player,warp_table,warp_id)
     -- Update the edit flow
     local edit_flow = warp_table['edit-'..warp_id]
     local player_allowed_edit = check_player_permissions(player,'allow_edit_warp',warp)
-    local players_editing = table_keys(warp.currently_editing)
+    local players_editing = table.get_keys(warp.currently_editing)
     local edit_warp_element = edit_flow[edit_warp.name]
     local discard_warp_element = edit_flow[discard_warp.name]