From 5984ab501318f432c56890e54d851e1fd41b139f Mon Sep 17 00:00:00 2001 From: Linventif Date: Sat, 20 Jul 2024 15:13:07 +0000 Subject: [PATCH] fix: fuck some shit with ipairs --- lua/gmod_integration/client/cl_gui_admin.lua | 9 ++++----- lua/gmod_integration/client/cl_main.lua | 2 +- lua/gmod_integration/client/cl_materials.lua | 4 ++-- lua/gmod_integration/server/sv__websocket.lua | 2 +- lua/gmod_integration/server/sv_con.lua | 2 +- lua/gmod_integration/server/sv_filtrers.lua | 2 +- lua/gmod_integration/server/sv_players.lua | 2 +- lua/gmod_integration/server/sv_settings.lua | 4 ++-- lua/gmod_integration/server/sv_sync_bans.lua | 2 +- lua/gmod_integration/server/sv_sync_kicks.lua | 2 +- lua/gmod_integration/server/sv_sync_roles.lua | 2 +- lua/gmod_integration/shared/sh_api_format.lua | 2 +- lua/gmod_integration/shared/sh_player_meta.lua | 4 ++-- 13 files changed, 19 insertions(+), 20 deletions(-) diff --git a/lua/gmod_integration/client/cl_gui_admin.lua b/lua/gmod_integration/client/cl_gui_admin.lua index 25ad782..94e9a73 100644 --- a/lua/gmod_integration/client/cl_gui_admin.lua +++ b/lua/gmod_integration/client/cl_gui_admin.lua @@ -201,7 +201,7 @@ function gmInte.openConfigMenu(data) messageLabel:Dock(FILL) messageLabel:SetText("Here you can configure your server settings.\nServer ID and Token are available on the webpanel in the server settings.\nThe documentation is available at https://docs.gmod-integration.com/\nIf you need help, please contact us on our discord server.") messageLabel:SetWrap(true) - for k, catName in ipairs(configCat) do + for k, catName in pairs(configCat) do local collapsibleCategory = vgui.Create("DCollapsibleCategory", scrollPanel) collapsibleCategory:Dock(TOP) collapsibleCategory:DockMargin(10, 0, 10, 10) @@ -215,13 +215,13 @@ function gmInte.openConfigMenu(data) configList:EnableVerticalScrollbar(false) collapsibleCategory:SetContents(configList) local categoryConfig = {} - for k, v in ipairs(possibleConfig) do + for k, v in pairs(possibleConfig) do if v.category == catName then table.insert(categoryConfig, v) end end // Sort by position table.sort(categoryConfig, function(a, b) return (a.position || 0) < (b.position || 0) end) - for k, actualConfig in ipairs(categoryConfig) do + for k, actualConfig in pairs(categoryConfig) do local panel = vgui.Create("DPanel", configList) panel:Dock(TOP) panel:SetSize(300, 25) @@ -245,7 +245,6 @@ function gmInte.openConfigMenu(data) input.OnLoseFocus = function(self) if actualConfig.secret then self:SetText("*** Click to show ***") end end local isLastID = 0 input.OnChange = function(self) - value = self:GetValue() if actualConfig.resetIfEmpty && self:GetValue() == "" && actualConfig.defaultValue then self:SetText(actualConfig.defaultValue) return @@ -286,7 +285,7 @@ function gmInte.openConfigMenu(data) buttonGrid:SetColWide(frame:GetWide() / 2 - 5) buttonGrid:SetRowHeight(45) local buttonsCount = 0 - for k, v in ipairs(buttonsInfo) do + for k, v in pairs(buttonsInfo) do if v.condition && !v.condition(data) then continue end local button = vgui.Create("DButton") button:SetText(v.label) diff --git a/lua/gmod_integration/client/cl_main.lua b/lua/gmod_integration/client/cl_main.lua index 923800a..c13443d 100644 --- a/lua/gmod_integration/client/cl_main.lua +++ b/lua/gmod_integration/client/cl_main.lua @@ -1,6 +1,6 @@ function gmInte.chatAddText(data) local args = {} - for _, v in ipairs(data) do + for _, v in pairs(data) do table.insert(args, v.color) table.insert(args, v.text) end diff --git a/lua/gmod_integration/client/cl_materials.lua b/lua/gmod_integration/client/cl_materials.lua index d1ee784..87a1193 100644 --- a/lua/gmod_integration/client/cl_materials.lua +++ b/lua/gmod_integration/client/cl_materials.lua @@ -22,13 +22,13 @@ function gmInte.createImgurMaterials(materials, addon_var, folder, name) end) end - for k, v in ipairs(materials) do + for k, v in pairs(materials) do getMatFromUrl("https://i.imgur.com/" .. v .. ".png", k) end end function gmInte.redowloadMaterials() - for k, v in ipairs(ImageCache) do + for k, v in pairs(ImageCache) do v.addon_var[v.id] = Material("../data/" .. v.folder .. "/" .. v.id .. ".png", "noclamp smooth") gmInte.log("materials", v.name .. " - Image Redownloaded - " .. v.id .. ".png") end diff --git a/lua/gmod_integration/server/sv__websocket.lua b/lua/gmod_integration/server/sv__websocket.lua index 8d23bc3..8de4265 100644 --- a/lua/gmod_integration/server/sv__websocket.lua +++ b/lua/gmod_integration/server/sv__websocket.lua @@ -1,6 +1,6 @@ local function websocketDLLExist() local files, _ = file.Find("lua/bin/*", "GAME") - for k, v in ipairs(files) do + for k, v in pairs(files) do if v:find("gwsockets") then return true end end return false diff --git a/lua/gmod_integration/server/sv_con.lua b/lua/gmod_integration/server/sv_con.lua index 94300e0..8c6f842 100644 --- a/lua/gmod_integration/server/sv_con.lua +++ b/lua/gmod_integration/server/sv_con.lua @@ -6,7 +6,7 @@ local conFuncs = { ["get-server-id"] = function() print(gmInte.config.id || "none") end, ["screenshot"] = function(args) if !args[2] then return gmInte.log("No SteamID64 provided") end - for _, ply in ipairs(player.GetAll()) do + for _, ply in pairs(player.GetAll()) do if ply:SteamID64() == args[2] then return gmInte.takeScreenshot(ply) end end end, diff --git a/lua/gmod_integration/server/sv_filtrers.lua b/lua/gmod_integration/server/sv_filtrers.lua index 042f95b..e429493 100644 --- a/lua/gmod_integration/server/sv_filtrers.lua +++ b/lua/gmod_integration/server/sv_filtrers.lua @@ -12,7 +12,7 @@ local function filterMessage(reason) "Service provided by Gmod Integration", } - for k, v in ipairs(Message) do + for k, v in pairs(Message) do Message[k] = "\n" .. v end return table.concat(Message) diff --git a/lua/gmod_integration/server/sv_players.lua b/lua/gmod_integration/server/sv_players.lua index f90602f..6e7c85f 100644 --- a/lua/gmod_integration/server/sv_players.lua +++ b/lua/gmod_integration/server/sv_players.lua @@ -90,7 +90,7 @@ end hook.Add("gmInte:PlayerReady", "gmInte:Player:Ready", function(ply) gmInte.playerReady(ply) end) hook.Add("ShutDown", "gmInte:Server:Shutdown:SavePlayers", function() - for ply, ply in ipairs(player.GetAll()) do + for _, ply in pairs(player.GetAll()) do gmInte.playerDisconnected(ply) end end) diff --git a/lua/gmod_integration/server/sv_settings.lua b/lua/gmod_integration/server/sv_settings.lua index f5d9fd8..41f5df5 100644 --- a/lua/gmod_integration/server/sv_settings.lua +++ b/lua/gmod_integration/server/sv_settings.lua @@ -14,7 +14,7 @@ function gmInte.saveSetting(setting, value) gmInte.log("Setting Saved") if value == "websocketFQDN" || value == "id" || value == "token" then gmInte.resetWebSocket() end // send to all players the new public config - for _, ply in ipairs(player.GetAll()) do + for _, ply in pairs(player.GetAll()) do if ply:IsValid() && ply:IsPlayer(ply) then gmInte.log("Sending new Public Config to " .. ply:Nick(), true) gmInte.publicGetConfig(ply) @@ -66,7 +66,7 @@ end function gmInte.superadminSetConfig(ply, data) if !ply:IsValid() || !ply:IsPlayer(ply) || !ply:IsSuperAdmin() then return end - for k, v in ipairs(data) do + for k, v in pairs(data) do gmInte.saveSetting(k, v) end diff --git a/lua/gmod_integration/server/sv_sync_bans.lua b/lua/gmod_integration/server/sv_sync_bans.lua index 9836f9f..9be3f2c 100644 --- a/lua/gmod_integration/server/sv_sync_bans.lua +++ b/lua/gmod_integration/server/sv_sync_bans.lua @@ -1,5 +1,5 @@ function gmInte.wsSyncBan(data) - for _, ply in ipairs(player.GetAll()) do + for _, ply in pairs(player.GetAll()) do if ply:SteamID64() == data.steam then ply:Kick(data.reason || "You have been banned from the server.") end end end diff --git a/lua/gmod_integration/server/sv_sync_kicks.lua b/lua/gmod_integration/server/sv_sync_kicks.lua index 3b06202..5593daf 100644 --- a/lua/gmod_integration/server/sv_sync_kicks.lua +++ b/lua/gmod_integration/server/sv_sync_kicks.lua @@ -1,5 +1,5 @@ function gmInte.wsSyncKick(data) - for _, ply in ipairs(player.GetAll()) do + for _, ply in pairs(player.GetAll()) do if ply:SteamID64() == data.steam then ply:Kick(data.reason || "You have been banned from the server.") end end end diff --git a/lua/gmod_integration/server/sv_sync_roles.lua b/lua/gmod_integration/server/sv_sync_roles.lua index 2f5506c..a9f7ef0 100644 --- a/lua/gmod_integration/server/sv_sync_roles.lua +++ b/lua/gmod_integration/server/sv_sync_roles.lua @@ -72,7 +72,7 @@ end) // For those who refuse to use CAMI (bro, WTF), routine scan local lastScan = {} timer.Create("gmInte:SyncRoles:PlayerScan", 3, 0, function() - for k, v in ipairs(player.GetAll()) do + for k, v in pairs(player.GetAll()) do if lastScan[v:SteamID64()] == v:GetUserGroup() then continue end gmInte.playerChangeGroup(v:SteamID64(), lastScan[v:SteamID64()], v:GetUserGroup()) lastScan[v:SteamID64()] = v:GetUserGroup() diff --git a/lua/gmod_integration/shared/sh_api_format.lua b/lua/gmod_integration/shared/sh_api_format.lua index 41418b4..da378b1 100644 --- a/lua/gmod_integration/shared/sh_api_format.lua +++ b/lua/gmod_integration/shared/sh_api_format.lua @@ -19,7 +19,7 @@ end function gmInte.getPlayersFormat() local players = {} - for k, v in ipairs(player.GetAll()) do + for k, v in pairs(player.GetAll()) do table.insert(players, gmInte.getPlayerFormat(v)) end return players diff --git a/lua/gmod_integration/shared/sh_player_meta.lua b/lua/gmod_integration/shared/sh_player_meta.lua index dc74344..77f6b79 100644 --- a/lua/gmod_integration/shared/sh_player_meta.lua +++ b/lua/gmod_integration/shared/sh_player_meta.lua @@ -39,13 +39,13 @@ end local function getCustomValues(ply) local values = {} // Get compatability values - for key, value in ipairs(getCustomCompatability(ply)) do + for key, value in pairs(getCustomCompatability(ply)) do values[key] = value end // Get custom values or overwrite compatability values if ply.gmIntCustomValues then - for key, value in ipairs(ply.gmIntCustomValues) do + for key, value in pairs(ply.gmIntCustomValues) do values[key] = value end end