From bcbcd03323cf14800163c6e0141400ae0bc0b2fd Mon Sep 17 00:00:00 2001 From: Linventif Date: Wed, 17 Jul 2024 21:05:44 +0000 Subject: [PATCH] fix: pairs -> ipairs --- lua/gmod_integration/client/cl_gui_admin.lua | 8 ++++---- lua/gmod_integration/client/cl_materials.lua | 4 ++-- lua/gmod_integration/server/sv__websocket.lua | 2 +- lua/gmod_integration/server/sv_filtrers.lua | 2 +- lua/gmod_integration/server/sv_net.lua | 2 +- lua/gmod_integration/server/sv_settings.lua | 2 +- lua/gmod_integration/shared/sh_player_meta.lua | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lua/gmod_integration/client/cl_gui_admin.lua b/lua/gmod_integration/client/cl_gui_admin.lua index 94e9a73..5e8cede 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 pairs(configCat) do + for k, catName in ipairs(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 pairs(possibleConfig) do + for k, v in ipairs(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 pairs(categoryConfig) do + for k, actualConfig in ipairs(categoryConfig) do local panel = vgui.Create("DPanel", configList) panel:Dock(TOP) panel:SetSize(300, 25) @@ -285,7 +285,7 @@ function gmInte.openConfigMenu(data) buttonGrid:SetColWide(frame:GetWide() / 2 - 5) buttonGrid:SetRowHeight(45) local buttonsCount = 0 - for k, v in pairs(buttonsInfo) do + for k, v in ipairs(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_materials.lua b/lua/gmod_integration/client/cl_materials.lua index 87a1193..d1ee784 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 pairs(materials) do + for k, v in ipairs(materials) do getMatFromUrl("https://i.imgur.com/" .. v .. ".png", k) end end function gmInte.redowloadMaterials() - for k, v in pairs(ImageCache) do + for k, v in ipairs(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 8de4265..8d23bc3 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 pairs(files) do + for k, v in ipairs(files) do if v:find("gwsockets") then return true end end return false diff --git a/lua/gmod_integration/server/sv_filtrers.lua b/lua/gmod_integration/server/sv_filtrers.lua index e429493..042f95b 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 pairs(Message) do + for k, v in ipairs(Message) do Message[k] = "\n" .. v end return table.concat(Message) diff --git a/lua/gmod_integration/server/sv_net.lua b/lua/gmod_integration/server/sv_net.lua index 5c99dcf..4ff56c7 100644 --- a/lua/gmod_integration/server/sv_net.lua +++ b/lua/gmod_integration/server/sv_net.lua @@ -34,7 +34,7 @@ local netReceive = { RunConsoleCommand("changelevel", game.GetMap()) end, [6] = function(ply) gmInte.verifyPlayer(ply) end, - [7] = function(ply, data) sendPlayerToken(ply) end + [7] = function(ply, data) gmInte.sendPlayerToken(ply) end } net.Receive("gmIntegration", function(len, ply) diff --git a/lua/gmod_integration/server/sv_settings.lua b/lua/gmod_integration/server/sv_settings.lua index 1191502..f5d9fd8 100644 --- a/lua/gmod_integration/server/sv_settings.lua +++ b/lua/gmod_integration/server/sv_settings.lua @@ -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 pairs(data) do + for k, v in ipairs(data) do gmInte.saveSetting(k, v) end diff --git a/lua/gmod_integration/shared/sh_player_meta.lua b/lua/gmod_integration/shared/sh_player_meta.lua index 77f6b79..dc74344 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 pairs(getCustomCompatability(ply)) do + for key, value in ipairs(getCustomCompatability(ply)) do values[key] = value end // Get custom values or overwrite compatability values if ply.gmIntCustomValues then - for key, value in pairs(ply.gmIntCustomValues) do + for key, value in ipairs(ply.gmIntCustomValues) do values[key] = value end end