From d61070620a655d58ff4e29b387e437cc35bdecc3 Mon Sep 17 00:00:00 2001 From: gononono64 Date: Tue, 14 Jan 2025 12:30:29 -0600 Subject: [PATCH] Fixed menus....again --- modules/framework/qb-core/server.lua | 1 + modules/inventory/_default/server.lua | 5 +++-- modules/menu/_oxlib.lua | 3 ++- modules/menu/_qb-menu.lua | 11 +++++++---- modules/menu/client.lua | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index ce5b43f..96e988e 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -251,6 +251,7 @@ end Framework.RegisterUsableItem = function(itemName, cb) local func = function(src, item, itemData) itemData = itemData or item + print("Placing TV", src, json.encode(itemData)) itemData.metadata = itemData.metadata or itemData.info or {} cb(src, itemName, itemData) end diff --git a/modules/inventory/_default/server.lua b/modules/inventory/_default/server.lua index b33ed1f..67930d1 100644 --- a/modules/inventory/_default/server.lua +++ b/modules/inventory/_default/server.lua @@ -1,11 +1,12 @@ Inventory = Inventory or {} -Inventory.AddItem = function(src, item, count, slot, metadata) +Inventory.AddItem = function(src, item, count, slot, metadata) return Framework.AddItem(src, item, count, slot, metadata) end Inventory.RemoveItem = function(src, item, count, slot, metadata) - return Framework.RemoveItem(src, item.name, count, slot, metadata) + item = type(item) == "table" and item.name or item + return Framework.RemoveItem(src, item, count, slot, metadata) end Inventory.GetItemInfo = function(item) diff --git a/modules/menu/_oxlib.lua b/modules/menu/_oxlib.lua index 6ce94db..6a73ff3 100644 --- a/modules/menu/_oxlib.lua +++ b/modules/menu/_oxlib.lua @@ -47,5 +47,6 @@ OpenMenu = function(id, data, useQBinput) if useQBinput then data = QBToOxMenu(id, data) end - return exports['qb-menu']:openMenu(data) + exports['qb-menu']:openMenu(data) + return data end diff --git a/modules/menu/_qb-menu.lua b/modules/menu/_qb-menu.lua index 2078353..990c19c 100644 --- a/modules/menu/_qb-menu.lua +++ b/modules/menu/_qb-menu.lua @@ -3,7 +3,7 @@ if GetResourceState('qb-menu') ~= 'started' and (BridgeClientConfig.MenuSystem ~ ---@param id string The menu ID. ---@param menu table The Ox menu data. ---@return table The QB menu data. -local function OxToQBMenu(id, menu) +function OxToQBMenu(id, menu) local qbMenu = { { header = menu.title, @@ -17,14 +17,16 @@ local function OxToQBMenu(id, menu) icon = v.icon, } - if v.onSelect and type(v.onSelect) == 'function' then + if v.onSelect then button.params = { - event = "community_bridge:client:MenuCallback", + event = "community_bridge:client:MenuCallback", args = {id = id, selected = i, args = v.args, onSelect = v.onSelect}, } end + table.insert(qbMenu, button) end + return qbMenu end @@ -32,5 +34,6 @@ OpenMenu = function(id, data, useQBinput) if not useQBinput then data = OxToQBMenu(id, data) end - return exports['qb-menu']:openMenu(data) + exports['qb-menu']:openMenu(data) + return data end \ No newline at end of file diff --git a/modules/menu/client.lua b/modules/menu/client.lua index bbd74cf..caf0594 100644 --- a/modules/menu/client.lua +++ b/modules/menu/client.lua @@ -12,10 +12,10 @@ if GetResourceState('ox_lib') ~= 'started' and GetResourceState('qb-menu') ~= 's ---@param useQb boolean Whether to use QB menu syntax. ---@return id string The menu ID. function Menu.Open(data, useQb) - --local id = data.id or CreateUniqueId(Menus) local id = data.id or Ids.CreateUniqueId(Menus, nil, nil) local menuExists = Menus[id] - OpenMenu(id, data, useQb) + Menus[id] = OpenMenu(id, data, useQb) + data.id = id return id end