Add startable legacy code

exp_legacy/module/modules/control/jail.lua

@@ -5,7 +5,7 @@
 
     @usage
     -- import the module from the control modules
-    local Jail = require 'modules.control.jail' --- @dep modules.control.jail
+    local Jail = require("modules.exp_legacy.modules.control.jail") --- @dep modules.control.jail
 
     -- This will move 'MrBiter' to the jail role and remove all other roles from them
     -- the player name and reason are only so they can be included in the event for user feedback
@@ -16,8 +16,8 @@
     Jail.unjail_player('MrBiter', 'Cooldude2606')
 ]]
 
-local Roles = require 'expcore.roles' --- @dep expcore.roles
-local Game = require 'utils.game' --- @dep utils.game
+local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local Game = require("modules.exp_legacy.utils.game") --- @dep utils.game
 
 local valid_player = Game.get_player_from_any
 local assign_roles = Roles.assign_player

exp_legacy/module/modules/control/production.lua

@@ -5,7 +5,7 @@
 
     @usage
     -- import the module from the control modules
-    local Production = require 'modules.control.production' --- @dep modules.control.production
+    local Production = require("modules.exp_legacy.modules.control.production") --- @dep modules.control.production
 
     -- This will return the less precise index from the one given
     -- this means that one_second will return one_minute or ten_hours will return fifty_hours
@@ -32,8 +32,8 @@
 
 ]]
 
-local Colors = require 'utils.color_presets' --- @dep utils.color_presets
-local format_number = require('util').format_number --- @dep util
+local Colors = require("modules/exp_util/include/color")
+local format_number = require("util").format_number --- @dep util
 
 local precision_index = defines.flow_precision_index
 local Production = {}

exp_legacy/module/modules/control/protection.lua

@@ -4,9 +4,9 @@
     @alias Protection
 ]]
 
-local Global = require 'utils.global' --- @dep utils.global
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.protection' --- @dep config.protection
+local Storage = require("modules/exp_util/storage")
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.protection") --- @dep config.protection
 local EntityProtection = {
     protected_entity_names = table.deep_copy(config.always_protected_names),
     protected_entity_types = table.deep_copy(config.always_protected_types),
@@ -36,17 +36,17 @@ end
 -- Require roles if a permission is assigned in the config
 local Roles
 if config.ignore_permission then
-    Roles = require 'expcore.roles' --- @dep expcore.roles
+    Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
 end
 
------ Global Variables -----
+----- Storage Variables -----
 --- Variables stored in the global table
 
 local protected_entities = {} -- All entities which are protected
 local protected_areas = {} -- All areas which are protected
 local repeats = {} -- Stores repeat removals by players
 
-Global.register({
+Storage.register({
     protected_entities = protected_entities,
     protected_areas = protected_areas,
     repeats = repeats

exp_legacy/module/modules/control/reports.lua

@@ -5,7 +5,7 @@
 
     @usage
     -- import the module from the control modules
-    local Reports = require 'modules.control.reports' --- @dep modules.control.reports
+    local Reports = require("modules.exp_legacy.modules.control.reports") --- @dep modules.control.reports
 
     -- This will place a report on "MrBiter" (must be a valid player) the report will have been made
     -- by "Cooldude2606" (must be the player name) with the reason 'Liking biters too much' this can be
@@ -24,8 +24,8 @@
 
 ]]
 
-local Game = require 'utils.game' --- @dep utils.game
-local Global = require 'utils.global' --- @dep utils.global
+local Game = require("modules.exp_legacy.utils.game") --- @dep utils.game
+local Storage = require("modules/exp_util/storage")
 
 local valid_player = Game.get_player_from_any
 
@@ -50,7 +50,7 @@ local Reports = {
 }
 
 local user_reports = Reports.user_reports
-Global.register(user_reports, function(tbl)
+Storage.register(user_reports, function(tbl)
     Reports.user_reports = tbl
     user_reports = Reports.user_reports
 end)

exp_legacy/module/modules/control/rockets.lua

@@ -5,7 +5,7 @@
 
     @usage
     -- import the module from the control modules
-    local Rockets = require 'modules.control.rockets' --- @dep modules.control.rockets
+    local Rockets = require("modules.exp_legacy.modules.control.rockets") --- @dep modules.control.rockets
 
     -- Some basic information is stored for each silo that has been built
     -- the data includes: the tick it was built, the rockets launched from it and more
@@ -25,9 +25,9 @@
 
 ]]
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
-local config = require 'config.gui.rockets' --- @dep config.rockets
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Storage = require("modules/exp_util/storage")
+local config = require("modules.exp_legacy.config.gui.rockets") --- @dep config.rockets
 
 local largest_rolling_avg = 0
 for _, avg_over in pairs(config.stats.rolling_avg) do
@@ -45,7 +45,7 @@ local Rockets = {
 local rocket_times = Rockets.times
 local rocket_stats = Rockets.stats
 local rocket_silos = Rockets.silos
-Global.register({
+Storage.register({
     rocket_times = rocket_times,
     rocket_stats = rocket_stats,
     rocket_silos = rocket_silos

exp_legacy/module/modules/control/selection.lua

@@ -4,8 +4,8 @@
     @alias Selection
 ]]
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Storage = require("modules/exp_util/storage")
 local Selection = {
     events = {
         --- When a player enters selection mode
@@ -24,7 +24,7 @@ local Selection = {
 local selection_tool = { name='selection-tool' }
 
 local selections = {}
-Global.register({
+Storage.register({
     selections = selections
 }, function(tbl)
     selections = tbl.selections

exp_legacy/module/modules/control/spectate.lua

@@ -1,7 +1,7 @@
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
-local Gui = require 'expcore.gui' --- @dep expcore.gui
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Storage = require("modules/exp_util/storage")
+local Gui = require("modules.exp_legacy.expcore.gui") --- @dep expcore.gui
 
 ----- Locals -----
 local follow_label -- Gui constructor
@@ -9,8 +9,8 @@ local following = {}
 local spectating = {}
 local Public = {}
 
------ Global data -----
-Global.register({
+----- Storage data -----
+Storage.register({
     following = following,
     spectating = spectating
 }, function(tbl)

exp_legacy/module/modules/control/tasks.lua

@@ -10,8 +10,8 @@ Tasks.update_task(task_id, 'We need more iron!', game.player.name)
 
 ]]
 
-local Datastore = require 'expcore.datastore' --- @dep expcore.datastore
-local Global = require 'utils.global' --- @dep utils.global
+local Datastore = require("modules.exp_legacy.expcore.datastore") --- @dep expcore.datastore
+local Storage = require("modules/exp_util/storage")
 
 --- Stores all data for the warp gui
 local TaskData = Datastore.connect('TaskData')
@@ -19,9 +19,9 @@ TaskData:set_serializer(function(raw_key) return raw_key.task_id end)
 
 local Tasks = {}
 
--- Global lookup table for force name to task ids
+-- Storage lookup table for force name to task ids
 local force_tasks = {_uid=1}
-Global.register(force_tasks, function(tbl)
+Storage.register(force_tasks, function(tbl)
     force_tasks = tbl
 end)
 

exp_legacy/module/modules/control/vlayer.lua

@@ -4,9 +4,9 @@
     @alias vlayer
 ]]
 
-local Global = require 'utils.global' --- @dep utils.global
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.vlayer' --- @dep config.vlayer
+local Storage = require("modules/exp_util/storage")
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.vlayer") --- @dep config.vlayer
 local move_items_stack = _C.move_items_stack
 
 local mega = 1000000
@@ -35,7 +35,7 @@ local vlayer_data = {
     surface = table.deep_copy(config.surface)
 }
 
-Global.register(vlayer_data, function(tbl)
+Storage.register(vlayer_data, function(tbl)
     vlayer_data = tbl
 end)
 

exp_legacy/module/modules/control/warnings.lua

@@ -5,7 +5,7 @@
 
     @usage
     -- import the module from the control modules
-    local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings
+    local Warnings = require("modules.exp_legacy.modules.control.warnings") --- @dep modules.control.warnings
 
     -- This will add a warning to the player
     Warnings.add_warning('MrBiter', 'Cooldude2606', 'Killed too many biters')
@@ -21,15 +21,15 @@
     Warnings.clear_warnings('MrBiter', 'Cooldude2606')
 ]]
 
-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.warnings' --- @dep config.warnings
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Game = require("modules.exp_legacy.utils.game") --- @dep utils.game
+local Storage = require("modules/exp_util/storage")
+local config = require("modules.exp_legacy.config.warnings") --- @dep config.warnings
 
 local valid_player = Game.get_player_from_any
 
 --- Stores the quickbar filters for a player
-local PlayerData = require 'expcore.player_data' --- @dep expcore.player_data
+local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data
 local PlayerWarnings = PlayerData.Required:combine('Warnings')
 PlayerWarnings:set_metadata{
     stringify = function(value)
@@ -75,7 +75,7 @@ local Warnings = {
 }
 
 local user_script_warnings = Warnings.user_script_warnings
-Global.register(user_script_warnings, function(tbl)
+Storage.register(user_script_warnings, function(tbl)
     Warnings.user_script_warnings = tbl
     user_script_warnings = tbl
 end)

exp_legacy/module/modules/control/warps.lua

@@ -21,9 +21,9 @@ Warps.make_warp_tag(warp_id)
 
 ]]
 
-local Datastore = require 'expcore.datastore' --- @dep expcore.datastore
-local Global = require 'utils.global' --- @dep utils.global
-local config = require 'config.gui.warps' --- @dep config.warps
+local Datastore = require("modules.exp_legacy.expcore.datastore") --- @dep expcore.datastore
+local Storage = require("modules/exp_util/storage")
+local config = require("modules.exp_legacy.config.gui.warps") --- @dep config.warps
 
 --- Stores all data for the warp system
 local WrapData = Datastore.connect('WrapData')
@@ -31,10 +31,10 @@ WrapData:set_serializer(function(raw_key) return raw_key.warp_id end)
 
 local Warps = {}
 
--- Global lookup table for force name to task ids
+-- Storage lookup table for force name to task ids
 local force_warps = {_uid=1}
 ---@cast force_warps table<string, { spawn: string, [number]: string }>
-Global.register(force_warps, function(tbl)
+Storage.register(force_warps, function(tbl)
     force_warps = tbl
 end)