From 65f4b32b4525cdcdb63a1cb258849151f2026ed0 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:41:16 -0500 Subject: [PATCH 1/6] OnPlayerUnload events (untested) atm, will test later today --- modules/framework/es_extended/server.lua | 4 ++++ modules/framework/nd_core/server.lua | 4 ++++ modules/framework/qb-core/server.lua | 4 ++++ modules/framework/qbx_core/server.lua | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index afc48e1..f072175 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -207,6 +207,10 @@ Framework.RegisterUsableItem = function(itemName, cb) ESX.RegisterUsableItem(itemName, func) end +RegisterNetEvent("esx:playerLogout", function() + TriggerEvent("community_bridge:Server:OnPlayerUnload", source) +end) + Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) ESX.RegisterCommand(name, permission, function(xPlayer, args, showError) diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 7e5c07a..e9e6158 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -177,6 +177,10 @@ Framework.GetAccountBalance = function(src, _type) return player.getData(_type) end +RegisterNetEvent("ND:characterUnloaded", function() + TriggerEvent("community_bridge:Server:OnPlayerUnload", source) +end) + Framework.RegisterUsableItem = function(itemName, cb) exports(itemName, function(event, item, inventory, slot, data) local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index e8d168a..bcff41b 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -257,6 +257,10 @@ Framework.RegisterUsableItem = function(itemName, cb) QBCore.Functions.CreateUseableItem(itemName, func) end +RegisterNetEvent("QBCore:Server:OnPlayerUnload", function() + TriggerEvent("community_bridge:Server:OnPlayerUnload", source) +end) + Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...) diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 9f9e464..7cf53cf 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -233,6 +233,10 @@ Framework.SetMetadata = function(src, item, slot, metadata) return player.Functions.AddItem(item, 1, slot, metadata) end +RegisterNetEvent("QBCore:Server:OnPlayerUnload", function() + TriggerEvent("community_bridge:Server:OnPlayerUnload", source) +end) + -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(itemName, cb) From 1d23d256c08ea32cc5873980f7a0adf357234d79 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:42:38 -0500 Subject: [PATCH 2/6] playerdropped handler --- modules/framework/es_extended/server.lua | 5 +++++ modules/framework/nd_core/server.lua | 5 +++++ modules/framework/qb-core/server.lua | 5 +++++ modules/framework/qbx_core/server.lua | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index f072175..c8adbea 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -211,6 +211,11 @@ RegisterNetEvent("esx:playerLogout", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", source) end) +AddEventHandler("playerDropped", function() + local src = source + TriggerEvent("community_bridge:Server:OnPlayerUnload", src) +end) + Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) ESX.RegisterCommand(name, permission, function(xPlayer, args, showError) diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index e9e6158..5aa7fe4 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -181,6 +181,11 @@ RegisterNetEvent("ND:characterUnloaded", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", source) end) +AddEventHandler("playerDropped", function() + local src = source + TriggerEvent("community_bridge:Server:OnPlayerUnload", src) +end) + Framework.RegisterUsableItem = function(itemName, cb) exports(itemName, function(event, item, inventory, slot, data) local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index bcff41b..fd32325 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -261,6 +261,11 @@ RegisterNetEvent("QBCore:Server:OnPlayerUnload", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", source) end) +AddEventHandler("playerDropped", function() + local src = source + TriggerEvent("community_bridge:Server:OnPlayerUnload", src) +end) + Framework.Commands = {} Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...) diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 7cf53cf..234805a 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -237,6 +237,11 @@ RegisterNetEvent("QBCore:Server:OnPlayerUnload", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", source) end) +AddEventHandler("playerDropped", function() + local src = source + TriggerEvent("community_bridge:Server:OnPlayerUnload", src) +end) + -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(itemName, cb) From 0c90d659a0d64e4b1d89e270f675b1ba20c764ea Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 31 Jan 2025 19:15:33 -0500 Subject: [PATCH 3/6] export GetInventoryItems standard, add export GetItemBySlot --- modules/framework/qb-core/server.lua | 20 +++++++++ modules/inventory/_default/server.lua | 4 ++ modules/inventory/codem-inventory/client.lua | 6 ++- modules/inventory/codem-inventory/server.lua | 38 ++++++++++++---- modules/inventory/jpr-inventory/client.lua | 15 +++++++ modules/inventory/jpr-inventory/server.lua | 25 +++++++++++ modules/inventory/origen_inventory/client.lua | 4 +- modules/inventory/origen_inventory/server.lua | 43 +++++++++++++------ modules/inventory/ox_inventory/server.lua | 6 ++- modules/inventory/ps-inventory/server.lua | 8 ++++ modules/inventory/qb-inventory/server.lua | 17 ++++++++ modules/inventory/qs-inventory/client.lua | 5 ++- modules/inventory/qs-inventory/server.lua | 39 +++++++++++++---- modules/inventory/tgiann-inventory/server.lua | 21 +++++++-- 14 files changed, 210 insertions(+), 41 deletions(-) create mode 100644 modules/inventory/jpr-inventory/client.lua create mode 100644 modules/inventory/jpr-inventory/server.lua diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index fd32325..fa26451 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -67,6 +67,26 @@ Framework.GetPlayerInventory = function(src) return repackedTable end +Framework.GetItemBySlot = function(src, slot) + local playerItems = QBCore.Functions.GetPlayer(src).PlayerData.items + local repack = {} + for _, v in pairs(playerItems) do + if v.slot == slot then + return { + name = v.name, + label = v.label, + weight = v.weight, + count = v.amount, + metadata = v.info, + slot = v.slot, + stack = v.unique or false, + description = v.description or "none", + } + end + end + return repack +end + -- Framework.SetMetadata(src, metadata, value) -- Adds the specified metadata key and number value to the player's data. Framework.SetPlayerMetadata = function(src, metadata, value) diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 1528f67..4571426 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -21,6 +21,10 @@ Inventory.GetInventoryItems = function(src) return Framework.GetPlayerInventory(src) end +Inventory.GetItemBySlot = function(src, slot) + return Framework.GetItemBySlot(src, slot) +end + Inventory.SetMetadata = function(src, item, slot, metadata) return Framework.SetMetadata(src, item, slot, metadata) end diff --git a/modules/inventory/codem-inventory/client.lua b/modules/inventory/codem-inventory/client.lua index 93d902d..f09c41f 100644 --- a/modules/inventory/codem-inventory/client.lua +++ b/modules/inventory/codem-inventory/client.lua @@ -1,8 +1,10 @@ if GetResourceState('codem-inventory') ~= 'started' then return end Inventory = Inventory or {} +local codem = exports['codem-inventory'] + Inventory.GetItemInfo = function(item) - local itemData = exports['codem-inventory']:GetItemList() + local itemData = codem:GetItemList() if not itemData[item] then return {} end local repackedTable = { name = itemData.name or "Missing Name", @@ -18,4 +20,4 @@ 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" -end +end \ No newline at end of file diff --git a/modules/inventory/codem-inventory/server.lua b/modules/inventory/codem-inventory/server.lua index aff87d7..61ea00e 100644 --- a/modules/inventory/codem-inventory/server.lua +++ b/modules/inventory/codem-inventory/server.lua @@ -1,20 +1,22 @@ if GetResourceState('codem-inventory') ~= 'started' then return end +local codem = exports['codem-inventory'] + Inventory = Inventory or {} Inventory.AddItem = function(src, item, count, slot, metadata) - return exports['codem-inventory']:AddItem(src, item, count, slot, metadata) + return codem:AddItem(src, item, count, slot, metadata) end Inventory.RemoveItem = function(src, item, count, slot, metadata) if metadata == nil then - return exports['codem-inventory']:RemoveItem(src, item, count, slot) + return codem:RemoveItem(src, item, count, slot) else - local items = exports['codem-inventory']:GetInventory(nil, src) + local items = codem:GetInventory(nil, src) for _, itemInfo in pairs(items) do if itemInfo.name == item then if itemInfo.info == metadata then - return exports['codem-inventory']:RemoveItem(src, item, count, itemInfo.slot) + return codem:RemoveItem(src, item, count, itemInfo.slot) end end end @@ -22,7 +24,7 @@ Inventory.RemoveItem = function(src, item, count, slot, metadata) end Inventory.GetItemInfo = function(item) - local itemData = exports['codem-inventory']:GetItemList() + local itemData = codem:GetItemList() if not itemData[item] then return {} end local repackedTable = { name = itemData.name or "Missing Name", @@ -37,10 +39,10 @@ end Inventory.GetItemCount = function(src, item, metadata) if metadata == nil then - return exports['codem-inventory']:GetItemsTotalAmount(src, item) + return codem:GetItemsTotalAmount(src, item) else local count = 0 - local items = exports['codem-inventory']:GetInventory(nil, src) + local items = codem:GetInventory(nil, src) for _, itemInfo in pairs(items) do if itemInfo.name == item and itemInfo.info == metadata then count = count + itemInfo.amount @@ -50,8 +52,26 @@ Inventory.GetItemCount = function(src, item, metadata) end end +Inventory.GetItemBySlot = function(src, slot) + local slotData = codem:GetItemBySlot(src, slot) + -- The keys are not documented, so this is a best guess + for _, item in pairs(slotData) do + return { + name = item.name, + label = item.name, + weight = item.weight, + slot = slot, + count = item.amount, + metadata = item.info, + stack = item.unique, + description = item.description + } + end + return {} +end + Inventory.GetInventoryItems = function(src) - local items = exports['codem-inventory']:GetInventory(nil, src) + local items = codem:GetInventory(nil, src) local repackedTable = {} for _, v in pairs(items) do table.insert(repackedTable, { @@ -65,7 +85,7 @@ Inventory.GetInventoryItems = function(src) end Inventory.SetMetadata = function(src, item, slot, metadata) - exports['codem-inventory']:SetItemMetadata(src, slot, metadata) + codem:SetItemMetadata(src, slot, metadata) end Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) diff --git a/modules/inventory/jpr-inventory/client.lua b/modules/inventory/jpr-inventory/client.lua new file mode 100644 index 0000000..d29debf --- /dev/null +++ b/modules/inventory/jpr-inventory/client.lua @@ -0,0 +1,15 @@ +if GetResourceState('jpr-inventory') ~= 'started' then return end + +Inventory = Inventory or {} + +RegisterNetEvent('community_bridge:client:jpr-inventory:openStash', function(id, data) + if source ~= 65535 then return end + TriggerEvent("inventory:client:SetCurrentStash", id) + TriggerServerEvent('inventory:server:OpenInventory', 'stash', id, { maxweight = data.weight, slots = data.slots }) +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 diff --git a/modules/inventory/jpr-inventory/server.lua b/modules/inventory/jpr-inventory/server.lua new file mode 100644 index 0000000..41225eb --- /dev/null +++ b/modules/inventory/jpr-inventory/server.lua @@ -0,0 +1,25 @@ +if GetResourceState('jpr-inventory') ~= 'started' then return end + +local jpr = exports['jpr-inventory'] + +Inventory = Inventory or {} + +Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) + return true +end + +Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) + TriggerClientEvent('community_bridge:client:qb-inventory:openStash', src, id, { weight = weight, slots = slots }) +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 + +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 } +end \ No newline at end of file diff --git a/modules/inventory/origen_inventory/client.lua b/modules/inventory/origen_inventory/client.lua index b8bfa99..389cf2f 100644 --- a/modules/inventory/origen_inventory/client.lua +++ b/modules/inventory/origen_inventory/client.lua @@ -2,10 +2,10 @@ if GetResourceState('origen_inventory') ~= 'started' then return end Inventory = Inventory or {} -local origen_inventory = exports.origen_inventory +local origin = exports.origen_inventory Inventory.GetItemInfo = function(item) - local itemData = origen_inventory:Items(item) + local itemData = origin:Items(item) local repackedTable = { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index 0bf768e..bed3d25 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -5,14 +5,11 @@ Inventory = Inventory or {} local origen_inventory = exports.origen_inventory Inventory.AddItem = function(src, item, count, slot, metadata) - if not origen_inventory:CanCarryItem(src, item, count) then - return Bridge.notify.SendNotify(src, "Inventory Full", "error", 5000) - end - return origen_inventory:AddItem(src, item, count, nil, nil, metadata) + return origen_inventory:AddItem(src, item, count, metadata, slot, true) end Inventory.RemoveItem = function(src, item, count, slot, metadata) - return origen_inventory:RemoveItem(src, item, count, metadata) + return origen_inventory:removeItem(src, item, count, metadata, slot, true) end Inventory.GetItemInfo = function(item) @@ -35,28 +32,49 @@ Inventory.GetItemCount = function(src, item, metadata) local items = origen_inventory:GetInventory(src) local count = 0 for _, itemInfo in pairs(items) do - if itemInfo.name == item and itemInfo.info == metadata then - count = count + itemInfo.amount + if itemInfo.name == item and itemInfo.info == metadata or itemInfo.metadata == metadata then + count = count + itemInfo.count end end return count end end -Inventory.GetPlayerInventory = function(src) +Inventory.GetInventoryItems = function(src) local playerItems = origen_inventory:GetInventory(src) local repackedTable = {} - for _, v in pairs(playerItems) do + for _, v in pairs(playerItems.inventory) do + print(json.encode(v, { indent = true })) table.insert(repackedTable, { name = v.name, - count = v.amount, - metadata = v.info, + count = v.count, + metadata = v.metadata, slot = v.slot, }) end return repackedTable end +Inventory.GetItemBySlot = function(src, slot) + -- This inventory got rid of almost all the great exports they had =( + local slotData = Inventory.GetInventoryItems(src) + for _, item in pairs(slotData) do + if item.slot == slot then + return { + name = item.name, + label = item.name, + weight = item.weight, + slot = slot, + count = item.amount, + metadata = item.metadata, + stack = item.unique or false, + description = item.description + } + end + end + return {} +end + Inventory.CanCarryItem = function(src, item, count) return origen_inventory:CanCarryItems(src, item, count) end @@ -70,7 +88,8 @@ Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coo end Inventory.SetMetadata = function(src, item, slot, metadata) - origen_inventory:SetItemMetadata(src, item, slot, metadata) + Inventory.RemoveItem (src, item, 1, slot, nil) + Inventory.AddItem(src, item, 1, slot, metadata) end Inventory.GetImagePath = function(item) diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 01ac955..60413e0 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -16,11 +16,15 @@ Inventory.GetItem = function(src, item, metadata) return ox_inventory:GetItem(src, item, metadata, false) end +Inventory.GetItemBySlot = function(src, slot) + return ox_inventory:GetSlot(src, slot) +end + Inventory.GetItemCount = function(src, item, metadata) return ox_inventory:GetItemCount(src, item, metadata, false) end -Inventory.GetPlayerInventory = function(src) +Inventory.GetInventoryItems = function(src) return ox_inventory:GetInventoryItems(src, false) end diff --git a/modules/inventory/ps-inventory/server.lua b/modules/inventory/ps-inventory/server.lua index bf0df31..72f6a61 100644 --- a/modules/inventory/ps-inventory/server.lua +++ b/modules/inventory/ps-inventory/server.lua @@ -1,5 +1,7 @@ if GetResourceState('ps-inventory') ~= 'started' then return end +local sloth = exports['ps-inventory'] + Inventory = Inventory or {} Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) @@ -14,4 +16,10 @@ 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 + +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} end \ No newline at end of file diff --git a/modules/inventory/qb-inventory/server.lua b/modules/inventory/qb-inventory/server.lua index f2604e8..ca26756 100644 --- a/modules/inventory/qb-inventory/server.lua +++ b/modules/inventory/qb-inventory/server.lua @@ -1,5 +1,7 @@ if GetResourceState('qb-inventory') ~= 'started' then return end +local qbInventory = exports['qb-inventory'] + Inventory = Inventory or {} Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) @@ -14,4 +16,19 @@ 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 + +function Inventory.GetItemBySlot(src, slot) + local slotData = qbInventory:GetItemBySlot(src, slot) + if not slotData then return {} end + return { + name = slotData.name, + label = slotData.name, + weight = slotData.weight, + slot = slotData.slot, + count = slotData.amount, + metadata = slotData.info, + stack = slotData.unique, + description = slotData.description + } end \ No newline at end of file diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index e54e334..be612bd 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -1,13 +1,14 @@ if GetResourceState('qs-inventory') ~= 'started' then return end +local quasar = exports["qs-inventory"] Inventory = Inventory or {} Inventory.OpenStash = function(id) - exports['qs-inventory']:RegisterStash(id, 50, 50000) + quasar:RegisterStash(id, 50, 50000) end Inventory.GetItemInfo = function(item) - local itemData = exports['qs-inventory']:GetItemList() + local itemData = quasar:GetItemList() if not itemData[item] then return {} end local repackedTable = { name = itemData.name or "Missing Name", diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index 7fab8cc..9605867 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -1,22 +1,24 @@ if GetResourceState('qs-inventory') ~= 'started' then return end +local quasar = exports['qs-inventory'] + Inventory = Inventory or {} Inventory.AddItem = function(src, item, count, slot, metadata) - if not exports['qs-inventory']:CanCarryItem(src, item, count) then return false end - return exports['qs-inventory']:AddItem(src, item, count, slot, metadata) + if not quasar:CanCarryItem(src, item, count) then return false end + return quasar:AddItem(src, item, count, slot, metadata) end Inventory.RemoveItem = function(src, item, count, slot, metadata) - return exports['qs-inventory']:RemoveItem(src, item, count, slot, metadata) + return quasar:RemoveItem(src, item, count, slot, metadata) end Inventory.GetItemCount = function(src, item, metadata) - return exports['qs-inventory']:GetItemTotalAmount(src, item) + return quasar:GetItemTotalAmount(src, item) end -Inventory.GetPlayerInventory = function(src) - local playerItems = exports['qs-inventory']:GetInventory(src) +Inventory.GetInventoryItems = function(src) + local playerItems = quasar:GetInventory(src) local repackedTable = {} for _, v in pairs(playerItems) do table.insert(repackedTable, { @@ -29,8 +31,27 @@ Inventory.GetPlayerInventory = function(src) return repackedTable end +Inventory.GetItemBySlot = function(src, slot) + local playerItems = quasar:GetInventory(src) + for _, item in pairs(playerItems) do + if item.slot == slot then + 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 + end + return nil +end + Inventory.CanCarryItem = function(src, item, count) - return exports['qs-inventory']:CanCarryItem(src, item, count) + return quasar:CanCarryItem(src, item, count) end Inventory.RegisterStash = function(id, label, slots, weight, owner, groups, coords) @@ -43,7 +64,7 @@ Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coo end Inventory.GetItemInfo = function(item) - local itemData = exports['qs-inventory']:GetItemList() + local itemData = quasar:GetItemList() if not itemData[item] then return {} end local repackedTable = { name = itemData.name or "Missing Name", @@ -57,7 +78,7 @@ Inventory.GetItemInfo = function(item) end Inventory.SetMetadata = function(src, item, slot, metadata) - return exports['qs-inventory']:SetItemMetadata(src, slot, metadata) + return quasar:SetItemMetadata(src, slot, metadata) end Inventory.GetImagePath = function(item) diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index 92a9fb0..f6132b9 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -1,16 +1,16 @@ if GetResourceState('tgiann-inventory') ~= 'started' then return end + local tgiann = exports["tgiann-inventory"] Inventory = Inventory or {} Inventory.AddItem = function(src, item, count, slot, metadata) if not tgiann:CanCarryItem(src, item, count) then return false end - local action = tgiann:AddItem(src, item, count, metadata) - return (action.itemAddRemoveLog == 'added') + return tgiann:AddItem(src, item, count, slot, metadata, false) end Inventory.RemoveItem = function(src, item, count, slot, metadata) - return tgiann:RemoveItem(src, item, count, nil, metadata) + return tgiann:RemoveItem(src, item, count, slot, metadata) end Inventory.GetItem = function(src, item, metadata) @@ -26,7 +26,14 @@ Inventory.GetItemCount = function(src, item, metadata) end Inventory.GetInventoryItems = function(src) - return tgiann:GetPlayerItems(src) + local inventory = tgiann:GetPlayerItems(src) + local items = {} + for _, v in pairs(inventory) do + if tonumber(_) then + table.insert(items, {name = v.name, label = v.name, weight = 0, description = v.description, slot = v.slot, count = v.amount, metadata = v.info}) + end + end + return items end Inventory.CanCarryItem = function(src, item, count) @@ -37,6 +44,12 @@ Inventory.RegisterStash = function(id, label, slots, weight, owner) return tgiann:CreateCustomStashWithItem(id, {}) 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} +end + Inventory.GetItemInfo = function(item) local itemData = tgiann:GetItemList() if not itemData[item] then return {} end From 3a9d85aa1be0d070a325d4435725a3c95e73117e Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 31 Jan 2025 19:23:47 -0500 Subject: [PATCH 4/6] Added - Framework.GetFrameworkName() Useful in situations that need run for framework specific tables --- modules/framework/es_extended/client.lua | 4 ++++ modules/framework/es_extended/server.lua | 4 ++++ modules/framework/qb-core/client.lua | 4 ++++ modules/framework/qb-core/server.lua | 4 ++++ modules/framework/qbx_core/client.lua | 4 ++++ modules/framework/qbx_core/server.lua | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index 0a4d2c9..05f7d8e 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -4,6 +4,10 @@ ESX = exports["es_extended"]:getSharedObject() Framework = {} +Framework.GetFrameworkName = function() + return 'es_extended' +end + Framework.GetPlayerData = function() return ESX.PlayerData end diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index c8adbea..d001235 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -4,6 +4,10 @@ ESX = exports["es_extended"]:getSharedObject() Framework = {} +Framework.GetFrameworkName = function() + return 'es_extended' +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index ad73bda..0b4f254 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -5,6 +5,10 @@ QBCore = exports['qb-core']:GetCoreObject() Framework = {} +Framework.GetFrameworkName = function() + return 'qb-core' +end + Framework.GetPlayerData = function() return QBCore.Functions.GetPlayerData() end diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index fa26451..4bfaf13 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -5,6 +5,10 @@ QBCore = exports['qb-core']:GetCoreObject() Framework = {} +Framework.GetFrameworkName = function() + return 'qb-core' +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 3d50505..dd8fc95 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -4,6 +4,10 @@ QBox = exports.qbx_core Framework = {} +Framework.GetFrameworkName = function() + return 'qbx_core' +end + Framework.GetPlayerData = function() return QBox.GetPlayerData() end diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 234805a..d7d51b5 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -4,6 +4,10 @@ local QBox = exports.qbx_core Framework = {} +Framework.GetFrameworkName = function() + return 'qbx_core' +end + -- Framework.GetPlayerIdentifier(src) -- Returns the citizen ID of the player. Framework.GetPlayerIdentifier = function(src) From cb1bba700ff722f378a345d9e52109ae25ba54fc Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Fri, 31 Jan 2025 19:56:25 -0500 Subject: [PATCH 5/6] GetPlayerInventory This will be the final adjustment to name, felt it was more descriptive considering the alt inventory types. stash/trunk/glovebox/etc --- modules/inventory/_default/server.lua | 2 +- modules/inventory/codem-inventory/server.lua | 20 +++++++++---------- modules/inventory/origen_inventory/server.lua | 2 +- modules/inventory/ox_inventory/server.lua | 2 +- modules/inventory/qs-inventory/server.lua | 2 +- modules/inventory/tgiann-inventory/server.lua | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 4571426..565b87f 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -17,7 +17,7 @@ Inventory.GetItemCount = function(src, item, metadata) return Framework.GetItemCount(src, item, metadata) end -Inventory.GetInventoryItems = function(src) +Inventory.GetPlayerInventory = function(src) return Framework.GetPlayerInventory(src) end diff --git a/modules/inventory/codem-inventory/server.lua b/modules/inventory/codem-inventory/server.lua index 61ea00e..9164fab 100644 --- a/modules/inventory/codem-inventory/server.lua +++ b/modules/inventory/codem-inventory/server.lua @@ -55,22 +55,22 @@ end Inventory.GetItemBySlot = function(src, slot) local slotData = codem:GetItemBySlot(src, slot) -- The keys are not documented, so this is a best guess - for _, item in pairs(slotData) do + for _, v in pairs(slotData) do return { - name = item.name, - label = item.name, - weight = item.weight, - slot = slot, - count = item.amount, - metadata = item.info, - stack = item.unique, - description = item.description + name = v.name, + label = v.name, + weight = v.weight, + slot = v.slot, + count = v.amount, + metadata = v.info, + stack = v.unique, + description = v.description } end return {} end -Inventory.GetInventoryItems = function(src) +Inventory.GetPlayerInventory = function(src) local items = codem:GetInventory(nil, src) local repackedTable = {} for _, v in pairs(items) do diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index bed3d25..86d5ec3 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -40,7 +40,7 @@ Inventory.GetItemCount = function(src, item, metadata) end end -Inventory.GetInventoryItems = function(src) +Inventory.GetPlayerInventory = function(src) local playerItems = origen_inventory:GetInventory(src) local repackedTable = {} for _, v in pairs(playerItems.inventory) do diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index 60413e0..364a173 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -24,7 +24,7 @@ Inventory.GetItemCount = function(src, item, metadata) return ox_inventory:GetItemCount(src, item, metadata, false) end -Inventory.GetInventoryItems = function(src) +Inventory.GetPlayerInventory = function(src) return ox_inventory:GetInventoryItems(src, false) end diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index 9605867..bca1d5f 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -17,7 +17,7 @@ Inventory.GetItemCount = function(src, item, metadata) return quasar:GetItemTotalAmount(src, item) end -Inventory.GetInventoryItems = function(src) +Inventory.GetPlayerInventory = function(src) local playerItems = quasar:GetInventory(src) local repackedTable = {} for _, v in pairs(playerItems) do diff --git a/modules/inventory/tgiann-inventory/server.lua b/modules/inventory/tgiann-inventory/server.lua index f6132b9..d190e26 100644 --- a/modules/inventory/tgiann-inventory/server.lua +++ b/modules/inventory/tgiann-inventory/server.lua @@ -25,7 +25,7 @@ Inventory.GetItemCount = function(src, item, metadata) return _item.amount or 0 end -Inventory.GetInventoryItems = function(src) +Inventory.GetPlayerInventory = function(src) local inventory = tgiann:GetPlayerItems(src) local items = {} for _, v in pairs(inventory) do From a08c22afed134555df30c202feb20b63b4ec96c0 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 3 Feb 2025 10:26:05 -0500 Subject: [PATCH 6/6] Get player owned vehicles added for esx/qb/qbx/nd --- modules/framework/es_extended/server.lua | 13 +++++++++++ modules/framework/nd_core/server.lua | 29 ++++++++++++++++-------- modules/framework/qb-core/server.lua | 12 ++++++++++ modules/framework/qbx_core/server.lua | 12 ++++++++++ modules/utility/client/utility.lua | 10 ++++++++ 5 files changed, 67 insertions(+), 9 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index d001235..3e2cd26 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -200,6 +200,19 @@ Framework.RemoveItem = function(src, item, amount, slot, metadata) return xPlayer.removeInventoryItem(item, amount) end +Framework.GetOwnedVehicles = function(src) + local citizenId = Framework.GetPlayerIdentifier(src) + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM owned_vehicles WHERE owner = '" .. citizenId .. "'") + local vehicles = {} + for i=1, #result do + local vehicle = result[i].vehicle + local plate = result[i].plate + local model = json.decode(vehicle).model + table.insert(vehicles, {vehicle = model, plate = plate}) + end + return vehicles +end + -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(itemName, cb) diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 5aa7fe4..5ceb7fa 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -177,14 +177,16 @@ Framework.GetAccountBalance = function(src, _type) return player.getData(_type) end -RegisterNetEvent("ND:characterUnloaded", function() - TriggerEvent("community_bridge:Server:OnPlayerUnload", source) -end) - -AddEventHandler("playerDropped", function() - local src = source - TriggerEvent("community_bridge:Server:OnPlayerUnload", src) -end) +Framework.GetOwnedVehicles = function(src) + local player = NDCore:getPlayer(src) + local vehicles = NDCore:getVehicles(player.id) + local foundvehicles = {} + for i=1, #vehicles do + local veh = vehicles[i] + table.insert(foundvehicles, {vehicle = veh.properties.model, plate = veh.plate}) + end + return foundvehicles +end Framework.RegisterUsableItem = function(itemName, cb) exports(itemName, function(event, item, inventory, slot, data) @@ -194,4 +196,13 @@ Framework.RegisterUsableItem = function(itemName, cb) return false end end) -end \ No newline at end of file +end + +RegisterNetEvent("ND:characterUnloaded", function() + TriggerEvent("community_bridge:Server:OnPlayerUnload", source) +end) + +AddEventHandler("playerDropped", function() + local src = source + TriggerEvent("community_bridge:Server:OnPlayerUnload", src) +end) \ No newline at end of file diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 4bfaf13..274790a 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -270,6 +270,18 @@ Framework.SetMetadata = function(src, item, slot, metadata) return player.Functions.AddItem(item, 1, freeSlot, metadata) end +Framework.GetOwnedVehicles = function(src) + local citizenId = Framework.GetPlayerIdentifier(src) + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'") + local vehicles = {} + for i=1, #result do + local vehicle = result[i].vehicle + local plate = result[i].plate + table.insert(vehicles, {vehicle = vehicle, plate = plate}) + end + return vehicles +end + -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(itemName, cb) diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index d7d51b5..f2b68e9 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -237,6 +237,18 @@ Framework.SetMetadata = function(src, item, slot, metadata) return player.Functions.AddItem(item, 1, slot, metadata) end +Framework.GetOwnedVehicles = function(src) + local citizenId = Framework.GetPlayerIdentifier(src) + local result = MySQL.Sync.fetchAll("SELECT vehicle, plate FROM player_vehicles WHERE citizenid = '" .. citizenId .. "'") + local vehicles = {} + for i=1, #result do + local vehicle = result[i].vehicle + local plate = result[i].plate + table.insert(vehicles, {vehicle = vehicle, plate = plate}) + end + return vehicles +end + RegisterNetEvent("QBCore:Server:OnPlayerUnload", function() TriggerEvent("community_bridge:Server:OnPlayerUnload", source) end) diff --git a/modules/utility/client/utility.lua b/modules/utility/client/utility.lua index 4cc1e60..8bd9fd9 100644 --- a/modules/utility/client/utility.lua +++ b/modules/utility/client/utility.lua @@ -176,6 +176,16 @@ Utility.NotifyText = function(text) DrawNotification(false, true) end +Utility.RequestAnimDict = function(dict) + RequestAnimDict(dict) + local count = 0 + while not HasAnimDictLoaded(dict) and count < 30000 do + Wait(0) + count = count + 1 + end + return HasAnimDictLoaded(dict) +end + Utility.TeleportPlayer = function(coords, conditionFunction, afterTeleportFunction) if conditionFunction ~= nil then if not conditionFunction() then