Merge branch 'main' into player-annotations

Qbox-project · May 11, 2023 · 45305a3 · 45305a3
2 parents 5e1d60c + 2f2e08e
commit 45305a3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/client/events.lua b/client/events.lua
@@ -169,13 +169,15 @@ end)
 -- Callback Events --
 
 -- Client Callback
+---@deprecated call a function instead
 RegisterNetEvent('QBCore:Client:TriggerClientCallback', function(name, ...)
     QBCore.Functions.TriggerClientCallback(name, function(...)
         TriggerServerEvent('QBCore:Server:TriggerClientCallback', name, ...)
     end, ...)
 end)
 
 -- Server Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Client/ instead
 RegisterNetEvent('QBCore:Client:TriggerCallback', function(name, ...)
     if QBCore.ServerCallbacks[name] then
         QBCore.ServerCallbacks[name](...)

diff --git a/client/functions.lua b/client/functions.lua
@@ -138,16 +138,19 @@ end
 -- Callback Functions --
 
 -- Client Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Client/ instead
 function QBCore.Functions.CreateClientCallback(name, cb)
     QBCore.ClientCallbacks[name] = cb
 end
 
+---@deprecated call a function instead
 function QBCore.Functions.TriggerClientCallback(name, cb, ...)
     if not QBCore.ClientCallbacks[name] then return end
     QBCore.ClientCallbacks[name](cb, ...)
 end
 
 -- Server Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Client/ instead
 function QBCore.Functions.TriggerCallback(name, cb, ...)
     QBCore.ServerCallbacks[name] = cb
     TriggerServerEvent('QBCore:Server:TriggerCallback', name, ...)

diff --git a/client/main.lua b/client/main.lua
@@ -2,8 +2,13 @@ QBCore = {}
 QBCore.PlayerData = {}
 QBCore.Config = QBConfig
 QBCore.Shared = QBShared
+
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Client/ instead
 QBCore.ClientCallbacks = {}
+
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Client/ instead
 QBCore.ServerCallbacks = {}
+
 IsLoggedIn = false
 
 exports('GetCoreObject', function()

diff --git a/server/events.lua b/server/events.lua
@@ -158,6 +158,7 @@ end)
 -- Callback Events --
 
 -- Client Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Server instead
 RegisterNetEvent('QBCore:Server:TriggerClientCallback', function(name, ...)
     if QBCore.ClientCallbacks[name] then
         QBCore.ClientCallbacks[name](...)
@@ -166,6 +167,7 @@ RegisterNetEvent('QBCore:Server:TriggerClientCallback', function(name, ...)
 end)
 
 -- Server Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Server instead
 RegisterNetEvent('QBCore:Server:TriggerCallback', function(name, ...)
     local src = source
     QBCore.Functions.TriggerCallback(name, src, function(...)

diff --git a/server/functions.lua b/server/functions.lua
@@ -207,16 +207,19 @@ end
 -- Callback Functions --
 
 -- Client Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Server instead
 function QBCore.Functions.TriggerClientCallback(name, source, cb, ...)
     QBCore.ClientCallbacks[name] = cb
     TriggerClientEvent('QBCore:Client:TriggerClientCallback', source, name, ...)
 end
 
 -- Server Callback
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Server instead
 function QBCore.Functions.CreateCallback(name, cb)
     QBCore.ServerCallbacks[name] = cb
 end
 
+---@deprecated call a function instead
 function QBCore.Functions.TriggerCallback(name, source, cb, ...)
     if not QBCore.ServerCallbacks[name] then return end
     QBCore.ServerCallbacks[name](source, cb, ...)

diff --git a/server/main.lua b/server/main.lua
@@ -1,7 +1,11 @@
 QBCore = {}
 QBCore.Config = QBConfig
 QBCore.Shared = QBShared
+
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Server instead
 QBCore.ClientCallbacks = {}
+
+---@deprecated use https://overextended.github.io/docs/ox_lib/Callback/Lua/Server instead
 QBCore.ServerCallbacks = {}
 
 exports('GetCoreObject', function()