Fixed many small bugs

2025-12-27 11:35:22 +09:00 · 2018-12-23 16:37:01 +00:00
parent 8dd52293e1
commit dde73c7b59
47 changed files with 174 additions and 100 deletions
--- a/modules/DeconControl/control.lua
+++ b/modules/DeconControl/control.lua
@@ -8,14 +8,14 @@
 local Game = require('FactorioStdLib.Game')
 local Server = require('ExpGamingCore.Server')
 local Role -- ExpGamingCore.Role@^4.0.0
-local Admin -- ExpGamingAdmin.AdminLib@^4.0.0
+local Admin -- ExpGamingAdmin@^4.0.0

 -- Module Define
 local module_verbose = false
 local ThisModule = {
    on_init=function()
        if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end
-        if loaded_modules['ExpGamingAdmin.AdminLib'] then Admin = require('ExpGamingAdmin.AdminLib') end
+        if loaded_modules['ExpGamingAdmin'] then Admin = require('ExpGamingAdmin') end
    end
 }

--- a/modules/DeconControl/softmod.json
+++ b/modules/DeconControl/softmod.json
@@ -20,7 +20,7 @@
    "ExpGamingLib": "^4.0.0",
    "ExpGamingAdmin.Warnings": "?^4.0.0",
    "ExpGamingCore.Role": "?^4.0.0",
-    "ExpGamingAdmin.AdminLib": "?^4.0.0"
+    "ExpGamingAdmin": "?^4.0.0"
  },
  "submodules": {}
 }
--- a/modules/ExpGamingAdmin/AdminLib/softmod.json
+++ b/modules/ExpGamingAdmin/AdminLib/softmod.json
@@ -1,20 +0,0 @@
-{
-  "name": "ExpGamingAdmin.AdminLib",
-  "version": "4.0.0",
-  "description": "The base functions required to make the others work.",
-  "location": "FSM_ARCHIVE",
-  "keywords": [
-    "lib",
-    "ExpGaming",
-    "Admin"
-  ],
-  "dependencies": {
-    "FactorioStdLib": "^0.8.0",
-    "ExpGamingCore.Role": "?^4.0.0",
-    "ExpGamingCore.Sync": "?^4.0.0",
-    "FactorioStdLib.Game": "^0.8.0",
-    "ExpGamingCore.Server": "?^4.0.0"
-  },
-  "collection": "ExpGamingAdmin@4.0.0",
-  "submodules": {}
-}
--- a/modules/ExpGamingAdmin/Ban/control.lua
+++ b/modules/ExpGamingAdmin/Ban/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Server = require('ExpGamingCore.Server')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Ban/softmod.json
+++ b/modules/ExpGamingAdmin/Ban/softmod.json
@@ -10,13 +10,13 @@
    "ExpGaming"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/ClearInventory/control.lua
+++ b/modules/ExpGamingAdmin/ClearInventory/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Game = require('FactorioStdLib.Game')

 -- Module Define
--- a/modules/ExpGamingAdmin/ClearInventory/softmod.json
+++ b/modules/ExpGamingAdmin/ClearInventory/softmod.json
@@ -12,8 +12,8 @@
    "Inventory"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
-    "FactorioStdLib.Game": "^0.8.0"
+    "FactorioStdLib.Game": "^0.8.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Commands/control.lua
+++ b/modules/ExpGamingAdmin/Commands/control.lua
@@ -3,7 +3,7 @@
 -- @author Cooldude2606
 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE

-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')

 --- Used to clear all parts of a player, removing warnings, reports, jail and temp ban
 -- @command clear-all
--- a/modules/ExpGamingAdmin/Commands/softmod.json
+++ b/modules/ExpGamingAdmin/Commands/softmod.json
@@ -22,7 +22,7 @@
    "ExpGamingAdmin.Warnings": "?^4.0.0",
    "ExpGamingAdmin.Reports": "?^4.0.0",
    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
-    "ExpGamingAdmin.AdminLib": "^4.0.0"
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Gui/control.lua
+++ b/modules/ExpGamingAdmin/Gui/control.lua
@@ -5,7 +5,7 @@
 -- @alais AdminGui 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Gui = require('ExpGamingCore.Gui')
 local Role = require('ExpGamingCore.Role')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Gui/softmod.json
+++ b/modules/ExpGamingAdmin/Gui/softmod.json
@@ -10,13 +10,13 @@
    "Gui"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Gui": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "ExpGamingPlayer": "?^4.0.0",
    "ExpGamingPlayer.playerInfo": "?^4.0.0",
-    "mod-gui": "*"
+    "mod-gui": "*",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Jail/control.lua
+++ b/modules/ExpGamingAdmin/Jail/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
--- a/modules/ExpGamingAdmin/Jail/softmod.json
+++ b/modules/ExpGamingAdmin/Jail/softmod.json
@@ -10,14 +10,14 @@
    "ExpGaming"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Kick/control.lua
+++ b/modules/ExpGamingAdmin/Kick/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Server = require('ExpGamingCore.Server')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Kick/softmod.json
+++ b/modules/ExpGamingAdmin/Kick/softmod.json
@@ -10,13 +10,13 @@
    "Commands"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Reports/control.lua
+++ b/modules/ExpGamingAdmin/Reports/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
 local Gui = require('ExpGamingCore.Gui')
--- a/modules/ExpGamingAdmin/Reports/softmod.json
+++ b/modules/ExpGamingAdmin/Reports/softmod.json
@@ -12,13 +12,13 @@
    "Commands"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingCore.Gui": "^4.0.0"
+    "ExpGamingCore.Gui": "^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Teleport/control.lua
+++ b/modules/ExpGamingAdmin/Teleport/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Game = require('FactorioStdLib.Game')

--- a/modules/ExpGamingAdmin/Teleport/softmod.json
+++ b/modules/ExpGamingAdmin/Teleport/softmod.json
@@ -13,9 +13,9 @@
    "Commands"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
-    "FactorioStdLib.Game": "^0.8.0"
+    "FactorioStdLib.Game": "^0.8.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/TempBan/control.lua
+++ b/modules/ExpGamingAdmin/TempBan/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/TempBan/softmod.json
+++ b/modules/ExpGamingAdmin/TempBan/softmod.json
@@ -11,13 +11,13 @@
    "Roles"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Warnings/control.lua
+++ b/modules/ExpGamingAdmin/Warnings/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Warnings/softmod.json
+++ b/modules/ExpGamingAdmin/Warnings/softmod.json
@@ -13,13 +13,13 @@
    "Ban"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingAdmin.Reports": "?^4.0.0",
-    "ExpGamingCore.Sync": "?^4.0.0"
+    "ExpGamingCore.Sync": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/AdminLib/control.lua
+++ b/modules/ExpGamingAdmin/AdminLib/control.lua
@@ -1,5 +1,5 @@
 --- The base functions required to make the others work.
-- @module ExpGamingAdmin.AdminLib@4.0.0
+-- @module ExpGamingAdmin@4.0.0
 -- @author Cooldude2606
 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE
 -- @alais Admin 
@@ -15,7 +15,7 @@ local Admin = {
    on_init=function()
        if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end
        if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end
-        if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server') end
+        if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server').add_module_to_interface('Admin','ExpGamingAdmin') end
    end,
    actions={},
    action_functions={},
--- a/modules/ExpGamingAdmin/AdminLib/locale/de.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/de.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/en.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/en.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg
--- a/modules/ExpGamingAdmin/softmod.json
+++ b/modules/ExpGamingAdmin/softmod.json
@@ -16,7 +16,7 @@
  "contact": "Discord: Cooldude2606#5241",
  "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE",
  "submodules": {
-    "ExpGamingAdmin.AdminLib": "4.0.0",
+    "ExpGamingAdmin": "4.0.0",
    "ExpGamingAdmin.Ban": "4.0.0",
    "ExpGamingAdmin.ClearInventory": "4.0.0",
    "ExpGamingAdmin.Gui": "4.0.0",
@@ -28,5 +28,10 @@
    "ExpGamingAdmin.Warnings": "4.0.0",
    "ExpGamingAdmin.Commands": "4.0.0"
  },
-  "dependencies": {}
+  "dependencies": {
+    "ExpGamingCore.Role": "?^4.0.0",
+    "ExpGamingCore.Sync": "?^4.0.0",
+    "ExpGamingCore.Server": "?^4.0.0",
+    "FactorioStdLib.Game": "^0.8.0"
+  }
 }
--- a/modules/ExpGamingCommands/bonus/softmod.json
+++ b/modules/ExpGamingCommands/bonus/softmod.json
@@ -15,7 +15,7 @@
    "FactorioStdLib.Game": "^0.8.0",
    "ExpGamingLib": "^4.0.0",
    "ExpGamingCore.Command": "^4.0.0",
-    "ExpGamingCore.Role": "^4.0.0"
+    "ExpGamingCore.Role": "?^4.0.0"
  },
  "collection": "ExpGamingCommands@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingCommands/repair/src/tempban.lua
+++ b/modules/ExpGamingCommands/repair/src/tempban.lua
@@ -1,5 +1,5 @@
 -- not_luadoc=true
-local temp_ban = require('ExpGamingAdmin.AdminLib').temp_ban
+local temp_ban = require('ExpGamingAdmin').temp_ban
 return function(player,entity)
    player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.textcolor.crit,player)
    temp_ban(player,'<server>','Attempt To Repair A Banned Item')
--- a/modules/ExpGamingCommands/teleport/control.lua
+++ b/modules/ExpGamingCommands/teleport/control.lua
@@ -3,7 +3,7 @@
 -- @author Cooldude2606
 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE

-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')

 --- Teleports the user to the player given
 -- @command go-to
--- a/modules/ExpGamingCommands/teleport/softmod.json
+++ b/modules/ExpGamingCommands/teleport/softmod.json
@@ -16,7 +16,7 @@
  "dependencies": {
    "ExpGamingCore.Command": "^4.0.0",
    "ExpGamingAdmin.Teleport": "^4.0.0",
-    "ExpGamingAdmin.AdminLib": "^4.0.0"
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingCommands@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingCore/Role/control.lua
+++ b/modules/ExpGamingCore/Role/control.lua
@@ -28,7 +28,7 @@ local Role = {
        end
    }),
    on_init=function(self)
-        if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server') end
+        if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server').add_module_to_interface('Role','ExpGamingCore.Role') end
        if loaded_modules['ExpGamingCore.Command'] then require(module_path..'/src/commands',{self=self}) end
        if loaded_modules['ExpGamingCore.Sync'] then require(module_path..'/src/sync',{self=self,RoleGlobal=RoleGlobal}) end
    end,
@@ -112,7 +112,12 @@ function Role.get(mixed)
        for _,role in pairs(global.players[player.index]) do table.insert(rtn,Role.get(role)) end
        return rtn
    elseif is_type(mixed,'table') and mixed.group then return mixed
-    elseif is_type(mixed,'string') then return Role.roles[mixed] end
+    elseif is_type(mixed,'string') then return Role.roles[mixed]
+    elseif is_type(mixed,'number') then 
+        for _,role in pairs(Role.roles) do
+            if role.index == mixed then return role end
+        end
+    end
 end

 --- Used to place a player into a role(s)
--- a/modules/ExpGamingCore/Server/src/commands.lua
+++ b/modules/ExpGamingCore/Server/src/commands.lua
@@ -13,8 +13,8 @@ local Server = Server
 Server.interfaceCallbacks = {}
 function Server.add_to_interface(loadAs,callback) Server.interfaceCallbacks[loadAs] = callback end

-function Server.add_module_to_interface(loadAs,moduleName,version)
-    local moduleName = _G.moduleName or version and moduleName..'@'..version or moduleName or nil
+function Server.add_module_to_interface(loadAs,moduleName)
+    local moduleName = moduleName or tostring(_G.moduleName) or nil
    if not moduleName then error('No module name supplied for: '..loadAs,2) return end
    Server.add_to_interface(loadAs,function() return require(moduleName) end)
 end
--- a/modules/ExpGamingPlayer/afkKick/control.lua
+++ b/modules/ExpGamingPlayer/afkKick/control.lua
@@ -8,13 +8,13 @@ local Role -- ExpGamingCore.Role@^4.0.0
 local Sync -- ExpGamingCore.Sync@^4.0.0

 local function get_allowed_afk_time(player)
-    local role
-    if Role then role = Role.get_highest(player)
-    else if player.admin then return else role = Role.meta.default end end
-    local count = #game.connected_players
-    local base = not role.allow_afk_kick and role.index or false
+    local player = Game.get_player(player)
+    local role = Role and Role.get_highest(player) or {index=1,allow_afk_kick=not player.admin}
+    local player_count = #game.connected_players
+    local role_count = Role and Role.meta.count or 1
+    local role_index = role.allow_afk_kick and role.index or false
    if not base then return false end
-    return (Role.meta.count/base)*count
+    return (role_count/role_index)*count
 end

 script.on_event(defines.events.on_tick,function(event)
--- a/modules/ExpGamingPlayer/inventorySearch/control.lua
+++ b/modules/ExpGamingPlayer/inventorySearch/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Game = require('FactorioStdLib.Game')
 local Role -- ExpGamingCore.Role@^4.0.0

--- a/modules/ExpGamingPlayer/inventorySearch/softmod.json
+++ b/modules/ExpGamingPlayer/inventorySearch/softmod.json
@@ -15,7 +15,7 @@
    "ExpGamingAdmin.Warnings": "^4.0.0",
    "ExpGamingCore.Role": "?^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
-    "ExpGamingAdmin.AdminLib": "^4.0.0"
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingPlayer@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingPlayer/playerList/control.lua
+++ b/modules/ExpGamingPlayer/playerList/control.lua
@@ -5,7 +5,7 @@

 local Game = require('FactorioStdLib.Game')
 local Gui = require('ExpGamingCore.Gui')
-local Admin -- ExpGamingAdmin.AdminLib@^4.0.0
+local Admin -- ExpGamingAdmin@^4.0.0
 local AdminGui -- ExpGamingAdmin.Gui@^4.0.0

 -- Local Varibles
@@ -31,7 +31,7 @@ local ThisModule = {
    on_init=function(self)
        if loaded_modules['ExpGamingPlayer.playerInfo'] then playerInfo = require('ExpGamingPlayer.playerInfo') end
        if loaded_modules['ExpGamingCore.Role'] then getPlayers = require(module_path..'/src/ranking',{self=self}) end
-        if loaded_modules['ExpGamingAdmin.AdminLib'] then Admin = require('ExpGamingAdmin.AdminLib') end
+        if loaded_modules['ExpGamingAdmin'] then Admin = require('ExpGamingAdmin') end
        if loaded_modules['ExpGamingAdmin.Gui'] then AdminGui = require('ExpGamingAdmin.Gui') end
    end
 }
--- a/modules/ExpGamingPlayer/playerList/softmod.json
+++ b/modules/ExpGamingPlayer/playerList/softmod.json
@@ -13,7 +13,7 @@
    "FactorioStdLib.Game": "^0.8.0",
    "ExpGamingCore.Gui": "^4.0.0",
    "ExpGamingCore.Role": "?^4.0.0",
-    "ExpGamingAdmin.AdminLib": "?^4.0.0",
+    "ExpGamingAdmin": "?^4.0.0",
    "ExpGamingAdmin.buttonFlow": "?^4.0.0",
    "ExpGamingAdmin.reports": "?^4.0.0",
    "ExpGamingPlayer.playerInfo": "?^4.0.0",
--- a/modules/index.lua
+++ b/modules/index.lua
@@ -6,7 +6,7 @@ return {
    ['DamagePopup']={'./modules/DamagePopup','FactorioStdLib.Color'},
    ['DeathMarkers']={'./modules/DeathMarkers',},
    ['DeconControl']={'./modules/DeconControl','ExpGamingCore.Server','FactorioStdLib.Game','ExpGamingLib'},
-    ['ExpGamingAdmin']={'./modules/ExpGamingAdmin',},
+    ['ExpGamingAdmin']={'./modules/ExpGamingAdmin','FactorioStdLib.Game'},
    ['ExpGamingBot']={'./modules/ExpGamingBot',},
    ['ExpGamingCommands']={'./modules/ExpGamingCommands',},
    ['ExpGamingCore']={'./modules/ExpGamingCore',},
@@ -20,49 +20,48 @@ return {
    ['SpawnArea']={'./modules/SpawnArea','FactorioStdLib.Game'},
    ['WarpPoints']={'./modules/WarpPoints','FactorioStdLib.Game','ExpGamingCore.Gui'},
    ['WornPaths']={'./modules/WornPaths','FactorioStdLib.Game'},
-    ['ExpGamingAdmin.ClearInventory']={'./modules/ExpGamingAdmin/ClearInventory','ExpGamingAdmin.AdminLib','FactorioStdLib.Game'},
    ['ExpGamingAdmin.Gui']={'./modules/ExpGamingAdmin/Gui','ExpGamingAdmin.AdminLib','ExpGamingCore.Gui','ExpGamingCore.Role','FactorioStdLib.Game','mod-gui'},
-    ['ExpGamingAdmin.Kick']={'./modules/ExpGamingAdmin/Kick','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','FactorioStdLib.Game'},
    ['ExpGamingAdmin.Ban']={'./modules/ExpGamingAdmin/Ban','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','FactorioStdLib.Game'},
-    ['ExpGamingAdmin.AdminLib']={'./modules/ExpGamingAdmin/AdminLib','FactorioStdLib','FactorioStdLib.Game'},
-    ['ExpGamingAdmin.Teleport']={'./modules/ExpGamingAdmin/Teleport','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','FactorioStdLib.Game'},
    ['ExpGamingAdmin.Reports']={'./modules/ExpGamingAdmin/Reports','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game','ExpGamingCore.Gui'},
+    ['ExpGamingAdmin.ClearInventory']={'./modules/ExpGamingAdmin/ClearInventory','ExpGamingAdmin.AdminLib','FactorioStdLib.Game'},
    ['ExpGamingAdmin.TempBan']={'./modules/ExpGamingAdmin/TempBan','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'},
+    ['ExpGamingAdmin.Teleport']={'./modules/ExpGamingAdmin/Teleport','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','FactorioStdLib.Game'},
    ['ExpGamingAdmin.Commands']={'./modules/ExpGamingAdmin/Commands','ExpGamingLib','ExpGamingCore.Command','ExpGamingAdmin.AdminLib'},
-    ['ExpGamingAdmin.Warnings']={'./modules/ExpGamingAdmin/Warnings','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'},
    ['ExpGamingAdmin.Jail']={'./modules/ExpGamingAdmin/Jail','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'},
-    ['ExpGamingBot.autoChat']={'./modules/ExpGamingBot/autoChat','FactorioStdLib.Game','ExpGamingCore.Server'},
+    ['ExpGamingAdmin.Warnings']={'./modules/ExpGamingAdmin/Warnings','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'},
+    ['ExpGamingAdmin.Kick']={'./modules/ExpGamingAdmin/Kick','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','FactorioStdLib.Game'},
    ['ExpGamingBot.autoMessage']={'./modules/ExpGamingBot/autoMessage','ExpGamingCore.Server','FactorioStdLib.Game'},
    ['ExpGamingBot.discordAlerts']={'./modules/ExpGamingBot/discordAlerts','ExpGamingCore.Sync','FactorioStdLib.Color','FactorioStdLib.Game'},
-    ['ExpGamingCommands.bonus']={'./modules/ExpGamingCommands/bonus','FactorioStdLib.Game','ExpGamingLib','ExpGamingCore.Command','ExpGamingCore.Role'},
+    ['ExpGamingBot.autoChat']={'./modules/ExpGamingBot/autoChat','FactorioStdLib.Game','ExpGamingCore.Server'},
    ['ExpGamingCommands.cheatMode']={'./modules/ExpGamingCommands/cheatMode','ExpGamingCore.Command'},
    ['ExpGamingCommands.repair']={'./modules/ExpGamingCommands/repair','ExpGamingLib','FactorioStdLib.Game','ExpGamingCore.Role'},
-    ['ExpGamingCommands.home']={'./modules/ExpGamingCommands/home','FactorioStdLib.Game','ExpGamingCore.Command'},
-    ['ExpGamingCommands.kill']={'./modules/ExpGamingCommands/kill','ExpGamingCore.Command','ExpGamingCore.Role','FactorioStdLib.Game'},
    ['ExpGamingCommands.tags']={'./modules/ExpGamingCommands/tags','ExpGamingLib','ExpGamingCore.Command','FactorioStdLib.Game'},
-    ['ExpGamingCore.Gui']={'./modules/ExpGamingCore/Gui','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.Game'},
-    ['ExpGamingCore.Sync']={'./modules/ExpGamingCore/Sync','ExpGamingLib','FactorioStdLib.Color','FactorioStdLib.Game','FactorioStdLib.Table'},
-    ['ExpGamingCommands.teleport']={'./modules/ExpGamingCommands/teleport','ExpGamingCore.Command','ExpGamingAdmin.Teleport','ExpGamingAdmin.AdminLib'},
-    ['ExpGamingCore.Server']={'./modules/ExpGamingCore/Server','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.String','FactorioStdLib.Game'},
-    ['ExpGamingCore.Group']={'./modules/ExpGamingCore/Group','FactorioStdLib','ExpGamingLib','FactorioStdLib.Game'},
-    ['ExpGamingPlayer.afkKick']={'./modules/ExpGamingPlayer/afkKick','FactorioStdLib.Game','ExpGamingCore.Gui'},
+    ['ExpGamingCommands.home']={'./modules/ExpGamingCommands/home','FactorioStdLib.Game','ExpGamingCore.Command'},
    ['ExpGamingCore.Command']={'./modules/ExpGamingCore/Command','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.Game'},
-    ['ExpGamingInfo.Readme']={'./modules/ExpGamingInfo/Readme','ExpGamingCore.Gui','FactorioStdLib.Game'},
-    ['ExpGamingCore.Role']={'./modules/ExpGamingCore/Role','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Game','ExpGamingCore.Group'},
+    ['ExpGamingCommands.teleport']={'./modules/ExpGamingCommands/teleport','ExpGamingCore.Command','ExpGamingAdmin.Teleport','ExpGamingAdmin.AdminLib'},
+    ['ExpGamingCommands.bonus']={'./modules/ExpGamingCommands/bonus','FactorioStdLib.Game','ExpGamingLib','ExpGamingCore.Command','ExpGamingCore.Role'},
+    ['ExpGamingCommands.kill']={'./modules/ExpGamingCommands/kill','ExpGamingCore.Command','ExpGamingCore.Role','FactorioStdLib.Game'},
+    ['ExpGamingCore.Server']={'./modules/ExpGamingCore/Server','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.String','FactorioStdLib.Game'},
+    ['ExpGamingCore.Gui']={'./modules/ExpGamingCore/Gui','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.Game'},
    ['ExpGamingInfo.Science']={'./modules/ExpGamingInfo/Science','ExpGamingCore.Gui','FactorioStdLib.Game'},
-    ['ExpGamingInfo.Rockets']={'./modules/ExpGamingInfo/Rockets','ExpGamingCore.Gui','FactorioStdLib.Game'},
-    ['ExpGamingInfo.Tasklist']={'./modules/ExpGamingInfo/Tasklist','ExpGamingCore.Gui','ExpGamingCore.Role','FactorioStdLib.Game'},
    ['ExpGamingPlayer.playerList']={'./modules/ExpGamingPlayer/playerList','FactorioStdLib.Game','ExpGamingCore.Gui'},
-    ['ExpGamingPlayer.inventorySearch']={'./modules/ExpGamingPlayer/inventorySearch','ExpGamingLib','ExpGamingAdmin.TempBan','ExpGamingAdmin.Warnings','FactorioStdLib.Game','ExpGamingAdmin.AdminLib'},
+    ['ExpGamingCore.Sync']={'./modules/ExpGamingCore/Sync','ExpGamingLib','FactorioStdLib.Color','FactorioStdLib.Game','FactorioStdLib.Table'},
+    ['ExpGamingCore.Role']={'./modules/ExpGamingCore/Role','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Game','ExpGamingCore.Group'},
+    ['ExpGamingInfo.Readme']={'./modules/ExpGamingInfo/Readme','ExpGamingCore.Gui','FactorioStdLib.Game'},
+    ['ExpGamingInfo.Rockets']={'./modules/ExpGamingInfo/Rockets','ExpGamingCore.Gui','FactorioStdLib.Game'},
+    ['ExpGamingCore.Group']={'./modules/ExpGamingCore/Group','FactorioStdLib','ExpGamingLib','FactorioStdLib.Game'},
+    ['ExpGamingInfo.Tasklist']={'./modules/ExpGamingInfo/Tasklist','ExpGamingCore.Gui','ExpGamingCore.Role','FactorioStdLib.Game'},
    ['ExpGamingPlayer.playerInfo']={'./modules/ExpGamingPlayer/playerInfo','FactorioStdLib.Game','ExpGamingCore.Gui'},
-    ['FactorioStdLib.Color']={'./modules/FactorioStdLib/Color',},
+    ['ExpGamingPlayer.afkKick']={'./modules/ExpGamingPlayer/afkKick','FactorioStdLib.Game','ExpGamingCore.Gui'},
+    ['FactorioStdLib.Table']={'./modules/FactorioStdLib/Table',},
    ['ExpGamingPlayer.polls']={'./modules/ExpGamingPlayer/polls','ExpGamingCore.Gui','ExpGamingCore.Server'},
+    ['FactorioStdLib.Color']={'./modules/FactorioStdLib/Color',},
    ['FactorioStdLib.Game']={'./modules/FactorioStdLib/Game',},
    ['FactorioStdLib.String']={'./modules/FactorioStdLib/String',},
-    ['FactorioStdLib.Table']={'./modules/FactorioStdLib/Table',},
-    ['ExpGamingCore.Gui.inputs']={'./modules/ExpGamingCore/Gui/inputs','mod-gui','FactorioStdLib.Color','FactorioStdLib.Game','ExpGamingCore.Gui'},
-    ['ExpGamingCore.Gui.popup']={'./modules/ExpGamingCore/Gui/popup','mod-gui','FactorioStdLib.Game','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'},
+    ['ExpGamingPlayer.inventorySearch']={'./modules/ExpGamingPlayer/inventorySearch','ExpGamingLib','ExpGamingAdmin.TempBan','ExpGamingAdmin.Warnings','FactorioStdLib.Game','ExpGamingAdmin.AdminLib'},
    ['ExpGamingCore.Gui.center']={'./modules/ExpGamingCore/Gui/center','mod-gui','FactorioStdLib.Game','FactorioStdLib.Color','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'},
+    ['ExpGamingCore.Gui.popup']={'./modules/ExpGamingCore/Gui/popup','mod-gui','FactorioStdLib.Game','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'},
    ['ExpGamingCore.Gui.toolbar']={'./modules/ExpGamingCore/Gui/toolbar','mod-gui','FactorioStdLib.Game','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'},
    ['ExpGamingCore.Gui.left']={'./modules/ExpGamingCore/Gui/left','mod-gui','FactorioStdLib.Game','ExpGamingCore.Server','FactorioStdLib.Color','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'},
+    ['ExpGamingCore.Gui.inputs']={'./modules/ExpGamingCore/Gui/inputs','mod-gui','FactorioStdLib.Color','FactorioStdLib.Game','ExpGamingCore.Gui'},
 }