From fe02d77b5894f3d383ad898ae729e4e3603b10e5 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:59:19 -0500 Subject: [PATCH 1/6] AddGlobalVehicle --- modules/target/ox_target/client.lua | 7 +++++++ modules/target/qb-target/client.lua | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index 98ba67b..e14021c 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -21,6 +21,13 @@ Target.AddGlobalPlayer = function(options) ox_target:addGlobalPlayer(options) end +Target.AddGlobalVehicle = function(options) + for k, v in pairs(options) do + options[k].onSelect = v.onSelect or v.action + end + ox_target:addGlobalVehicle(options) +end + Target.AddLocalEntity = function(entities, options) for k, v in pairs(options) do options[k].onSelect = v.onSelect or v.action diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua index 8de88f3..3ebb5d8 100644 --- a/modules/target/qb-target/client.lua +++ b/modules/target/qb-target/client.lua @@ -23,6 +23,17 @@ Target.AddGlobalPlayer = function(options) }) end + +Target.AddGlobalVehicle = function(options) + for k, v in pairs(options) do + options[k].action = v.action or v.onSelect + end + exports['qb-target']:AddGlobalVehicle({ + options = options, + distance = options.distance or 1.5 + }) +end + Target.AddLocalEntity = function(entities, options) for k, v in pairs(options) do options[k].action = v.action or v.onSelect From 1485af3678a9fd27b54634bdb6f08e037c348b84 Mon Sep 17 00:00:00 2001 From: gononono64 <96976330+gononono64@users.noreply.github.com> Date: Sun, 26 Jan 2025 11:18:55 -0600 Subject: [PATCH 2/6] Matched qbcore and esx to usable convention Tested in both esx and qb using mrc tv which relies on itemdata.metadata (using remotes) --- modules/framework/es_extended/server.lua | 2 +- modules/framework/qb-core/server.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 21d1b81..afc48e1 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -202,7 +202,7 @@ 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) + cb(src, itemData) end ESX.RegisterUsableItem(itemName, func) end diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index ce5b43f..e8d168a 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -252,7 +252,7 @@ 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) + cb(src, itemData) end QBCore.Functions.CreateUseableItem(itemName, func) end From b3720a0bfc5535ec9b1fa6e39067dc821f09a293 Mon Sep 17 00:00:00 2001 From: gononono64 <96976330+gononono64@users.noreply.github.com> Date: Sun, 26 Jan 2025 11:22:53 -0600 Subject: [PATCH 3/6] reverting until newb comes around. Switched qbox to match Im not 100% on which convention he wants --- modules/framework/qb-core/server.lua | 2 +- modules/framework/qbx_core/server.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index e8d168a..ce5b43f 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -252,7 +252,7 @@ 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, itemData) + cb(src, itemName, itemData) end QBCore.Functions.CreateUseableItem(itemName, func) end diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 41ccd2e..5689844 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -241,5 +241,5 @@ Framework.RegisterUsableItem = function(itemName, cb) itemData.metadata = itemData.metadata or itemData.info or {} cb(src, itemName, itemData) end - return QBox:CreateUseableItem(itemName, cb) + return QBox:CreateUseableItem(itemName, func) end \ No newline at end of file From a30b63a2cd9bb7b153d1ed66387c317438e7082e Mon Sep 17 00:00:00 2001 From: gononono64 <96976330+gononono64@users.noreply.github.com> Date: Sun, 26 Jan 2025 11:24:40 -0600 Subject: [PATCH 4/6] undoing esx need to talk to newb for convention --- modules/framework/es_extended/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index afc48e1..21d1b81 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -202,7 +202,7 @@ 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, itemData) + cb(src, itemName, itemData) end ESX.RegisterUsableItem(itemName, func) end From 2ee6286c7a3866b39984ce195c00f813d7d8c317 Mon Sep 17 00:00:00 2001 From: gononono64 <96976330+gononono64@users.noreply.github.com> Date: Sun, 26 Jan 2025 12:07:26 -0600 Subject: [PATCH 5/6] yeeted itemName Yeeted itemName because redundant and example given previously by newb was this: ```lua ... function(src, itemData) ... ``` --- modules/framework/es_extended/server.lua | 2 +- modules/framework/nd_core/server.lua | 2 +- modules/framework/qb-core/server.lua | 2 +- modules/framework/qbx_core/server.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 21d1b81..afc48e1 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -202,7 +202,7 @@ 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) + cb(src, itemData) end ESX.RegisterUsableItem(itemName, func) end diff --git a/modules/framework/nd_core/server.lua b/modules/framework/nd_core/server.lua index 54d5857..7e5c07a 100644 --- a/modules/framework/nd_core/server.lua +++ b/modules/framework/nd_core/server.lua @@ -181,7 +181,7 @@ Framework.RegisterUsableItem = function(itemName, cb) exports(itemName, function(event, item, inventory, slot, data) local slotData = exports.ox_inventory:GetSlot(inventory.id, slot) if event == 'usingItem' then - cb(inventory.id, item, slotData) + cb(inventory.id, slotData) return false end end) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index ce5b43f..e8d168a 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -252,7 +252,7 @@ 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) + cb(src, itemData) end QBCore.Functions.CreateUseableItem(itemName, func) end diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 5689844..9f9e464 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -239,7 +239,7 @@ 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) + cb(src, itemData) end return QBox:CreateUseableItem(itemName, func) end \ No newline at end of file From ca80bfbea0b24e1fc8248c259c7bfc8f5c11dd37 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 26 Jan 2025 19:15:16 -0500 Subject: [PATCH 6/6] 0.2.0 Breaking changes for register usables --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index 67ff777..526232f 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,7 +4,7 @@ lua54 'yes' use_experimental_fxv2_oal 'yes' author 'The Order of the Sacred Framework' description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.' -version '0.1.6' +version '0.2.0' shared_scripts { '@ox_lib/init.lua',