From b6a7dd0c20bcc27e2bd05163d2f8129d5255b5b4 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Thu, 9 Jan 2025 07:44:59 -0500 Subject: [PATCH] Loottables/logs/versionchecker now in Utility --- modules/Utility/server/VersionChecker.lua | 10 ++++----- modules/Utility/server/logs.lua | 4 ++-- modules/Utility/server/lootTables.lua | 26 ++++++++++++----------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules/Utility/server/VersionChecker.lua b/modules/Utility/server/VersionChecker.lua index 98b7a52..9ee14aa 100644 --- a/modules/Utility/server/VersionChecker.lua +++ b/modules/Utility/server/VersionChecker.lua @@ -1,6 +1,6 @@ -VersionCheck = {} +Utility = Utility or {} -function VersionCheck.VersionChecker(repoPath) +function Utility.VersionChecker(repoPath) local resource = repoPath:match("([^/]+)$") if not resource then return Prints.Error('^1Invalid repository format. Expected format: "username/reponame"^0') end @@ -23,16 +23,16 @@ function VersionCheck.VersionChecker(repoPath) local latest = response.tag_name:match('%d+%.%d+%.%d+') if not latest then return Prints.Error(failure) end - if latest == version then return Prints.Error(('^2 %s is on the latest version.^0'):format(resource)) end + if latest == version then return print(('^2 %s is on the latest version.^0'):format(resource)) end local currentVersion, latestVersion = version:gsub('%D', ''), latest:gsub('%D', '') if currentVersion < latestVersion then - return Prints.Error(('^1An update is available for %s (current version: %s)\r\n - ^5Please download the latest version from the GitHub release page.^7\r\n%s'):format(resource, version, response.html_url)) + return print(('^1An update is available for %s (current version: %s)\r\n - ^5Please download the latest version from the GitHub release page.^7\r\n%s'):format(resource, version, response.html_url)) end end, 'GET') end AddEventHandler('onResourceStart', function(resourceName) if GetCurrentResourceName() ~= resourceName then return end - VersionCheck.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") + Utility.VersionChecker("The-Order-Of-The-Sacred-Framework/community_bridge") end) \ No newline at end of file diff --git a/modules/Utility/server/logs.lua b/modules/Utility/server/logs.lua index 4308928..e8c8d8d 100644 --- a/modules/Utility/server/logs.lua +++ b/modules/Utility/server/logs.lua @@ -1,9 +1,9 @@ -Logger = {} +Utility = Utility or {} local WebhookURL = BridgeServerConfig.WebhookURL local LogoForEmbed = BridgeServerConfig.WebhookImage -Logger.SendLog = function(src, message) +Utility.SendLog = function(src, message) if not src or not message then return end if BridgeServerConfig.LogSystem == "builtin" then PerformHttpRequest(WebhookURL, function(err, text, headers) end, 'POST', json.encode( diff --git a/modules/Utility/server/lootTables.lua b/modules/Utility/server/lootTables.lua index 26fd25f..9244c54 100644 --- a/modules/Utility/server/lootTables.lua +++ b/modules/Utility/server/lootTables.lua @@ -1,6 +1,8 @@ -LootTables = {} +Utility = Utility or {} -LootTables.RegisterLootTable = function(name, items) +local lootTables = {} + +Utility.RegisterLootTable = function(name, items) local repackedTable = {} for k, v in pairs(items) do table.insert(repackedTable, { @@ -13,19 +15,19 @@ LootTables.RegisterLootTable = function(name, items) metadata = v.metadata }) end - LootTables[name] = repackedTable - return LootTables[name] + lootTables[name] = repackedTable + return lootTables[name] end -LootTables.GetLootTable = function(name) +Utility.GetLootTable = function(name) assert(name, "No Name Passed For Loot Table") - return LootTables[name] or {} + return lootTables[name] or {} end -LootTables.GetRandomItem = function(name, tier, randomNumber) +Utility.GetRandomItem = function(name, tier, randomNumber) assert(name, "No Name Passed For Loot Table") if tier == nil then tier = 1 end - local lootTable = LootTables[name] or {} + local lootTable = lootTables[name] or {} math.randomseed(GetGameTimer()) local chance = randomNumber or math.random(1, 100) for _, v in pairs(lootTable) do @@ -35,10 +37,10 @@ LootTables.GetRandomItem = function(name, tier, randomNumber) end end -LootTables.GetRandomItems = function(name, tier, randomNumber) +Utility.GetRandomItems = function(name, tier, randomNumber) assert(name, "No Name Passed For Loot Table") if tier == nil then tier = 1 end - local lootTable = LootTables.GetLootTable(name) + local lootTable = Utility.GetLootTable(name) math.randomseed(GetGameTimer()) local chance = randomNumber or math.random(1, 100) local items = {} @@ -50,10 +52,10 @@ LootTables.GetRandomItems = function(name, tier, randomNumber) return items end -LootTables.GetRandomItemsWithLimit = function(name, tier, randomNumber) +Utility.GetRandomItemsWithLimit = function(name, tier, randomNumber) assert(name, "No Name Passed For Loot Table") if tier == nil then tier = 1 end - local lootTable = LootTables.GetLootTable(name) + local lootTable = Utility.GetLootTable(name) math.randomseed(GetGameTimer()) local chance = randomNumber or math.random(1, 100) local items = {}