fix(es_extended/callback): merge styling issues

esx-framework · Dec 3, 2024 · 76a1df3 · 76a1df3
1 parent d23b7ce
commit 76a1df3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/[core]/es_extended/client/modules/callback.lua b/[core]/es_extended/client/modules/callback.lua
@@ -1,5 +1,9 @@
 ---@diagnostic disable: duplicate-set-field
 
+-- =============================================
+-- MARK: Variables
+-- =============================================
+
 Callbacks = {}
 
 Callbacks.requests = {}

diff --git a/[core]/es_extended/server/modules/callback.lua b/[core]/es_extended/server/modules/callback.lua
@@ -1,11 +1,19 @@
 ---@diagnostic disable: duplicate-set-field
 
+-- =============================================
+-- MARK: Variables
+-- =============================================
+
 Callbacks = {}
 
 Callbacks.requests = {}
 Callbacks.storage = {}
 Callbacks.id = 0
 
+-- =============================================
+-- MARK: Internal Functions
+-- =============================================
+
 function Callbacks:Register(name, resource, cb)
     self.storage[name] = {
         resource = resource,
@@ -60,15 +68,9 @@ function Callbacks:RecieveClient(requestId, invoker, ...)
     self.requests[requestId] = nil
 end
 
-RegisterNetEvent("esx:clientCallback", function(requestId, invoker, ...)
-    Callbacks:RecieveClient(requestId, invoker, ...)
-end)
-
-RegisterNetEvent("esx:triggerServerCallback", function(eventName, requestId, invoker, ...)
-    local source = source
-    Callbacks:ServerRecieve(source, eventName, requestId, invoker, ...)
-end)
-
+-- =============================================
+-- MARK: ESX Functions
+-- =============================================
 
 ---@param player number playerId
 ---@param eventName string
@@ -84,7 +86,7 @@ end
 ---@param eventName string
 ---@param callback function
 ---@return nil
-ESX.RegisterServerCallback = function(eventName, callback)
+function ESX.RegisterServerCallback(eventName, callback)
     local invokingResource = GetInvokingResource()
     local invoker = (invokingResource and invokingResource ~= "Unknown") and invokingResource or "es_extended"
 
@@ -97,6 +99,19 @@ function ESX.DoesServerCallbackExist(eventName)
     return Callbacks.storage[eventName] ~= nil
 end
 
+-- =============================================
+-- MARK: Events
+-- =============================================
+
+RegisterNetEvent("esx:clientCallback", function(requestId, invoker, ...)
+    Callbacks:RecieveClient(requestId, invoker, ...)
+end)
+
+RegisterNetEvent("esx:triggerServerCallback", function(eventName, requestId, invoker, ...)
+    local source = source
+    Callbacks:ServerRecieve(source, eventName, requestId, invoker, ...)
+end)
+
 AddEventHandler("onResourceStop", function(resource)
     for k, v in pairs(Callbacks.storage) do
         if v.resource == resource then