From e706154191d02e3d0ad3132524ac3f520e359f19 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:34:10 -0500 Subject: [PATCH 01/19] Update client.lua --- modules/inventory/_default/client.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/inventory/_default/client.lua b/modules/inventory/_default/client.lua index db02090..bd5f17b 100644 --- a/modules/inventory/_default/client.lua +++ b/modules/inventory/_default/client.lua @@ -5,6 +5,10 @@ Inventory.GetItemInfo = function(item) return Framework.GetItemInfo(item) end +Inventory.HasItem = function(item) + return Framework.HasItem(item) +end + Inventory.GetImagePath = function(item) return "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end From 262811197885ea3d071298a227138d014b670023 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:43:28 -0500 Subject: [PATCH 02/19] Update client.lua --- modules/inventory/codem-inventory/client.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/inventory/codem-inventory/client.lua b/modules/inventory/codem-inventory/client.lua index 6ad452c..b04af5d 100644 --- a/modules/inventory/codem-inventory/client.lua +++ b/modules/inventory/codem-inventory/client.lua @@ -17,6 +17,12 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + local itemList = codem:GetItemList() + local itemCheck = itemList and itemList[item] ~= nil + return itemCheck +end + Inventory.GetImagePath = function(item) local imagePath = string.format("nui://codem-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" @@ -38,4 +44,4 @@ Inventory.GetPlayerInventory = function() }) end return items -end \ No newline at end of file +end From 3542aff067f0665210e96271b4160056b44c7551 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:48:47 -0500 Subject: [PATCH 03/19] Update client.lua --- modules/inventory/jpr-inventory/client.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/inventory/jpr-inventory/client.lua b/modules/inventory/jpr-inventory/client.lua index d29debf..cf5a4df 100644 --- a/modules/inventory/jpr-inventory/client.lua +++ b/modules/inventory/jpr-inventory/client.lua @@ -1,5 +1,6 @@ if GetResourceState('jpr-inventory') ~= 'started' then return end +local jpr = exports['jpr-inventory'] Inventory = Inventory or {} RegisterNetEvent('community_bridge:client:jpr-inventory:openStash', function(id, data) @@ -8,8 +9,12 @@ RegisterNetEvent('community_bridge:client:jpr-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +Inventory.HasItem = function(item) + return jpr:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("jpr-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://jpr-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end From 665e6be22f08e8b7f12b32ca084ae54c3ce3bdb8 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:50:50 -0500 Subject: [PATCH 04/19] Update client.lua --- modules/inventory/origen_inventory/client.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/inventory/origen_inventory/client.lua b/modules/inventory/origen_inventory/client.lua index ebb4154..e7c139a 100644 --- a/modules/inventory/origen_inventory/client.lua +++ b/modules/inventory/origen_inventory/client.lua @@ -17,6 +17,10 @@ Inventory.GetItemInfo = function(item) return repackedTable or {} end +Inventory.HasItem = function(item) + return origin:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("origen_inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://origen_inventory/html/images/%s.png", item) @@ -39,4 +43,4 @@ Inventory.GetPlayerInventory = function() }) end return items -end \ No newline at end of file +end From 0a141fe2c7a0bc4d05a61fd3746da8634e3e9ae7 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:52:37 -0500 Subject: [PATCH 05/19] Update client.lua --- modules/inventory/ox_inventory/client.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/inventory/ox_inventory/client.lua b/modules/inventory/ox_inventory/client.lua index 3f1c239..dc2f1d0 100644 --- a/modules/inventory/ox_inventory/client.lua +++ b/modules/inventory/ox_inventory/client.lua @@ -17,6 +17,12 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + local itemCount = ox_inventory:Search('count', item) + local hasItem = itemCount ~= 0 + return hasItem +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("ox_inventory", string.format("web/images/%s.png", item)) local imagePath = file and string.format("nui://ox_inventory/web/images/%s.png", item) @@ -27,4 +33,4 @@ Inventory.GetPlayerInventory = function() return exports.ox_inventory:GetPlayerItems() end ---Bridge.RegisterModule("Inventory", Inventory) \ No newline at end of file +--Bridge.RegisterModule("Inventory", Inventory) From c08611a99d40e36b6457eddca589c5bb4697d923 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:56:06 -0500 Subject: [PATCH 06/19] Update client.lua --- modules/inventory/ps-inventory/client.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/inventory/ps-inventory/client.lua b/modules/inventory/ps-inventory/client.lua index f031826..b1f0332 100644 --- a/modules/inventory/ps-inventory/client.lua +++ b/modules/inventory/ps-inventory/client.lua @@ -1,5 +1,7 @@ if GetResourceState('ps-inventory') ~= 'started' then return end +local ps = exports['ps-inventory'] + Inventory = Inventory or {} RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, data) @@ -8,8 +10,12 @@ RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, TriggerServerEvent('ps-inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +Inventory.HasItem = function(item) + return ps:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("ps-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://ps-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end From acac0c113f50178178c33ad556a07c3f7dda9c08 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:57:10 -0500 Subject: [PATCH 07/19] Update client.lua --- modules/inventory/ps-inventory/client.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/inventory/ps-inventory/client.lua b/modules/inventory/ps-inventory/client.lua index b1f0332..6f8b2f9 100644 --- a/modules/inventory/ps-inventory/client.lua +++ b/modules/inventory/ps-inventory/client.lua @@ -1,6 +1,6 @@ if GetResourceState('ps-inventory') ~= 'started' then return end -local ps = exports['ps-inventory'] +local ps_inventory = exports['ps-inventory'] Inventory = Inventory or {} @@ -11,7 +11,7 @@ RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, end) Inventory.HasItem = function(item) - return ps:HasItem(item) + return ps_inventory:HasItem(item) end Inventory.GetImagePath = function(item) From db6a1045db3f6d0d584a76eb84c34158b4fcbd70 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:57:20 -0500 Subject: [PATCH 08/19] Update client.lua --- modules/inventory/ps-inventory/client.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/inventory/ps-inventory/client.lua b/modules/inventory/ps-inventory/client.lua index 6f8b2f9..b1f0332 100644 --- a/modules/inventory/ps-inventory/client.lua +++ b/modules/inventory/ps-inventory/client.lua @@ -1,6 +1,6 @@ if GetResourceState('ps-inventory') ~= 'started' then return end -local ps_inventory = exports['ps-inventory'] +local ps = exports['ps-inventory'] Inventory = Inventory or {} @@ -11,7 +11,7 @@ RegisterNetEvent('community_bridge:client:ps-inventory:openStash', function(id, end) Inventory.HasItem = function(item) - return ps_inventory:HasItem(item) + return ps:HasItem(item) end Inventory.GetImagePath = function(item) From ccf2219ad294aa7c36ccf9ef7c76cade6d26c2be Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 12:59:00 -0500 Subject: [PATCH 09/19] Update client.lua --- modules/inventory/qb-inventory/client.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/inventory/qb-inventory/client.lua b/modules/inventory/qb-inventory/client.lua index fc28b4a..3ac50d6 100644 --- a/modules/inventory/qb-inventory/client.lua +++ b/modules/inventory/qb-inventory/client.lua @@ -1,5 +1,7 @@ if GetResourceState('qb-inventory') ~= 'started' then return end +local qb = exports['qb-inventory'] + Inventory = Inventory or {} RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, data) @@ -8,8 +10,12 @@ RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) end) +Inventory.HasItem = function(item) + return exports['qb-inventory']:HasItem(item) +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("qb-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qb-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" -end \ No newline at end of file +end From 3ce2f8f143b631de0fd1d8e8dc6d97068d1d5adc Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:02:36 -0500 Subject: [PATCH 10/19] Update client.lua --- modules/inventory/qs-inventory/client.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index a7b7c1d..80dabc5 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -21,6 +21,11 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + local check = quasar:Search(item) + if check ~= 0 then return true else return false end -- if item count isn't 0, returns true, else return false +end + Inventory.GetImagePath = function(item) local file = LoadResourceFile("qs-inventory", string.format("html/images/%s.png", item)) local imagePath = file and string.format("nui://qs-inventory/html/images/%s.png", item) From 8836a5eab49cd83a7f2536100b741a0315992a82 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:04:39 -0500 Subject: [PATCH 11/19] Update client.lua --- modules/inventory/tgiann-inventory/client.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/inventory/tgiann-inventory/client.lua b/modules/inventory/tgiann-inventory/client.lua index 9508c85..bef81e4 100644 --- a/modules/inventory/tgiann-inventory/client.lua +++ b/modules/inventory/tgiann-inventory/client.lua @@ -21,6 +21,10 @@ Inventory.GetItemInfo = function(item) return repackedTable end +Inventory.HasItem = function(item) + return tgiann:HasItem(item) +end + Inventory.GetImagePath = function(item) local pngPath = LoadResourceFile("inventory_images", string.format("html/images/%s.png", item)) local webpPath = LoadResourceFile("inventory_images", string.format("html/images/%s.webp", item)) @@ -44,4 +48,4 @@ Inventory.GetPlayerInventory = function() }) end return items -end \ No newline at end of file +end From f69827b8002dc97f20a40657831356d2785e14bc Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:26:10 -0500 Subject: [PATCH 12/19] Update client.lua --- modules/inventory/qs-inventory/client.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index 80dabc5..819abe6 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -23,7 +23,7 @@ end Inventory.HasItem = function(item) local check = quasar:Search(item) - if check ~= 0 then return true else return false end -- if item count isn't 0, returns true, else return false + return check and true or false end Inventory.GetImagePath = function(item) From 55c2778eb03229e33513ef3a0e4700323d31f877 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:27:52 -0500 Subject: [PATCH 13/19] Update client.lua --- modules/inventory/qb-inventory/client.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/inventory/qb-inventory/client.lua b/modules/inventory/qb-inventory/client.lua index 3ac50d6..cfe6b5c 100644 --- a/modules/inventory/qb-inventory/client.lua +++ b/modules/inventory/qb-inventory/client.lua @@ -11,7 +11,7 @@ RegisterNetEvent('community_bridge:client:qb-inventory:openStash', function(id, end) Inventory.HasItem = function(item) - return exports['qb-inventory']:HasItem(item) + return qb:HasItem(item) end Inventory.GetImagePath = function(item) From 8953b0e8f82139839f5699a1d650071e27197b21 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:32:03 -0500 Subject: [PATCH 14/19] Update client.lua --- modules/inventory/codem-inventory/client.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/inventory/codem-inventory/client.lua b/modules/inventory/codem-inventory/client.lua index b04af5d..83a0228 100644 --- a/modules/inventory/codem-inventory/client.lua +++ b/modules/inventory/codem-inventory/client.lua @@ -17,12 +17,6 @@ Inventory.GetItemInfo = function(item) return repackedTable end -Inventory.HasItem = function(item) - local itemList = codem:GetItemList() - local itemCheck = itemList and itemList[item] ~= nil - return itemCheck -end - Inventory.GetImagePath = function(item) local imagePath = string.format("nui://codem-inventory/html/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" From 167f0c8b81eb70b05e80f0c3133792c62a282880 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:33:20 -0500 Subject: [PATCH 15/19] Update client.lua --- modules/framework/qb-core/client.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 3b8291b..e6a1e7d 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -13,6 +13,10 @@ Framework.GetPlayerData = function() return QBCore.Functions.GetPlayerData() end +Framework.HasItem = function(item) + return QBCore.Functions.HasItem(item) +end + Framework.GetPlayerMetaData = function(metadata) return QBCore.Functions.GetPlayerData().metadata[metadata] end @@ -109,4 +113,4 @@ RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) PlayerJobGradeLevel = data.grade.level TriggerEvent('community_bridge:Client:OnPlayerGangUpdate', PlayerGangName, PlayerGangLabel, PlayerGangGradeName, PlayerGangGradeLevel) --]] -end) \ No newline at end of file +end) From b653241826199dbd781608b7f4eef6099a08d001 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:33:54 -0500 Subject: [PATCH 16/19] Update client.lua --- modules/framework/qb-core/client.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index e6a1e7d..cb62bc9 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -13,10 +13,6 @@ Framework.GetPlayerData = function() return QBCore.Functions.GetPlayerData() end -Framework.HasItem = function(item) - return QBCore.Functions.HasItem(item) -end - Framework.GetPlayerMetaData = function(metadata) return QBCore.Functions.GetPlayerData().metadata[metadata] end @@ -61,6 +57,10 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end +Framework.HasItem = function(item) + return QBCore.Functions.HasItem(item) +end + Framework.GetPlayerInventory = function() local items = {} local frameworkInv = QBCore.Functions.GetPlayerData().items From 7232f6a990710e22aa74fa87ed019739f1c40b25 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 13:36:45 -0500 Subject: [PATCH 17/19] Update client.lua --- modules/framework/ox_core/client.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/framework/ox_core/client.lua b/modules/framework/ox_core/client.lua index cb054e4..8084091 100644 --- a/modules/framework/ox_core/client.lua +++ b/modules/framework/ox_core/client.lua @@ -29,6 +29,12 @@ Framework.GetPlayerJob = function() return group, title, title, grade end +Framework.HasItem = function() + local itemCount = ox_inventory:Search('count', item) + local hasItem = itemCount ~= 0 + return hasItem +end + Framework.GetPlayerInventory = function() return exports.ox_inventory:GetPlayerItems() end @@ -55,4 +61,4 @@ RegisterNetEvent('ox:setGroup', function(name, grade) PlayerJobGradeName = grade PlayerJobGradeLevel = grade TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) -end) \ No newline at end of file +end) From 045a104d744047d8281b40d5ae943708b192d799 Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 14:16:18 -0500 Subject: [PATCH 18/19] Update client.lua --- modules/framework/es_extended/client.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index eb92eaf..def52a3 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -34,6 +34,11 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade_label, playerData.job.grade end +Framework.HasItem = function() + local hasItem = ESX.SearchInventory(item, true) + return hasItem > 0 and true or false +end + Framework.GetPlayerInventory = function() return ESX.GetPlayerData().inventory end From e20a0d9860690ab35c0e1020b96fcfe04996cb2a Mon Sep 17 00:00:00 2001 From: PenguScripts <102926606+PenguScript@users.noreply.github.com> Date: Mon, 17 Feb 2025 14:26:54 -0500 Subject: [PATCH 19/19] Update client.lua --- modules/framework/es_extended/client.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index def52a3..6841e62 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -34,7 +34,7 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade_label, playerData.job.grade end -Framework.HasItem = function() +Framework.HasItem = function(item) local hasItem = ESX.SearchInventory(item, true) return hasItem > 0 and true or false end