From 33a9b6ba69c98727dfc210ec6035f0e94e875cf1 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Wed, 9 Jul 2025 22:08:44 -0400 Subject: [PATCH] Framework.ItemList for esx and a catchall for qbox --- modules/framework/es_extended/client.lua | 7 ++++++ modules/framework/es_extended/server.lua | 27 ++++++++++++++++++++++++ modules/inventory/_default/client.lua | 4 ++++ modules/inventory/_default/server.lua | 1 + 4 files changed, 39 insertions(+) diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index ce90f27..6879291 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -6,6 +6,13 @@ Callback = Callback or Require("lib/utility/shared/callbacks.lua") Framework = Framework or {} +-- This is an internal function, its here to attempt to emulate qbs shared items mainly. +Framework.ItemList = function() + local items = Callback.Trigger('community_bridge:Callback:GetFrameworkItems', false) + local fakeShared = { Items = items.Items or {} } + return fakeShared +end + ---This will get the name of the framework being used (if a supported framework). ---@return string Framework.GetFrameworkName = function() diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 32583d3..b5bf610 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -14,6 +14,28 @@ Framework.GetFrameworkName = function() return 'es_extended' end +-- This is an internal function, its here to attempt to emulate qbs shared items mainly. +Framework.ItemList = function() + local items = ESX.Items + local repackedTable = {} + for k, v in pairs(items) do + if v.label then + repackedTable[k] = { + name = k, + label = v.label, + weight = v.weight, + type = "item", + image = k .. ".png", + unique = false, + useable = true, + shouldClose = true, + description = 'No description provided.', + } + end + end + return { Items = repackedTable or {} } +end + ---This will return if the player is an admin in the framework. ---@param src any ---@return boolean @@ -457,6 +479,11 @@ Callback.Register('community_bridge:Callback:GetFrameworkJobs', function(source) return Framework.GetFrameworkJobs() or {} end) +-- This is linked to an internal function, its an attempt to standardize the item list across frameworks. +Callback.Register('community_bridge:Callback:GetFrameworkItems', function(source) + return Framework.ItemList() or {} +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/inventory/_default/client.lua b/modules/inventory/_default/client.lua index fbe8df5..820f869 100644 --- a/modules/inventory/_default/client.lua +++ b/modules/inventory/_default/client.lua @@ -45,6 +45,10 @@ end ---This will return the entire items table from the inventory. ---@return table Inventory.Items = function() + if not Framework.Shared or not Framework.Shared.Items then + local itemList = Framework.ItemList() or { Items = {} } + return itemList.Items + end return Framework.Shared.Items end diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index 65903b9..73d4b84 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -54,6 +54,7 @@ end ---This will return the entire items table from the inventory. ---@return table Inventory.Items = function() + if not Framework.Shared or not Framework.Shared.Items then return Framework.ItemList().Items end return Framework.Shared.Items end