From ab1a22d113daefc2b0c0f75efaa478c542d7a25a Mon Sep 17 00:00:00 2001 From: qwezert Date: Sun, 12 Jan 2025 15:48:41 +0200 Subject: [PATCH 1/2] fix add access to core Shared table for qb-core, fix small typos, fix position for ox notify, add api to core Commands for qb-core --- modules/framework/qb-core/client.lua | 12 +++++++++++- modules/framework/qb-core/server.lua | 5 +++++ modules/inventory/origen_inventory/server.lua | 2 +- modules/notify/client.lua | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 78f5545..fd33406 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -49,6 +49,8 @@ Framework.GetIsPlayerDead = function() return QBCore.Functions.GetPlayerData().metadata["isdead"] or QBCore.GetPlayerData().metadata["inlaststand"] end +Framework.Shared = QBCore.Shared + RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) FillBridgeTables() @@ -65,5 +67,13 @@ RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) PlayerJobLabel = data.label PlayerJobGradeName = data.grade.name PlayerJobGradeLevel = data.grade.level - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) +end) + +RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) + PlayerJobName = data.name + PlayerJobLabel = data.label + PlayerJobGradeName = data.grade.name + PlayerJobGradeLevel = data.grade.level + TriggerEvent('community_bridge:Client:OnPlayerGangUpdate', PlayerGangName, PlayerGangLabel, PlayerGangGradeName, PlayerGangGradeLevel) end) \ No newline at end of file diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index c5d2bd9..202dd73 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -244,4 +244,9 @@ end -- Registers a usable item with a callback function. Framework.RegisterUsableItem = function(item, cb) QBCore.Functions.CreateUseableItem(item, cb) +end + +Framework.Commands = {} +Framework.Commands.Add = function(name, help, arguments, argsrequired, callback, permission, ...) + QBCore.Commands.Add(name, help, arguments, argsrequired, callback, permission, ...) end \ No newline at end of file diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index 0bf768e..c5fbcdb 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -6,7 +6,7 @@ local origen_inventory = exports.origen_inventory Inventory.AddItem = function(src, item, count, slot, metadata) if not origen_inventory:CanCarryItem(src, item, count) then - return Bridge.notify.SendNotify(src, "Inventory Full", "error", 5000) + return Bridge.Notify.SendNotify(src, "Inventory Full", "error", 5000) end return origen_inventory:AddItem(src, item, count, nil, nil, metadata) end diff --git a/modules/notify/client.lua b/modules/notify/client.lua index 9c51e4d..1995499 100644 --- a/modules/notify/client.lua +++ b/modules/notify/client.lua @@ -13,7 +13,7 @@ Notify.SendNotify = function(message, type, time) elseif notifyType == 'esx_notify' then return ESX.ShowNotification(message, type, time) elseif notifyType == 'ox' then - return exports.ox_lib:notify({ description = message, type = type, position = 'top' }) + return exports.ox_lib:notify({ description = message, type = type, position = 'center-left' }) elseif notifyType == 't-notify' then return exports['t-notify']:Alert({ style = 'info', message = message, duration = time, }) elseif notifyType == 'wasabi_notify' then From 68407ba4c3ef975298256ce01f1f5eeaf257523e Mon Sep 17 00:00:00 2001 From: qwezert Date: Sun, 12 Jan 2025 15:52:40 +0200 Subject: [PATCH 2/2] qe --- modules/inventory/origen_inventory/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index c5fbcdb..0bf768e 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -6,7 +6,7 @@ local origen_inventory = exports.origen_inventory Inventory.AddItem = function(src, item, count, slot, metadata) if not origen_inventory:CanCarryItem(src, item, count) then - return Bridge.Notify.SendNotify(src, "Inventory Full", "error", 5000) + return Bridge.notify.SendNotify(src, "Inventory Full", "error", 5000) end return origen_inventory:AddItem(src, item, count, nil, nil, metadata) end