Merge Game, FlyingText, Common and table

exp_legacy/module/modules/control/jail.lua

@@ -16,10 +16,9 @@
     Jail.unjail_player('MrBiter', 'Cooldude2606')
 ]]
 
-local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
-local Game = require("modules.exp_legacy.utils.game") --- @dep utils.game
+local Roles = require("modules.exp_legacy.expcore.roles")
 
-local valid_player = Game.get_player_from_any
+local valid_player = function(p) return type(p) == "userdata" and p or game.get_player(p) end
 local assign_roles = Roles.assign_player
 local unassign_roles = Roles.unassign_player
 local has_role = Roles.player_has_role
@@ -65,7 +64,7 @@ end
 -- @tparam LuaPlayer player the player to check if they are in jail
 -- @treturn boolean whether the player is currently in jail
 function Jail.is_jailed(player)
-    return has_role(player, "Jail")
+    return has_role(valid_player(player), "Jail")
 end
 
 --- Moves a player to jail and removes all other roles

exp_legacy/module/modules/control/reports.lua

@@ -24,10 +24,9 @@
 
 ]]
 
-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
+local valid_player = function(p) return type(p) == "userdata" and p or game.get_player(p) end
 
 local Reports = {
     user_reports = {}, -- stores all user reports, global table

exp_legacy/module/modules/control/vlayer.lua

@@ -4,10 +4,10 @@
     @alias vlayer
 ]]
 
+local ExpUtil = require("modules/exp_util")
 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
 
@@ -682,13 +682,25 @@ function vlayer.remove_interface(surface, position)
 
     -- Return the type of interface removed and do some clean up
     if name == "logistic-chest-storage" then
-        move_items_stack(interface.get_inventory(defines.inventory.chest).get_contents())
+        local inventory = assert(interface.get_inventory(defines.inventory.chest))
+        ExpUtil.transfer_inventory_to_surface{
+            inventory = inventory,
+            surface = interface.surface,
+            name = "iron-chest",
+            allow_creation = true,
+        }
         table.remove_element(vlayer_data.entity_interfaces.storage_input, interface)
         interface.destroy()
 
         return "storage-input", pos
     elseif name == "logistic-chest-requester" then
-        move_items_stack(interface.get_inventory(defines.inventory.chest).get_contents())
+        local inventory = assert(interface.get_inventory(defines.inventory.chest))
+        ExpUtil.transfer_inventory_to_surface{
+            inventory = inventory,
+            surface = interface.surface,
+            name = "iron-chest",
+            allow_creation = true,
+        }
         table.remove_element(vlayer_data.entity_interfaces.storage_output, interface)
         interface.destroy()
 

exp_legacy/module/modules/control/warnings.lua

@@ -21,12 +21,11 @@
     Warnings.clear_warnings('MrBiter', 'Cooldude2606')
 ]]
 
-local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
-local Game = require("modules.exp_legacy.utils.game") --- @dep utils.game
+local Event = require("modules/exp_legacy/utils/event")
 local Storage = require("modules/exp_util/storage")
-local config = require("modules.exp_legacy.config.warnings") --- @dep config.warnings
+local config = require("modules.exp_legacy.config.warnings")
 
-local valid_player = Game.get_player_from_any
+local valid_player = function(p) return type(p) == "userdata" and p or game.get_player(p) end
 
 --- Stores the quickbar filters for a player
 local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data

exp_legacy/module/modules/control/warps.lua

@@ -70,7 +70,7 @@ WrapData:on_update(function(warp_id, warp, old_warp)
         end
 
         -- Sort the warp names in alphabetical order
-        local new_warp_ids = table.get_values(table.keysort(warp_names))
+        local new_warp_ids = table.get_values(table.key_sort(warp_names))
         table.insert(new_warp_ids, 1, spawn_id)
         new_warp_ids.spawn = spawn_id
         force_warps[force_name] = new_warp_ids