Fixed menus....again

This commit is contained in:
gononono64 committed 2025-01-14 12:30:29 -06:00
1 parent 2ee4216f57
commit d61070620a
5 files changed
+15 -9

No files matched your search

+1
View File
@@ -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
+3 -2
View File
@@ -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)
+2 -1
View File
@@ -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
+7 -4
View File
@@ -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
+2 -2
View File
@@ -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