diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index e8e65d1..8791d2e 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -198,8 +198,13 @@ end -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. -Framework.RegisterUsableItem = function(item, cb) - ESX.RegisterUsableItem(item, cb) +Framework.RegisterUsableItem = function(itemName, cb) + local func = function(src, item, itemData) + itemData = itemData or item + itemData.metadata = itemData.metadata or itemData.info or {} + cb(src, itemName, itemData) + end + ESX.RegisterUsableItem(itemName, func) end Framework.Commands = {} diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 13e5144..ce5b43f 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -248,8 +248,13 @@ end -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. -Framework.RegisterUsableItem = function(item, cb) - QBCore.Functions.CreateUseableItem(item, cb) +Framework.RegisterUsableItem = function(itemName, cb) + local func = function(src, item, itemData) + itemData = itemData or item + itemData.metadata = itemData.metadata or itemData.info or {} + cb(src, itemName, itemData) + end + QBCore.Functions.CreateUseableItem(itemName, func) end Framework.Commands = {} diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 13592c1..41ccd2e 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -235,6 +235,11 @@ end -- Framework.RegisterUsableItem(item, cb) -- Registers a usable item with a callback function. -Framework.RegisterUsableItem = function(item, cb) - return QBox:CreateUseableItem(item, cb) +Framework.RegisterUsableItem = function(itemName, cb) + local func = function(src, item, itemData) + itemData = itemData or item + itemData.metadata = itemData.metadata or itemData.info or {} + cb(src, itemName, itemData) + end + return QBox:CreateUseableItem(itemName, cb) end \ No newline at end of file diff --git a/modules/menu/_oxlib.lua b/modules/menu/_oxlib.lua index 9ad495c..6ce94db 100644 --- a/modules/menu/_oxlib.lua +++ b/modules/menu/_oxlib.lua @@ -1,4 +1,4 @@ -if GetResourceState('ox_lib') ~= 'started' then return end +if GetResourceState('ox_lib') ~= 'started' and (BridgeClientConfig.MenuSystem ~= "ox" or BridgeClientConfig.MenuSystem ~= "auto") then return end --- Converts a QB menu to an Ox menu. ---@param id string The menu ID. diff --git a/modules/menu/_qb-menu.lua b/modules/menu/_qb-menu.lua index 987cde2..2078353 100644 --- a/modules/menu/_qb-menu.lua +++ b/modules/menu/_qb-menu.lua @@ -1,4 +1,4 @@ -if GetResourceState('qb-menu') ~= 'started' then return end +if GetResourceState('qb-menu') ~= 'started' and (BridgeClientConfig.MenuSystem ~= "qb" or BridgeClientConfig.MenuSystem ~= "auto") then return end --- Converts an Ox menu to a QB menu. ---@param id string The menu ID. ---@param menu table The Ox menu data. diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index 4490a67..98ba67b 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -15,18 +15,30 @@ local targetZones = {} Target = {} Target.AddGlobalPlayer = function(options) + for k, v in pairs(options) do + options[k].onSelect = v.onSelect or v.action + end ox_target:addGlobalPlayer(options) end Target.AddLocalEntity = function(entities, options) + for k, v in pairs(options) do + options[k].onSelect = v.onSelect or v.action + end ox_target:addLocalEntity(entities, options) end Target.AddModel = function(models, options) + for k, v in pairs(options) do + options[k].onSelect = v.onSelect or v.action + end ox_target:addModel(models, options) end Target.AddBoxZone = function(name, coords, size, heading, options) + for k, v in pairs(options) do + options[k].onSelect = v.onSelect or v.action + end local target = ox_target:addBoxZone({ coords = coords, size = size, diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua index f329e75..8de88f3 100644 --- a/modules/target/qb-target/client.lua +++ b/modules/target/qb-target/client.lua @@ -15,7 +15,7 @@ Target = {} Target.AddGlobalPlayer = function(options) for k, v in pairs(options) do - options[k].action = v.onSelect + options[k].action = v.action or v.onSelect end exports['qb-target']:AddGlobalPlayer({ options = options, @@ -25,7 +25,7 @@ end Target.AddLocalEntity = function(entities, options) for k, v in pairs(options) do - options[k].action = v.onSelect + options[k].action = v.action or v.onSelect end exports['qb-target']:AddTargetEntity(entities, { options = options, @@ -35,7 +35,7 @@ end Target.AddModel = function(models, options) for k, v in pairs(options) do - options[k].action = v.onSelect + options[k].action = v.action or v.onSelect end exports['qb-target']:AddTargetModel(models, { options = options, @@ -45,7 +45,7 @@ end Target.AddBoxZone = function(name, coords, size, heading, options) for k, v in pairs(options) do - options[k].action = v.onSelect + options[k].action = v.action or v.onSelect end exports['qb-target']:AddBoxZone(name, coords, size.x, size.y, { name = name, diff --git a/modules/utility/client/object_Placer.lua b/modules/utility/client/object_Placer.lua index f2a4ddc..7a40b17 100644 --- a/modules/utility/client/object_Placer.lua +++ b/modules/utility/client/object_Placer.lua @@ -13,7 +13,7 @@ local placementText = { } local function finishPlacing() - Bridge.notify.HideHelpText() + Bridge.Notify.HideHelpText() if activePlacementProp == nil then return end DeleteObject(activePlacementProp) activePlacementProp = nil @@ -37,7 +37,7 @@ Utility.PlaceObject = function(object, distance, snapToGround, allowedMats, offs SetEntityInvincible(activePlacementProp, true) FreezeEntityPosition(activePlacementProp, true) - Bridge.notify.ShowHelpText(type(placementText) == 'table' and table.concat(placementText) or placementText, { + Bridge.Notify.ShowHelpText(type(placementText) == 'table' and table.concat(placementText) or placementText, { position = "left-center", }) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 70e8571..ca4e13c 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -2,7 +2,7 @@ BridgeClientConfig = {} BridgeClientConfig.NotifySystem = "ox" -- Change this to your notification system (ox/qb/esx?) BridgeClientConfig.ZoneSystem = "ox" -- Change this to your dialog system (ox/poly) BridgeClientConfig.InputSystem = "ox" -- Change this to your Input system (ox/qb) -BridgeClientConfig.MenuSystem = "ox" -- Change this to your Menu system (ox/qb) +BridgeClientConfig.MenuSystem = "auto" -- Change this to your Menu system (ox/qb) BridgeClientConfig.ProgressBar = "ox" -- Change this to your preferred progress bar (ox/qb) BridgeClientConfig.DebugLevel = 3 -- Change this to your Debug level, 1 for none, 2 for some, 3 for all data BridgeClientConfig.ShowHelpText = "ox" --