refactor: remove modules system and fix indentation

Setting a "standard" module and resource structure is too limiting, so stick to import only.
This commit is contained in:
Linden
2021-11-11 07:52:38 +11:00
parent f72665b197
commit ab4807fee0
6 changed files with 72 additions and 119 deletions

View File

@@ -1,13 +1,13 @@
local ServerCallbacks = {}
local function CallbackTimer(event, delay)
if type(delay) == 'number' then
local time = GetGameTimer()
if (ServerCallbacks[event] or 0) > time then
return false
end
ServerCallbacks[event] = time + delay
end
if type(delay) == 'number' then
local time = GetGameTimer()
if (ServerCallbacks[event] or 0) > time then
return false
end
ServerCallbacks[event] = time + delay
end
end
local ServerCallback = table.create(0, 2)
@@ -16,28 +16,28 @@ local ServerCallback = table.create(0, 2)
---@param event string
---@param delay number
ServerCallback.Await = function(resource, event, delay, ...)
CallbackTimer(event, delay)
event = ('__cb_%s:%s'):format(resource, event)
TriggerServerEvent(event, ...)
local promise = promise.new()
event = RegisterNetEvent(event, function(...)
promise:resolve({...})
RemoveEventHandler(event)
end)
return table.unpack(Citizen.Await(promise))
CallbackTimer(event, delay)
event = ('__cb_%s:%s'):format(resource, event)
TriggerServerEvent(event, ...)
local promise = promise.new()
event = RegisterNetEvent(event, function(...)
promise:resolve({...})
RemoveEventHandler(event)
end)
return table.unpack(Citizen.Await(promise))
end
--- Sends an event to the server and triggers a callback function once the response is returned.
---@param event string
---@param delay number
ServerCallback.Async = function(resource, event, delay, cb, ...)
CallbackTimer(event, delay)
event = ('__cb_%s:%s'):format(resource, event)
TriggerServerEvent(event, ...)
event = RegisterNetEvent(event, function(...)
cb(...)
RemoveEventHandler(event)
end)
CallbackTimer(event, delay)
event = ('__cb_%s:%s'):format(resource, event)
TriggerServerEvent(event, ...)
event = RegisterNetEvent(event, function(...)
cb(...)
RemoveEventHandler(event)
end)
end
return ServerCallback

View File

@@ -1,16 +1,14 @@
local ServerCallbacks = {}
local ServerCallback = {
Register = function(name, callback)
name = ('__cb_%s:%s'):format(GetCurrentResourceName(), name)
Register = function(name, callback)
name = ('__cb_%s:%s'):format(GetCurrentResourceName(), name)
RegisterServerEvent(name, function(...)
local source = source
callback(source, function(...)
TriggerClientEvent(name, source, ...)
end, ...)
end)
end
RegisterServerEvent(name, function(...)
local source = source
callback(source, function(...)
TriggerClientEvent(name, source, ...)
end, ...)
end)
end
}
return ServerCallback