Basic Lua 5.0 compatibility for ETPro

2024-11-28 15:02:12 +00:00 · 2019-01-10 14:20:04 +01:00 · 2019-01-10 14:20:04 +01:00 · 1ab9877e77
commit 1ab9877e77
parent 5e3c966453
97 changed files with 413 additions and 395 deletions
--- a/luascripts/wolfadmin/admin/admin.lua
+++ b/luascripts/wolfadmin/admin/admin.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local util = require (wolfa_getLuaPath()..".util.util")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local util = wolfa_requireModule("util.util")

 local admin = {}

--- a/luascripts/wolfadmin/admin/balancer.lua
+++ b/luascripts/wolfadmin/admin/balancer.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local teams = require (wolfa_getLuaPath()..".game.teams")
+local teams = wolfa_requireModule("game.teams")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local bits = require (wolfa_getLuaPath()..".util.bits")
-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local tables = require (wolfa_getLuaPath()..".util.tables")
-local timers = require (wolfa_getLuaPath()..".util.timers")
-local util = require (wolfa_getLuaPath()..".util.util")
+local constants = wolfa_requireModule("util.constants")
+local bits = wolfa_requireModule("util.bits")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local tables = wolfa_requireModule("util.tables")
+local timers = wolfa_requireModule("util.timers")
+local util = wolfa_requireModule("util.util")

 local balancer = {}

--- a/luascripts/wolfadmin/admin/bans.lua
+++ b/luascripts/wolfadmin/admin/bans.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 local bans = {}

--- a/luascripts/wolfadmin/admin/history.lua
+++ b/luascripts/wolfadmin/admin/history.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 local history = {}

--- a/luascripts/wolfadmin/admin/mutes.lua
+++ b/luascripts/wolfadmin/admin/mutes.lua
@ -15,12 +15,12 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local events = require (wolfa_getLuaPath()..".util.events")
-local timers = require (wolfa_getLuaPath()..".util.timers")
+local events = wolfa_requireModule("util.events")
+local timers = wolfa_requireModule("util.timers")

 local mutes = {}

--- a/luascripts/wolfadmin/admin/rules.lua
+++ b/luascripts/wolfadmin/admin/rules.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local events = require (wolfa_getLuaPath()..".util.events")
-local files = require (wolfa_getLuaPath()..".util.files")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local events = wolfa_requireModule("util.events")
+local files = wolfa_requireModule("util.files")
+local settings = wolfa_requireModule("util.settings")

-local toml = require "toml"
+local toml = wolfa_requireLib("toml")

 local rules = {}

--- a/luascripts/wolfadmin/auth/acl.lua
+++ b/luascripts/wolfadmin/auth/acl.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local tables = require (wolfa_getLuaPath()..".util.tables")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local tables = wolfa_requireModule("util.tables")

 local acl = {}

--- a/luascripts/wolfadmin/auth/auth.lua
+++ b/luascripts/wolfadmin/auth/auth.lua
@ -15,10 +15,10 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")

 local auth = {}

@ -129,11 +129,11 @@ function auth.onGameInit()
            return
        end

-        srv = require (wolfa_getLuaPath()..".auth.acl")
+        srv = wolfa_requireModule("auth.acl")

        srv.readPermissions()
    else
-        srv = require (wolfa_getLuaPath()..".auth.shrubbot")
+        srv = wolfa_requireModule("auth.shrubbot")

        srv.loadFlags(et.trap_Cvar_Get("fs_game"))
    end
--- a/luascripts/wolfadmin/auth/shrubbot.lua
+++ b/luascripts/wolfadmin/auth/shrubbot.lua
@ -17,12 +17,12 @@

 local shrubbot = {}

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 local flags

 function shrubbot.loadFlags(mod)
-    flags = require (wolfa_getLuaPath()..".auth.shrubbot."..mod)
+    flags = wolfa_requireModule("auth.shrubbot."..mod)
 end

 function shrubbot.isPlayerAllowed(clientId, permission)
--- a/luascripts/wolfadmin/auth/shrubbot/etpub.lua
+++ b/luascripts/wolfadmin/auth/shrubbot/etpub.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

 -- ETPub shrubbot flags
 -- left by mod: fjlovyDHJOTY
--- a/luascripts/wolfadmin/auth/shrubbot/nq.lua
+++ b/luascripts/wolfadmin/auth/shrubbot/nq.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

 -- NoQuarter shrubbot flags
 -- left by mod: jlqyFHOQY
--- a/luascripts/wolfadmin/auth/shrubbot/silent.lua
+++ b/luascripts/wolfadmin/auth/shrubbot/silent.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

 -- silEnT shrubbot flags
 -- left by mod: fhjovyDHJOTY
--- a/luascripts/wolfadmin/commands/admin/admintest.lua
+++ b/luascripts/wolfadmin/commands/admin/admintest.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandAdminTest(clientId, command)
    local level = auth.getPlayerLevel(clientId)
--- a/luascripts/wolfadmin/commands/admin/balance.lua
+++ b/luascripts/wolfadmin/commands/admin/balance.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local balancer = require (wolfa_getLuaPath()..".admin.balancer")
+local commands = wolfa_requireModule("commands.commands")
+local auth = wolfa_requireModule("auth.auth")
+local balancer = wolfa_requireModule("admin.balancer")

 function commandBalance(clientId, command, action)
    if action == "enable" then
--- a/luascripts/wolfadmin/commands/admin/ban.lua
+++ b/luascripts/wolfadmin/commands/admin/ban.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local bans = require (wolfa_getLuaPath()..".admin.bans")
-local history = require (wolfa_getLuaPath()..".admin.history")
+local bans = wolfa_requireModule("admin.bans")
+local history = wolfa_requireModule("admin.history")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local settings = wolfa_requireModule("util.settings")

 function commandBan(clientId, command, victim, ...)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/cointoss.lua
+++ b/luascripts/wolfadmin/commands/admin/cointoss.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 function commandCoinToss(clientId, command)
    math.randomseed(os.time())
--- a/luascripts/wolfadmin/commands/admin/enablevote.lua
+++ b/luascripts/wolfadmin/commands/admin/enablevote.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local voting = require (wolfa_getLuaPath()..".game.voting")
+local commands = wolfa_requireModule("commands.commands")
+local auth = wolfa_requireModule("auth.auth")
+local voting = wolfa_requireModule("game.voting")

 function commandEnableVote(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^denablevote: ^9next map voting has been enabled.\";")
--- a/luascripts/wolfadmin/commands/admin/finger.lua
+++ b/luascripts/wolfadmin/commands/admin/finger.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandFinger(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/gib.lua
+++ b/luascripts/wolfadmin/commands/admin/gib.lua
@ -15,14 +15,14 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local constants = wolfa_requireModule("util.constants")
+local settings = wolfa_requireModule("util.settings")

 function commandGib(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/greeting.lua
+++ b/luascripts/wolfadmin/commands/admin/greeting.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local greetings = require (wolfa_getLuaPath()..".players.greetings")
+local greetings = wolfa_requireModule("players.greetings")

 function commandGreeting(clientId, command)
    local greeting = greetings.get(clientId)
--- a/luascripts/wolfadmin/commands/admin/help.lua
+++ b/luascripts/wolfadmin/commands/admin/help.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandHelp(clientId, command, cmd)
    local cmds = commands.getadmin()
--- a/luascripts/wolfadmin/commands/admin/incognito.lua
+++ b/luascripts/wolfadmin/commands/admin/incognito.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

 function commandIncognito(clientId, command)
    local isIncognito = auth.isPlayerAllowed(clientId, auth.PERM_INCOGNITO, true)
--- a/luascripts/wolfadmin/commands/admin/kick.lua
+++ b/luascripts/wolfadmin/commands/admin/kick.lua
@ -15,14 +15,14 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local admin = require (wolfa_getLuaPath()..".admin.admin")
-local history = require (wolfa_getLuaPath()..".admin.history")
+local admin = wolfa_requireModule("admin.admin")
+local history = wolfa_requireModule("admin.history")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandKick(clientId, command, victim, ...)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/kickbots.lua
+++ b/luascripts/wolfadmin/commands/admin/kickbots.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local bots = require (wolfa_getLuaPath()..".game.bots")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local bots = wolfa_requireModule("game.bots")

 function commandBotsOff(clientId, command)
    bots.enable(false)
--- a/luascripts/wolfadmin/commands/admin/listaliases.lua
+++ b/luascripts/wolfadmin/commands/admin/listaliases.lua
@ -15,16 +15,16 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local pagination = require (wolfa_getLuaPath()..".util.pagination")
-local util = require (wolfa_getLuaPath()..".util.util")
+local pagination = wolfa_requireModule("util.pagination")
+local util = wolfa_requireModule("util.util")

 function commandListAliases(clientId, command, victim, offset)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/listmaps.lua
+++ b/luascripts/wolfadmin/commands/admin/listmaps.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local game = require (wolfa_getLuaPath()..".game.game")
+local game = wolfa_requireModule("game.game")

 function commandListMaps(clientId, command)
    local maps = game.getMaps()
--- a/luascripts/wolfadmin/commands/admin/listplayers.lua
+++ b/luascripts/wolfadmin/commands/admin/listplayers.lua
@ -15,16 +15,16 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local fireteams = require (wolfa_getLuaPath()..".game.fireteams")
+local fireteams = wolfa_requireModule("game.fireteams")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local settings = require (wolfa_getLuaPath()..".util.settings")
-local util = require (wolfa_getLuaPath()..".util.util")
+local settings = wolfa_requireModule("util.settings")
+local util = wolfa_requireModule("util.util")

 function commandListPlayers(clientId, command)
    local playersOnline = {}
--- a/luascripts/wolfadmin/commands/admin/lock.lua
+++ b/luascripts/wolfadmin/commands/admin/lock.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local teams = require (wolfa_getLuaPath()..".game.teams")
+local teams = wolfa_requireModule("game.teams")

-local util = require (wolfa_getLuaPath()..".util.util")
-local constants = require (wolfa_getLuaPath()..".util.constants")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local constants = wolfa_requireModule("util.constants")
+local settings = wolfa_requireModule("util.settings")

 function commandLock(clientId, command, team)
    if team == nil or (team ~= constants.TEAM_AXIS_SC and team ~= constants.TEAM_ALLIES_SC and team ~= constants.TEAM_SPECTATORS_SC and team ~= "all") then
--- a/luascripts/wolfadmin/commands/admin/mute.lua
+++ b/luascripts/wolfadmin/commands/admin/mute.lua
@ -15,17 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local history = require (wolfa_getLuaPath()..".admin.history")
-local mutes = require (wolfa_getLuaPath()..".admin.mutes")
+local history = wolfa_requireModule("admin.history")
+local mutes = wolfa_requireModule("admin.mutes")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local util = require (wolfa_getLuaPath()..".util.util")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local settings = wolfa_requireModule("util.settings")

 function commandMute(clientId, command, victim, ...)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/needbots.lua
+++ b/luascripts/wolfadmin/commands/admin/needbots.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local bots = require (wolfa_getLuaPath()..".game.bots")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local bots = wolfa_requireModule("game.bots")

 function commandBotsOn(clientId, command)
    bots.enable(true)
--- a/luascripts/wolfadmin/commands/admin/nextmap.lua
+++ b/luascripts/wolfadmin/commands/admin/nextmap.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandNextMap(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dnextmap: ^9next map was loaded.\";")
--- a/luascripts/wolfadmin/commands/admin/pause.lua
+++ b/luascripts/wolfadmin/commands/admin/pause.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandPause(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dpause: ^9map paused.\";")
--- a/luascripts/wolfadmin/commands/admin/plock.lua
+++ b/luascripts/wolfadmin/commands/admin/plock.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 function commandPlayerLock(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/punlock.lua
+++ b/luascripts/wolfadmin/commands/admin/punlock.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 function commandPlayerUnlock(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/put.lua
+++ b/luascripts/wolfadmin/commands/admin/put.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local admin = require (wolfa_getLuaPath()..".admin.admin")
+local admin = wolfa_requireModule("admin.admin")

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
-local constants = require (wolfa_getLuaPath()..".util.constants")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local constants = wolfa_requireModule("util.constants")
+local settings = wolfa_requireModule("util.settings")

 function commandPlayerLock(clientId, command, victim, team)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/putbots.lua
+++ b/luascripts/wolfadmin/commands/admin/putbots.lua
@ -15,12 +15,12 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local constants = require (wolfa_getLuaPath()..".util.constants")
-local util = require (wolfa_getLuaPath()..".util.util")
-local balancer = require (wolfa_getLuaPath()..".admin.balancer")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local bots = require (wolfa_getLuaPath()..".game.bots")
+local auth = wolfa_requireModule("auth.auth")
+local constants = wolfa_requireModule("util.constants")
+local util = wolfa_requireModule("util.util")
+local balancer = wolfa_requireModule("admin.balancer")
+local commands = wolfa_requireModule("commands.commands")
+local bots = wolfa_requireModule("game.bots")

 function commandPutBots(clientId, command, team)
    if team == nil and team ~= constants.TEAM_AXIS_SC and team ~= constants.TEAM_ALLIES_SC and team ~= constants.TEAM_SPECTATORS_SC then
--- a/luascripts/wolfadmin/commands/admin/readconfig.lua
+++ b/luascripts/wolfadmin/commands/admin/readconfig.lua
@ -15,17 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local rules = require (wolfa_getLuaPath()..".admin.rules")
+local rules = wolfa_requireModule("admin.rules")

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local sprees = require (wolfa_getLuaPath()..".game.sprees")
+local sprees = wolfa_requireModule("game.sprees")

-local greetings = require (wolfa_getLuaPath()..".players.greetings")
+local greetings = wolfa_requireModule("players.greetings")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandReadconfig(clientId, command)
    settings.load()
--- a/luascripts/wolfadmin/commands/admin/reset.lua
+++ b/luascripts/wolfadmin/commands/admin/reset.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandReset(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dreset: ^9match reset.\";")
--- a/luascripts/wolfadmin/commands/admin/resetsprees.lua
+++ b/luascripts/wolfadmin/commands/admin/resetsprees.lua
@ -15,16 +15,16 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local game = require (wolfa_getLuaPath()..".game.game")
-local sprees = require (wolfa_getLuaPath()..".game.sprees")
+local game = wolfa_requireModule("game.game")
+local sprees = wolfa_requireModule("game.sprees")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandResetSprees(clientId, command, map)
    if not db.isConnected() then
--- a/luascripts/wolfadmin/commands/admin/restart.lua
+++ b/luascripts/wolfadmin/commands/admin/restart.lua
@ -15,10 +15,10 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local game = require (wolfa_getLuaPath()..".game.game")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local game = wolfa_requireModule("game.game")
+local settings = wolfa_requireModule("util.settings")

 function commandRestart(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^drestart: ^9map restarted.\";")
--- a/luascripts/wolfadmin/commands/admin/rules.lua
+++ b/luascripts/wolfadmin/commands/admin/rules.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local rules = require (wolfa_getLuaPath()..".admin.rules")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local rules = wolfa_requireModule("admin.rules")

 function commandRules(clientId, command, rule)
    if not rule then
--- a/luascripts/wolfadmin/commands/admin/setlevel.lua
+++ b/luascripts/wolfadmin/commands/admin/setlevel.lua
@ -15,16 +15,16 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local admin = require (wolfa_getLuaPath()..".admin.admin")
-local history = require (wolfa_getLuaPath()..".admin.history")
+local admin = wolfa_requireModule("admin.admin")
+local history = wolfa_requireModule("admin.history")

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandSetLevel(clientId, command, victim, level)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/showbans.lua
+++ b/luascripts/wolfadmin/commands/admin/showbans.lua
@ -15,17 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local bans = require (wolfa_getLuaPath()..".admin.bans")
+local bans = wolfa_requireModule("admin.bans")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local pagination = require (wolfa_getLuaPath()..".util.pagination")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local util = require (wolfa_getLuaPath()..".util.util")
+local pagination = wolfa_requireModule("util.pagination")
+local settings = wolfa_requireModule("util.settings")
+local util = wolfa_requireModule("util.util")

 function commandShowBans(clientId, offset)
    if not db.isConnected() then
--- a/luascripts/wolfadmin/commands/admin/showhistory.lua
+++ b/luascripts/wolfadmin/commands/admin/showhistory.lua
@ -15,17 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local history = require (wolfa_getLuaPath()..".admin.history")
+local history = wolfa_requireModule("admin.history")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
-local pagination = require (wolfa_getLuaPath()..".util.pagination")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local pagination = wolfa_requireModule("util.pagination")
+local settings = wolfa_requireModule("util.settings")

 function commandListHistory(clientId, command, victim, offset)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/shuffle.lua
+++ b/luascripts/wolfadmin/commands/admin/shuffle.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandShuffle(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by XP.\";")
--- a/luascripts/wolfadmin/commands/admin/shufflesr.lua
+++ b/luascripts/wolfadmin/commands/admin/shufflesr.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandShuffleSR(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dshuffle: ^9teams were shuffled by Skill Rating.\";")
--- a/luascripts/wolfadmin/commands/admin/slap.lua
+++ b/luascripts/wolfadmin/commands/admin/slap.lua
@ -15,14 +15,14 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local constants = wolfa_requireModule("util.constants")
+local settings = wolfa_requireModule("util.settings")

 function commandSlap(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/spec999.lua
+++ b/luascripts/wolfadmin/commands/admin/spec999.lua
@ -15,16 +15,16 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local admin = require (wolfa_getLuaPath()..".admin.admin")
+local admin = wolfa_requireModule("admin.admin")

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local constants = wolfa_requireModule("util.constants")
+local settings = wolfa_requireModule("util.settings")

 function commandSpec999(clientId, command)
    local count = 0
--- a/luascripts/wolfadmin/commands/admin/sprees.lua
+++ b/luascripts/wolfadmin/commands/admin/sprees.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local sprees = require (wolfa_getLuaPath()..".game.sprees")
+local sprees = wolfa_requireModule("game.sprees")

 function commandShowSprees(clientId, command)
    if not db.isConnected() then
--- a/luascripts/wolfadmin/commands/admin/stats.lua
+++ b/luascripts/wolfadmin/commands/admin/stats.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandShowStats(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/swap.lua
+++ b/luascripts/wolfadmin/commands/admin/swap.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandSwap(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dswap: ^9teams swapped.\";")
--- a/luascripts/wolfadmin/commands/admin/time.lua
+++ b/luascripts/wolfadmin/commands/admin/time.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
-local commands = require (wolfa_getLuaPath()..".commands.commands")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local auth = wolfa_requireModule("auth.auth")
+local commands = wolfa_requireModule("commands.commands")
+local settings = wolfa_requireModule("util.settings")

 function commandTime(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dtime: ^9current time is ^7"..os.date("%H:%M:%S").."^9.\";")
--- a/luascripts/wolfadmin/commands/admin/unban.lua
+++ b/luascripts/wolfadmin/commands/admin/unban.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local bans = require (wolfa_getLuaPath()..".admin.bans")
+local bans = wolfa_requireModule("admin.bans")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandRemoveBan(clientId, command, banId)
    if settings.get("g_standalone") == 0 or not db.isConnected() then
--- a/luascripts/wolfadmin/commands/admin/unlock.lua
+++ b/luascripts/wolfadmin/commands/admin/unlock.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local teams = require (wolfa_getLuaPath()..".game.teams")
+local teams = wolfa_requireModule("game.teams")

-local util = require (wolfa_getLuaPath()..".util.util")
-local constants = require (wolfa_getLuaPath()..".util.constants")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local constants = wolfa_requireModule("util.constants")
+local settings = wolfa_requireModule("util.settings")

 function commandUnlock(clientId, command, team)
    if team == nil or (team ~= constants.TEAM_AXIS_SC and team ~= constants.TEAM_ALLIES_SC and team ~= constants.TEAM_SPECTATORS_SC and team ~= "all") then
--- a/luascripts/wolfadmin/commands/admin/unmute.lua
+++ b/luascripts/wolfadmin/commands/admin/unmute.lua
@ -15,15 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local mutes = require (wolfa_getLuaPath()..".admin.mutes")
+local mutes = wolfa_requireModule("admin.mutes")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandUnmute(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/unpause.lua
+++ b/luascripts/wolfadmin/commands/admin/unpause.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandUnpause(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat -1 \"^dpause: ^9map unpaused.\";")
--- a/luascripts/wolfadmin/commands/admin/vmute.lua
+++ b/luascripts/wolfadmin/commands/admin/vmute.lua
@ -15,16 +15,16 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local history = require (wolfa_getLuaPath()..".admin.history")
-local mutes = require (wolfa_getLuaPath()..".admin.mutes")
+local history = wolfa_requireModule("admin.history")
+local mutes = wolfa_requireModule("admin.mutes")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandVoiceMute(clientId, command, victim, ...)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/vunmute.lua
+++ b/luascripts/wolfadmin/commands/admin/vunmute.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 function commandVoiceUnmute(clientId, command, victim)
    local cmdClient
--- a/luascripts/wolfadmin/commands/admin/warn.lua
+++ b/luascripts/wolfadmin/commands/admin/warn.lua
@ -15,17 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local history = require (wolfa_getLuaPath()..".admin.history")
+local history = wolfa_requireModule("admin.history")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandWarn(clientId, command, victim, ...)
    local cmdClient
--- a/luascripts/wolfadmin/commands/client/ac.lua
+++ b/luascripts/wolfadmin/commands/client/ac.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 function commandAdminChat(clientId, command, ...)
    if not ... then
--- a/luascripts/wolfadmin/commands/client/callvote.lua
+++ b/luascripts/wolfadmin/commands/client/callvote.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local events = require (wolfa_getLuaPath()..".util.events")
+local events = wolfa_requireModule("util.events")

 function commandCallVote(clientId, command)
    local voteArguments = {}
--- a/luascripts/wolfadmin/commands/client/pm.lua
+++ b/luascripts/wolfadmin/commands/client/pm.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local logs = require (wolfa_getLuaPath()..".util.logs")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local util = require (wolfa_getLuaPath()..".util.util")
+local logs = wolfa_requireModule("util.logs")
+local settings = wolfa_requireModule("util.settings")
+local util = wolfa_requireModule("util.util")

 function commandPersonalMessage(clientId, command, recipient, ...)
    if recipient and ... then
--- a/luascripts/wolfadmin/commands/client/r.lua
+++ b/luascripts/wolfadmin/commands/client/r.lua
@ -15,10 +15,10 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local logs = require (wolfa_getLuaPath()..".util.logs")
-local players = require (wolfa_getLuaPath()..".players.players")
+local logs = wolfa_requireModule("util.logs")
+local players = wolfa_requireModule("players.players")

 function commandR(clientId, command, ...)
    if not ... then
--- a/luascripts/wolfadmin/commands/client/say.lua
+++ b/luascripts/wolfadmin/commands/client/say.lua
@ -15,12 +15,12 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local logs = require (wolfa_getLuaPath()..".util.logs")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local logs = wolfa_requireModule("util.logs")
+local settings = wolfa_requireModule("util.settings")

 local types = {
    ["say"] = "chat",
--- a/luascripts/wolfadmin/commands/client/team.lua
+++ b/luascripts/wolfadmin/commands/client/team.lua
@ -15,14 +15,14 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local teams = require (wolfa_getLuaPath()..".game.teams")
+local teams = wolfa_requireModule("game.teams")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local util = require (wolfa_getLuaPath()..".util.util")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = wolfa_requireModule("util.util")
+local settings = wolfa_requireModule("util.settings")

 function commandTeam(clientId, command)
    if players.isTeamLocked(clientId) then
--- a/luascripts/wolfadmin/commands/client/wolfadmin.lua
+++ b/luascripts/wolfadmin/commands/client/wolfadmin.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

 function commandWolfAdmin(clientId, command)
    et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^3This server is running ^7Wolf^1Admin ^7"..wolfa_getVersion().." ^3("..wolfa_getRelease().."^3)\";")
--- a/luascripts/wolfadmin/commands/commands.lua
+++ b/luascripts/wolfadmin/commands/commands.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local util = require (wolfa_getLuaPath()..".util.util")
-local events = require (wolfa_getLuaPath()..".util.events")
-local files = require (wolfa_getLuaPath()..".util.files")
-local logs = require (wolfa_getLuaPath()..".util.logs")
-local tables = require (wolfa_getLuaPath()..".util.tables")
+local util = wolfa_requireModule("util.util")
+local events = wolfa_requireModule("util.events")
+local files = wolfa_requireModule("util.files")
+local logs = wolfa_requireModule("util.logs")
+local tables = wolfa_requireModule("util.tables")

 local commands = {}

@ -96,7 +96,7 @@ function commands.loadFiles(dir)
    
    for _, file in pairs(files) do
        if string.match(string.lower(file), "^[a-z0-9]+%.lua$") then
-            require (wolfa_getLuaPath()..".commands."..dir.."."..string.sub(file, 1, string.len(file) - 4))
+            wolfa_requireModule("commands."..dir.."."..string.sub(file, 1, string.len(file) - 4))
            
            amount = amount + 1
        end
--- a/luascripts/wolfadmin/commands/server/acl.lua
+++ b/luascripts/wolfadmin/commands/server/acl.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local acl = require (wolfa_getLuaPath()..".auth.acl")
+local acl = wolfa_requireModule("auth.acl")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 function commandAclListLevels()
    for _, level in ipairs(acl.getLevels()) do
--- a/luascripts/wolfadmin/commands/server/cannounce.lua
+++ b/luascripts/wolfadmin/commands/server/cannounce.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandClientAnnounce(command, clientId, text)
    local clientId = tonumber(clientId)
--- a/luascripts/wolfadmin/commands/server/cchat.lua
+++ b/luascripts/wolfadmin/commands/server/cchat.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandClientChatPrint(command, clientId, text)
    local clientId = tonumber(clientId)
--- a/luascripts/wolfadmin/commands/server/ccp.lua
+++ b/luascripts/wolfadmin/commands/server/ccp.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandClientCenterPrint(command, clientId, text)
    local clientId = tonumber(clientId)
--- a/luascripts/wolfadmin/commands/server/ccpm.lua
+++ b/luascripts/wolfadmin/commands/server/ccpm.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandClientCPM(command, clientId, text)
    local clientId = tonumber(clientId)
--- a/luascripts/wolfadmin/commands/server/cmusic.lua
+++ b/luascripts/wolfadmin/commands/server/cmusic.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandClientPlayMusic(command, clientId, text)
    local clientId = tonumber(clientId)
--- a/luascripts/wolfadmin/commands/server/csay.lua
+++ b/luascripts/wolfadmin/commands/server/csay.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local commands = require (wolfa_getLuaPath()..".commands.commands")
+local commands = wolfa_requireModule("commands.commands")

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 function commandClientConsolePrint(command, clientId, text)
    local clientId = tonumber(clientId)
--- a/luascripts/wolfadmin/db/db.lua
+++ b/luascripts/wolfadmin/db/db.lua
@ -15,8 +15,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")

 local db = {}

@ -32,9 +32,9 @@ end
 function db.oninit()
    if settings.get("db_type") ~= "none" then
        if settings.get("db_type") == "sqlite3" then
-            con = require (wolfa_getLuaPath()..".db.sqlite3")
+            con = wolfa_requireModule("db.sqlite3")
        elseif settings.get("db_type") == "mysql" then
-            con = require (wolfa_getLuaPath()..".db.mysql")
+            con = wolfa_requireModule("db.mysql")
        else
            outputDebug("Invalid database system (none|sqlite3|mysql), defaulting to 'none'.")

--- a/luascripts/wolfadmin/db/mysql.lua
+++ b/luascripts/wolfadmin/db/mysql.lua
@ -15,12 +15,12 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local util = require (wolfa_getLuaPath()..".util.util")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local tables = require (wolfa_getLuaPath()..".util.tables")
+local constants = wolfa_requireModule("util.constants")
+local util = wolfa_requireModule("util.util")
+local settings = wolfa_requireModule("util.settings")
+local tables = wolfa_requireModule("util.tables")

 local luasql = require "luasql.mysql"

--- a/luascripts/wolfadmin/db/sqlite3.lua
+++ b/luascripts/wolfadmin/db/sqlite3.lua
@ -15,12 +15,12 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local util = require (wolfa_getLuaPath()..".util.util")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local tables = require (wolfa_getLuaPath()..".util.tables")
+local constants = wolfa_requireModule("util.constants")
+local util = wolfa_requireModule("util.util")
+local settings = wolfa_requireModule("util.settings")
+local tables = wolfa_requireModule("util.tables")

 local luasql = require "luasql.sqlite3"

--- a/luascripts/wolfadmin/game/bots.lua
+++ b/luascripts/wolfadmin/game/bots.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local util = require (wolfa_getLuaPath()..".util.util")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local util = wolfa_requireModule("util.util")

 local bots = {}

--- a/luascripts/wolfadmin/game/fireteams.lua
+++ b/luascripts/wolfadmin/game/fireteams.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local bits = require (wolfa_getLuaPath()..".util.bits")
+local bits = wolfa_requireModule("util.bits")

 local fireteams = {}

--- a/luascripts/wolfadmin/game/game.lua
+++ b/luascripts/wolfadmin/game/game.lua
@ -15,11 +15,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local util = require (wolfa_getLuaPath()..".util.util")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local util = wolfa_requireModule("util.util")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 local game = {}

--- a/luascripts/wolfadmin/game/sprees.lua
+++ b/luascripts/wolfadmin/game/sprees.lua
@ -15,19 +15,19 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local game = require (wolfa_getLuaPath()..".game.game")
+local game = wolfa_requireModule("game.game")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local bits = require (wolfa_getLuaPath()..".util.bits")
-local constants = require (wolfa_getLuaPath()..".util.constants")
-local events = require (wolfa_getLuaPath()..".util.events")
-local files = require (wolfa_getLuaPath()..".util.files")
-local settings = require (wolfa_getLuaPath()..".util.settings")
+local bits = wolfa_requireModule("util.bits")
+local constants = wolfa_requireModule("util.constants")
+local events = wolfa_requireModule("util.events")
+local files = wolfa_requireModule("util.files")
+local settings = wolfa_requireModule("util.settings")

-local toml = require "toml"
+local toml = wolfa_requireLib("toml")

 local sprees = {}

--- a/luascripts/wolfadmin/game/teams.lua
+++ b/luascripts/wolfadmin/game/teams.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local tables = require (wolfa_getLuaPath()..".util.tables")
-local events = require (wolfa_getLuaPath()..".util.events")
+local constants = wolfa_requireModule("util.constants")
+local tables = wolfa_requireModule("util.tables")
+local events = wolfa_requireModule("util.events")

 local teams = {}

--- a/luascripts/wolfadmin/game/voting.lua
+++ b/luascripts/wolfadmin/game/voting.lua
@ -15,13 +15,13 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local timers = require (wolfa_getLuaPath()..".util.timers")
-local util = require (wolfa_getLuaPath()..".util.util")
+local constants = wolfa_requireModule("util.constants")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local timers = wolfa_requireModule("util.timers")
+local util = wolfa_requireModule("util.util")

 local voting = {}

--- a/luascripts/wolfadmin/main.lua
+++ b/luascripts/wolfadmin/main.lua
@ -55,7 +55,8 @@ local release = "4 January 2019"

 local basepath
 local homepath
-local luapath
+local lualibspath
+local luamodspath

 -- need to do this somewhere else
 function wolfa_getVersion()
@ -74,53 +75,70 @@ function wolfa_getHomePath()
    return homepath
 end

-function wolfa_getLuaPath()
-    return luapath
+function wolfa_getLuaLibsPath()
+    return lualibspath
+end
+
+function wolfa_getLuaModsPath()
+    return luamodspath
+end
+
+function wolfa_requireLib(lib)
+    return require(wolfa_getLuaLibsPath().."/"..string.gsub(lib, "%.", "/"))
+end
+
+function wolfa_requireModule(module)
+    return require(wolfa_getLuaModsPath().."/"..string.gsub(module, "%.", "/"))
 end

 function et_InitGame(levelTime, randomSeed, restartMap)
    -- set up paths
    basepath = string.gsub(et.trap_Cvar_Get("fs_basepath"), "\\", "/").."/"..et.trap_Cvar_Get("fs_game").."/"
    homepath = string.gsub(et.trap_Cvar_Get("fs_homepath"), "\\", "/").."/"..et.trap_Cvar_Get("fs_game").."/"
-    luapath = string.gsub(debug.getinfo(1).source, "[\\/]", "."):sub(0, -10)
+    lualibspath = "lualibs"
+    luamodspath = "luascripts/wolfadmin"
+
+    if debug then
+        luamodspath = string.sub(debug.getinfo(1).source, 0, -10)
+    end

    -- load modules
-    require (wolfa_getLuaPath()..".util.debug")
+    wolfa_requireModule("util.debug")

-    admin = require (wolfa_getLuaPath()..".admin.admin")
-    balancer = require (wolfa_getLuaPath()..".admin.balancer")
-    bans = require (wolfa_getLuaPath()..".admin.bans")
-    history = require (wolfa_getLuaPath()..".admin.history")
-    mutes = require (wolfa_getLuaPath()..".admin.mutes")
-    rules = require (wolfa_getLuaPath()..".admin.rules")
+    admin = wolfa_requireModule("admin.admin")
+    balancer = wolfa_requireModule("admin.balancer")
+    bans = wolfa_requireModule("admin.bans")
+    history = wolfa_requireModule("admin.history")
+    mutes = wolfa_requireModule("admin.mutes")
+    rules = wolfa_requireModule("admin.rules")

-    auth = require (wolfa_getLuaPath()..".auth.auth")
+    auth = wolfa_requireModule("auth.auth")

-    db = require (wolfa_getLuaPath()..".db.db")
+    db = wolfa_requireModule("db.db")

-    commands = require (wolfa_getLuaPath()..".commands.commands")
+    commands = wolfa_requireModule("commands.commands")

-    bots = require (wolfa_getLuaPath()..".game.bots")
-    game = require (wolfa_getLuaPath()..".game.game")
-    fireteams = require (wolfa_getLuaPath()..".game.fireteams")
-    sprees = require (wolfa_getLuaPath()..".game.sprees")
-    teams = require (wolfa_getLuaPath()..".game.teams")
-    voting = require (wolfa_getLuaPath()..".game.voting")
+    bots = wolfa_requireModule("game.bots")
+    game = wolfa_requireModule("game.game")
+    fireteams = wolfa_requireModule("game.fireteams")
+    sprees = wolfa_requireModule("game.sprees")
+    teams = wolfa_requireModule("game.teams")
+    voting = wolfa_requireModule("game.voting")

-    greetings = require (wolfa_getLuaPath()..".players.greetings")
-    players = require (wolfa_getLuaPath()..".players.players")
-    stats = require (wolfa_getLuaPath()..".players.stats")
+    greetings = wolfa_requireModule("players.greetings")
+    players = wolfa_requireModule("players.players")
+    stats = wolfa_requireModule("players.stats")

-    bits = require (wolfa_getLuaPath()..".util.bits")
-    constants = require (wolfa_getLuaPath()..".util.constants")
-    events = require (wolfa_getLuaPath()..".util.events")
-    files = require (wolfa_getLuaPath()..".util.files")
-    logs = require (wolfa_getLuaPath()..".util.logs")
-    pagination = require (wolfa_getLuaPath()..".util.pagination")
-    settings = require (wolfa_getLuaPath()..".util.settings")
-    tables = require (wolfa_getLuaPath()..".util.tables")
-    timers = require (wolfa_getLuaPath()..".util.timers")
-    util = require (wolfa_getLuaPath()..".util.util")
+    bits = wolfa_requireModule("util.bits")
+    constants = wolfa_requireModule("util.constants")
+    events = wolfa_requireModule("util.events")
+    files = wolfa_requireModule("util.files")
+    logs = wolfa_requireModule("util.logs")
+    pagination = wolfa_requireModule("util.pagination")
+    settings = wolfa_requireModule("util.settings")
+    tables = wolfa_requireModule("util.tables")
+    timers = wolfa_requireModule("util.timers")
+    util = wolfa_requireModule("util.util")

    -- register the module
    et.RegisterModname("WolfAdmin "..wolfa_getVersion())
--- a/luascripts/wolfadmin/players/greetings.lua
+++ b/luascripts/wolfadmin/players/greetings.lua
@ -15,19 +15,19 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local auth = require (wolfa_getLuaPath()..".auth.auth")
+local auth = wolfa_requireModule("auth.auth")

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local util = require (wolfa_getLuaPath()..".util.util")
-local events = require (wolfa_getLuaPath()..".util.events")
-local settings = require (wolfa_getLuaPath()..".util.settings")
-local files = require (wolfa_getLuaPath()..".util.files")
+local constants = wolfa_requireModule("util.constants")
+local util = wolfa_requireModule("util.util")
+local events = wolfa_requireModule("util.events")
+local settings = wolfa_requireModule("util.settings")
+local files = wolfa_requireModule("util.files")

-local toml = require "toml"
+local toml = wolfa_requireLib("toml")

 local greetings = {}

--- a/luascripts/wolfadmin/players/players.lua
+++ b/luascripts/wolfadmin/players/players.lua
@ -15,10 +15,10 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local db = require (wolfa_getLuaPath()..".db.db")
+local db = wolfa_requireModule("db.db")

-local bits = require (wolfa_getLuaPath()..".util.bits")
-local events = require (wolfa_getLuaPath()..".util.events")
+local bits = wolfa_requireModule("util.bits")
+local events = wolfa_requireModule("util.events")

 local players = {}

--- a/luascripts/wolfadmin/players/stats.lua
+++ b/luascripts/wolfadmin/players/stats.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

 local stats = {}

--- a/luascripts/wolfadmin/util/bits.lua
+++ b/luascripts/wolfadmin/util/bits.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 local bits = {}

--- a/luascripts/wolfadmin/util/debug.lua
+++ b/luascripts/wolfadmin/util/debug.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 local COLOURS_CHAT = {
    [1] = "^_", -- termination
--- a/luascripts/wolfadmin/util/events.lua
+++ b/luascripts/wolfadmin/util/events.lua
@ -15,8 +15,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local constants = require (wolfa_getLuaPath()..".util.constants")
-local util = require (wolfa_getLuaPath()..".util.util")
+local constants = wolfa_requireModule("util.constants")
+local util = wolfa_requireModule("util.util")

 local events = {}

--- a/luascripts/wolfadmin/util/files.lua
+++ b/luascripts/wolfadmin/util/files.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 local files = {}

@ -24,9 +24,9 @@ function files.ls(directory)
    local entries = {}
    
    if platform == "unix" then
-        command = 'ls -1 "'..wolfa_getBasePath()..wolfa_getLuaPath():gsub("%.", "/").."/"..directory..'"'
+        command = 'ls -1 "'..wolfa_getBasePath()..wolfa_getLuaModsPath():gsub("%.", "/").."/"..directory..'"'
    elseif platform == "windows" then
-        command = 'dir "'..wolfa_getBasePath()..wolfa_getLuaPath():gsub("%.", "/").."/"..directory..'" /b'
+        command = 'dir "'..wolfa_getBasePath()..wolfa_getLuaModsPath():gsub("%.", "/").."/"..directory..'" /b'
    end

    for filename in io.popen(command):lines() do
--- a/luascripts/wolfadmin/util/logs.lua
+++ b/luascripts/wolfadmin/util/logs.lua
@ -15,9 +15,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local players = require (wolfa_getLuaPath()..".players.players")
+local players = wolfa_requireModule("players.players")

-local settings = require (wolfa_getLuaPath()..".util.settings")
+local settings = wolfa_requireModule("util.settings")

 local logs = {}

--- a/luascripts/wolfadmin/util/pagination.lua
+++ b/luascripts/wolfadmin/util/pagination.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 local pagination = {}

--- a/luascripts/wolfadmin/util/settings.lua
+++ b/luascripts/wolfadmin/util/settings.lua
@ -15,8 +15,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local toml = require "toml"
-local events = require (wolfa_getLuaPath()..".util.events")
+local toml = wolfa_requireLib("toml")
+local events = wolfa_requireModule("util.events")

 local settings = {}

@ -159,7 +159,7 @@ function settings.load()
        -- compatibility for 1.1.* and lower
        outputDebug("Using .cfg files is deprecated as of 1.2.0. Please consider updating to .toml files.", 3)

-        local files = require (wolfa_getLuaPath()..".util.files")
+        local files = wolfa_requireModule("util.files")
        local _, array = files.loadFromCFG("wolfadmin.cfg", "[a-z]+")

        for blocksname, settings in pairs(array) do
--- a/luascripts/wolfadmin/util/tables.lua
+++ b/luascripts/wolfadmin/util/tables.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local util = require (wolfa_getLuaPath()..".util.util")
+local util = wolfa_requireModule("util.util")

 local tables = {}

--- a/luascripts/wolfadmin/util/timers.lua
+++ b/luascripts/wolfadmin/util/timers.lua
@ -15,8 +15,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local events = require (wolfa_getLuaPath()..".util.events")
-local tables = require (wolfa_getLuaPath()..".util.tables")
+local events = wolfa_requireModule("util.events")
+local tables = wolfa_requireModule("util.tables")

 local timers = {}

--- a/luascripts/wolfadmin/util/util.lua
+++ b/luascripts/wolfadmin/util/util.lua
@ -15,7 +15,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.

-local constants = require (wolfa_getLuaPath()..".util.constants")
+local constants = wolfa_requireModule("util.constants")

 local util = {}