💥 feat(decorator): add decorator to be alias of some functions like @onnet = RegisterNetEvent (must use require by our)

shared_script '@es_extended/shared/require.lua'

Author: mysbryce

client/functions/init.lua

@@ -18,13 +18,13 @@ require('client.functions.services.notifications')
 require('client.functions.services.ui')
 require('client.functions.services.games')
 
-RegisterNetEvent('esx:showNotification', ESX.ShowNotification)
+@onNet('esx:showNotification', ESX.ShowNotification)
 
-RegisterNetEvent('esx:showAdvancedNotification', ESX.ShowAdvancedNotification)
+@onNet('esx:showAdvancedNotification', ESX.ShowAdvancedNotification)
 
-RegisterNetEvent('esx:showHelpNotification', ESX.ShowHelpNotification)
+@onNet('esx:showHelpNotification', ESX.ShowHelpNotification)
 
-AddEventHandler('onResourceStop', function(resourceName)
+@onStop(function(resourceName)
   for i = 1, #ESX.UI.Menu.Opened, 1 do
     if ESX.UI.Menu.Opened[i] then
       if ESX.UI.Menu.Opened[i].resourceName == resourceName or ESX.UI.Menu.Opened[i].namespace == resourceName then

client/functions/services/games/init.lua

@@ -37,8 +37,8 @@ Core.EnumerateEntitiesWithinDistance = function(entities, isPlayerEntities, coor
   return nearbyEntities
 end
 
-require('client.functions.services.game.players-peds')
-require('client.functions.services.game.utils')
-require('client.functions.services.game.objects')
-require('client.functions.services.game.vehicles')
-require('client.functions.services.game.raycast')
+require('client.functions.services.games.players-peds')
+require('client.functions.services.games.utils')
+require('client.functions.services.games.objects')
+require('client.functions.services.games.vehicles')
+require('client.functions.services.games.raycast')

client/functions/services/ui/init.lua

@@ -1,3 +1,25 @@
+---@param str string The string to hash
+---@return string The hashed string
+function ESX.HashString(str)
+  return ('~INPUT_%s~'):format(('%x'):format(joaat(str) & 0x7fffffff + 2 ^ 31):upper())
+end
+
+---@param command_name string The command name
+---@param label string The label to show
+---@param input_group string The input group
+---@param key string The key to bind
+---@param on_press function The function to call on press
+---@param on_release? function The function to call on release
+function ESX.RegisterInput(command_name, label, input_group, key, on_press, on_release)
+  local command = on_release and '+' .. command_name or command_name
+  RegisterCommand(command, on_press, false)
+  Core.Input[command_name] = ESX.HashString(command)
+  if on_release then
+    RegisterCommand('-' .. command_name, on_release, false)
+  end
+  RegisterKeyMapping(command, label or '', input_group or 'keyboard', key or '')
+end
+
 ---@param menuType string
 ---@param open function The function to call on open
 ---@param close function The function to call on close

client/modules/adjustments/basic-actions/player_crouch.lua

@@ -2,7 +2,7 @@ local crouchCommand = 'player_crouch'
 local animSet = 'move_ped_crouched'
 local crouched = false
 
-RegisterCommand(crouchCommand, function()
+@command(crouchCommand, function()
   local isDead = LocalPlayer.state.isDead or false
 
   if not isDead then

client/modules/adjustments/basic-actions/player_finger_pointing.lua

@@ -41,7 +41,7 @@ local function stopPointing()
   RemoveAnimDict(anim.dict)
 end
 
-RegisterCommand(pointingCommand, function()
+@command(pointingCommand, function()
   local ped = cache.ped
 
   if not IsPedInAnyVehicle(ped, true) and not LocalPlayer.state.isDead then

client/modules/adjustments/basic-actions/player_handsup.lua

@@ -5,7 +5,7 @@ local anim = {
   name = 'handsup_enter',
 }
 
-RegisterCommand(handsupCommand, function()
+@command(handsupCommand, function()
   local ped = cache.ped
   local notInVehicle = cache.vehicle == false or cache.vehicle == nil
 

client/modules/adjustments/basic-actions/player_slide.lua

@@ -9,17 +9,17 @@ return function(cooldown)
     exitName = 'exit',
   }
 
-  RegisterCommand('+press_shift', function()
+  @command('+press_shift', function()
     pressShift = true
   end, false)
 
-  RegisterCommand('-press_shift', function()
+  @command('-press_shift', function()
     pressShift = false
   end, false)
 
   RegisterKeyMapping('+press_shift', '(Don\'t change) Press Shift', 'keyboard', 'LSHIFT')
 
-  RegisterCommand(slideCommand, function()
+  @command(slideCommand, function()
     local isDead = LocalPlayer.state.isDead or false
 
     if canSlide and not isDead and pressShift then

client/modules/adjustments/init.lua

@@ -227,7 +227,7 @@ end
 
 function M:DisableRadio()
   if adjustment.remove_hud_components[16] then
-    AddEventHandler('esx:enteredVehicle', function(vehicle)
+    @on('esx:enteredVehicle', function(vehicle)
       SetVehRadioStation(vehicle, 'OFF')
       SetUserRadioControlEnabled(false)
     end)

client/modules/death/init.lua

@@ -79,7 +79,7 @@ function M:Died()
 end
 
 function M:Load()
-  AddEventHandler('esx:onPlayerSpawn', function()
+  @on('esx:onPlayerSpawn', function()
     LocalPlayer.state:set('isDead', false, true)
 
     Citizen.CreateThreadNow(function()
@@ -97,7 +97,7 @@ function M:Load()
     end)
   end)
 
-  AddEventHandler('esx:onPlayerDeath', function()
+  @on('esx:onPlayerDeath', function()
     LocalPlayer.state:set('isDead', true, true)
   end)
 end

client/modules/init.lua

@@ -20,7 +20,7 @@ local M = {
 
 local registerCallback = lib.callback.register
 
-RegisterNetEvent('esx:requestModel', function(model)
+@onNet('esx:requestModel', function(model)
   ESX.Streaming.RequestModel(model)
 end)
 
@@ -34,7 +34,7 @@ end
 
 local hybridType = public.hybrid_data
 
-RegisterNetEvent('esx:playerLoaded', function(xPlayer, isNew)
+@onNet('esx:playerLoaded', function(xPlayer, isNew)
   local tries = 0
   repeat
     Core.Items = lib.loadJson('db.items')
@@ -157,7 +157,7 @@ RegisterNetEvent('esx:playerLoaded', function(xPlayer, isNew)
   lib.print.info('Player has initialized')
 end)
 
-RegisterNetEvent('esx:setInventory', function(_newInventory)
+@onNet('esx:setInventory', function(_newInventory)
   local newInventory = {}
 
   for index, item in ipairs(_newInventory) do
@@ -178,21 +178,21 @@ local function onPlayerSpawn()
   ESX.SetPlayerData('dead', false)
 end
 
-AddEventHandler('playerSpawned', onPlayerSpawn)
-AddEventHandler('esx:onPlayerSpawn', onPlayerSpawn)
+@on('playerSpawned', onPlayerSpawn)
+@on('esx:onPlayerSpawn', onPlayerSpawn)
 
-AddEventHandler('esx:onPlayerDeath', function()
+@on('esx:onPlayerDeath', function()
   ESX.SetPlayerData('dead', true)
 end)
 
-AddEventHandler('skinchanger:modelLoaded', function()
+@on('skinchanger:modelLoaded', function()
   while not ESX.PlayerLoaded do
     Wait(100)
   end
   TriggerEvent('esx:restoreLoadout')
 end)
 
-AddEventHandler('esx:restoreLoadout', function()
+@on('esx:restoreLoadout', function()
   local ammoTypes = {}
   RemoveAllPedWeapons(cache.ped, true)
 
@@ -249,7 +249,7 @@ AddStateBagChangeHandler('VehicleProperties', nil, function(bagName, _, value)
   ESX.Game.SetVehicleProperties(vehicle, value)
 end)
 
-RegisterNetEvent('esx:setAccountMoney', function(account)
+@onNet('esx:setAccountMoney', function(account)
   local retval = true
   if hybridType == true or hybridType == 'hash' then
     retval = pcall(function()
@@ -274,23 +274,23 @@ RegisterNetEvent('esx:setAccountMoney', function(account)
   ESX.SetPlayerData('accounts', ESX.PlayerData.accounts)
 end)
 
-RegisterNetEvent('esx:setJob', function(job)
+@onNet('esx:setJob', function(job)
   ESX.SetPlayerData('job', job)
 end)
 
-RegisterNetEvent('esx:setGroup', function(group)
+@onNet('esx:setGroup', function(group)
   ESX.SetPlayerData('group', group)
 end)
 
-RegisterNetEvent('esx:registerSuggestions', function(registeredCommands)
+@onNet('esx:registerSuggestions', function(registeredCommands)
   for name, command in pairs(registeredCommands) do
     if command.suggestion then
       TriggerEvent('chat:addSuggestion', ('/%s'):format(name), command.suggestion.help, command.suggestion.arguments)
     end
   end
 end)
 
-RegisterNetEvent('esx:addInventoryItem', function(item, count)
+@onNet('esx:addInventoryItem', function(item, count)
   local retval = true
 
   if hybridType == true or hybridType == 'hash' then
@@ -313,7 +313,7 @@ RegisterNetEvent('esx:addInventoryItem', function(item, count)
   end
 end)
 
-RegisterNetEvent('esx:removeInventoryItem', function(item, count)
+@onNet('esx:removeInventoryItem', function(item, count)
   local retval = true
 
   if hybridType == true or hybridType == 'hash' then
@@ -336,7 +336,7 @@ RegisterNetEvent('esx:removeInventoryItem', function(item, count)
   end
 end)
 
-RegisterNetEvent('esx:addLoadoutItem', function(weaponName, weaponLabel, ammo)
+@onNet('esx:addLoadoutItem', function(weaponName, weaponLabel, ammo)
   local data = {
     name = weaponName,
     ammo = ammo,
@@ -369,7 +369,7 @@ RegisterNetEvent('esx:addLoadoutItem', function(weaponName, weaponLabel, ammo)
   ESX.SetPlayerData('loadout', ESX.PlayerData.loadout)
 end)
 
-RegisterNetEvent('esx:removeLoadoutItem', function(weaponName, weaponLabel)
+@onNet('esx:removeLoadoutItem', function(weaponName, weaponLabel)
   local retval = true
 
   if hybridType == true or hybridType == 'hash' then
@@ -399,16 +399,16 @@ registerCallback('esx:getVehicleType', function(model)
   return ESX.GetVehicleTypeClient(model)
 end)
 
-RegisterNetEvent('esx:updatePlayerData', function(key, val)
+@onNet('esx:updatePlayerData', function(key, val)
   ESX.SetPlayerData(key, val)
 end)
 
 ---@param command string
-RegisterNetEvent('esx:executeCommand', function(command)
+@onNet('esx:executeCommand', function(command)
   ExecuteCommand(command)
 end)
 
-AddEventHandler('onResourceStop', function(resource)
+@on('onResourceStop', function(resource)
   if Core.Events[resource] then
     for i = 1, #Core.Events[resource] do
       RemoveEventHandler(Core.Events[resource][i])