From 485c2d3460c86fafc2cce277c8aedb1d9350e1a2 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 9 May 2025 02:00:02 -0400 Subject: [PATCH] inv diagnostics + repacked tables --- modules/inventory/_default/client.lua | 1 + modules/inventory/_default/server.lua | 1 + modules/inventory/codem-inventory/client.lua | 5 +++-- modules/inventory/codem-inventory/server.lua | 5 +++-- modules/inventory/core_inventory/client.lua | 1 + modules/inventory/core_inventory/server.lua | 2 +- modules/inventory/jpr-inventory/client.lua | 4 ++-- modules/inventory/jpr-inventory/server.lua | 12 +++++++++++- modules/inventory/origen_inventory/client.lua | 5 +++-- modules/inventory/origen_inventory/server.lua | 5 +++-- modules/inventory/ox_inventory/client.lua | 4 ++-- modules/inventory/ox_inventory/server.lua | 9 +++------ modules/inventory/ps-inventory/client.lua | 4 ++-- modules/inventory/ps-inventory/server.lua | 12 +++++++++++- modules/inventory/qb-inventory/client.lua | 4 ++-- modules/inventory/qb-inventory/server.lua | 4 ++-- modules/inventory/qs-inventory/client.lua | 4 ++-- modules/inventory/qs-inventory/server.lua | 4 ++-- modules/inventory/tgiann-inventory/client.lua | 4 ++-- modules/inventory/tgiann-inventory/server.lua | 15 ++++++++++++--- 20 files changed, 69 insertions(+), 36 deletions(-) diff --git a/modules/inventory/_default/client.lua b/modules/inventory/_default/client.lua index 21991ad..a9145b7 100644 --- a/modules/inventory/_default/client.lua +++ b/modules/inventory/_default/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field Inventory = Inventory or {} ---This will fallback to framework add item functions when an inventory does not have the specifiec function. diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 2d42c54..48cfc2b 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field Inventory = Inventory or {} ---This will fallback to framework add item functions when an inventory does not have the specifiec function. diff --git a/modules/inventory/codem-inventory/client.lua b/modules/inventory/codem-inventory/client.lua index 11be4c5..2b7a208 100644 --- a/modules/inventory/codem-inventory/client.lua +++ b/modules/inventory/codem-inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('codem-inventory') ~= 'started' then return end Inventory = Inventory or {} @@ -8,8 +9,9 @@ local codem = exports['codem-inventory'] ---@return table Inventory.GetItemInfo = function(item) local itemData = codem:GetItemList(item) + if not itemData then return {} end local image = itemData.image and Inventory.GetImagePath(itemData.image) or Inventory.GetImagePath(item) - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -17,7 +19,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = image, } - return repackedTable or {} end ---comment diff --git a/modules/inventory/codem-inventory/server.lua b/modules/inventory/codem-inventory/server.lua index cbf6847..8963a93 100644 --- a/modules/inventory/codem-inventory/server.lua +++ b/modules/inventory/codem-inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('codem-inventory') ~= 'started' then return end Inventory = Inventory or {} @@ -6,7 +7,8 @@ local codem = exports['codem-inventory'] Inventory.GetItemInfo = function(item) local itemData = codem:GetItemList(item) - local repackedTable = { + if not itemData then return {} end + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -14,7 +16,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable or {} end Inventory.AddItem = function(src, item, count, slot, metadata) diff --git a/modules/inventory/core_inventory/client.lua b/modules/inventory/core_inventory/client.lua index f59f174..c3d6ddc 100644 --- a/modules/inventory/core_inventory/client.lua +++ b/modules/inventory/core_inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('core_inventory') ~= 'started' then return end Inventory = Inventory or {} diff --git a/modules/inventory/core_inventory/server.lua b/modules/inventory/core_inventory/server.lua index 65792dc..e190413 100644 --- a/modules/inventory/core_inventory/server.lua +++ b/modules/inventory/core_inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('core_inventory') ~= 'started' then return end Inventory = Inventory or {} @@ -76,7 +77,6 @@ Inventory.GetItemBySlot = function(src, slot) local inv = Inventory.GetPlayerInventory(src) if not inv then return {} end for _, v in pairs(inv) do - print(v.slot, slot) if v.slot == slot then return { name = v.name, diff --git a/modules/inventory/jpr-inventory/client.lua b/modules/inventory/jpr-inventory/client.lua index f7deebc..6aeb6f8 100644 --- a/modules/inventory/jpr-inventory/client.lua +++ b/modules/inventory/jpr-inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('jpr-inventory') ~= 'started' then return end local jpr = exports['jpr-inventory'] @@ -29,7 +30,7 @@ end Inventory.GetItemInfo = function(item) local itemData = Framework.Shared.Items[item] if not itemData then return {} end - local repackedTable = { + return { name = itemData.name, label = itemData.label, stack = itemData.unique, @@ -37,5 +38,4 @@ Inventory.GetItemInfo = function(item) description = itemData.description, image = Inventory.GetImagePath(itemData.name) } - return repackedTable end \ No newline at end of file diff --git a/modules/inventory/jpr-inventory/server.lua b/modules/inventory/jpr-inventory/server.lua index 9c7cf01..908374f 100644 --- a/modules/inventory/jpr-inventory/server.lua +++ b/modules/inventory/jpr-inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('jpr-inventory') ~= 'started' then return end local jpr = exports['jpr-inventory'] @@ -56,7 +57,16 @@ end Inventory.GetItemBySlot = function(src, slot) local slotData = jpr:GetItemBySlot(src, slot) if not slotData then return {} end - return { name = slotData.name, label = slotData.label, weight = slotData.weight, slot = slot, count = slotData.amount, metadata = slotData.info, stack = slotData.unique, description = slotData.description } + return { + name = slotData.name, + label = slotData.label, + weight = slotData.weight, + slot = slot, + count = slotData.amount, + metadata = slotData.info, + stack = slotData.unique, + description = slotData.description + } end ---comment diff --git a/modules/inventory/origen_inventory/client.lua b/modules/inventory/origen_inventory/client.lua index a7f8359..6e76284 100644 --- a/modules/inventory/origen_inventory/client.lua +++ b/modules/inventory/origen_inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('origen_inventory') ~= 'started' then return end Inventory = Inventory or {} @@ -9,7 +10,8 @@ local origin = exports.origen_inventory ---@return table Inventory.GetItemInfo = function(item) local itemData = origin:Items(item) - local repackedTable = { + if not itemData then return {} end + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -17,7 +19,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable or {} end ---comment diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index f567fb9..a2e69f5 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('origen_inventory') ~= 'started' then return end Inventory = Inventory or {} @@ -25,7 +26,8 @@ end Inventory.GetItemInfo = function(item) local itemData = origen_inventory:Items(item) - local repackedTable = { + if not itemData then return {} end + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -33,7 +35,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable or {} end Inventory.GetItemCount = function(src, item, metadata) diff --git a/modules/inventory/ox_inventory/client.lua b/modules/inventory/ox_inventory/client.lua index 766c571..284edd6 100644 --- a/modules/inventory/ox_inventory/client.lua +++ b/modules/inventory/ox_inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('ox_inventory') ~= 'started' then return end local ox_inventory = exports.ox_inventory @@ -9,7 +10,7 @@ Inventory = Inventory or {} Inventory.GetItemInfo = function(item) local itemData = ox_inventory:Items(item) if not itemData then return {} end - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.stack or "true", @@ -17,7 +18,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = (itemData.client and itemData.client.image) or Inventory.GetImagePath(item), } - return repackedTable end ---comment diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index e2eb791..cbe0569 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('ox_inventory') ~= 'started' then return end local ox_inventory = exports.ox_inventory @@ -19,18 +20,14 @@ end Inventory.GetItemInfo = function(item) local itemData = ox_inventory:Items(item) if not itemData then return {} end - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.stack or "true", weight = itemData.weight or "0", description = itemData.description or "none", - image = string.format("nui://ox_inventory/web/images/%s", itemData.client - and itemData.client.image - or string.format("%s.png", item) - ), + image = string.format("nui://ox_inventory/web/images/%s", itemData.client and itemData.client.image or string.format("%s.png", item)), } - return repackedTable end -- string.format("nui://ox_inventory/web/images/%s.png", item) diff --git a/modules/inventory/ps-inventory/client.lua b/modules/inventory/ps-inventory/client.lua index 6d37dd6..cf69bb0 100644 --- a/modules/inventory/ps-inventory/client.lua +++ b/modules/inventory/ps-inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('ps-inventory') ~= 'started' then return end local ps = exports['ps-inventory'] @@ -31,7 +32,7 @@ end Inventory.GetItemInfo = function(item) local itemData = Framework.Shared.Items[item] if not itemData then return {} end - local repackedTable = { + return { name = itemData.name, label = itemData.label, stack = itemData.unique, @@ -39,5 +40,4 @@ Inventory.GetItemInfo = function(item) description = itemData.description, image = Inventory.GetImagePath(itemData.name) } - return repackedTable end \ No newline at end of file diff --git a/modules/inventory/ps-inventory/server.lua b/modules/inventory/ps-inventory/server.lua index ff95702..60ef824 100644 --- a/modules/inventory/ps-inventory/server.lua +++ b/modules/inventory/ps-inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('ps-inventory') ~= 'started' then return end local sloth = exports['ps-inventory'] @@ -57,7 +58,16 @@ end Inventory.GetItemBySlot = function(src, slot) local slotData = sloth:GetItemBySlot(src, slot) if not slotData then return {} end - return {name = slotData.name, label = slotData.name, weight = slotData.weight, slot = slot, count = slotData.amount, metadata = slotData.info, stack = slotData.unique, description = slotData.description} + return { + name = slotData.name, + label = slotData.name, + weight = slotData.weight, + slot = slot, + count = slotData.amount, + metadata = slotData.info, + stack = slotData.unique, + description = slotData.description + } end ---comment diff --git a/modules/inventory/qb-inventory/client.lua b/modules/inventory/qb-inventory/client.lua index 0818f4f..10cab4f 100644 --- a/modules/inventory/qb-inventory/client.lua +++ b/modules/inventory/qb-inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('qb-inventory') ~= 'started' then return end local qb = exports['qb-inventory'] @@ -30,7 +31,7 @@ end Inventory.GetItemInfo = function(item) local itemData = Framework.Shared.Items[item] if not itemData then return {} end - local repackedTable = { + return { name = itemData.name, label = itemData.label, stack = itemData.unique, @@ -38,6 +39,5 @@ Inventory.GetItemInfo = function(item) description = itemData.description, image = Inventory.GetImagePath(itemData.image or itemData.name) } - return repackedTable end diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index ba70836..bfd7b74 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('qb-inventory') ~= 'started' then return end local qbInventory = exports['qb-inventory'] @@ -43,7 +44,7 @@ end Inventory.GetItemInfo = function(item) local itemData = Framework.Shared.Items[item] if not itemData then return {} end - local repackedTable = { + return { name = itemData.name, label = itemData.label, stack = itemData.unique, @@ -51,7 +52,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description, image = Inventory.GetImagePath(itemData.image or itemData.name) } - return repackedTable end ---comment diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index 9a0f0d1..a1058aa 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('qs-inventory') ~= 'started' then return end local quasar = exports["qs-inventory"] Inventory = Inventory or {} @@ -17,7 +18,7 @@ Inventory.GetItemInfo = function(item) if not itemsData then return {} end local itemData = itemsData[item] if not itemData then return {} end - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -25,7 +26,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable end ---comment diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index 0cbc1a8..f7e06ed 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('qs-inventory') ~= 'started' then return end local quasar = exports['qs-inventory'] @@ -131,7 +132,7 @@ Inventory.GetItemInfo = function(item) if not itemsData then return {} end local itemData = itemsData[item] if not itemData then return {} end - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -139,7 +140,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable end diff --git a/modules/inventory/tgiann-inventory/client.lua b/modules/inventory/tgiann-inventory/client.lua index 5ddcee4..ed33bd8 100644 --- a/modules/inventory/tgiann-inventory/client.lua +++ b/modules/inventory/tgiann-inventory/client.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('tgiann-inventory') ~= 'started' then return end local tgiann = exports["tgiann-inventory"] @@ -14,7 +15,7 @@ end Inventory.GetItemInfo = function(item) local itemData = tgiann:GetItemList() if not itemData[item] then return {} end - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -22,7 +23,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable end ---comment diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index 6219a5e..553d998 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: duplicate-set-field if GetResourceState('tgiann-inventory') ~= 'started' then return end local tgiann = exports["tgiann-inventory"] @@ -100,7 +101,16 @@ end Inventory.GetItemBySlot = function(src, slot) local item = tgiann:GetItemBySlot(src, slot) if not item then return {} end - return {name = item.name, label = item.label, weight = item.weight, slot = slot, count = item.amount, metadata = item.info, stack = item.unique or false, description = item.description} + return { + name = item.name, + label = item.label, + weight = item.weight, + slot = slot, + count = item.amount, + metadata = item.info, + stack = item.unique or false, + description = item.description + } end ---This will return a table of the item data including the image (very useful for menus etc) @@ -109,7 +119,7 @@ end Inventory.GetItemInfo = function(item) local itemData = tgiann:GetItemList() if not itemData[item] then return {} end - local repackedTable = { + return { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", stack = itemData.unique or "false", @@ -117,7 +127,6 @@ Inventory.GetItemInfo = function(item) description = itemData.description or "none", image = itemData.image or Inventory.GetImagePath(item), } - return repackedTable end ---This will update the item metadata for an item with the provided slot and metadata, its best to get the item first