From 85efbd5cf83731a66bd416a6b66631625354fe4b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sun, 9 Dec 2018 16:23:35 +0000 Subject: [PATCH] Removed versions from requires --- Boiler Print Module | 8 +- modules/ChatPopup/control.lua | 4 +- modules/DamagePopup/control.lua | 2 +- modules/DeconControl/control.lua | 8 +- modules/ExpGamingAdmin/AdminLib/control.lua | 8 +- modules/ExpGamingAdmin/Ban/control.lua | 12 +- .../ExpGamingAdmin/ClearInventory/control.lua | 4 +- modules/ExpGamingAdmin/Commands/control.lua | 2 +- modules/ExpGamingAdmin/Commands/src/jail.lua | 2 +- .../ExpGamingAdmin/Commands/src/reports.lua | 4 +- .../ExpGamingAdmin/Commands/src/warnings.lua | 2 +- modules/ExpGamingAdmin/Gui/control.lua | 10 +- modules/ExpGamingAdmin/Jail/control.lua | 14 +- modules/ExpGamingAdmin/Kick/control.lua | 12 +- modules/ExpGamingAdmin/Reports/control.lua | 14 +- modules/ExpGamingAdmin/Teleport/control.lua | 6 +- modules/ExpGamingAdmin/TempBan/control.lua | 12 +- modules/ExpGamingAdmin/Warnings/control.lua | 14 +- modules/ExpGamingBot/autoChat/control.lua | 6 +- modules/ExpGamingBot/autoMessage/control.lua | 4 +- .../ExpGamingBot/discordAlerts/control.lua | 6 +- modules/ExpGamingCommands/bonus/control.lua | 6 +- modules/ExpGamingCommands/home/control.lua | 2 +- modules/ExpGamingCommands/kill/control.lua | 2 +- modules/ExpGamingCommands/repair/control.lua | 6 +- .../ExpGamingCommands/repair/src/tempban.lua | 2 +- modules/ExpGamingCommands/tags/control.lua | 4 +- .../ExpGamingCommands/teleport/control.lua | 2 +- modules/ExpGamingCore/Command/control.lua | 4 +- modules/ExpGamingCore/Group/control.lua | 2 +- modules/ExpGamingCore/Gui/control.lua | 4 +- modules/ExpGamingCore/Gui/src/server.lua | 4 +- modules/ExpGamingCore/Gui/src/test.lua | 2 +- modules/ExpGamingCore/Role/control.lua | 10 +- modules/ExpGamingCore/Role/src/sync.lua | 6 +- modules/ExpGamingCore/Sync/control.lua | 8 +- modules/ExpGamingCore/Sync/src/gui.lua | 4 +- modules/ExpGamingInfo/Readme/control.lua | 6 +- modules/ExpGamingInfo/Readme/src/sync.lua | 4 +- modules/ExpGamingInfo/Rockets/control.lua | 4 +- modules/ExpGamingInfo/Rockets/src/sync.lua | 4 +- modules/ExpGamingInfo/Science/control.lua | 4 +- modules/ExpGamingInfo/Science/src/sync.lua | 4 +- modules/ExpGamingInfo/Tasklist/control.lua | 6 +- modules/ExpGamingPlayer/afkKick/control.lua | 8 +- .../ExpGamingPlayer/afkKick/src/server.lua | 2 +- .../inventorySearch/control.lua | 6 +- .../ExpGamingPlayer/playerInfo/control.lua | 8 +- .../ExpGamingPlayer/playerList/control.lua | 10 +- .../playerList/src/ranking.lua | 2 +- modules/ExpGamingPlayer/polls/control.lua | 6 +- modules/GameSettingsGui/control.lua | 4 +- modules/GuiAnnouncements/control.lua | 6 +- modules/PlayerAutoColor/control.lua | 2 +- modules/SpawnArea/control.lua | 2 +- modules/WarpPoints/control.lua | 8 +- modules/WornPaths/control.lua | 2 +- modules/index.lua | 152 +++++++++--------- 58 files changed, 236 insertions(+), 236 deletions(-) diff --git a/Boiler Print Module b/Boiler Print Module index 7601a711..089901ef 100644 --- a/Boiler Print Module +++ b/Boiler Print Module @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Module = require('Module@>X.Y.Z') -local SubModule = require('Collection.Submodule@^X.Y.Z') +local Module = require('Module') +local SubModule = require('Collection.Submodule') local OptModule -- OptModule@^X.Y.Z -- Local Varibles @@ -15,8 +15,8 @@ local OptModule -- OptModule@^X.Y.Z local module_verbose = false local ThisModule = { on_init=function(self) - if loaded_modules['OptModule@^X.Y.Z'] then OptModule = require('OptModule@^X.Y.Z') end - if loaded_modules['OptModule2@^X.Y.Z'] then require(module_path..'/src/module2',{self=self}) end + if loaded_modules['OptModule'] then OptModule = require('OptModule') end + if loaded_modules['OptModule2'] then require(module_path..'/src/module2',{self=self}) end --code end, on_post=function() diff --git a/modules/ChatPopup/control.lua b/modules/ChatPopup/control.lua index 798af9a9..1ddd025e 100644 --- a/modules/ChatPopup/control.lua +++ b/modules/ChatPopup/control.lua @@ -5,8 +5,8 @@ -- @alais ChatPopup -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') -local Color = require('FactorioStdLib.Color@^0.8.0') +local Game = require('FactorioStdLib.Game') +local Color = require('FactorioStdLib.Color') local ChatPopup = {} diff --git a/modules/DamagePopup/control.lua b/modules/DamagePopup/control.lua index a2194913..adbd7b0b 100644 --- a/modules/DamagePopup/control.lua +++ b/modules/DamagePopup/control.lua @@ -5,7 +5,7 @@ -- @alais DamagePopup -- Module Require -local Color = require('FactorioStdLib.Color@^0.8.0') +local Color = require('FactorioStdLib.Color') local DamagePopup = {} diff --git a/modules/DeconControl/control.lua b/modules/DeconControl/control.lua index 5583af5d..2e316a6f 100644 --- a/modules/DeconControl/control.lua +++ b/modules/DeconControl/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') -local Server = require('ExpGamingCore.Server@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Server = require('ExpGamingCore.Server') local Role -- ExpGamingCore.Role@^4.0.0 local Admin -- ExpGamingAdmin.AdminLib@^4.0.0 @@ -14,8 +14,8 @@ local Admin -- ExpGamingAdmin.AdminLib@^4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end - if loaded_modules['ExpGamingAdmin.AdminLib@^4.0.0'] then Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end + if loaded_modules['ExpGamingAdmin.AdminLib'] then Admin = require('ExpGamingAdmin.AdminLib') end end } diff --git a/modules/ExpGamingAdmin/AdminLib/control.lua b/modules/ExpGamingAdmin/AdminLib/control.lua index c1e6b352..bf0d070b 100644 --- a/modules/ExpGamingAdmin/AdminLib/control.lua +++ b/modules/ExpGamingAdmin/AdminLib/control.lua @@ -5,7 +5,7 @@ -- @alais Admin -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') local Role -- ExpGamingCore.Role@^4.0.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -13,9 +13,9 @@ local Sync -- ExpGamingCore.Sync@^4.0.0 local module_verbose = false local Admin = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['ExpGamingCore.Server@^4.0.0'] then require('ExpGamingCore.Server@^4.0.0').add_module_to_interface('Admin','ExpGamingAdmin.AdminLib') end + 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 end, actions={}, action_functions={}, diff --git a/modules/ExpGamingAdmin/Ban/control.lua b/modules/ExpGamingAdmin/Ban/control.lua index 0731719a..7735f05f 100644 --- a/modules/ExpGamingAdmin/Ban/control.lua +++ b/modules/ExpGamingAdmin/Ban/control.lua @@ -5,10 +5,10 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0') -local Server = require('ExpGamingCore.Server@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local AdminGui = require('ExpGamingAdmin.Gui') +local Server = require('ExpGamingCore.Server') +local Game = require('FactorioStdLib.Game') local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -16,8 +16,8 @@ local Sync -- ExpGamingCore.Sync@^4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['FactorioStdLib.Color@^0.8.0'] then Color = require('FactorioStdLib.Color@^0.8.0') end + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end + if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end end } diff --git a/modules/ExpGamingAdmin/ClearInventory/control.lua b/modules/ExpGamingAdmin/ClearInventory/control.lua index 5a5ae497..785b8a4f 100644 --- a/modules/ExpGamingAdmin/ClearInventory/control.lua +++ b/modules/ExpGamingAdmin/ClearInventory/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local Game = require('FactorioStdLib.Game') -- Module Define local module_verbose = false diff --git a/modules/ExpGamingAdmin/Commands/control.lua b/modules/ExpGamingAdmin/Commands/control.lua index c646accf..0d893173 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@^4.0.0') +local Admin = require('ExpGamingAdmin.AdminLib') --- Used to clear all parts of a player, removing warnings, reports, jail and temp ban -- @command clear-all diff --git a/modules/ExpGamingAdmin/Commands/src/jail.lua b/modules/ExpGamingAdmin/Commands/src/jail.lua index 87163faa..fd5dfb4d 100644 --- a/modules/ExpGamingAdmin/Commands/src/jail.lua +++ b/modules/ExpGamingAdmin/Commands/src/jail.lua @@ -1,5 +1,5 @@ local Admin = self -local Role = require('ExpGamingCore.Role@^4.0.0') +local Role = require('ExpGamingCore.Role') --- Used to jail a player which stops them from moving -- @command jail diff --git a/modules/ExpGamingAdmin/Commands/src/reports.lua b/modules/ExpGamingAdmin/Commands/src/reports.lua index 1b889fd0..e952737b 100644 --- a/modules/ExpGamingAdmin/Commands/src/reports.lua +++ b/modules/ExpGamingAdmin/Commands/src/reports.lua @@ -1,6 +1,6 @@ local Admin = self -local Role = require('ExpGamingCore.Role@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Role = require('ExpGamingCore.Role') +local Game = require('FactorioStdLib.Game') --- Reports a player -- @command report diff --git a/modules/ExpGamingAdmin/Commands/src/warnings.lua b/modules/ExpGamingAdmin/Commands/src/warnings.lua index f962d696..073f14ce 100644 --- a/modules/ExpGamingAdmin/Commands/src/warnings.lua +++ b/modules/ExpGamingAdmin/Commands/src/warnings.lua @@ -1,5 +1,5 @@ local Admin = self -local Role = require('ExpGamingCore.Role@^4.0.0') +local Role = require('ExpGamingCore.Role') --- Gives a warning to a player -- @command warn diff --git a/modules/ExpGamingAdmin/Gui/control.lua b/modules/ExpGamingAdmin/Gui/control.lua index 2eae0ac5..075eca0b 100644 --- a/modules/ExpGamingAdmin/Gui/control.lua +++ b/modules/ExpGamingAdmin/Gui/control.lua @@ -5,10 +5,10 @@ -- @alais AdminGui -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local Gui = require('ExpGamingCore.Gui') +local Role = require('ExpGamingCore.Role') +local Game = require('FactorioStdLib.Game') local playerInfo -- ExpGamingPlayer.playerInfo@^4.0.0 local mod_gui = require('mod-gui') @@ -16,7 +16,7 @@ local mod_gui = require('mod-gui') local module_verbose = false local AdminGui = { on_init=function() - if loaded_modules['ExpGamingPlayer.playerInfo@^4.0.0'] then playerInfo = require('ExpGamingPlayer@^4.0.0') + if loaded_modules['ExpGamingPlayer.playerInfo'] then playerInfo = require('ExpGamingPlayer') else playerInfo = function(player,frame) frame.add{ type='label', diff --git a/modules/ExpGamingAdmin/Jail/control.lua b/modules/ExpGamingAdmin/Jail/control.lua index 793c5a2a..e86e12f4 100644 --- a/modules/ExpGamingAdmin/Jail/control.lua +++ b/modules/ExpGamingAdmin/Jail/control.lua @@ -5,11 +5,11 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0') -local Server = require('ExpGamingCore.Server@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local AdminGui = require('ExpGamingAdmin.Gui') +local Server = require('ExpGamingCore.Server') +local Role = require('ExpGamingCore.Role') +local Game = require('FactorioStdLib.Game') local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -17,8 +17,8 @@ local Sync -- ExpGamingCore.Sync@^4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['FactorioStdLib.Color@^0.8.0'] then Color = require('FactorioStdLib.Color@^0.8.0') end + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end + if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end end } diff --git a/modules/ExpGamingAdmin/Kick/control.lua b/modules/ExpGamingAdmin/Kick/control.lua index 719a28de..316ba32f 100644 --- a/modules/ExpGamingAdmin/Kick/control.lua +++ b/modules/ExpGamingAdmin/Kick/control.lua @@ -5,10 +5,10 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0') -local Server = require('ExpGamingCore.Server@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local AdminGui = require('ExpGamingAdmin.Gui') +local Server = require('ExpGamingCore.Server') +local Game = require('FactorioStdLib.Game') local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -16,8 +16,8 @@ local Sync -- ExpGamingCore.Sync@^4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['FactorioStdLib.Color@^0.8.0'] then Color = require('FactorioStdLib.Color@^0.8.0') end + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end + if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end end } -- Function Define diff --git a/modules/ExpGamingAdmin/Reports/control.lua b/modules/ExpGamingAdmin/Reports/control.lua index b20590cb..72956283 100644 --- a/modules/ExpGamingAdmin/Reports/control.lua +++ b/modules/ExpGamingAdmin/Reports/control.lua @@ -5,11 +5,11 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local Server = require('ExpGamingCore.Server@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local Server = require('ExpGamingCore.Server') +local Role = require('ExpGamingCore.Role') +local Gui = require('ExpGamingCore.Gui') +local Game = require('FactorioStdLib.Game') local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -17,8 +17,8 @@ local Sync -- ExpGamingCore.Sync@^4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['FactorioStdLib.Color@^0.8.0'] then Color = require('FactorioStdLib.Color@^0.8.0') end + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end + if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end end } diff --git a/modules/ExpGamingAdmin/Teleport/control.lua b/modules/ExpGamingAdmin/Teleport/control.lua index bfd0c7c1..31ff64a3 100644 --- a/modules/ExpGamingAdmin/Teleport/control.lua +++ b/modules/ExpGamingAdmin/Teleport/control.lua @@ -5,9 +5,9 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local AdminGui = require('ExpGamingAdmin.Gui@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local AdminGui = require('ExpGamingAdmin.Gui') +local Game = require('FactorioStdLib.Game') -- Module Define local module_verbose = false diff --git a/modules/ExpGamingAdmin/TempBan/control.lua b/modules/ExpGamingAdmin/TempBan/control.lua index 327f445f..71210d05 100644 --- a/modules/ExpGamingAdmin/TempBan/control.lua +++ b/modules/ExpGamingAdmin/TempBan/control.lua @@ -5,10 +5,10 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local Server = require('ExpGamingCore.Server@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local Server = require('ExpGamingCore.Server') +local Role = require('ExpGamingCore.Role') +local Game = require('FactorioStdLib.Game') local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -16,8 +16,8 @@ local Sync -- ExpGamingCore.Sync@^4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['FactorioStdLib.Color@^0.8.0'] then Color = require('FactorioStdLib.Color@^0.8.0') end + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end + if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end end } diff --git a/modules/ExpGamingAdmin/Warnings/control.lua b/modules/ExpGamingAdmin/Warnings/control.lua index ec284254..4e9f443e 100644 --- a/modules/ExpGamingAdmin/Warnings/control.lua +++ b/modules/ExpGamingAdmin/Warnings/control.lua @@ -5,10 +5,10 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local Server = require('ExpGamingCore.Server@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local Server = require('ExpGamingCore.Server') +local Role = require('ExpGamingCore.Role') +local Game = require('FactorioStdLib.Game') local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -37,9 +37,9 @@ local punishments = { local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['FactorioStdLib.Color@^0.8.0'] then Color = require('FactorioStdLib.Color@^0.8.0') end - if loaded_modules['ExpGamingAdmin.Reports@^4.0.0'] then + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end + if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end + if loaded_modules['ExpGamingAdmin.Reports'] then take_action = take_action + 1 table.insert(punishments,take_action,{'report',{'ExpGamingAdmin-Warnings.reported'},defines.textcolor.med}) end diff --git a/modules/ExpGamingBot/autoChat/control.lua b/modules/ExpGamingBot/autoChat/control.lua index ac0b65cb..fbd1b9b8 100644 --- a/modules/ExpGamingBot/autoChat/control.lua +++ b/modules/ExpGamingBot/autoChat/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') -local Server = require('ExpGamingCore.Server@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Server = require('ExpGamingCore.Server') local Role -- ExpGamingCore.Role@^4.0.0 -- Local Varibles @@ -121,7 +121,7 @@ local commands = { local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end end } diff --git a/modules/ExpGamingBot/autoMessage/control.lua b/modules/ExpGamingBot/autoMessage/control.lua index 00906d71..e03c9c24 100644 --- a/modules/ExpGamingBot/autoMessage/control.lua +++ b/modules/ExpGamingBot/autoMessage/control.lua @@ -16,8 +16,8 @@ local Sync -- ExpGamingCore.Sync@4.0.0 local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end + if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end end, on_post=function() --code diff --git a/modules/ExpGamingBot/discordAlerts/control.lua b/modules/ExpGamingBot/discordAlerts/control.lua index 1cbeab2a..f74ccc5b 100644 --- a/modules/ExpGamingBot/discordAlerts/control.lua +++ b/modules/ExpGamingBot/discordAlerts/control.lua @@ -5,9 +5,9 @@ -- @alais ThisModule -- Module Require -local Sync = require('ExpGamingCore.Sync@^4.0.0') -local Color = require('FactorioStdLib.Color@^0.8.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Sync = require('ExpGamingCore.Sync') +local Color = require('FactorioStdLib.Color') +local Game = require('FactorioStdLib.Game') -- Module Define local module_verbose = false diff --git a/modules/ExpGamingCommands/bonus/control.lua b/modules/ExpGamingCommands/bonus/control.lua index 452005d9..c216ebcb 100644 --- a/modules/ExpGamingCommands/bonus/control.lua +++ b/modules/ExpGamingCommands/bonus/control.lua @@ -4,7 +4,7 @@ -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE local global = global{} -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') -- these are the settings which are changed with scale being as +100% local settings = { @@ -54,8 +54,8 @@ end) return { on_init= function(self) - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then - local Role = require('ExpGamingCore.Role@^4.0.0') + if loaded_modules['ExpGamingCore.Role'] then + local Role = require('ExpGamingCore.Role') -- instant respawn script.on_event(defines.events.on_pre_player_died,function(event) local player = Game.get_player(event) diff --git a/modules/ExpGamingCommands/home/control.lua b/modules/ExpGamingCommands/home/control.lua index dd79b921..67f4d1fc 100644 --- a/modules/ExpGamingCommands/home/control.lua +++ b/modules/ExpGamingCommands/home/control.lua @@ -3,7 +3,7 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') local global = global{} --- Sets the home for a player diff --git a/modules/ExpGamingCommands/kill/control.lua b/modules/ExpGamingCommands/kill/control.lua index 37a6df71..b04ef3d8 100644 --- a/modules/ExpGamingCommands/kill/control.lua +++ b/modules/ExpGamingCommands/kill/control.lua @@ -3,7 +3,7 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^4.0.0') +local Game = require('FactorioStdLib.Game') --- Kills a player of a lower rank -- @command kill diff --git a/modules/ExpGamingCommands/repair/control.lua b/modules/ExpGamingCommands/repair/control.lua index fb3835fa..a0ab5e53 100644 --- a/modules/ExpGamingCommands/repair/control.lua +++ b/modules/ExpGamingCommands/repair/control.lua @@ -4,8 +4,8 @@ -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') -local Role = require('ExpGamingCore.Role@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Role = require('ExpGamingCore.Role') -- Set an item to true to disallow it from being repaired local disallow = { @@ -24,7 +24,7 @@ local repairDisallow local module_verbose = false local ThisModule = { on_init = function(self) - if loaded_modules['ExpGamingAdmin.TempBan@^4.0.0'] then verbose('ExpGamingAdmin.TempBan is installed; Loading tempban src') repairDisallow = require(module_path..'/src/tempban') end + if loaded_modules['ExpGamingAdmin.TempBan'] then verbose('ExpGamingAdmin.TempBan is installed; Loading tempban src') repairDisallow = require(module_path..'/src/tempban') end end } diff --git a/modules/ExpGamingCommands/repair/src/tempban.lua b/modules/ExpGamingCommands/repair/src/tempban.lua index ddda15ec..942511a2 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@^4.0.0').temp_ban +local temp_ban = require('ExpGamingAdmin.AdminLib').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/tags/control.lua b/modules/ExpGamingCommands/tags/control.lua index bc021e4a..f320144b 100644 --- a/modules/ExpGamingCommands/tags/control.lua +++ b/modules/ExpGamingCommands/tags/control.lua @@ -3,14 +3,14 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') local Role -- ExpGamingCore.Role@^4.0.0 -- Module Define local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end end } diff --git a/modules/ExpGamingCommands/teleport/control.lua b/modules/ExpGamingCommands/teleport/control.lua index b2abdf47..cedd2567 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@^4.0.0') +local Admin = require('ExpGamingAdmin.AdminLib') --- Teleports the user to the player given -- @command go-to diff --git a/modules/ExpGamingCore/Command/control.lua b/modules/ExpGamingCore/Command/control.lua index b87bd256..4421437d 100644 --- a/modules/ExpGamingCore/Command/control.lua +++ b/modules/ExpGamingCore/Command/control.lua @@ -4,8 +4,8 @@ -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -- @alias commands -local Game = require('FactorioStdLib.Game@^0.8.0') -local Color = require('FactorioStdLib.Color@^0.8.0') +local Game = require('FactorioStdLib.Game') +local Color = require('FactorioStdLib.Color') --- Used as an error constant for validation -- @field commands.error diff --git a/modules/ExpGamingCore/Group/control.lua b/modules/ExpGamingCore/Group/control.lua index 36d44dc2..91937bf3 100644 --- a/modules/ExpGamingCore/Group/control.lua +++ b/modules/ExpGamingCore/Group/control.lua @@ -23,7 +23,7 @@ local Group = { end }), on_init = function() - if loaded_modules['ExpGamingCore.Server@^4.0.0'] then require('ExpGamingCore.Server@^4.0.0').add_module_to_interface('Group','ExpGamingCore.Group') end + if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server') end end, on_post = function(self) -- creats a root role that the server can use diff --git a/modules/ExpGamingCore/Gui/control.lua b/modules/ExpGamingCore/Gui/control.lua index 4482a500..8e29234d 100644 --- a/modules/ExpGamingCore/Gui/control.lua +++ b/modules/ExpGamingCore/Gui/control.lua @@ -173,8 +173,8 @@ script.on_event('on_player_respawned',function(event) end) function Gui:on_init() - if loaded_modules['ExpGamingCore.Server@^4.0.0'] then - Server = require('ExpGamingCore.Server@^4.0.0') + if loaded_modules['ExpGamingCore.Server'] then + Server = require('ExpGamingCore.Server') verbose('ExpGamingCore.Server is installed; Loading server src') script.on_init(require(module_path..'/src/server',{Gui=self})) end diff --git a/modules/ExpGamingCore/Gui/src/server.lua b/modules/ExpGamingCore/Gui/src/server.lua index ca360803..8e901ae0 100644 --- a/modules/ExpGamingCore/Gui/src/server.lua +++ b/modules/ExpGamingCore/Gui/src/server.lua @@ -1,8 +1,8 @@ --- This file will be loaded when ExpGamingCore.Server is present -- @function _comment -local Game = require('FactorioStdLib.Game@^0.8.0') -local Server = require('ExpGamingCore.Server@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Server = require('ExpGamingCore.Server') Server.add_module_to_interface('ExpGui','ExpGamingCore.Gui') diff --git a/modules/ExpGamingCore/Gui/src/test.lua b/modules/ExpGamingCore/Gui/src/test.lua index bb841e24..21b4ff42 100644 --- a/modules/ExpGamingCore/Gui/src/test.lua +++ b/modules/ExpGamingCore/Gui/src/test.lua @@ -6,7 +6,7 @@ --- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module -- @function _comment -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') local Gui = Gui -- this is to force gui to remain in the ENV local mod_gui = require("mod-gui") diff --git a/modules/ExpGamingCore/Role/control.lua b/modules/ExpGamingCore/Role/control.lua index cc61483c..e68b27d0 100644 --- a/modules/ExpGamingCore/Role/control.lua +++ b/modules/ExpGamingCore/Role/control.lua @@ -5,8 +5,8 @@ -- @alais Role -- Module Require -local Group = require('ExpGamingCore.Group@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Group = require('ExpGamingCore.Group') +local Game = require('FactorioStdLib.Game') -- Local Varibles local role_change_event_id = script.generate_event_name('on_role_change') @@ -28,9 +28,9 @@ local Role = { end }), on_init=function(self) - if loaded_modules['ExpGamingCore.Server@^4.0.0'] then require('ExpGamingCore.Server@^4.0.0').add_module_to_interface('Role','ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Command@^4.0.0'] then require(module_path..'/src/commands',{self=self}) end - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then require(module_path..'/src/sync',{self=self,RoleGlobal=RoleGlobal}) end + if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server') 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, on_post=function(self) -- creates a server role with root access diff --git a/modules/ExpGamingCore/Role/src/sync.lua b/modules/ExpGamingCore/Role/src/sync.lua index 68f3bfaf..af6b3e39 100644 --- a/modules/ExpGamingCore/Role/src/sync.lua +++ b/modules/ExpGamingCore/Role/src/sync.lua @@ -1,8 +1,8 @@ local Role = self local RoleGlobal = RoleGlobal -local Sync = require('ExpGamingCore.Sync@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') -local Color = require('FactorioStdLib.Color@^0.8.0') +local Sync = require('ExpGamingCore.Sync') +local Game = require('FactorioStdLib.Game') +local Color = require('FactorioStdLib.Color') -- just to hard reset the role sync function Sync.set_roles(...) diff --git a/modules/ExpGamingCore/Sync/control.lua b/modules/ExpGamingCore/Sync/control.lua index 7bd0a816..1427be42 100644 --- a/modules/ExpGamingCore/Sync/control.lua +++ b/modules/ExpGamingCore/Sync/control.lua @@ -4,8 +4,8 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') -local Color = require('FactorioStdLib.Color@^0.8.0') +local Game = require('FactorioStdLib.Game') +local Color = require('FactorioStdLib.Color') local Sync = {} local Sync_updates = {} @@ -317,8 +317,8 @@ script.on_event('on_pre_player_left_game',Sync.emit_update) script.on_event('on_rocket_launched',Sync.emit_update) function Sync:on_init() - if loaded_modules['ExpGamingCore.Gui@^4.0.0'] then verbose('ExpGamingCore.Gui is installed; Loading gui src') require(module_path..'/src/gui',{Sync=Sync,module_path=module_path}) end - if loaded_modules['ExpGamingCore.Server@^4.0.0'] then require('ExpGamingCore.Server@^4.0.0').add_module_to_interface('Sync','ExpGamingCore.Sync') end + if loaded_modules['ExpGamingCore.Gui'] then verbose('ExpGamingCore.Gui is installed; Loading gui src') require(module_path..'/src/gui',{Sync=Sync,module_path=module_path}) end + if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server') end end function Sync:on_post() diff --git a/modules/ExpGamingCore/Sync/src/gui.lua b/modules/ExpGamingCore/Sync/src/gui.lua index a7c8408d..51ea6121 100644 --- a/modules/ExpGamingCore/Sync/src/gui.lua +++ b/modules/ExpGamingCore/Sync/src/gui.lua @@ -7,8 +7,8 @@ --- This file will be loaded when ExpGamingCore.Gui is present -- @function _comment -local Game = require('FactorioStdLib.Game@^0.8.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Gui = require('ExpGamingCore.Gui') local Sync = Sync -- this is to force sync to remain in the ENV local Sync_gui_functions = {} diff --git a/modules/ExpGamingInfo/Readme/control.lua b/modules/ExpGamingInfo/Readme/control.lua index 4943dbe3..9bdbe504 100644 --- a/modules/ExpGamingInfo/Readme/control.lua +++ b/modules/ExpGamingInfo/Readme/control.lua @@ -5,14 +5,14 @@ -- @alais ThisModule -- Module Require -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Gui = require('ExpGamingCore.Gui') +local Game = require('FactorioStdLib.Game') -- Module Define local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then require(module_path..'/src/sync') end + if loaded_modules['ExpGamingCore.Sync'] then require(module_path..'/src/sync') end end } diff --git a/modules/ExpGamingInfo/Readme/src/sync.lua b/modules/ExpGamingInfo/Readme/src/sync.lua index eb52d6a7..51c3c8da 100644 --- a/modules/ExpGamingInfo/Readme/src/sync.lua +++ b/modules/ExpGamingInfo/Readme/src/sync.lua @@ -1,5 +1,5 @@ -local Sync = require('ExpGamingCore.Sync@^4.0.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') +local Sync = require('ExpGamingCore.Sync') +local Gui = require('ExpGamingCore.Gui') Sync.add_to_gui(Gui.inputs.add_button('readme-sync-guildlines','View Guildlines','View the guildlines in the readme',function(player,element) Gui.center.open_tab(player,'readme','guildlines') diff --git a/modules/ExpGamingInfo/Rockets/control.lua b/modules/ExpGamingInfo/Rockets/control.lua index deb2a72c..0af0b354 100644 --- a/modules/ExpGamingInfo/Rockets/control.lua +++ b/modules/ExpGamingInfo/Rockets/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Gui = require('ExpGamingCore.Gui') +local Game = require('FactorioStdLib.Game') -- Module Define local module_verbose = false diff --git a/modules/ExpGamingInfo/Rockets/src/sync.lua b/modules/ExpGamingInfo/Rockets/src/sync.lua index e215f530..ce050aa6 100644 --- a/modules/ExpGamingInfo/Rockets/src/sync.lua +++ b/modules/ExpGamingInfo/Rockets/src/sync.lua @@ -1,5 +1,5 @@ -local Sync = require('ExpGamingCore.Sync@^4.0.0') -local global = global['ExpGamingInfo.Rockets@^4.0.0'] +local Sync = require('ExpGamingCore.Sync') +local global = global['ExpGamingInfo.Rockets'] Sync.add_update('rockets',function() local _return = {} diff --git a/modules/ExpGamingInfo/Science/control.lua b/modules/ExpGamingInfo/Science/control.lua index 0fa25bdc..309b7b4a 100644 --- a/modules/ExpGamingInfo/Science/control.lua +++ b/modules/ExpGamingInfo/Science/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Gui = require('ExpGamingCore.Gui') +local Game = require('FactorioStdLib.Game') -- Local Varibles local science_packs = { diff --git a/modules/ExpGamingInfo/Science/src/sync.lua b/modules/ExpGamingInfo/Science/src/sync.lua index 3c7649c1..fd3993c7 100644 --- a/modules/ExpGamingInfo/Science/src/sync.lua +++ b/modules/ExpGamingInfo/Science/src/sync.lua @@ -1,5 +1,5 @@ -local Sync = require('ExpGamingCore.Sync@^4.0.0') -local data = global['ExpGamingInfo.Science@^4.0.0'] +local Sync = require('ExpGamingCore.Sync') +local data = global['ExpGamingInfo.Science'] Sync.add_update('science',function() local _return = {} diff --git a/modules/ExpGamingInfo/Tasklist/control.lua b/modules/ExpGamingInfo/Tasklist/control.lua index de0c0e6f..401567a7 100644 --- a/modules/ExpGamingInfo/Tasklist/control.lua +++ b/modules/ExpGamingInfo/Tasklist/control.lua @@ -5,9 +5,9 @@ -- @alais ThisModule -- Module Require -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Gui = require('ExpGamingCore.Gui') +local Role = require('ExpGamingCore.Role') +local Game = require('FactorioStdLib.Game') -- Module Define local module_verbose = false diff --git a/modules/ExpGamingPlayer/afkKick/control.lua b/modules/ExpGamingPlayer/afkKick/control.lua index 0e302ccf..ac601afd 100644 --- a/modules/ExpGamingPlayer/afkKick/control.lua +++ b/modules/ExpGamingPlayer/afkKick/control.lua @@ -3,7 +3,7 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') local Role -- ExpGamingCore.Role@^4.0.0 local Sync -- ExpGamingCore.Sync@^4.0.0 @@ -30,8 +30,8 @@ end) return setmetatable({ get_allowed_afk_time=get_allowed_afk_time, on_init=function(self) - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end - if loaded_modules['ExpGamingCore.Sync@^4.0.0'] then Sync = require('ExpGamingCore.Sync@^4.0.0') end - if loaded_modules['ExpGamingCore.Server@^4.0.0'] then require(module_path..'/src/server',Sync,self) end + 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(module_path..'/src/server',Sync,self) end end },{__call=function(self,...) self.get_allowed_afk_time(...) end}) \ No newline at end of file diff --git a/modules/ExpGamingPlayer/afkKick/src/server.lua b/modules/ExpGamingPlayer/afkKick/src/server.lua index f8d4b3e1..531cd334 100644 --- a/modules/ExpGamingPlayer/afkKick/src/server.lua +++ b/modules/ExpGamingPlayer/afkKick/src/server.lua @@ -1,6 +1,6 @@ local Sync = Sync local get_allowed_afk_time = self -local Server = require('ExpGamingCore.Server@^4.0.0') +local Server = require('ExpGamingCore.Server') Event[defines.events.on_tick] = nil script.on_init(function(event) diff --git a/modules/ExpGamingPlayer/inventorySearch/control.lua b/modules/ExpGamingPlayer/inventorySearch/control.lua index 675b9549..20c38564 100644 --- a/modules/ExpGamingPlayer/inventorySearch/control.lua +++ b/modules/ExpGamingPlayer/inventorySearch/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Admin = require('ExpGamingAdmin.AdminLib') +local Game = require('FactorioStdLib.Game') local Role -- ExpGamingCore.Role@^4.0.0 -- Local Varibles @@ -48,7 +48,7 @@ local _root_tree = {low_items=low_items,med_items=med_items,high_items=high_item local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end end } diff --git a/modules/ExpGamingPlayer/playerInfo/control.lua b/modules/ExpGamingPlayer/playerInfo/control.lua index a5a4817e..7a4a56cc 100644 --- a/modules/ExpGamingPlayer/playerInfo/control.lua +++ b/modules/ExpGamingPlayer/playerInfo/control.lua @@ -3,8 +3,8 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Gui = require('ExpGamingCore.Gui') local Role -- ExpGamingCore.Role@^4.0.0 local Group -- ExpGamingCore.Group@^4.0.0 @@ -50,8 +50,8 @@ end return setmetatable({ get_player_info=get_player_info, on_init=function(self) - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end - if loaded_modules['ExpGamingCore.Group@^4.0.0'] then Group = require('ExpGamingCore.Group@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end + if loaded_modules['ExpGamingCore.Group'] then Group = require('ExpGamingCore.Group') end end },{ __call=function(self,...) self.get_player_info(...) end diff --git a/modules/ExpGamingPlayer/playerList/control.lua b/modules/ExpGamingPlayer/playerList/control.lua index 56405202..63a1f66e 100644 --- a/modules/ExpGamingPlayer/playerList/control.lua +++ b/modules/ExpGamingPlayer/playerList/control.lua @@ -3,8 +3,8 @@ -- @author Cooldude2606 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -local Game = require('FactorioStdLib.Game@^0.8.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Gui = require('ExpGamingCore.Gui') local Admin -- ExpGamingAdmin.AdminLib@^4.0.0 local AdminGui -- ExpGamingAdmin.Gui@^4.0.0 @@ -30,9 +30,9 @@ local module_verbose = false local ThisModule = { on_init=function(self) if loaded_modules['ExpGamingPlayer.playerInfo'] then playerInfo = require('ExpGamingPlayer.playerInfo') end - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then getPlayers = require(module_path..'/src/ranking',{self=self}) end - if loaded_modules['ExpGamingAdmin.AdminLib@^4.0.0'] then Admin = require('ExpGamingAdmin.AdminLib@^4.0.0') end - if loaded_modules['ExpGamingAdmin.Gui@^4.0.0'] then AdminGui = require('ExpGamingAdmin.Gui@^4.0.0') 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.Gui'] then AdminGui = require('ExpGamingAdmin.Gui') end end } diff --git a/modules/ExpGamingPlayer/playerList/src/ranking.lua b/modules/ExpGamingPlayer/playerList/src/ranking.lua index e94e61ee..66a94eae 100644 --- a/modules/ExpGamingPlayer/playerList/src/ranking.lua +++ b/modules/ExpGamingPlayer/playerList/src/ranking.lua @@ -1,4 +1,4 @@ -local Role = require('ExpGamingCore.Role@^4.0.0') +local Role = require('ExpGamingCore.Role') script.on_event(defines.events.on_role_change,self.update) diff --git a/modules/ExpGamingPlayer/polls/control.lua b/modules/ExpGamingPlayer/polls/control.lua index 7c1341ba..172d68ff 100644 --- a/modules/ExpGamingPlayer/polls/control.lua +++ b/modules/ExpGamingPlayer/polls/control.lua @@ -4,8 +4,8 @@ -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -- Module Require -local Server = require('ExpGamingCore.Server@^4.0.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') +local Server = require('ExpGamingCore.Server') +local Gui = require('ExpGamingCore.Gui') local Role -- ExpGamingCore.Server@^4.0.0 -- Local Varibles @@ -15,7 +15,7 @@ local poll_time_out = 90 -- In seconds local module_verbose = false local ThisModule = { on_init=function() - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end end } diff --git a/modules/GameSettingsGui/control.lua b/modules/GameSettingsGui/control.lua index 61bbb758..8499fcf0 100644 --- a/modules/GameSettingsGui/control.lua +++ b/modules/GameSettingsGui/control.lua @@ -4,8 +4,8 @@ -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE -- Module Require -local Server = require('ExpGamingCore.Server@^4.0.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') +local Server = require('ExpGamingCore.Server') +local Gui = require('ExpGamingCore.Gui') -- Local Varibles --{type='slider',object='',key='',name='',min=x,max=y} diff --git a/modules/GuiAnnouncements/control.lua b/modules/GuiAnnouncements/control.lua index c2f73c86..8ee154d0 100644 --- a/modules/GuiAnnouncements/control.lua +++ b/modules/GuiAnnouncements/control.lua @@ -7,9 +7,9 @@ -- maybe make this not require Role and have it optinal -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Role = require('ExpGamingCore.Role@^4.0.0') +local Game = require('FactorioStdLib.Game') +local Gui = require('ExpGamingCore.Gui') +local Role = require('ExpGamingCore.Role') -- Module Define local module_verbose = false diff --git a/modules/PlayerAutoColor/control.lua b/modules/PlayerAutoColor/control.lua index 3fb811cc..5cbcfade 100644 --- a/modules/PlayerAutoColor/control.lua +++ b/modules/PlayerAutoColor/control.lua @@ -5,7 +5,7 @@ -- @alais ThisModule -- Module Require -local Color = require('FactorioStdLib.Color@^0.8.0') +local Color = require('FactorioStdLib.Color') -- Module Define local module_verbose = false diff --git a/modules/SpawnArea/control.lua b/modules/SpawnArea/control.lua index 944e4760..9c731ec7 100644 --- a/modules/SpawnArea/control.lua +++ b/modules/SpawnArea/control.lua @@ -5,7 +5,7 @@ -- @alais ThisModule -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') -- Local Varibles local turret_enabled = true diff --git a/modules/WarpPoints/control.lua b/modules/WarpPoints/control.lua index 2674d4b8..8c6c028b 100644 --- a/modules/WarpPoints/control.lua +++ b/modules/WarpPoints/control.lua @@ -5,8 +5,8 @@ -- @alais ThisModule -- Module Require -local Gui = require('ExpGamingCore.Gui@^4.0.0') -local Game = require('FactorioStdLib.Game@^0.8.0') +local Gui = require('ExpGamingCore.Gui') +local Game = require('FactorioStdLib.Game') local Role -- ExpGamingCore.Role@^4.0.0 -- Local Varibles @@ -27,8 +27,8 @@ local global local module_verbose = false local ThisModule = { on_init=function(self) - if loaded_modules['ExpGamingCore.Role@^4.0.0'] then Role = require('ExpGamingCore.Role@^4.0.0') end - if loaded_modules['ExpGamingCore.Command@^4.0.0'] then require(module_path..'/src/commands',{self=self,warps=global,warp_min_distance=warp_min_distance}) end + if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end + if loaded_modules['ExpGamingCore.Command'] then require(module_path..'/src/commands',{self=self,warps=global,warp_min_distance=warp_min_distance}) end end } diff --git a/modules/WornPaths/control.lua b/modules/WornPaths/control.lua index d8842d42..6596cf45 100644 --- a/modules/WornPaths/control.lua +++ b/modules/WornPaths/control.lua @@ -5,7 +5,7 @@ -- @alais ThisModule -- Module Require -local Game = require('FactorioStdLib.Game@^0.8.0') +local Game = require('FactorioStdLib.Game') -- Local Varibles local entites = require(module_path..'/src/entites') diff --git a/modules/index.lua b/modules/index.lua index 9da647b2..b51a0315 100644 --- a/modules/index.lua +++ b/modules/index.lua @@ -1,80 +1,80 @@ -- not_luadoc=true --- Used to index the files to be loaded return { - ['FactorioStdLib.String@^0.8.0']='./modules/FactorioStdLib/String', - ['FactorioStdLib.String@0.8.0']='./modules/FactorioStdLib/String', - ['FactorioStdLib.Table@^0.8.0']='./modules/FactorioStdLib/Table', - ['FactorioStdLib.Table@0.8.0']='./modules/FactorioStdLib/Table', - ['FactorioStdLib.Game@^0.8.0']='./modules/FactorioStdLib/Game', - ['DeathMarkers@4.0.0']='./modules/DeathMarkers', - ['FactorioStdLib.Color@^0.8.0']='./modules/FactorioStdLib/Color', - ['FactorioStdLib.Color@0.8.0']='./modules/FactorioStdLib/Color', - ['PlayerAutoColor@4.0.0']='./modules/PlayerAutoColor', - ['DamagePopup@4.0.0']='./modules/DamagePopup', - ['FactorioStdLib.Game@0.8.0']='./modules/FactorioStdLib/Game', - ['WornPaths@4.0.0']='./modules/WornPaths', - ['SpawnArea@4.0.0']='./modules/SpawnArea', - ['FactorioStdLib@^0.8.0']='./modules/FactorioStdLib', - ['FactorioStdLib@0.8.0']='./modules/FactorioStdLib', - ['ExpGamingLib@^4.0.0']='./modules/ExpGamingLib', - ['ExpGamingLib@4.0.0']='./modules/ExpGamingLib', - ['ExpGamingCore.Command@^4.0.0']='./modules/ExpGamingCore/Command', - ['ExpGamingCore.Server@^4.0.0']='./modules/ExpGamingCore/Server', - ['ExpGamingCore.Command@4.0.0']='./modules/ExpGamingCore/Command', - ['ExpGamingCommands.home@4.0.0']='./modules/ExpGamingCommands/home', - ['ExpGamingCommands.cheatMode@4.0.0']='./modules/ExpGamingCommands/cheatMode', - ['ExpGamingCore.Server@4.0.0']='./modules/ExpGamingCore/Server', - ['ExpGamingCore.Group@^4.0.0']='./modules/ExpGamingCore/Group', - ['ExpGamingCore.Group@4.0.0']='./modules/ExpGamingCore/Group', - ['ExpGamingCore.Role@^4.0.0']='./modules/ExpGamingCore/Role', - ['ExpGamingCore.Role@4.0.0']='./modules/ExpGamingCore/Role', - ['ExpGamingCommands.tags@4.0.0']='./modules/ExpGamingCommands/tags', - ['ExpGamingCommands.kill@4.0.0']='./modules/ExpGamingCommands/kill', - ['ExpGamingCommands.bonus@4.0.0']='./modules/ExpGamingCommands/bonus', - ['ExpGamingBot.autoChat@4.0.0']='./modules/ExpGamingBot/autoChat', - ['ExpGamingCore.Gui@^4.0.0']='./modules/ExpGamingCore/Gui', - ['ExpGamingCore.Gui@4.0.0']='./modules/ExpGamingCore/Gui', - ['WarpPoints@4.0.0']='./modules/WarpPoints', - ['GuiAnnouncements@4.0.0']='./modules/GuiAnnouncements', - ['GameSettingsGui@4.0.0']='./modules/GameSettingsGui', - ['ExpGamingInfo.Tasklist@4.0.0']='./modules/ExpGamingInfo/Tasklist', - ['ExpGamingCore.Sync@^4.0.0']='./modules/ExpGamingCore/Sync', - ['ExpGamingPlayer.polls@4.0.0']='./modules/ExpGamingPlayer/polls', - ['ExpGamingPlayer.playerInfo@4.0.0']='./modules/ExpGamingPlayer/playerInfo', - ['ExpGamingPlayer.afkKick@4.0.0']='./modules/ExpGamingPlayer/afkKick', - ['ExpGamingCore.Sync@4.0.0']='./modules/ExpGamingCore/Sync', - ['ExpGamingInfo.Science@4.0.0']='./modules/ExpGamingInfo/Science', - ['ExpGamingInfo.Rockets@4.0.0']='./modules/ExpGamingInfo/Rockets', - ['ExpGamingInfo.Readme@4.0.0']='./modules/ExpGamingInfo/Readme', - ['ExpGamingInfo@4.0.0']='./modules/ExpGamingInfo', - ['ExpGamingCore@4.0.0']='./modules/ExpGamingCore', - ['ExpGamingBot.discordAlerts@4.0.0']='./modules/ExpGamingBot/discordAlerts', - ['ExpGamingBot.autoMessage@4.0.0']='./modules/ExpGamingBot/autoMessage', - ['ExpGamingBot@4.0.0']='./modules/ExpGamingBot', - ['ExpGamingAdmin.AdminLib@^4.0.0']='./modules/ExpGamingAdmin/AdminLib', - ['ExpGamingAdmin.AdminLib@4.0.0']='./modules/ExpGamingAdmin/AdminLib', - ['ExpGamingAdmin.TempBan@^4.0.0']='./modules/ExpGamingAdmin/TempBan', - ['ExpGamingAdmin.ClearInventory@4.0.0']='./modules/ExpGamingAdmin/ClearInventory', - ['ExpGamingAdmin.TempBan@4.0.0']='./modules/ExpGamingAdmin/TempBan', - ['ExpGamingCommands.repair@4.0.0']='./modules/ExpGamingCommands/repair', - ['ExpGamingPlayer.playerList@4.0.0']='./modules/ExpGamingPlayer/playerList', - ['ExpGamingAdmin.Reports@4.0.0']='./modules/ExpGamingAdmin/Reports', - ['ExpGamingAdmin.Warnings@^4.0.0']='./modules/ExpGamingAdmin/Warnings', - ['ExpGamingAdmin.Warnings@4.0.0']='./modules/ExpGamingAdmin/Warnings', - ['ExpGamingPlayer.inventorySearch@4.0.0']='./modules/ExpGamingPlayer/inventorySearch', - ['ExpGamingPlayer@4.0.0']='./modules/ExpGamingPlayer', - ['ExpGamingAdmin.Gui@^4.0.0']='./modules/ExpGamingAdmin/Gui', - ['ExpGamingAdmin.Gui@4.0.0']='./modules/ExpGamingAdmin/Gui', - ['ExpGamingAdmin.Teleport@^4.0.0']='./modules/ExpGamingAdmin/Teleport', - ['ExpGamingAdmin.Teleport@4.0.0']='./modules/ExpGamingAdmin/Teleport', - ['ExpGamingCommands.teleport@4.0.0']='./modules/ExpGamingCommands/teleport', - ['ExpGamingCommands@4.0.0']='./modules/ExpGamingCommands', - ['ExpGamingAdmin.Kick@4.0.0']='./modules/ExpGamingAdmin/Kick', - ['ExpGamingAdmin.Jail@4.0.0']='./modules/ExpGamingAdmin/Jail', - ['ExpGamingAdmin.Commands@4.0.0']='./modules/ExpGamingAdmin/Commands', - ['ExpGamingAdmin.Ban@4.0.0']='./modules/ExpGamingAdmin/Ban', - ['ExpGamingAdmin@4.0.0']='./modules/ExpGamingAdmin', - ['DeconControl@4.0.0']='./modules/DeconControl', - ['ChatPopup@4.0.0']='./modules/ChatPopup', - ['AdvancedStartingItems@4.0.0']='./modules/AdvancedStartingItems', + ['FactorioStdLib.String']='./modules/FactorioStdLib/String', + ['FactorioStdLib.String']='./modules/FactorioStdLib/String', + ['FactorioStdLib.Table']='./modules/FactorioStdLib/Table', + ['FactorioStdLib.Table']='./modules/FactorioStdLib/Table', + ['FactorioStdLib.Game']='./modules/FactorioStdLib/Game', + ['DeathMarkers']='./modules/DeathMarkers', + ['FactorioStdLib.Color']='./modules/FactorioStdLib/Color', + ['FactorioStdLib.Color']='./modules/FactorioStdLib/Color', + ['PlayerAutoColor']='./modules/PlayerAutoColor', + ['DamagePopup']='./modules/DamagePopup', + ['FactorioStdLib.Game']='./modules/FactorioStdLib/Game', + ['WornPaths']='./modules/WornPaths', + ['SpawnArea']='./modules/SpawnArea', + ['FactorioStdLib']='./modules/FactorioStdLib', + ['FactorioStdLib']='./modules/FactorioStdLib', + ['ExpGamingLib']='./modules/ExpGamingLib', + ['ExpGamingLib']='./modules/ExpGamingLib', + ['ExpGamingCore.Command']='./modules/ExpGamingCore/Command', + ['ExpGamingCore.Server']='./modules/ExpGamingCore/Server', + ['ExpGamingCore.Command']='./modules/ExpGamingCore/Command', + ['ExpGamingCommands.home']='./modules/ExpGamingCommands/home', + ['ExpGamingCommands.cheatMode']='./modules/ExpGamingCommands/cheatMode', + ['ExpGamingCore.Server']='./modules/ExpGamingCore/Server', + ['ExpGamingCore.Group']='./modules/ExpGamingCore/Group', + ['ExpGamingCore.Group']='./modules/ExpGamingCore/Group', + ['ExpGamingCore.Role']='./modules/ExpGamingCore/Role', + ['ExpGamingCore.Role']='./modules/ExpGamingCore/Role', + ['ExpGamingCommands.tags']='./modules/ExpGamingCommands/tags', + ['ExpGamingCommands.kill']='./modules/ExpGamingCommands/kill', + ['ExpGamingCommands.bonus']='./modules/ExpGamingCommands/bonus', + ['ExpGamingBot.autoChat']='./modules/ExpGamingBot/autoChat', + ['ExpGamingCore.Gui']='./modules/ExpGamingCore/Gui', + ['ExpGamingCore.Gui']='./modules/ExpGamingCore/Gui', + ['WarpPoints']='./modules/WarpPoints', + ['GuiAnnouncements']='./modules/GuiAnnouncements', + ['GameSettingsGui']='./modules/GameSettingsGui', + ['ExpGamingInfo.Tasklist']='./modules/ExpGamingInfo/Tasklist', + ['ExpGamingCore.Sync']='./modules/ExpGamingCore/Sync', + ['ExpGamingPlayer.polls']='./modules/ExpGamingPlayer/polls', + ['ExpGamingPlayer.playerInfo']='./modules/ExpGamingPlayer/playerInfo', + ['ExpGamingPlayer.afkKick']='./modules/ExpGamingPlayer/afkKick', + ['ExpGamingCore.Sync']='./modules/ExpGamingCore/Sync', + ['ExpGamingInfo.Science']='./modules/ExpGamingInfo/Science', + ['ExpGamingInfo.Rockets']='./modules/ExpGamingInfo/Rockets', + ['ExpGamingInfo.Readme']='./modules/ExpGamingInfo/Readme', + ['ExpGamingInfo']='./modules/ExpGamingInfo', + ['ExpGamingCore']='./modules/ExpGamingCore', + ['ExpGamingBot.discordAlerts']='./modules/ExpGamingBot/discordAlerts', + ['ExpGamingBot.autoMessage']='./modules/ExpGamingBot/autoMessage', + ['ExpGamingBot']='./modules/ExpGamingBot', + ['ExpGamingAdmin.AdminLib']='./modules/ExpGamingAdmin/AdminLib', + ['ExpGamingAdmin.AdminLib']='./modules/ExpGamingAdmin/AdminLib', + ['ExpGamingAdmin.TempBan']='./modules/ExpGamingAdmin/TempBan', + ['ExpGamingAdmin.ClearInventory']='./modules/ExpGamingAdmin/ClearInventory', + ['ExpGamingAdmin.TempBan']='./modules/ExpGamingAdmin/TempBan', + ['ExpGamingCommands.repair']='./modules/ExpGamingCommands/repair', + ['ExpGamingPlayer.playerList']='./modules/ExpGamingPlayer/playerList', + ['ExpGamingAdmin.Reports']='./modules/ExpGamingAdmin/Reports', + ['ExpGamingAdmin.Warnings']='./modules/ExpGamingAdmin/Warnings', + ['ExpGamingAdmin.Warnings']='./modules/ExpGamingAdmin/Warnings', + ['ExpGamingPlayer.inventorySearch']='./modules/ExpGamingPlayer/inventorySearch', + ['ExpGamingPlayer']='./modules/ExpGamingPlayer', + ['ExpGamingAdmin.Gui']='./modules/ExpGamingAdmin/Gui', + ['ExpGamingAdmin.Gui']='./modules/ExpGamingAdmin/Gui', + ['ExpGamingAdmin.Teleport']='./modules/ExpGamingAdmin/Teleport', + ['ExpGamingAdmin.Teleport']='./modules/ExpGamingAdmin/Teleport', + ['ExpGamingCommands.teleport']='./modules/ExpGamingCommands/teleport', + ['ExpGamingCommands']='./modules/ExpGamingCommands', + ['ExpGamingAdmin.Kick']='./modules/ExpGamingAdmin/Kick', + ['ExpGamingAdmin.Jail']='./modules/ExpGamingAdmin/Jail', + ['ExpGamingAdmin.Commands']='./modules/ExpGamingAdmin/Commands', + ['ExpGamingAdmin.Ban']='./modules/ExpGamingAdmin/Ban', + ['ExpGamingAdmin']='./modules/ExpGamingAdmin', + ['DeconControl']='./modules/DeconControl', + ['ChatPopup']='./modules/ChatPopup', + ['AdvancedStartingItems']='./modules/AdvancedStartingItems', } \ No newline at end of file