Rename utils and fix requires

control.lua

@@ -1,10 +1,8 @@
--- Libraries. Removing these will likely lead to game crashes
-require 'config'
-require 'utils.utils'
-require 'utils.list_utils'
+-- Omitting the math library is a very bad idea
 require 'utils.math'
 
-require 'map_gen.shared.perlin_noise'
+-- Map layout and config dictate the map you play and the settings in it
+require 'config'
 require 'map_layout'
 
 -- Specific to RedMew hosts, can be disabled safely if not hosting on RedMew servers
@@ -13,14 +11,14 @@ require 'features.server_commands'
 
 -- Library modules which, if missing, will cause other feature modules to fail
 require 'features.base_data'
---require 'features.follow' -- Nothing currently uses anything inside follow
 require 'features.player_create'
 require 'features.user_groups'
 
--- Feature modules, each can be disabled
+-- Feature modules, each can be disabled safely
 require 'features.autodeconstruct'
 require 'features.chat_triggers'
 require 'features.corpse_util'
+require 'features.custom_commands'
 require 'features.donator_messages'
 require 'features.train_saviour'
 require 'features.fish_market'
@@ -31,11 +29,9 @@ require 'features.reactor_meltdown'
 require 'features.train_station_names'
 require 'features.walkabout'
 
--- Contains various commands for users and admins alike
-require 'features.custom_commands'
-
 -- GUIs the order determines the order they appear from left to right.
--- These can be safely disabled. Some map presets will add GUI modules themselves.
+-- These can be safely disabled if you want less GUI items.
+-- Some map presets will add GUI modules themselves.
 require 'features.gui.info'
 require 'features.gui.player_list'
 require 'features.gui.poll'

features/antigrief.lua

@@ -1,5 +1,5 @@
 local Event = require 'utils.event'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Game = require 'utils.game'
 
 global.original_last_users_by_ent_pos = {}

features/autodeconstruct.lua

@@ -1,8 +1,8 @@
 --Author: Valansch
 
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
-local Task = require 'utils.Task'
+local Token = require 'utils.token'
+local Task = require 'utils.task'
 
 local function is_depleted(drill, entity)
     local position = drill.position

features/chat_triggers.lua

@@ -2,7 +2,7 @@
 
 local Game = require 'utils.game'
 local Event = require 'utils.event'
-require 'utils.list_utils'
+require 'utils.table'
 local Hodor = require 'resources.hodor_messages'
 
 local prefix = '## - '

features/corpse_util.lua

@@ -1,7 +1,7 @@
 local Event = require 'utils.event'
 local Global = require 'utils.global'
-local Task = require 'utils.Task'
-local Token = require 'utils.global_token'
+local Task = require 'utils.task'
+local Token = require 'utils.token'
 local Game = require 'utils.game'
 
 local player_corpses = {}

features/custom_commands.lua

@@ -1,8 +1,8 @@
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local UserGroups = require 'features.user_groups'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Game = require 'utils.game'
 local Report = require 'features.report'
 

features/fish_market.lua

@@ -17,11 +17,11 @@ make pet faster
 make pet follow you moar
 --]]
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
-local Task = require 'utils.Task'
+local Token = require 'utils.token'
+local Task = require 'utils.task'
 local PlayerStats = require 'features.player_stats'
 local Game = require 'utils.game'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 
 local Market_items = require 'resources.market_items'
 local market_item = Market_items.market_item

features/follow.lua

@@ -1,6 +1,6 @@
 global.follows = {}
 global.follows.n_entries = 0
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Game = require 'utils.game'
 
 local function get_direction(follower, target)

features/free_item_logging.lua

@@ -1,4 +1,4 @@
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Event = require 'utils.event'
 local Game = require 'utils.game'
 

features/gui/blueprint_helper.lua

@@ -1,7 +1,7 @@
 -- Soft mod version of Blueprint Flipper and Turner https://mods.factorio.com/mods/Marthen/Blueprint_Flip_Turn
 
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Gui = require 'utils.gui'
 local Game = require 'utils.game'
 

features/gui/player_list.lua

@@ -4,7 +4,7 @@ local Gui = require 'utils.gui'
 local Donators = require 'resources.donators'
 local UserGroups = require 'features.user_groups'
 local PlayerStats = require 'features.player_stats'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Report = require 'features.report'
 local Game = require 'utils.game'
 

features/gui/poll.lua

@@ -4,7 +4,7 @@ local Event = require 'utils.event'
 local UserGroups = require 'features.user_groups'
 local Game = require 'utils.game'
 local math = require 'utils.math'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Server = require 'features.server'
 
 local default_poll_duration = 300 * 60 -- in ticks

features/gui/popup.lua

@@ -1,5 +1,5 @@
 local Gui = require 'utils.gui'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Game = require 'utils.game'
 
 local close_name = Gui.uid_name()

features/gui/tag_group.lua

@@ -3,7 +3,7 @@ local Gui = require 'utils.gui'
 local Global = require 'utils.global'
 local UserGroups = require 'features.user_groups'
 local Game = require 'utils.game'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 
 local deafult_verb = 'expanded'
 

features/gui/tasklist.lua

@@ -2,7 +2,7 @@ local Event = require 'utils.event'
 local Gui = require 'utils.gui'
 local Global = require 'utils.global'
 local UserGroups = require 'features.user_groups'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Game = require 'utils.game'
 local math = require 'utils.math'
 

features/nuke_control.lua

@@ -1,6 +1,6 @@
 local Event = require 'utils.event'
 local UserGroups = require 'features.user_groups'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Game = require 'utils.game'
 
 local function allowed_to_nuke(player)

features/report.lua

@@ -1,7 +1,7 @@
 local Module = {}
 
 local Gui = require('utils.gui')
-local Utils = require('utils.utils')
+local Utils = require('utils.core')
 local Game = require 'utils.game'
 
 local report_frame_name = Gui.uid_name()

features/user_groups.lua

@@ -1,5 +1,5 @@
 local Event = require 'utils.event'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Server = require 'features.server'
 local Donators = require 'resources.donators'
 local Game = require 'utils.game'

features/walkabout.lua

@@ -1,8 +1,8 @@
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 local Game = require 'utils.game'
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
-local Utils = require 'utils.utils'
+local Token = require 'utils.token'
+local Utils = require 'utils.core'
 
 global.walking = {}
 global.walking_storage = {}

features/wood_market.lua

@@ -1,9 +1,9 @@
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
-local Task = require 'utils.Task'
+local Token = require 'utils.token'
+local Task = require 'utils.task'
 local PlayerStats = require 'features.player_stats'
 local Game = require 'utils.game'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 
 local market_items = require 'resources.market_items'
 

map_gen/Diggy/Feature/AlienSpawner.lua

@@ -5,8 +5,8 @@
 -- dependencies
 local Event = require 'utils.event'
 local Global = require 'utils.global'
-local Token = require 'utils.global_token'
-local Task = require 'utils.Task'
+local Token = require 'utils.token'
+local Task = require 'utils.task'
 local AlienEvolutionProgress = require 'map_gen.Diggy.AlienEvolutionProgress'
 local Debug = require 'map_gen.Diggy.Debug'
 local Template = require 'map_gen.Diggy.Template'

map_gen/Diggy/Feature/ArtefactHunting.lua

@@ -12,7 +12,7 @@ local Perlin = require 'map_gen.shared.perlin_noise'
 local random = math.random
 local ceil = math.ceil
 local Gui = require 'utils.gui'
-local utils = require 'utils.utils'
+local utils = require 'utils.core'
 
 -- this
 local ArtefactHunting = {}

map_gen/Diggy/Feature/DiggyCaveCollapse.lua

@@ -2,14 +2,14 @@
     Provides the ability to collapse caves when digging.
 ]]
 -- dependencies
-require 'utils.list_utils'
+require 'utils.table'
 
 local Event = require 'utils.event'
 local Template = require 'map_gen.Diggy.Template'
 local ScoreTable = require 'map_gen.Diggy.ScoreTable'
 local Debug = require 'map_gen.Diggy.Debug'
-local Task = require 'utils.Task'
-local Token = require 'utils.global_token'
+local Task = require 'utils.task'
+local Token = require 'utils.token'
 local Global = require 'utils.global'
 local Game = require 'utils.game'
 local insert = table.insert

map_gen/Diggy/Feature/SimpleRoomGenerator.lua

@@ -7,8 +7,8 @@ local Template = require 'map_gen.Diggy.Template'
 local Perlin = require 'map_gen.shared.perlin_noise'
 local Event = require 'utils.event'
 local Debug = require'map_gen.Diggy.Debug'
-local Task = require 'utils.Task'
-local Token = require 'utils.global_token'
+local Task = require 'utils.task'
+local Token = require 'utils.token'
 local raise_event = script.raise_event
 
 -- this

map_gen/Diggy/Feature/StartingZone.lua

@@ -3,7 +3,7 @@
 ]]
 -- dependencies
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Template = require 'map_gen.Diggy.Template'
 local Debug = require 'map_gen.Diggy.Debug'
 local Retailer = require 'features.retailer'

map_gen/Diggy/Scenario.lua

@@ -4,8 +4,8 @@ local Debug = require 'map_gen.Diggy.Debug'
 local ScenarioInfo = require 'features.gui.info'
 local Event = require 'utils.event'
 
-require 'utils.list_utils'
-require 'utils.utils'
+require 'utils.table'
+require 'utils.core'
 
 -- this
 local Scenario = {}

map_gen/Diggy/Template.lua

@@ -1,6 +1,6 @@
 -- dependencies
-local Task = require 'utils.Task'
-local Token = require 'utils.global_token'
+local Task = require 'utils.task'
+local Token = require 'utils.token'
 local Debug = require 'map_gen.Diggy.Debug'
 local insert = table.insert
 local min = math.min

map_gen/combined/borg_planet_v2.lua

@@ -2,7 +2,7 @@
 -- !! ATTENTION !!
 -- Use water only in starting area as map setting!!!
 local perlin = require 'map_gen.shared.perlin_noise'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local wreck_item_pool = {
     {name = 'iron-gear-wheel', count = 32},

map_gen/combined/dagobah_swamp.lua

@@ -3,7 +3,7 @@
 -- !! ATTENTION !!
 -- Use water only in starting area as map setting!!!
 local perlin = require 'map_gen.shared.perlin_noise'
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 wreck_item_pool = {}
 wreck_item_pool = {
     {name = 'iron-gear-wheel', count = 32},

map_gen/combined/meteor_strike.lua

@@ -1,5 +1,5 @@
 local perlin = require 'map_gen.shared.perlin_noise'
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 local Event = require 'utils.event'
 
 local block_size = 1 -- in tiles

map_gen/combined/red_planet_v2.lua

@@ -4,7 +4,7 @@
 -- Use water only in starting area as map setting!!!
 
 local perlin = require 'map_gen.shared.perlin_noise'
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 
 wreck_item_pool = {}
 wreck_item_pool = {

map_gen/misc/infinite_storage_chest.lua

@@ -1,7 +1,7 @@
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Gui = require 'utils.gui'
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 local Global = require 'utils.global'
 local Game = require 'utils.game'
 

map_gen/misc/loot_items.lua

@@ -1,4 +1,4 @@
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local item_pool = {
     {name = 'firearm-magazine', count = 200, weight = 1250},

map_gen/misc/silly_player_names.lua

@@ -1,8 +1,8 @@
-require 'utils.list_utils'
+require 'utils.table'
 local Game = require 'utils.game'
 local Event = require 'utils.event'
 local naming_words = require 'resources.naming_words'
-local Utils = require('utils.utils')
+local Utils = require('utils.core')
 global.actual_name = {}
 global.silly_names = {}
 global.silly_names.count = 0

map_gen/misc/spawn_control.lua

@@ -1,6 +1,6 @@
 local Event = require 'utils.event'
 local Game = require 'utils.game'
-local Utils = require 'utils.utils'
+local Utils = require 'utils.core'
 local Module = {}
 
 global.player_spawns = {} -- player_index to spawn_name

map_gen/misc/wreck_items.lua

@@ -1,6 +1,6 @@
 -- adds some wrecked items around the map, good for MP, reduces total resources pulled from factory, and adds incentive to push out
 
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local wreck_item_pool = {
     {name = 'iron-gear-wheel', count = 32},

map_gen/ores/rso/rso_control.lua

@@ -3,7 +3,7 @@
 require("rso_config")
 require("util")
 require("rso_resource_config")
-local Utils = require "utils.utils"
+local Utils = require "utils.core"
 local Game = require 'utils.game'
 local math = require 'utils.math'
 

map_gen/presets/crash_site/entity_died_events.lua

@@ -1,6 +1,6 @@
 local Event = require 'utils.event'
-local Task = require 'utils.Task'
-local Token = require 'utils.global_token'
+local Task = require 'utils.task'
+local Token = require 'utils.token'
 local Global = require 'utils.global'
 
 local no_coin_entity = {}

map_gen/presets/crash_site/outpost_builder.lua

@@ -1,8 +1,8 @@
 local Random = require 'map_gen.shared.random'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Global = require 'utils.global'
 local Event = require 'utils.event'
-local Task = require 'utils.Task'
+local Task = require 'utils.task'
 local Market = require 'map_gen.presets.crash_site.market'
 local PlayerStats = require 'features.player_stats'
 

map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/big_chemical_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/big_circuit_factory.lua

@@ -1,6 +1,6 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
 
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/big_copper_plate_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/big_engine_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/big_gear_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/big_iron_plate_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/big_oil_refinery.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/big_power_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/big_science_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/big_stone_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/medium_chemical_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/medium_circuit_factory.lua

@@ -1,6 +1,6 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
 
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/medium_copper_plate_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/medium_engine_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/medium_iron_plate_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/medium_oil_refinery.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/medium_power_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/medium_science_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/medium_stone_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_chemical_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_circuit_factory.lua

@@ -1,6 +1,6 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
 
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_copper_plate_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/small_engine_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/small_gear_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_iron_plate_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/small_oil_refinery.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_power_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_science_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 10},

map_gen/presets/crash_site/outpost_data/small_stone_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua

@@ -1,5 +1,5 @@
 local ob = require 'map_gen.presets.crash_site.outpost_builder'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local loot = {
     {weight = 5},

map_gen/presets/triangle_of_death.lua

@@ -1,7 +1,7 @@
 local b = require 'map_gen.shared.builders'
 local Random = require 'map_gen.shared.random'
 local Perlin = require 'map_gen.shared.perlin_noise'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Global = require 'utils.global'
 local Event = require 'utils.event'
 local degrees = require "utils.math".degrees

map_gen/shared/generate.lua

@@ -1,5 +1,5 @@
-local Task = require 'utils.Task'
-local Token = require 'utils.global_token'
+local Task = require 'utils.task'
+local Token = require 'utils.token'
 local Event = require 'utils.event'
 
 local insert = table.insert

map_gen/shared/generate_not_threaded.lua

@@ -1,4 +1,4 @@
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Event = require 'utils.event'
 
 local insert = table.insert

map_gen/shared/global_builders.lua

@@ -1,4 +1,4 @@
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local Builders = {}
 

utils/Task.lua

@@ -5,9 +5,9 @@
 -- ======================================================= --
 
 local Queue = require 'utils.Queue'
-local PriorityQueue = require 'utils.PriorityQueue'
+local PriorityQueue = require 'utils.priority_queue'
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local Task = {}
 

utils/event.lua

@@ -85,7 +85,7 @@ function Event.on_nth_tick(tick, handler)
     end
 end
 
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 global.event_tokens = {}
 
 function Event.add_removable(event_name, token)

utils/global.lua

@@ -1,5 +1,5 @@
 local Event = require 'utils.event'
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 
 local Global = {}
 

utils/gui.lua

@@ -1,4 +1,4 @@
-local Token = require 'utils.global_token'
+local Token = require 'utils.token'
 local Event = require 'utils.event'
 local Game = require 'utils.game'