Add startable legacy code

exp_legacy/module/modules/addons/advanced-start.lua

@@ -1,8 +1,8 @@
 --- Adds a better method of player starting items based on production levels.
 -- @addon Advanced-Start
 
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.advanced_start' --- @dep config.advanced_start
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.advanced_start") --- @dep config.advanced_start
 local items = config.items
 
 Event.add(defines.events.on_player_created, function(event)
@@ -43,7 +43,7 @@ Event.on_init(function()
     remote.call('freeplay', 'set_skip_intro', config.skip_intro)
     if config.research_queue_from_start then
         for _, force in pairs(game.forces) do
-            force.research_queue_enabled = true
+            --force.research_queue_enabled = true
         end
     end
     if not config.disable_base_game_silo_script then

exp_legacy/module/modules/addons/afk-kick.lua

@@ -1,25 +1,25 @@
 --- Kicks players when all players on the server are afk
 -- @addon afk-kick
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
-local config = require 'config.afk_kick' --- @dep config.afk_kick
-local Async = require 'expcore.async' --- @dep expcore.async
+local Async = require("modules/exp_util/async")
+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.afk_kick") --- @dep config.afk_kick
 
 --- Optional roles require
 local Roles
 if config.active_role then
-    Roles = require 'expcore.roles'
+    Roles = require("modules.exp_legacy.expcore.roles")
 end
 
 --- Globals
 local primitives = { last_active = 0 }
-Global.register(primitives, function(tbl)
+Storage.register(primitives, function(tbl)
     primitives = tbl
 end)
 
 --- Kicks an afk player, used to add a delay so the gui has time to appear
-local kick_player =
+local kick_player_async =
 Async.register(function(player)
     if game.tick - primitives.last_active < config.kick_time then return end -- Safety Catch
     game.kick_player(player, 'AFK while no active players on the server')
@@ -54,7 +54,7 @@ Event.on_nth_tick(config.update_time, function()
         }.location = { x=res.width*(0.5 - 0.11*uis), y=res.height*(0.5 - 0.14*uis) }
 
         -- Kick the player, some delay needed because network delay
-        Async.wait(10, kick_player, player)
+        kick_player_async:start_after(10, player)
     end
 end)
 

exp_legacy/module/modules/addons/chat-popups.lua

@@ -2,11 +2,11 @@
 -- also displays a ping above users who are named in the message
 -- @addon Chat-Popups
 
-local Game = require 'utils.game' --- @dep utils.game
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.popup_messages' --- @dep config.popup_messages
+local FloatingText = require("modules/exp_util/floating_text")
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.popup_messages") --- @dep config.popup_messages
 
-local send_text = Game.print_player_floating_text -- (player_index, text, color)
+local send_text = FloatingText.print_as_player -- (player, text)
 
 Event.add(defines.events.on_console_chat, function(event)
     if not event.player_index or event.player_index < 1 then return end
@@ -18,7 +18,7 @@ Event.add(defines.events.on_console_chat, function(event)
 
     -- Sends the message as text above them
     if config.show_player_messages then
-        send_text(player.index, {'chat-popup.message', player.name, event.message}, player.chat_color)
+        send_text(player, {'chat-popup.message', player.name, event.message})
     end
 
     if not config.show_player_mentions then return end
@@ -30,7 +30,7 @@ Event.add(defines.events.on_console_chat, function(event)
     for _, mentioned_player in pairs(game.connected_players) do
         if mentioned_player.index ~= player.index then
             if search_string:find(mentioned_player.name:lower(), 1, true) then
-                send_text(mentioned_player.index, {'chat-popup.ping', player.name}, player.chat_color)
+                send_text(mentioned_player, {'chat-popup.ping', player.name})
             end
         end
     end

exp_legacy/module/modules/addons/chat-reply.lua

@@ -1,9 +1,9 @@
 --- Adds auto replies to chat messages; as well as chat commands
 -- @addon Chat-Reply
 
-local Event = require 'utils.event' --- @dep utils.event
-local Roles = require 'expcore.roles' --- @dep expcore.roles
-local config = require 'config.chat_reply' --- @dep config.chat_reply
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local config = require("modules.exp_legacy.config.chat_reply") --- @dep config.chat_reply
 
 Event.add(defines.events.on_console_chat, function(event)
     local player_index = event.player_index

exp_legacy/module/modules/addons/compilatron.lua

@@ -1,11 +1,10 @@
 --- Adds a compilatron that walks around the spawn area; adapted from redmew code
 -- @addon Compilatron
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
-local Task = require 'utils.task' --- @dep utils.task
-local Token = require 'utils.token' --- @dep utils.token
-local config = require 'config.compilatron' --- @dep config.compilatron
+local Async = require("modules/exp_util/async")
+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.compilatron") --- @dep config.compilatron
 local messages = config.messages
 local locations = config.locations
 
@@ -14,7 +13,7 @@ local Public = {
     current_messages={}
 }
 
-Global.register({
+Storage.register({
     compilatrons = Public.compilatrons,
     current_messages = Public.current_messages
 }, function(tbl)
@@ -22,20 +21,21 @@ Global.register({
     Public.current_messages = tbl.current_messages
 end)
 
---- This will re-create the speech bubble after it de-spawns called with set_timeout
-local callback =
-    Token.register(
-    function(data)
-        local ent = data.ent
-        local name = data.name
-        local msg_number = data.msg_number
-        local message =
-            ent.surface.create_entity(
-            {name = 'compi-speech-bubble', text = messages[name][msg_number], position = {0, 0}, source = ent}
-        )
-        Public.current_messages[name] = {message = message, msg_number = msg_number}
-    end
-)
+local speech_bubble_async =
+Async.register(function(data)
+    local message = 
+    data.entity.surface.create_entity{
+        name = 'compi-speech-bubble',
+        text = messages[data.name][data.msg_number],
+        source = data.entity,
+        position = {0, 0},
+    }
+
+    Public.current_messages[data.name] = {
+        message = message,
+        msg_number = data.msg_number
+    }
+end)
 
 --- This will move the messages onto the next message in the loop
 local function circle_messages()
@@ -57,7 +57,7 @@ local function circle_messages()
             msg_number = 1
         end
         -- this calls the callback above to re-spawn the message after some time
-        Task.set_timeout_in_ticks(300, callback, {ent = ent, name = name, msg_number = msg_number})
+        speech_bubble_async:start_after(300, {ent = ent, name = name, msg_number = msg_number})
     end
 end
 

exp_legacy/module/modules/addons/damage-popups.lua

@@ -2,9 +2,9 @@
 -- also shows player health when a player is attacked
 -- @addon Damage-Popups
 
-local Game = require 'utils.game' --- @dep utils.game
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.popup_messages' --- @dep config.popup_messages
+local FloatingText = require("modules/exp_util/floating_text")
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.popup_messages") --- @dep config.popup_messages
 
 Event.add(defines.events.on_entity_damaged, function(event)
     local entity = event.entity
@@ -31,7 +31,7 @@ Event.add(defines.events.on_entity_damaged, function(event)
 
     -- Outputs the message as floating text
     if message then
-        Game.print_floating_text(
+        FloatingText.print(
             entity.surface,
             position,
             message,

exp_legacy/module/modules/addons/death-logger.lua

@@ -1,9 +1,9 @@
 --- Makes markers on the map where places have died and reclaims items if not recovered
 -- @addon Death-Logger
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
-local config = require 'config.death_logger' --- @dep config.death_logger
+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.death_logger") --- @dep config.death_logger
 local format_time, move_items = _C.format_time, _C.move_items_stack --- @dep expcore.common
 
 -- Max amount of ticks a corpse can be alive
@@ -13,7 +13,7 @@ local deaths = {
     archive={} -- deaths moved here after body is gone
     --{player_name='Cooldude2606', time_of_death='15H 15M', position={x=0, y=0}, corpse=LuaEntity, tag=LuaCustomChartTag}
 }
-Global.register(deaths, function(tbl)
+Storage.register(deaths, function(tbl)
     deaths = tbl
 end)
 

exp_legacy/module/modules/addons/deconlog.lua

@@ -1,11 +1,11 @@
 --- Log certain actions into a file when events are triggered
 -- @addon Deconlog
 
-local Event = require 'utils.event' --- @dep utils.event
-local Roles = require 'expcore.roles' --- @dep expcore.roles
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
 local format_time = _C.format_time --- @dep expcore.common
-local format_number = require('util').format_number --- @dep util
-local config = require 'config.deconlog' --- @dep config.deconlog
+local format_number = require("util").format_number --- @dep util
+local config = require("modules.exp_legacy.config.deconlog") --- @dep config.deconlog
 
 local filepath = "log/decon.log"
 

exp_legacy/module/modules/addons/discord-alerts.lua

@@ -1,10 +1,10 @@
 --- Sends alert messages to our discord server when certain events are triggered
 -- @addon Discord-Alerts
 
-local Event = require 'utils.event' --- @dep utils.event
-local Colors = require 'utils.color_presets' --- @dep utils.color_presets
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Colors = require("modules/exp_util/include/color")
 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 config = require("modules.exp_legacy.config.discord_alerts") --- @dep config.discord_alerts
 
 local playtime_format = {hours = true, minutes = true, short = true, string = true}
 
@@ -96,7 +96,7 @@ end
 
 --- Repeated protected entity mining
 if config.entity_protection then
-    local EntityProtection = require 'modules.control.protection' --- @dep modules.control.protection
+    local EntityProtection = require("modules.exp_legacy.modules.control.protection") --- @dep modules.control.protection
     Event.add(EntityProtection.events.on_repeat_violation, function(event)
         local player_name = get_player_name(event)
         emit_event{
@@ -112,7 +112,7 @@ end
 
 --- Reports added and removed
 if config.player_reports then
-    local Reports = require 'modules.control.reports' --- @dep modules.control.reports
+    local Reports = require("modules.exp_legacy.modules.control.reports") --- @dep modules.control.reports
     Event.add(Reports.events.on_player_reported, function(event)
         local player_name, by_player_name = get_player_name(event)
         emit_event{
@@ -141,7 +141,7 @@ end
 
 --- Warnings added and removed
 if config.player_warnings then
-    local Warnings = require 'modules.control.warnings' --- @dep modules.control.warnings
+    local Warnings = require("modules.exp_legacy.modules.control.warnings") --- @dep modules.control.warnings
     Event.add(Warnings.events.on_warning_added, function(event)
         local player_name, by_player_name = get_player_name(event)
         local player = game.get_player(player_name)
@@ -171,7 +171,7 @@ end
 
 --- When a player is jailed or unjailed
 if config.player_jail then
-    local Jail = require 'modules.control.jail'
+    local Jail = require("modules.exp_legacy.modules.control.jail")
     Event.add(Jail.events.on_player_jailed, function(event)
         local player_name, by_player_name = get_player_name(event)
         emit_event{

exp_legacy/module/modules/addons/fagc.lua

@@ -1,7 +1,7 @@
 --- Allows the FAGC clientside bot to receive information about bans and unbans and propagate that information to other servers
 -- @addon FAGC
 
-local Event = require 'utils.event' --- @dep utils.event
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
 
 -- Clear the file on startup to minimize its size
 Event.on_init(function()

exp_legacy/module/modules/addons/inserter.lua

@@ -1,4 +1,4 @@
-local Event = require 'utils.event'
+local Event = require("modules/exp_legacy/utils/event")
 
 local controllers_with_inventory = {
 	[defines.controllers.character] = true,

exp_legacy/module/modules/addons/inventory-clear.lua

@@ -1,8 +1,8 @@
 --- Will move players items to spawn when they are banned or kicked, option to clear on leave
 -- @addon Inventory-Clear
 
-local Event = require 'utils.event' --- @dep utils.event
-local events = require 'config.inventory_clear' --- @dep config.inventory_clear
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local events = require("modules.exp_legacy.config.inventory_clear") --- @dep config.inventory_clear
 local move_items_stack = _C.move_items_stack --- @dep expcore.common
 
 local function clear_items(event)

exp_legacy/module/modules/addons/lawnmower.lua

@@ -3,10 +3,10 @@
     @addon Lawnmower
 ]]
 
-local Commands = require 'expcore.commands' --- @dep expcore.commands
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.lawnmower' --- @dep config.lawnmower
-require 'config.expcore.command_general_parse'
+local Commands = require("modules.exp_legacy.expcore.commands") --- @dep expcore.commands
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.lawnmower") --- @dep config.lawnmower
+require("modules.exp_legacy.config.expcore.command_general_parse")
 
 Commands.new_command('lawnmower', {'expcom-lawnmower.description'}, 'Clean up biter corpse, decoratives and nuclear hole')
 :add_param('range', false, 'integer-range', 1, 200)

exp_legacy/module/modules/addons/logging.lua

@@ -2,9 +2,9 @@
     @addon Logging
 ]]
 
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.logging' --- @dep config.logging
-local config_res = require 'config.research' --- @dep config.research
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.logging") --- @dep config.logging
+local config_res = require("modules.exp_legacy.config.research") --- @dep config.research
 
 local function add_log(data)
 	game.write_file(config.file_name, data, true, 0)

exp_legacy/module/modules/addons/miner.lua

@@ -1,10 +1,9 @@
-local Event = require 'utils.event_core' --- @dep utils.event_core
-local Global = require 'utils.global' --- @dep utils.global
-local config = require 'config.miner' --- @dep config.miner
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event_core
+local Storage = require("modules/exp_util/storage")
+local config = require("modules.exp_legacy.config.miner") --- @dep config.miner
 
 local miner_data = {}
-
-Global.register(miner_data, function(tbl)
+Storage.register(miner_data, function(tbl)
     miner_data = tbl
 end)
 

exp_legacy/module/modules/addons/nukeprotect.lua

@@ -1,9 +1,9 @@
 --- Disable new players from having certain items in their inventory, most commonly nukes
 -- @addon Nukeprotect
 
-local Event = require 'utils.event'          --- @dep utils.event
-local Roles = require 'expcore.roles'        --- @dep expcore.roles
-local config = require 'config.nukeprotect'  --- @dep config.nukeprotect
+local Event = require("modules/exp_legacy/utils/event")          --- @dep utils.event
+local Roles = require("modules.exp_legacy.expcore.roles")        --- @dep expcore.roles
+local config = require("modules.exp_legacy.config.nukeprotect")  --- @dep config.nukeprotect
 local move_items_stack = _C.move_items_stack --- @dep expcore.common
 
 

exp_legacy/module/modules/addons/pollution-grading.lua

@@ -1,8 +1,8 @@
 --- Makes polution look much nice of the map, ie not one big red mess
 -- @addon Pollution-Grading
 
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.pollution_grading' --- @dep config.pollution_grading
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.pollution_grading") --- @dep config.pollution_grading
 
 local delay = config.update_delay * 3600 -- convert from minutes to ticks
 Event.on_nth_tick(delay, function()

exp_legacy/module/modules/addons/protection-jail.lua

@@ -1,15 +1,15 @@
 --- When a player triggers protection multiple times they are automatically jailed
 -- @addon protection-jail
 
-local Event = require 'utils.event' ---@dep utils.event
-local Global = require 'utils.global' ---@dep utils.global
-local Jail = require 'modules.control.jail' ---@dep modules.control.jail
-local Protection = require 'modules.control.protection' --- @dep modules.control.protection
+local Event = require("modules/exp_legacy/utils/event") ---@dep utils.event
+local Storage = require("modules/exp_util/storage") ---@dep utils.global
+local Jail = require("modules.exp_legacy.modules.control.jail") ---@dep modules.control.jail
+local Protection = require("modules.exp_legacy.modules.control.protection") --- @dep modules.control.protection
 local format_chat_player_name = _C.format_chat_player_name --- @dep expcore.common
 
 --- Stores how many times the repeat violation was triggered
 local repeat_count = {}
-Global.register(repeat_count, function(tbl)
+Storage.register(repeat_count, function(tbl)
     repeat_count = tbl
 end)
 

exp_legacy/module/modules/addons/report-jail.lua

@@ -1,9 +1,9 @@
 --- When a player is reported, the player is automatically jailed if the combined playtime of the reporters exceeds the reported player
 -- @addon report-jail
 
-local Event = require 'utils.event' ---@dep utils.event
-local Jail = require 'modules.control.jail' ---@dep modules.control.jail
-local Reports = require 'modules.control.reports' --- @dep modules.control.reports
+local Event = require("modules/exp_legacy/utils/event") ---@dep utils.event
+local Jail = require("modules.exp_legacy.modules.control.jail") ---@dep modules.control.jail
+local Reports = require("modules.exp_legacy.modules.control.reports") --- @dep modules.control.reports
 local format_chat_player_name = _C.format_chat_player_name --- @dep expcore.common
 
 --- Returns the playtime of the reporter. Used when calculating the total playtime of all reporters

exp_legacy/module/modules/addons/scorched-earth.lua

@@ -1,10 +1,10 @@
 --- When a player walks around the tiles under them will degrade over time, the same is true when entites are built
 -- @addon Scorched-Earth
 
-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 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
+local config = require("modules.exp_legacy.config.scorched_earth") --- @dep config.scorched_earth
 
 -- Loops over the config and finds the wile which has the highest value for strength
 local max_strength = 0
@@ -16,7 +16,7 @@ end
 
 -- Used for debugging the degrade chances
 local debug_players = {}
-Global.register(debug_players, function(tbl)
+Storage.register(debug_players, function(tbl)
     debug_players = tbl
 end)
 

exp_legacy/module/modules/addons/spawn-area.lua

@@ -1,12 +1,12 @@
 --- Adds a custom spawn area with chests and afk turrets
 -- @addon Spawn-Area
 
-local Global = require 'utils.global' --- @dep utils.global
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.spawn_area' --- @dep config.spawn_area
+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.spawn_area") --- @dep config.spawn_area
 
 local turrets = config.turrets.locations
-Global.register(turrets, function(tbl)
+Storage.register(turrets, function(tbl)
     turrets = tbl
 end)
 

exp_legacy/module/modules/addons/station-auto-name.lua

@@ -1,7 +1,7 @@
 ---LuaPlayerBuiltEntityEventFilters
 ---Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name = "fast-inserter"}})
-local Event = require 'utils.event' --- @dep utils.event
-local config = require 'config.station_auto_name' --- @dep config.chat_reply
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local config = require("modules.exp_legacy.config.station_auto_name") --- @dep config.chat_reply
 
 --Credit to Cooldude2606 for using his lua magic to make this function.
 local directions = {

exp_legacy/module/modules/addons/tree-decon.lua

@@ -1,16 +1,16 @@
 --- Makes trees which are marked for decon "decay" quickly to allow faster building
 -- @addon Tree-Decon
 
-local Event = require 'utils.event' --- @dep utils.event
-local Global = require 'utils.global' --- @dep utils.global
-local Roles = require 'expcore.roles' --- @dep expcore.roles
-local Gui = require 'expcore.gui' --- @dep expcore.gui
-local PlayerData = require 'expcore.player_data' --- @dep expcore.player_data
+local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
+local Storage = require("modules/exp_util/storage")
+local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
+local Gui = require("modules.exp_legacy.expcore.gui") --- @dep expcore.gui
+local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data
 
--- Global queue used to store trees that need to be removed, also cache for player roles
+-- Storage queue used to store trees that need to be removed, also cache for player roles
 local cache = {}
 local tree_queue = { _head=0 }
-Global.register({tree_queue, cache}, function(tbl)
+Storage.register({tree_queue, cache}, function(tbl)
     tree_queue = tbl[1]
     cache = tbl[2]
 end)