Fixed many small bugs

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
 }
 

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": {}
 }

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": {}
-}

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')

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": {}

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

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": {}

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

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": {}

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')

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": {}

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')

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": {}

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')

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": {}

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')

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": {}

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')
 

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": {}

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')

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": {}

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')

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": {}

modules/ExpGamingAdmin/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={},

modules/ExpGamingAdmin/locale/de.cfg

@@ -0,0 +1,15 @@
+[ExpGamingAdmin]
+name=Admin-Befehle
+tooltip=Die mächtigsten Befehle sind hier zuhause.
+no-info-file=Die Informationsdatei wurde nicht gefunden.
+message=Wähle einen Spieler und eine Aktion. Stell vor dem Ausführen sicher, dass der Richtige ist!
+warning=Achtung, dieser Spieler hat einen höheren Rang als du selbst, weshalb du seinen Rang nicht ändern kannst.
+short-reason=Achtung, dies ist ein sehr kurzer Grund. Bitte versuche, mehr Informationen anzugeben. (Warning: The reason is too short. UPDATE)
+rank-high=Dieser Spieler hat einen hohen Rang. Bitte benutze nur Ingame-Befehle gegen diese Person, wenn du dir sicher bist!
+invalid=Der Spieler oder die Aktion war ungültig. Bitte versuche es noch einmal!
+take-action= Ergreife Maßnahme
+tooltip-ban=Banne Spieler
+tooltip-kick=Kicke Spieler
+tooltip-jail=Sperre Spieler ins Gefängnis
+tooltip-go-to=Gehe zum Spieler
+tooltip-bring=Bringe den Spieler zu dir

modules/ExpGamingAdmin/locale/en.cfg

@@ -0,0 +1,21 @@
+[ExpGamingAdmin]
+name=Admin Commands
+tooltip=Admin commands make their home here
+no-info-file=No info file was found
+message=Please select a player and an action to take. Make sure to choose the correct one!
+warning=Warning: This player outranks you. Therefore, you cannot edit their rank.
+short-reason=Warning: The reason is too short.
+rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank.
+invalid=The player or the action is invalid. Please try again!
+take-action=Take Action
+tooltip-ban=Ban Player
+tooltip-kick=Kick Player
+tooltip-jail=Jail Player
+tooltip-go-to=Go To Player
+tooltip-bring=Bring Player
+temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset
+report=Report Player
+cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all <player_name>
+low-print=__1__ has been reported by a user for: __2__
+high-print=__1__ has been reported by __2__ for: __3__
+cant-report=This player can't be reported.

modules/ExpGamingAdmin/locale/fr.cfg

@@ -0,0 +1,15 @@
+[ExpGamingAdmin]
+name=Commandes Admin
+tooltip=Des commandes très puissantes résident ici.
+no-info-file=Aucun fichier info trouvé
+message=Veuillez sélectionner un joueur et une action, faites en sorte que ce soit la bonne !
+warning=Attention, ce joueur est de rang supérieur au vôtre, vous ne pouvez le modifier.
+short-reason=Attention, la raison indiquée est trop courte. Soyez concis mais aussi précis. (Warning: The reason is too short. UPDATE)
+rank-high=Ce joueur est de rang supérieur, veuillez utiliser une commande dont vous maîtriser l'utilisation !
+invalid=Le Joueur ou l'action est invalide, ré-essayez !
+take-action=Agir
+tooltip-ban=Bannir un Joueur
+tooltip-kick=Exclure un Joueur
+tooltip-jail=Emprisonner un Joueur
+tooltip-go-to=Aller à la position d'un Joueur
+tooltip-bring=Amener le Joueur à soi

modules/ExpGamingAdmin/locale/nl.cfg

@@ -0,0 +1,15 @@
+[ExpGamingAdmin]
+name=Admin Commands
+tooltip=Admin Commands kan je hier vinden.
+no-info-file=Infobestand niet gevonden.
+message=Selecteer een speler en de bijbehorende actie. Wees er zeker van dat je de correcte actie kiest.
+warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft.
+short-reason=Fout: De reden is te kort. (Warning: The reason is too short. UPDATE)
+rank-high=Fout: Deze speler overtreft jouw rank.
+invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw!
+take-action=Actie ondernemen
+tooltip-ban=Ban speler
+tooltip-kick=Kick speler
+tooltip-jail=Jail speler
+tooltip-go-to=Ga naar speler
+tooltip-bring=Breng speler

modules/ExpGamingAdmin/locale/sv-SE.cfg

@@ -0,0 +1,19 @@
+[ExpGamingAdmin]
+name=Adminkommandon
+tooltip=Adminkommando gör dit hem här
+no-info-file=Ingen informationsfil kunde hittas
+message=Var snäll och välj en spelare och en åtgärd att utfärda, se till att du väljer den rätta!
+warning=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang.
+short-reason=Warning: Skälet är för kort.
+rank-high=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang.
+invalid=Spelaren eller åtgärden är ogiltig. Var vänlig och försök igen!
+take-action=Utför åtgärd.
+tooltip-ban=Bannlys Spelare
+tooltip-kick=Sparka Spelare
+tooltip-jail=Fängsla Spelare
+tooltip-go-to=Gå till Spelare
+tooltip-bring=Hämta spelare
+report=Rapportera Spelare
+low-print=__1__ har blivit rapporterad av __2__ för: __3__
+high-print=__1__ har blivit rapporterad av __2__ för: __3__
+cant-report=Den här spelaren kan inte bli rapporterad.

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"
+  }
 }

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": {}

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')

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

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": {}

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)

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)
+function Server.add_module_to_interface(loadAs,moduleName)
-    local moduleName = _G.moduleName or version and moduleName..'@'..version or moduleName or nil
+    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

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
+    local player = Game.get_player(player)
-    if Role then role = Role.get_highest(player)
+    local role = Role and Role.get_highest(player) or {index=1,allow_afk_kick=not player.admin}
-    else if player.admin then return else role = Role.meta.default end end
+    local player_count = #game.connected_players
-    local count = #game.connected_players
+    local role_count = Role and Role.meta.count or 1
-    local base = not role.allow_afk_kick and role.index or false
+    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)

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
 

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": {}

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
 }

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",

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'},
+    ['ExpGamingCommands.home']={'./modules/ExpGamingCommands/home','FactorioStdLib.Game','ExpGamingCore.Command'},
-    ['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'},
     ['ExpGamingCore.Command']={'./modules/ExpGamingCore/Command','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.Game'},
-    ['ExpGamingInfo.Readme']={'./modules/ExpGamingInfo/Readme','ExpGamingCore.Gui','FactorioStdLib.Game'},
+    ['ExpGamingCommands.teleport']={'./modules/ExpGamingCommands/teleport','ExpGamingCore.Command','ExpGamingAdmin.Teleport','ExpGamingAdmin.AdminLib'},
-    ['ExpGamingCore.Role']={'./modules/ExpGamingCore/Role','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Game','ExpGamingCore.Group'},
+    ['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',},
+    ['ExpGamingPlayer.inventorySearch']={'./modules/ExpGamingPlayer/inventorySearch','ExpGamingLib','ExpGamingAdmin.TempBan','ExpGamingAdmin.Warnings','FactorioStdLib.Game','ExpGamingAdmin.AdminLib'},
-    ['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'},
     ['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'},
 }