Merge pull request #35 from PenguScript/main

+ Inventory.HasItem
This commit is contained in:
MrNewb authored and GitHub committed 2025-02-17 14:27:29 -05:00
commit b9b90938d3
12 files changed
+65 -10

No files matched your search

+5
View File
@@ -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(item)
local hasItem = ESX.SearchInventory(item, true)
return hasItem > 0 and true or false
end
Framework.GetPlayerInventory = function()
return ESX.GetPlayerData().inventory
end
+7 -1
View File
@@ -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)
end)
+5 -1
View File
@@ -57,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
@@ -109,4 +113,4 @@ RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data)
PlayerJobGradeLevel = data.grade.level
TriggerEvent('community_bridge:Client:OnPlayerGangUpdate', PlayerGangName, PlayerGangLabel, PlayerGangGradeName, PlayerGangGradeLevel)
--]]
end)
end)
+5 -1
View File
@@ -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
end
+1 -1
View File
@@ -38,4 +38,4 @@ Inventory.GetPlayerInventory = function()
})
end
return items
end
end
+6 -1
View File
@@ -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
end
@@ -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
end
+7 -1
View File
@@ -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)
--Bridge.RegisterModule("Inventory", Inventory)
+7 -1
View File
@@ -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
end
+7 -1
View File
@@ -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 qb: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
end
@@ -21,6 +21,11 @@ Inventory.GetItemInfo = function(item)
return repackedTable
end
Inventory.HasItem = function(item)
local check = quasar:Search(item)
return check and true or 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)
@@ -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
end