Dynamic loading of modules (fixes #71)

timosmit · Jan 18, 2017 · cd4bf52 · cd4bf52
1 parent 7a93c4b
commit cd4bf52
Show file tree

Hide file tree

Showing 84 changed files with 423 additions and 388 deletions.
diff --git a/luamods/wolfadmin/admin/admin.lua b/luamods/wolfadmin/admin/admin.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 db = require "luamods.wolfadmin.db.db"
+local db = require (wolfa_getLuaPath()..".db.db")
 
-local players = require "luamods.wolfadmin.players.players"
--- local stats = require "luamods.wolfadmin.players.stats"
+local players = require (wolfa_getLuaPath()..".players.players")
+-- local stats = require (wolfa_getLuaPath()..".players.stats")
 
-local constants = require "luamods.wolfadmin.util.constants"
-local events = require "luamods.wolfadmin.util.events"
-local files = require "luamods.wolfadmin.util.files"
-local settings = require "luamods.wolfadmin.util.settings"
-local util = require "luamods.wolfadmin.util.util"
+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 util = require (wolfa_getLuaPath()..".util.util")
 
 local admin = {}
 

diff --git a/luamods/wolfadmin/admin/balancer.lua b/luamods/wolfadmin/admin/balancer.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 constants = require "luamods.wolfadmin.util.constants"
-local util = require "luamods.wolfadmin.util.util"
-local bits = require "luamods.wolfadmin.util.bits"
-local tables = require "luamods.wolfadmin.util.tables"
-local events = require "luamods.wolfadmin.util.events"
-local timers = require "luamods.wolfadmin.util.timers"
-local settings = require "luamods.wolfadmin.util.settings"
+local constants = require (wolfa_getLuaPath()..".util.constants")
+local util = require (wolfa_getLuaPath()..".util.util")
+local bits = require (wolfa_getLuaPath()..".util.bits")
+local tables = require (wolfa_getLuaPath()..".util.tables")
+local events = require (wolfa_getLuaPath()..".util.events")
+local timers = require (wolfa_getLuaPath()..".util.timers")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
-local admin = require "luamods.wolfadmin.admin.admin"
+local admin = require (wolfa_getLuaPath()..".admin.admin")
 
-local teams = require "luamods.wolfadmin.game.teams"
+local teams = require (wolfa_getLuaPath()..".game.teams")
 
 local balancer = {}
 

diff --git a/luamods/wolfadmin/admin/bans.lua b/luamods/wolfadmin/admin/bans.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 "luamods.wolfadmin.db.db"
+local db = require (wolfa_getLuaPath()..".db.db")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local events = require "luamods.wolfadmin.util.events"
-local settings = require "luamods.wolfadmin.util.settings"
+local events = require (wolfa_getLuaPath()..".util.events")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 local bans = {}
 

diff --git a/luamods/wolfadmin/admin/history.lua b/luamods/wolfadmin/admin/history.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 "luamods.wolfadmin.db.db"
+local db = require (wolfa_getLuaPath()..".db.db")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local events = require "luamods.wolfadmin.util.events"
-local settings = require "luamods.wolfadmin.util.settings"
+local events = require (wolfa_getLuaPath()..".util.events")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 local history = {}
 

diff --git a/luamods/wolfadmin/admin/mutes.lua b/luamods/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 "luamods.wolfadmin.db.db"
+local db = require (wolfa_getLuaPath()..".db.db")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local events = require "luamods.wolfadmin.util.events"
-local timers = require "luamods.wolfadmin.util.timers"
+local events = require (wolfa_getLuaPath()..".util.events")
+local timers = require (wolfa_getLuaPath()..".util.timers")
 
 local mutes = {}
 

diff --git a/luamods/wolfadmin/admin/rules.lua b/luamods/wolfadmin/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 events = require "luamods.wolfadmin.util.events"
-local files = require "luamods.wolfadmin.util.files"
-local settings = require "luamods.wolfadmin.util.settings"
+local events = require (wolfa_getLuaPath()..".util.events")
+local files = require (wolfa_getLuaPath()..".util.files")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 local rules = {}
 

diff --git a/luamods/wolfadmin/auth/acl.lua b/luamods/wolfadmin/auth/acl.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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local db = require "luamods.wolfadmin.db.db"
+local db = require (wolfa_getLuaPath()..".db.db")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local events = require "luamods.wolfadmin.util.events"
-local files = require "luamods.wolfadmin.util.files"
-local tables = require "luamods.wolfadmin.util.tables"
+local events = require (wolfa_getLuaPath()..".util.events")
+local files = require (wolfa_getLuaPath()..".util.files")
+local tables = require (wolfa_getLuaPath()..".util.tables")
 
 local acl = {}
 

diff --git a/luamods/wolfadmin/auth/auth.lua b/luamods/wolfadmin/auth/auth.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 events = require "luamods.wolfadmin.util.events"
-local files = require "luamods.wolfadmin.util.files"
-local settings = require "luamods.wolfadmin.util.settings"
+local events = require (wolfa_getLuaPath()..".util.events")
+local files = require (wolfa_getLuaPath()..".util.files")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 local auth = {}
 
@@ -114,9 +114,9 @@ auth.PERM_IMMUNE = "immune"
 -- this, but it will suffice.
 function auth.oninit()
     if settings.get("g_standalone") == 1 then
-        srv = require "luamods.wolfadmin.auth.acl"
+        srv = require (wolfa_getLuaPath()..".auth.acl")
     else
-        srv = require "luamods.wolfadmin.auth.shrubbot"
+        srv = require (wolfa_getLuaPath()..".auth.shrubbot")
     end
 
     if settings.get("g_standalone") == 1 and et.trap_Cvar_Get("g_shrubbot") ~= "" then

diff --git a/luamods/wolfadmin/auth/shrubbot.lua b/luamods/wolfadmin/auth/shrubbot.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 events = require "luamods.wolfadmin.util.events"
-local files = require "luamods.wolfadmin.util.files"
+local events = require (wolfa_getLuaPath()..".util.events")
+local files = require (wolfa_getLuaPath()..".util.files")
 
-local auth = require "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
 local shrubbot = {}
 

diff --git a/luamods/wolfadmin/commands/admin/admintest.lua b/luamods/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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local settings = require "luamods.wolfadmin.util.settings"
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 function commandAdminTest(clientId, cmdArguments)
     local level = auth.getlevel(clientId)

diff --git a/luamods/wolfadmin/commands/admin/balance.lua b/luamods/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 "luamods.wolfadmin.commands.commands"
-local auth = require "luamods.wolfadmin.auth.auth"
-local balancer = require "luamods.wolfadmin.admin.balancer"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
+local auth = require (wolfa_getLuaPath()..".auth.auth")
+local balancer = require (wolfa_getLuaPath()..".admin.balancer")
 
 function commandBalance(clientId, cmdArguments)
     if cmdArguments[1] == "enable" then

diff --git a/luamods/wolfadmin/commands/admin/ban.lua b/luamods/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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local bans = require "luamods.wolfadmin.admin.bans"
-local history = require "luamods.wolfadmin.admin.history"
+local bans = require (wolfa_getLuaPath()..".admin.bans")
+local history = require (wolfa_getLuaPath()..".admin.history")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local util = require "luamods.wolfadmin.util.util"
-local settings = require "luamods.wolfadmin.util.settings"
+local util = require (wolfa_getLuaPath()..".util.util")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 function commandBan(clientId, cmdArguments)
     if cmdArguments[1] == nil then

diff --git a/luamods/wolfadmin/commands/admin/enablevote.lua b/luamods/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 "luamods.wolfadmin.commands.commands"
-local auth = require "luamods.wolfadmin.auth.auth"
-local voting = require "luamods.wolfadmin.game.voting"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
+local auth = require (wolfa_getLuaPath()..".auth.auth")
+local voting = require (wolfa_getLuaPath()..".game.voting")
 
 function commandEnableVote(clientId, cmdArguments)
     et.trap_SendConsoleCommand(et.EXEC_APPEND, "chat \"^denablevote: ^9next map voting has been enabled.\";")

diff --git a/luamods/wolfadmin/commands/admin/finger.lua b/luamods/wolfadmin/commands/admin/finger.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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local settings = require "luamods.wolfadmin.util.settings"
-local util = require "luamods.wolfadmin.util.util"
+local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = require (wolfa_getLuaPath()..".util.util")
 
 function commandFinger(clientId, cmdArguments)
     if cmdArguments[1] == nil then

diff --git a/luamods/wolfadmin/commands/admin/gib.lua b/luamods/wolfadmin/commands/admin/gib.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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local settings = require "luamods.wolfadmin.util.settings"
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 function commandGib(clientId, cmdArguments)
     if cmdArguments[1] == nil then

diff --git a/luamods/wolfadmin/commands/admin/greeting.lua b/luamods/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 util = require "luamods.wolfadmin.util.util"
-local auth = require "luamods.wolfadmin.auth.auth"
-local commands = require "luamods.wolfadmin.commands.commands"
-local settings = require "luamods.wolfadmin.util.settings"
-local greetings = require "luamods.wolfadmin.players.greetings"
+local util = require (wolfa_getLuaPath()..".util.util")
+local auth = require (wolfa_getLuaPath()..".auth.auth")
+local commands = require (wolfa_getLuaPath()..".commands.commands")
+local settings = require (wolfa_getLuaPath()..".util.settings")
+local greetings = require (wolfa_getLuaPath()..".players.greetings")
 
 function commandGreeting(clientId, cmdArguments)
     local greeting = greetings.get(clientId)

diff --git a/luamods/wolfadmin/commands/admin/help.lua b/luamods/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 "luamods.wolfadmin.auth.auth"
-local commands = require "luamods.wolfadmin.commands.commands"
-local settings = require "luamods.wolfadmin.util.settings"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
+local commands = require (wolfa_getLuaPath()..".commands.commands")
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 function commandHelp(clientId, cmdArguments)
     local cmds = commands.getadmin()

diff --git a/luamods/wolfadmin/commands/admin/incognito.lua b/luamods/wolfadmin/commands/admin/incognito.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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
 function commandIncognito(clientId, cmdArguments)
     local fileName = et.trap_Cvar_Get("g_shrubbot")

diff --git a/luamods/wolfadmin/commands/admin/kick.lua b/luamods/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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local admin = require "luamods.wolfadmin.admin.admin"
-local history = require "luamods.wolfadmin.admin.history"
+local admin = require (wolfa_getLuaPath()..".admin.admin")
+local history = require (wolfa_getLuaPath()..".admin.history")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local settings = require "luamods.wolfadmin.util.settings"
+local settings = require (wolfa_getLuaPath()..".util.settings")
 
 function commandKick(clientId, cmdArguments)
     if cmdArguments[1] == nil then

diff --git a/luamods/wolfadmin/commands/admin/kickbots.lua b/luamods/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 "luamods.wolfadmin.auth.auth"
-local commands = require "luamods.wolfadmin.commands.commands"
-local bots = require "luamods.wolfadmin.game.bots"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
+local commands = require (wolfa_getLuaPath()..".commands.commands")
+local bots = require (wolfa_getLuaPath()..".game.bots")
 
 function commandBotsOff(clientId, cmdArguments)
     bots.enable(false)

diff --git a/luamods/wolfadmin/commands/admin/listaliases.lua b/luamods/wolfadmin/commands/admin/listaliases.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 "luamods.wolfadmin.auth.auth"
+local auth = require (wolfa_getLuaPath()..".auth.auth")
 
-local db = require "luamods.wolfadmin.db.db"
+local db = require (wolfa_getLuaPath()..".db.db")
 
-local commands = require "luamods.wolfadmin.commands.commands"
+local commands = require (wolfa_getLuaPath()..".commands.commands")
 
-local players = require "luamods.wolfadmin.players.players"
+local players = require (wolfa_getLuaPath()..".players.players")
 
-local pagination = require "luamods.wolfadmin.util.pagination"
-local settings = require "luamods.wolfadmin.util.settings"
-local util = require "luamods.wolfadmin.util.util"
+local pagination = require (wolfa_getLuaPath()..".util.pagination")
+local settings = require (wolfa_getLuaPath()..".util.settings")
+local util = require (wolfa_getLuaPath()..".util.util")
 
 function commandListAliases(clientId, cmdArguments)
     if not db.isconnected() then