From dde73c7b599714e0f839094f457c1da83bb35e77 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 23 Dec 2018 16:37:01 +0000 Subject: [PATCH] Fixed many small bugs --- .../de.cfg => locale/de/ExpGamingAdmin.cfg | 0 .../en.cfg => locale/en/ExpGamingAdmin.cfg | 0 .../fr.cfg => locale/fr/ExpGamingAdmin.cfg | 0 .../nl.cfg => locale/nl/ExpGamingAdmin.cfg | 0 .../sv-SE/ExpGamingAdmin.cfg | 0 modules/DeconControl/control.lua | 4 +- modules/DeconControl/softmod.json | 2 +- modules/ExpGamingAdmin/AdminLib/softmod.json | 20 -------- modules/ExpGamingAdmin/Ban/control.lua | 2 +- modules/ExpGamingAdmin/Ban/softmod.json | 4 +- .../ExpGamingAdmin/ClearInventory/control.lua | 2 +- .../ClearInventory/softmod.json | 4 +- modules/ExpGamingAdmin/Commands/control.lua | 2 +- modules/ExpGamingAdmin/Commands/softmod.json | 2 +- modules/ExpGamingAdmin/Gui/control.lua | 2 +- modules/ExpGamingAdmin/Gui/softmod.json | 4 +- modules/ExpGamingAdmin/Jail/control.lua | 2 +- modules/ExpGamingAdmin/Jail/softmod.json | 4 +- modules/ExpGamingAdmin/Kick/control.lua | 2 +- modules/ExpGamingAdmin/Kick/softmod.json | 4 +- modules/ExpGamingAdmin/Reports/control.lua | 2 +- modules/ExpGamingAdmin/Reports/softmod.json | 4 +- modules/ExpGamingAdmin/Teleport/control.lua | 2 +- modules/ExpGamingAdmin/Teleport/softmod.json | 4 +- modules/ExpGamingAdmin/TempBan/control.lua | 2 +- modules/ExpGamingAdmin/TempBan/softmod.json | 4 +- modules/ExpGamingAdmin/Warnings/control.lua | 2 +- modules/ExpGamingAdmin/Warnings/softmod.json | 4 +- .../ExpGamingAdmin/{AdminLib => }/control.lua | 4 +- modules/ExpGamingAdmin/locale/de.cfg | 15 ++++++ modules/ExpGamingAdmin/locale/en.cfg | 21 ++++++++ modules/ExpGamingAdmin/locale/fr.cfg | 15 ++++++ modules/ExpGamingAdmin/locale/nl.cfg | 15 ++++++ modules/ExpGamingAdmin/locale/sv-SE.cfg | 19 +++++++ modules/ExpGamingAdmin/softmod.json | 9 +++- modules/ExpGamingCommands/bonus/softmod.json | 2 +- .../ExpGamingCommands/repair/src/tempban.lua | 2 +- .../ExpGamingCommands/teleport/control.lua | 2 +- .../ExpGamingCommands/teleport/softmod.json | 2 +- modules/ExpGamingCore/Role/control.lua | 9 +++- modules/ExpGamingCore/Server/src/commands.lua | 4 +- modules/ExpGamingPlayer/afkKick/control.lua | 12 ++--- .../inventorySearch/control.lua | 2 +- .../inventorySearch/softmod.json | 2 +- .../ExpGamingPlayer/playerList/control.lua | 4 +- .../ExpGamingPlayer/playerList/softmod.json | 2 +- modules/index.lua | 49 +++++++++---------- 47 files changed, 174 insertions(+), 100 deletions(-) rename modules/ExpGamingAdmin/AdminLib/locale/de.cfg => locale/de/ExpGamingAdmin.cfg (100%) rename modules/ExpGamingAdmin/AdminLib/locale/en.cfg => locale/en/ExpGamingAdmin.cfg (100%) rename modules/ExpGamingAdmin/AdminLib/locale/fr.cfg => locale/fr/ExpGamingAdmin.cfg (100%) rename modules/ExpGamingAdmin/AdminLib/locale/nl.cfg => locale/nl/ExpGamingAdmin.cfg (100%) rename modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg => locale/sv-SE/ExpGamingAdmin.cfg (100%) delete mode 100644 modules/ExpGamingAdmin/AdminLib/softmod.json rename modules/ExpGamingAdmin/{AdminLib => }/control.lua (96%) create mode 100644 modules/ExpGamingAdmin/locale/de.cfg create mode 100644 modules/ExpGamingAdmin/locale/en.cfg create mode 100644 modules/ExpGamingAdmin/locale/fr.cfg create mode 100644 modules/ExpGamingAdmin/locale/nl.cfg create mode 100644 modules/ExpGamingAdmin/locale/sv-SE.cfg diff --git a/modules/ExpGamingAdmin/AdminLib/locale/de.cfg b/locale/de/ExpGamingAdmin.cfg similarity index 100% rename from modules/ExpGamingAdmin/AdminLib/locale/de.cfg rename to locale/de/ExpGamingAdmin.cfg diff --git a/modules/ExpGamingAdmin/AdminLib/locale/en.cfg b/locale/en/ExpGamingAdmin.cfg similarity index 100% rename from modules/ExpGamingAdmin/AdminLib/locale/en.cfg rename to locale/en/ExpGamingAdmin.cfg diff --git a/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg b/locale/fr/ExpGamingAdmin.cfg similarity index 100% rename from modules/ExpGamingAdmin/AdminLib/locale/fr.cfg rename to locale/fr/ExpGamingAdmin.cfg diff --git a/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg b/locale/nl/ExpGamingAdmin.cfg similarity index 100% rename from modules/ExpGamingAdmin/AdminLib/locale/nl.cfg rename to locale/nl/ExpGamingAdmin.cfg diff --git a/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg b/locale/sv-SE/ExpGamingAdmin.cfg similarity index 100% rename from modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg rename to locale/sv-SE/ExpGamingAdmin.cfg diff --git a/modules/DeconControl/control.lua b/modules/DeconControl/control.lua index 2e316a6f..6b658fa3 100644 --- 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 } diff --git a/modules/DeconControl/softmod.json b/modules/DeconControl/softmod.json index 70ec9616..2f33a047 100644 --- 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": {} } diff --git a/modules/ExpGamingAdmin/AdminLib/softmod.json b/modules/ExpGamingAdmin/AdminLib/softmod.json deleted file mode 100644 index 4674410f..00000000 --- a/modules/ExpGamingAdmin/AdminLib/softmod.json +++ /dev/null @@ -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": {} -} diff --git a/modules/ExpGamingAdmin/Ban/control.lua b/modules/ExpGamingAdmin/Ban/control.lua index 7735f05f..856c3c05 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Ban/softmod.json b/modules/ExpGamingAdmin/Ban/softmod.json index 1f9c339f..a055b3e5 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/ClearInventory/control.lua b/modules/ExpGamingAdmin/ClearInventory/control.lua index 785b8a4f..1efd59f9 100644 --- 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 diff --git a/modules/ExpGamingAdmin/ClearInventory/softmod.json b/modules/ExpGamingAdmin/ClearInventory/softmod.json index fbddd257..ae931353 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Commands/control.lua b/modules/ExpGamingAdmin/Commands/control.lua index 0d893173..73038cd6 100644 --- 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 diff --git a/modules/ExpGamingAdmin/Commands/softmod.json b/modules/ExpGamingAdmin/Commands/softmod.json index 9daadd44..541a7255 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Gui/control.lua b/modules/ExpGamingAdmin/Gui/control.lua index 075eca0b..1d86d808 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Gui/softmod.json b/modules/ExpGamingAdmin/Gui/softmod.json index 4e668d3e..97fc27d7 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Jail/control.lua b/modules/ExpGamingAdmin/Jail/control.lua index e86e12f4..692cdebb 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Jail/softmod.json b/modules/ExpGamingAdmin/Jail/softmod.json index 3d5a1cf4..c6dba711 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Kick/control.lua b/modules/ExpGamingAdmin/Kick/control.lua index 316ba32f..38108f86 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Kick/softmod.json b/modules/ExpGamingAdmin/Kick/softmod.json index 7ac3ea5c..26baa78c 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Reports/control.lua b/modules/ExpGamingAdmin/Reports/control.lua index 72956283..9ed5df58 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Reports/softmod.json b/modules/ExpGamingAdmin/Reports/softmod.json index 4ea22139..4aee29bb 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Teleport/control.lua b/modules/ExpGamingAdmin/Teleport/control.lua index 31ff64a3..36dc5a77 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Teleport/softmod.json b/modules/ExpGamingAdmin/Teleport/softmod.json index eb234df1..2bebb4c4 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/TempBan/control.lua b/modules/ExpGamingAdmin/TempBan/control.lua index 71210d05..e5108047 100644 --- 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') diff --git a/modules/ExpGamingAdmin/TempBan/softmod.json b/modules/ExpGamingAdmin/TempBan/softmod.json index 88aee99d..64853ebb 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/Warnings/control.lua b/modules/ExpGamingAdmin/Warnings/control.lua index 4e9f443e..3c27c608 100644 --- 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') diff --git a/modules/ExpGamingAdmin/Warnings/softmod.json b/modules/ExpGamingAdmin/Warnings/softmod.json index 74504119..70c11140 100644 --- 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": {} diff --git a/modules/ExpGamingAdmin/AdminLib/control.lua b/modules/ExpGamingAdmin/control.lua similarity index 96% rename from modules/ExpGamingAdmin/AdminLib/control.lua rename to modules/ExpGamingAdmin/control.lua index bf0d070b..502d4fdf 100644 --- a/modules/ExpGamingAdmin/AdminLib/control.lua +++ b/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={}, diff --git a/modules/ExpGamingAdmin/locale/de.cfg b/modules/ExpGamingAdmin/locale/de.cfg new file mode 100644 index 00000000..299b094f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/modules/ExpGamingAdmin/locale/en.cfg b/modules/ExpGamingAdmin/locale/en.cfg new file mode 100644 index 00000000..f240bac1 --- /dev/null +++ b/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 +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. \ No newline at end of file diff --git a/modules/ExpGamingAdmin/locale/fr.cfg b/modules/ExpGamingAdmin/locale/fr.cfg new file mode 100644 index 00000000..f882fc1c --- /dev/null +++ b/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 diff --git a/modules/ExpGamingAdmin/locale/nl.cfg b/modules/ExpGamingAdmin/locale/nl.cfg new file mode 100644 index 00000000..ff47947a --- /dev/null +++ b/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 diff --git a/modules/ExpGamingAdmin/locale/sv-SE.cfg b/modules/ExpGamingAdmin/locale/sv-SE.cfg new file mode 100644 index 00000000..679188c2 --- /dev/null +++ b/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. diff --git a/modules/ExpGamingAdmin/softmod.json b/modules/ExpGamingAdmin/softmod.json index ef13dbd3..efeae92e 100644 --- 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" + } } diff --git a/modules/ExpGamingCommands/bonus/softmod.json b/modules/ExpGamingCommands/bonus/softmod.json index 6edafc2b..ddb09af9 100644 --- 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": {} diff --git a/modules/ExpGamingCommands/repair/src/tempban.lua b/modules/ExpGamingCommands/repair/src/tempban.lua index 942511a2..31c029c2 100644 --- 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,'','Attempt To Repair A Banned Item') diff --git a/modules/ExpGamingCommands/teleport/control.lua b/modules/ExpGamingCommands/teleport/control.lua index cedd2567..d66f7e1b 100644 --- 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 diff --git a/modules/ExpGamingCommands/teleport/softmod.json b/modules/ExpGamingCommands/teleport/softmod.json index 03ca30ed..4420b19c 100644 --- 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": {} diff --git a/modules/ExpGamingCore/Role/control.lua b/modules/ExpGamingCore/Role/control.lua index e68b27d0..ad3e0864 100644 --- 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) diff --git a/modules/ExpGamingCore/Server/src/commands.lua b/modules/ExpGamingCore/Server/src/commands.lua index 4188454c..2155eede 100644 --- 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 diff --git a/modules/ExpGamingPlayer/afkKick/control.lua b/modules/ExpGamingPlayer/afkKick/control.lua index ac601afd..46718019 100644 --- 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) diff --git a/modules/ExpGamingPlayer/inventorySearch/control.lua b/modules/ExpGamingPlayer/inventorySearch/control.lua index 20c38564..7862c19e 100644 --- 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 diff --git a/modules/ExpGamingPlayer/inventorySearch/softmod.json b/modules/ExpGamingPlayer/inventorySearch/softmod.json index cbf8e3cd..17f251c0 100644 --- 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": {} diff --git a/modules/ExpGamingPlayer/playerList/control.lua b/modules/ExpGamingPlayer/playerList/control.lua index 63a1f66e..7d32f081 100644 --- 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 } diff --git a/modules/ExpGamingPlayer/playerList/softmod.json b/modules/ExpGamingPlayer/playerList/softmod.json index c8c8f619..bda73c47 100644 --- 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", diff --git a/modules/index.lua b/modules/index.lua index 88265445..d48bd875 100644 --- 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'}, } \ No newline at end of file