From bb868b864d5d67e550caef090bdacebaaad1a44c Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 13:53:25 +0100 Subject: [PATCH 01/53] refactor(server/classes/player): player statebag --- [core]/es_extended/server/classes/player.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 0af5ad6b..a9c2fa54 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -26,11 +26,12 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, ExecuteCommand(('add_principal identifier.%s group.%s'):format(self.license, self.group)) - Player(self.source).state:set("identifier", self.identifier, true) - Player(self.source).state:set("license", self.license, true) - Player(self.source).state:set("job", self.job, true) - Player(self.source).state:set("group", self.group, true) - Player(self.source).state:set("name", self.name, true) + local stateBag = Player(self.source).state + stateBag:set("identifier", self.identifier, true) + stateBag:set("license", self.license, true) + stateBag:set("job", self.job, true) + stateBag:set("group", self.group, true) + stateBag:set("name", self.name, true) function self.triggerEvent(eventName, ...) TriggerClientEvent(eventName, self.source, ...) From becdf1ec4933a318de6118261e2716a5004afa37 Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 14:14:20 +0100 Subject: [PATCH 02/53] refactor(server/functions): ESX.GetPlayerFromIdentifier add new table: Core.playersByIdentifier removed for loop from GetPlayerFromIdentifier. --- [core]/es_extended/server/common.lua | 2 ++ [core]/es_extended/server/functions.lua | 6 +----- [core]/es_extended/server/main.lua | 3 +++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua index 6aaf87c8..c130f59c 100644 --- a/[core]/es_extended/server/common.lua +++ b/[core]/es_extended/server/common.lua @@ -14,6 +14,8 @@ Core.Pickups = {} Core.PickupId = 0 Core.PlayerFunctionOverrides = {} +Core.playersByIdentifier = {} + AddEventHandler("esx:getSharedObject", function() local Invoke = GetInvokingResource() print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke)) diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 3d2ffe32..f0bf792a 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -245,11 +245,7 @@ function ESX.GetPlayerFromId(source) end function ESX.GetPlayerFromIdentifier(identifier) - for k, v in pairs(ESX.Players) do - if v.identifier == identifier then - return v - end - end + return Core.playersByIdentifier[identifier] end function ESX.GetIdentifier(playerId) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index 8b4c00d3..ffc8e114 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -280,6 +280,7 @@ function loadESXPlayer(identifier, playerId, isNew) local xPlayer = CreateExtendedPlayer(playerId, identifier, userData.group, userData.accounts, userData.inventory, userData.weight, userData.job, userData.loadout, userData.playerName, userData.coords) ESX.Players[playerId] = xPlayer + Core.playersByIdentifier[identifier] = xPlayer if userData.firstname then xPlayer.set('firstName', userData.firstname) @@ -342,6 +343,7 @@ AddEventHandler('playerDropped', function(reason) if xPlayer then TriggerEvent('esx:playerDropped', playerId, reason) + Core.playersByIdentifier[xPlayer.identifier] = nil Core.SavePlayer(xPlayer, function() ESX.Players[playerId] = nil end) @@ -353,6 +355,7 @@ AddEventHandler('esx:playerLogout', function(playerId, cb) if xPlayer then TriggerEvent('esx:playerDropped', playerId) + Core.playersByIdentifier[xPlayer.identifier] = nil Core.SavePlayer(xPlayer, function() ESX.Players[playerId] = nil if cb then From ecd0d4c4f36e812e56459c2ca6f6c9123469549f Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 14:15:22 +0100 Subject: [PATCH 03/53] fix(server/main): ident --- [core]/es_extended/server/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index ffc8e114..7c50263b 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -309,10 +309,10 @@ function loadESXPlayer(identifier, playerId, isNew) maxWeight = xPlayer.getMaxWeight(), money = xPlayer.getMoney(), sex = xPlayer.get("sex") or "m", - firstName = xPlayer.get("firstName") or "John", - lastName = xPlayer.get("lastName") or "Doe", - dateofbirth = xPlayer.get("dateofbirth") or "01/01/2000", - height = xPlayer.get("height") or 120, + firstName = xPlayer.get("firstName") or "John", + lastName = xPlayer.get("lastName") or "Doe", + dateofbirth = xPlayer.get("dateofbirth") or "01/01/2000", + height = xPlayer.get("height") or 120, dead = false }, isNew, userData.skin) From 597574cd084e236150a734851d108a40baaa4ce2 Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 14:26:21 +0100 Subject: [PATCH 04/53] refactor(server/common): remove duplicated job load core --- [core]/es_extended/server/common.lua | 33 +--------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua index c130f59c..8cbff655 100644 --- a/[core]/es_extended/server/common.lua +++ b/[core]/es_extended/server/common.lua @@ -63,38 +63,7 @@ MySQL.ready(function() end end - local Jobs = {} - local jobs = MySQL.query.await('SELECT * FROM jobs') - - for _, v in ipairs(jobs) do - Jobs[v.name] = v - Jobs[v.name].grades = {} - end - - local jobGrades = MySQL.query.await('SELECT * FROM job_grades') - - for _, v in ipairs(jobGrades) do - if Jobs[v.job_name] then - Jobs[v.job_name].grades[tostring(v.grade)] = v - else - print(('[^3WARNING^7] Ignoring job grades for ^5%s^0 due to missing job'):format(v.job_name)) - end - end - - for _, v in pairs(Jobs) do - if ESX.Table.SizeOf(v.grades) == 0 then - Jobs[v.name] = nil - print(('[^3WARNING^7] Ignoring job ^5%s^0 due to no job grades found'):format(v.name)) - end - end - - if not Jobs then - -- Fallback data, if no jobs exist - ESX.Jobs['unemployed'] = {label = 'Unemployed', - grades = {['0'] = {grade = 0, label = 'Unemployed', salary = 200, skin_male = {}, skin_female = {}}}} - else - ESX.Jobs = Jobs - end + ESX.RefreshJobs() print('[^2INFO^7] ESX ^5Legacy 1.9.0^0 initialized!') StartDBSync() From e4f81a75233f1cd2a482bae0f1762414d6b5484e Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 14:35:36 +0100 Subject: [PATCH 05/53] refactor(server/functions): ESX.GetPlayers() it only stayed for backwards compatibility --- [core]/es_extended/server/functions.lua | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index f0bf792a..50e1edf8 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -216,15 +216,7 @@ function Core.SavePlayers(cb) end end -function ESX.GetPlayers() - local sources = {} - - for k, v in pairs(ESX.Players) do - sources[#sources + 1] = k - end - - return sources -end +ESX.GetPlayers = GetPlayers function ESX.GetExtendedPlayers(key, val) local xPlayers = {} From da62365ab0a54c05f25206cba3833e93b32a1fac Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 15:57:20 +0100 Subject: [PATCH 06/53] refactor(server/classes/player): refactor some functions small code format --- [core]/es_extended/server/classes/player.lua | 65 ++++++++++---------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index a9c2fa54..d02757e0 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -121,17 +121,17 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end function self.getAccounts(minimal) - if minimal then - local minimalAccounts = {} - - for i=1, #self.accounts do - minimalAccounts[self.accounts[i].name] = self.accounts[i].money - end - - return minimalAccounts - else + if not minimal then return self.accounts end + + local minimalAccounts = {} + + for i=1, #self.accounts do + minimalAccounts[self.accounts[i].name] = self.accounts[i].money + end + + return minimalAccounts end function self.getAccount(account) @@ -163,32 +163,31 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end function self.getLoadout(minimal) - if minimal then - local minimalLoadout = {} - - for k,v in ipairs(self.loadout) do - minimalLoadout[v.name] = {ammo = v.ammo} - if v.tintIndex > 0 then minimalLoadout[v.name].tintIndex = v.tintIndex end - - if #v.components > 0 then - local components = {} - - for k2,component in ipairs(v.components) do - if component ~= 'clip_default' then - components[#components + 1] = component - end - end - - if #components > 0 then - minimalLoadout[v.name].components = components - end - end - end - - return minimalLoadout - else + if not minimal then return self.loadout end + local minimalLoadout = {} + + for k,v in ipairs(self.loadout) do + minimalLoadout[v.name] = {ammo = v.ammo} + if v.tintIndex > 0 then minimalLoadout[v.name].tintIndex = v.tintIndex end + + if #v.components > 0 then + local components = {} + + for k2,component in ipairs(v.components) do + if component ~= 'clip_default' then + components[#components + 1] = component + end + end + + if #components > 0 then + minimalLoadout[v.name].components = components + end + end + end + + return minimalLoadout end function self.getName() From 94c36df94774ff7ba28b4a27398c70f711d46043 Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 16:23:16 +0100 Subject: [PATCH 07/53] refactor(server/functions): Core.SavePlayers() format: Core.SavePlayer --- [core]/es_extended/server/functions.lua | 75 ++++++++++++++++--------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index 50e1edf8..d46184d6 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -176,10 +176,21 @@ function ESX.TriggerServerCallback(name, requestId, source,Invoke, cb, ...) end function Core.SavePlayer(xPlayer, cb) + local parameters = { + json.encode(xPlayer.getAccounts(true)), + xPlayer.job.name, + xPlayer.job.grade, + xPlayer.group, + json.encode(xPlayer.getCoords()), + json.encode(xPlayer.getInventory(true)), + json.encode(xPlayer.getLoadout(true)), + xPlayer.identifier + } + MySQL.prepare( 'UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ? WHERE `identifier` = ?', - {json.encode(xPlayer.getAccounts(true)), xPlayer.job.name, xPlayer.job.grade, xPlayer.group, json.encode(xPlayer.getCoords()), - json.encode(xPlayer.getInventory(true)), json.encode(xPlayer.getLoadout(true)), xPlayer.identifier}, function(affectedRows) + parameters, + function(affectedRows) if affectedRows == 1 then print(('[^2INFO^7] Saved player ^5"%s^7"'):format(xPlayer.name)) TriggerEvent('esx:playerSaved', xPlayer.playerId, xPlayer) @@ -187,33 +198,47 @@ function Core.SavePlayer(xPlayer, cb) if cb then cb() end - end) + end + ) end function Core.SavePlayers(cb) - local xPlayers = ESX.GetExtendedPlayers() - local count = #xPlayers - if count > 0 then - local parameters = {} - local time = os.time() - for i = 1, count do - local xPlayer = xPlayers[i] - parameters[#parameters + 1] = {json.encode(xPlayer.getAccounts(true)), xPlayer.job.name, xPlayer.job.grade, xPlayer.group, - json.encode(xPlayer.getCoords()), json.encode(xPlayer.getInventory(true)), json.encode(xPlayer.getLoadout(true)), - xPlayer.identifier} - end - MySQL.prepare( - "UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ? WHERE `identifier` = ?", - parameters, function(results) - if results then - if type(cb) == 'function' then - cb() - else - print(('[^2INFO^7] Saved ^5%s^7 %s over ^5%s^7 ms'):format(count, count > 1 and 'players' or 'player', ESX.Math.Round((os.time() - time) / 1000000, 2))) - end - end - end) + local xPlayers = ESX.Players + if not next(xPlayers) then + return end + + local startTime = os.time() + local parameters = {} + + for _, xPlayer in pairs(ESX.Players) do + parameters[#parameters + 1] = { + json.encode(xPlayer.getAccounts(true)), + xPlayer.job.name, + xPlayer.job.grade, + xPlayer.group, + json.encode(xPlayer.getCoords()), + json.encode(xPlayer.getInventory(true)), + json.encode(xPlayer.getLoadout(true)), + xPlayer.identifier + } + end + + MySQL.prepare( + "UPDATE `users` SET `accounts` = ?, `job` = ?, `job_grade` = ?, `group` = ?, `position` = ?, `inventory` = ?, `loadout` = ? WHERE `identifier` = ?", + parameters, + function(results) + if not results then + return + end + + if type(cb) == 'function' then + return cb() + end + + print(('[^2INFO^7] Saved ^5%s^7 %s over ^5%s^7 ms'):format(#parameters, #parameters > 1 and 'players' or 'player', ESX.Math.Round((os.time() - startTime) / 1000000, 2))) + end + ) end ESX.GetPlayers = GetPlayers From cd8bb8b1f77acb5128702614280c06efaea11d86 Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 18:29:06 +0100 Subject: [PATCH 08/53] refactor(client/functions): ESX.Game.GetPeds --- [core]/es_extended/client/functions.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua index 5403abcd..1094ef87 100644 --- a/[core]/es_extended/client/functions.lua +++ b/[core]/es_extended/client/functions.lua @@ -537,10 +537,15 @@ function ESX.Game.GetObjects() -- Leave the function for compatibility end function ESX.Game.GetPeds(onlyOtherPeds) - local peds, myPed, pool = {}, ESX.PlayerData.ped, GetGamePool('CPed') + local myPed, pool = ESX.PlayerData.ped, GetGamePool('CPed') + if not onlyOtherPeds then + return pool + end + + local peds = {} for i = 1, #pool do - if ((onlyOtherPeds and pool[i] ~= myPed) or not onlyOtherPeds) then + if pool[i] ~= myPed then peds[#peds + 1] = pool[i] end end From ecb975feed30659ea78409bf74d519dc5e782057 Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 18:52:35 +0100 Subject: [PATCH 09/53] refactor(esx_menu_dialog): remove useless thread if nui cursor is active, movement is disabled. --- [core]/esx_menu_dialog/client/main.lua | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/[core]/esx_menu_dialog/client/main.lua b/[core]/esx_menu_dialog/client/main.lua index f58986c9..2720c412 100644 --- a/[core]/esx_menu_dialog/client/main.lua +++ b/[core]/esx_menu_dialog/client/main.lua @@ -30,10 +30,9 @@ local function closeMenu(namespace, name) name = name, }) - if ESX.Table.SizeOf(OpenedMenus) == 0 then + if not next(OpenedMenus) then SetNuiFocus(false) end - end ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu) @@ -78,24 +77,4 @@ AddEventHandler('esx_menu_dialog:message:menu_change', function(data) if menu.change ~= nil then menu.change(data, menu) end -end) - -CreateThread(function() - while true do - Wait(0) - - if ESX.Table.SizeOf(OpenedMenus) > 0 then - DisableControlAction(0, 1, true) -- LookLeftRight - DisableControlAction(0, 2, true) -- LookUpDown - DisableControlAction(0, 142, true) -- MeleeAttackAlternate - DisableControlAction(0, 106, true) -- VehicleMouseControlOverride - DisableControlAction(0, 12, true) -- WeaponWheelUpDown - DisableControlAction(0, 14, true) -- WeaponWheelNext - DisableControlAction(0, 15, true) -- WeaponWheelPrev - DisableControlAction(0, 16, true) -- SelectNextWeapon - DisableControlAction(0, 17, true) -- SelectPrevWeapon - else - Wait(500) - end - end end) \ No newline at end of file From 5450414b0da59d3a4359ffddc02ce86e03504c6a Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 22 Jan 2023 18:54:11 +0100 Subject: [PATCH 10/53] refactor(client/functions): ESX.SetTimeout and ESX.ClearTimeout timeout functions moved to shared file and removed thread from client side --- [core]/es_extended/client/functions.lua | 33 +------------------ [core]/es_extended/common/modules/timeout.lua | 23 +++++++++++++ [core]/es_extended/fxmanifest.lua | 6 ++-- [core]/es_extended/server/common.lua | 2 -- [core]/es_extended/server/functions.lua | 20 ----------- 5 files changed, 26 insertions(+), 58 deletions(-) create mode 100644 [core]/es_extended/common/modules/timeout.lua diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua index 1094ef87..77c01ae3 100644 --- a/[core]/es_extended/client/functions.lua +++ b/[core]/es_extended/client/functions.lua @@ -4,7 +4,6 @@ ESX.PlayerData = {} ESX.PlayerLoaded = false Core.CurrentRequestId = 0 Core.ServerCallbacks = {} -Core.TimeoutCallbacks = {} Core.Input = {} ESX.UI = {} ESX.UI.HUD = {} @@ -21,18 +20,6 @@ ESX.Scaleform.Utils = {} ESX.Streaming = {} -function ESX.SetTimeout(msec, cb) - table.insert(Core.TimeoutCallbacks, { - time = GetGameTimer() + msec, - cb = cb - }) - return #Core.TimeoutCallbacks -end - -function ESX.ClearTimeout(i) - Core.TimeoutCallbacks[i] = nil -end - function ESX.IsPlayerLoaded() return ESX.PlayerLoaded end @@ -1392,22 +1379,4 @@ AddEventHandler('esx:showAdvancedNotification', RegisterNetEvent('esx:showHelpNotification') AddEventHandler('esx:showHelpNotification', function(msg, thisFrame, beep, duration) ESX.ShowHelpNotification(msg, thisFrame, beep, duration) -end) - --- SetTimeout -CreateThread(function() - while true do - local sleep = 100 - if #Core.TimeoutCallbacks > 0 then - local currTime = GetGameTimer() - sleep = 0 - for i = 1, #Core.TimeoutCallbacks, 1 do - if currTime >= Core.TimeoutCallbacks[i].time then - Core.TimeoutCallbacks[i].cb() - Core.TimeoutCallbacks[i] = nil - end - end - end - Wait(sleep) - end -end) +end) \ No newline at end of file diff --git a/[core]/es_extended/common/modules/timeout.lua b/[core]/es_extended/common/modules/timeout.lua new file mode 100644 index 00000000..cb56de7b --- /dev/null +++ b/[core]/es_extended/common/modules/timeout.lua @@ -0,0 +1,23 @@ +local TimeoutCount = 0 +local CancelledTimeouts = {} + +ESX.SetTimeout = function(msec, cb) + local id = TimeoutCount + 1 + + SetTimeout(msec, function() + if CancelledTimeouts[id] then + CancelledTimeouts[id] = nil + return + end + + cb() + end) + + TimeoutCount = id + + return id +end + +ESX.ClearTimeout = function(id) + CancelledTimeouts[id] = true +end \ No newline at end of file diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index 1c9c63be..ffc21344 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -27,8 +27,7 @@ server_scripts { 'server/main.lua', 'server/commands.lua', - 'common/modules/math.lua', - 'common/modules/table.lua', + 'common/modules/*.lua', 'common/functions.lua' } @@ -42,8 +41,7 @@ client_scripts { 'client/modules/scaleform.lua', 'client/modules/streaming.lua', - 'common/modules/math.lua', - 'common/modules/table.lua', + 'common/modules/*.lua', 'common/functions.lua' } diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua index 8cbff655..e59e0243 100644 --- a/[core]/es_extended/server/common.lua +++ b/[core]/es_extended/server/common.lua @@ -7,8 +7,6 @@ Core.UsableItemsCallbacks = {} Core.ServerCallbacks = {} Core.ClientCallbacks = {} Core.CurrentRequestId = 0 -Core.TimeoutCount = -1 -Core.CancelledTimeouts = {} Core.RegisteredCommands = {} Core.Pickups = {} Core.PickupId = 0 diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua index d46184d6..3e10f922 100644 --- a/[core]/es_extended/server/functions.lua +++ b/[core]/es_extended/server/functions.lua @@ -4,22 +4,6 @@ function ESX.Trace(msg) end end -function ESX.SetTimeout(msec, cb) - local id = Core.TimeoutCount + 1 - - SetTimeout(msec, function() - if Core.CancelledTimeouts[id] then - Core.CancelledTimeouts[id] = nil - else - cb() - end - end) - - Core.TimeoutCount = id - - return id -end - function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion) if type(name) == 'table' then for k, v in ipairs(name) do @@ -159,10 +143,6 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion) end end -function ESX.ClearTimeout(id) - Core.CancelledTimeouts[id] = true -end - function ESX.RegisterServerCallback(name, cb) Core.ServerCallbacks[name] = cb end From 1c77be6936e5f324c38bc717f5720be43722843d Mon Sep 17 00:00:00 2001 From: Csoki Date: Tue, 24 Jan 2023 20:39:00 +0100 Subject: [PATCH 11/53] fix(es_extended/fxmanifest): syntax fix --- [core]/es_extended/fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua index 816b9859..e21addea 100644 --- a/[core]/es_extended/fxmanifest.lua +++ b/[core]/es_extended/fxmanifest.lua @@ -41,7 +41,7 @@ client_scripts { 'common/modules/*.lua', 'common/functions.lua', - 'common/functions.lua' + 'common/functions.lua', 'client/modules/*.lua' } From 662f657310bcae626bd7b3e57439cfd3304342a6 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sun, 29 Jan 2023 12:40:54 +0100 Subject: [PATCH 12/53] Fix Thread for "optional" features and little optimalization Thanks Tinky124 for inspiration in DisableVehicleRewards --- [core]/es_extended/client/main.lua | 111 ++++++++++++++--------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index a10df217..ad8185b1 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -57,66 +57,63 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin) NetworkSetFriendlyFireOption(true) end - CreateThread(function() - local SetPlayerHealthRechargeMultiplier = SetPlayerHealthRechargeMultiplier - local BlockWeaponWheelThisFrame = BlockWeaponWheelThisFrame - local DisableControlAction = DisableControlAction - local IsPedArmed = IsPedArmed - local SetPlayerLockonRangeOverride = SetPlayerLockonRangeOverride - local DisablePlayerVehicleRewards = DisablePlayerVehicleRewards - local RemoveAllPickupsOfType = RemoveAllPickupsOfType - local HideHudComponentThisFrame = HideHudComponentThisFrame - local PlayerId = PlayerId() - local DisabledComps = {} - for i=1, #(Config.RemoveHudCommonents) do - if Config.RemoveHudCommonents[i] then - DisabledComps[#DisabledComps + 1] = i - end + local playerId = PlayerId() + + -- RemoveHudCommonents + for i=1, #(Config.RemoveHudCommonents) do + if Config.RemoveHudCommonents[i] then + SetHudComponentPosition(i, 999999.0, 999999.0) end + end - while true do - local Sleep = true - - if Config.DisableHealthRegeneration then - Sleep = false - SetPlayerHealthRechargeMultiplier(PlayerId, 0.0) - end - - if Config.DisableWeaponWheel then - Sleep = false - BlockWeaponWheelThisFrame() - DisableControlAction(0, 37,true) - end - - if Config.DisableAimAssist then - Sleep = false - if IsPedArmed(ESX.PlayerData.ped, 4) then - SetPlayerLockonRangeOverride(PlayerId, 2.0) - end - end - - if Config.DisableVehicleRewards then - Sleep = false - DisablePlayerVehicleRewards(PlayerId) - end - - if Config.DisableNPCDrops then - Sleep = false - RemoveAllPickupsOfType(0xDF711959) - RemoveAllPickupsOfType(0xF9AFB48F) - RemoveAllPickupsOfType(0xA9355DCD) - end - - if #DisabledComps > 0 then - Sleep = false - for i=1, #(DisabledComps) do - HideHudComponentThisFrame(DisabledComps[i]) - end - end - - Wait(Sleep and 1500 or 0) + -- DisableNPCDrops + if Config.DisableNPCDrops then + local weaponPickups = {`PICKUP_WEAPON_CARBINERIFLE`, `PICKUP_WEAPON_PISTOL`, `PICKUP_WEAPON_PUMPSHOTGUN`} + for i = 1, #weaponPickups do + ToggleUsePickupsForPlayer(playerId, weaponPickups[i], false) end - end) + end + + -- DisableVehicleRewards + if Config.DisableVehicleRewards then + AddEventHandler('gameEventTriggered', function(name, args) + if name == "CEventNetworkPlayerEnteredVehicle" then + CreateThread(function() + while true do + DisablePlayerVehicleRewards(playerId) + if not GetVehiclePedIsIn(ESX.PlayerData.ped, false) then + break + end + + Wait(0) + end + end) + end + end) + end + + if Config.DisableHealthRegeneration or Config.DisableWeaponWheel or Config.DisableAimAssist then + CreateThread(function() + while true do + if Config.DisableHealthRegeneration then + SetPlayerHealthRechargeMultiplier(playerId, 0.0) + end + + if Config.DisableWeaponWheel then + BlockWeaponWheelThisFrame() + DisableControlAction(0, 37, true) + end + + if Config.DisableAimAssist then + if IsPedArmed(ESX.PlayerData.ped, 4) then + SetPlayerLockonRangeOverride(playerId, 2.0) + end + end + + Wait(0) + end + end) + end if Config.EnableHud then for i=1, #(ESX.PlayerData.accounts) do From 49680d1e1a9ae587273d1faa74f600fb9ff13547 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sun, 29 Jan 2023 13:27:02 +0100 Subject: [PATCH 13/53] esx:EnteredVehicle <3 --- [core]/es_extended/client/main.lua | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index ad8185b1..4c91c750 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -76,19 +76,17 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin) -- DisableVehicleRewards if Config.DisableVehicleRewards then - AddEventHandler('gameEventTriggered', function(name, args) - if name == "CEventNetworkPlayerEnteredVehicle" then - CreateThread(function() - while true do - DisablePlayerVehicleRewards(playerId) - if not GetVehiclePedIsIn(ESX.PlayerData.ped, false) then - break - end - - Wait(0) + AddEventHandler('esx:EnteredVehicle', function(vehicle, plate, seat, displayName, netId) + CreateThread(function() + while true do + DisablePlayerVehicleRewards(playerId) + if not GetVehiclePedIsIn(ESX.PlayerData.ped, false) then + break end - end) - end + + Wait(0) + end + end) end) end From 0210f4ce92f331bc7ab4d2d7346eed49d37c71e0 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sun, 29 Jan 2023 13:48:29 +0100 Subject: [PATCH 14/53] Fix --- [core]/es_extended/client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 4c91c750..7dcc3184 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -76,11 +76,11 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin) -- DisableVehicleRewards if Config.DisableVehicleRewards then - AddEventHandler('esx:EnteredVehicle', function(vehicle, plate, seat, displayName, netId) + AddEventHandler('esx:enteredVehicle', function(vehicle, plate, seat, displayName, netId) CreateThread(function() while true do DisablePlayerVehicleRewards(playerId) - if not GetVehiclePedIsIn(ESX.PlayerData.ped, false) then + if not IsPedInAnyVehicle(ESX.PlayerData.ped, false) then break end From 829b316382f6c3dbee3b38d7f8211e36a2a3ec52 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sun, 29 Jan 2023 14:42:13 +0100 Subject: [PATCH 15/53] Class vehicle --- [core]/es_extended/client/main.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 7dcc3184..09e67227 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -77,16 +77,18 @@ AddEventHandler('esx:playerLoaded', function(xPlayer, isNew, skin) -- DisableVehicleRewards if Config.DisableVehicleRewards then AddEventHandler('esx:enteredVehicle', function(vehicle, plate, seat, displayName, netId) - CreateThread(function() - while true do - DisablePlayerVehicleRewards(playerId) - if not IsPedInAnyVehicle(ESX.PlayerData.ped, false) then - break + if GetVehicleClass(vehicle) == 18 then + CreateThread(function() + while true do + DisablePlayerVehicleRewards(playerId) + if not IsPedInAnyVehicle(ESX.PlayerData.ped, false) then + break + end + + Wait(0) end - - Wait(0) - end - end) + end) + end end) end From f7f734522f1b1b7fc597cbb902b3348734b6ebb2 Mon Sep 17 00:00:00 2001 From: Ducko Date: Mon, 30 Jan 2023 16:11:33 +0100 Subject: [PATCH 16/53] Create da.lua --- [core]/es_extended/locales/da.lua | 366 ++++++++++++++++++++++++++++++ 1 file changed, 366 insertions(+) create mode 100644 [core]/es_extended/locales/da.lua diff --git a/[core]/es_extended/locales/da.lua b/[core]/es_extended/locales/da.lua new file mode 100644 index 00000000..c21b2437 --- /dev/null +++ b/[core]/es_extended/locales/da.lua @@ -0,0 +1,366 @@ +Locales['en'] = { + -- Inventory + ['inventory'] = 'Inventory ( Vægt %s / %s )', + ['use'] = 'Brug', + ['give'] = 'Giv', + ['remove'] = 'Smid', + ['return'] = 'Tilbage', + ['give_to'] = 'Giv til', + ['amount'] = 'Beløb', + ['giveammo'] = 'Giv ammunition', + ['amountammo'] = 'Ammunition beløb', + ['noammo'] = 'Ikke nok!', + ['gave_item'] = 'Giver %sx %s til %s', + ['received_item'] = 'Modtog %sx %s fra %s', + ['gave_weapon'] = 'Giver %s til %s', + ['gave_weapon_ammo'] = 'Giver ~o~%sx %s for %s til %s', + ['gave_weapon_withammo'] = 'Giver %s med ~o~%sx %s til %s', + ['gave_weapon_hasalready'] = '%s har allerede en %s', + ['gave_weapon_noweapon'] = '%s har ikke det våben', + ['received_weapon'] = 'Modtog %s fra %s', + ['received_weapon_ammo'] = 'Modtog ~o~%sx %s for din %s fra %s', + ['received_weapon_withammo'] = 'Modtog %s med ~o~%sx %s fra %s', + ['received_weapon_hasalready'] = '%s har forsøgt at give dig en %s, men du allerede dette våben', + ['received_weapon_noweapon'] = '%s har forsøgt at give dig ammunition for en %s, men du har ikke dette våben', + ['gave_account_money'] = 'Giver %s kr. (%s) til %s', + ['received_account_money'] = 'Modtog %s kr. (%s) fra %s', + ['amount_invalid'] = 'Ugyldig mængde', + ['players_nearby'] = 'Ingen spillere i nærheden', + ['ex_inv_lim'] = 'Kan ikke udføre handling, overskrider maks. vægt på %s', + ['imp_invalid_quantity'] = 'Handlingen kan ikke udføres, mængden er ugyldig', + ['imp_invalid_amount'] = 'Handlingen kan ikke udføres, beløbet er ugyldigt', + ['threw_standard'] = 'Smider %sx %s', + ['threw_account'] = 'Smider %s kr. %s', + ['threw_weapon'] = 'Smider %s', + ['threw_weapon_ammo'] = 'Smider %s med ~o~%sx %s', + ['threw_weapon_already'] = 'Du har allerede dette våben', + ['threw_cannot_pickup'] = 'Inventory er fyldt, Kan ikke tages!', + ['threw_pickup_prompt'] = 'Tryk på E for at tage genstand', + + -- Key mapping + ['keymap_showinventory'] = 'Vis Inventory', + + -- Salary related + ['received_salary'] = 'Du er blevet betalt: %s kr.', + ['received_help'] = 'Du har fået udbetalt din velfærdscheck: %s kr.', + ['company_nomoney'] = 'den virksomhed, du er ansat i, er for fattig til at udbetale din løn', + ['received_paycheck'] = 'modtaget lønseddel', + ['bank'] = 'Maze Bank', + ['account_bank'] = 'Bank', + ['account_black_money'] = 'Beskidte penge', + ['account_money'] = 'Penge', + + ['act_imp'] = 'Kan ikke udføre handling', + ['in_vehicle'] = 'Kan ikke udføre handling, spilleren er i et køretøj', + + -- Commands + ['command_bring'] = 'Tag en spiller til dig', + ['command_car'] = 'Spawn et køretøj', + ['command_car_car'] = 'Køretøjsmodel eller hash', + ['command_cardel'] = 'Fjern køretøjer i nærheden', + ['command_cardel_radius'] = 'Fjerner alle køretøjer inden for den specificerede radius', + ['command_clear'] = 'Ryd chatten', + ['command_clearall'] = 'Ryd chatten for alle spillere', + ['command_clearinventory'] = 'Fjern alle elementer fra spillernes inventar', + ['command_clearloadout'] = 'Fjern alle våben fra Players Loadout', + ['command_freeze'] = 'Frys en spiller', + ['command_unfreeze'] = 'Frigør en spiller', + ['command_giveaccountmoney'] = 'Giv penge til en bestemt konto', + ['command_giveaccountmoney_account'] = 'Konto at tilføje til', + ['command_giveaccountmoney_amount'] = 'Beløb at tilføje', + ['command_giveaccountmoney_invalid'] = 'Kontonavn ugyldigt', + ['command_giveitem'] = 'Giv spilleren en genstand', + ['command_giveitem_item'] = 'Genstands navn', + ['command_giveitem_count'] = 'Antal', + ['command_giveweapon'] = 'Giv spilleren et våben', + ['command_giveweapon_weapon'] = 'Navn på våben', + ['command_giveweapon_ammo'] = 'Ammunitions mængde', + ['command_giveweapon_hasalready'] = 'Spilleren har allerede dette våben', + ['command_giveweaponcomponent'] = 'Giv en våbenkomponent til spilleren', + ['command_giveweaponcomponent_component'] = 'Komponent navn', + ['command_giveweaponcomponent_invalid'] = 'Ugyldig våben-komponent', + ['command_giveweaponcomponent_hasalready'] = 'Spilleren har allerede denne våben-komponent', + ['command_giveweaponcomponent_missingweapon'] = 'Spilleren har ikke dette våben', + ['command_goto'] = 'Teleporter dig selv til en spiller', + ['command_kill'] = 'Dræb en spiller', + ['command_save'] = 'Force save en spillers data', + ['command_saveall'] = 'Force save alle spillers data', + ['command_setaccountmoney'] = 'Indstil pengene på en bestemt konto', + ['command_setaccountmoney_amount'] = 'Beløb', + ['command_setcoords'] = 'Teleporter til specificerede koordinater', + ['command_setcoords_x'] = 'X værdi', + ['command_setcoords_y'] = 'Y værdi', + ['command_setcoords_z'] = 'Z værdi', + ['command_setjob'] = 'Sæt en spillers job', + ['command_setjob_job'] = 'Navn', + ['command_setjob_grade'] = 'Job karakter', + ['command_setjob_invalid'] = 'jobbet, karakteren eller begge dele er ugyldige', + ['command_setgroup'] = 'Indstil en spillers tilladelsesgruppe', + ['command_setgroup_group'] = 'Navn på gruppe', + ['commanderror_argumentmismatch'] = 'Antal ugyldige argumenter (bestået %s, ønsket %s)', + ['commanderror_argumentmismatch_number'] = 'Ugyldigt argument #%s datatype (bestået streng, ønsket nummer)', + ['commanderror_invaliditem'] = 'Ugyldig genstand', + ['commanderror_invalidweapon'] = 'Ugyldigt våben', + ['commanderror_console'] = 'Kommandoen kan ikke udføres fra konsollen', + ['commanderror_invalidcommand'] = 'Ugyldig kommando - /%s', + ['commanderror_invalidplayerid'] = 'Den angivne spiller er ikke online', + ['commandgeneric_playerid'] = 'Spillerens server-id', + ['command_giveammo_noweapon_found'] = '%s har ikke det våben', + ['command_giveammo_weapon'] = 'Våben navn', + ['command_giveammo_ammo'] = 'Ammunitions mængde', + ['tpm_nowaypoint'] = 'Ingen waypoint indstillet.', + ['tpm_success'] = 'Teleporteret med succes', + + ['noclip_message'] = 'Noclip er blevet %s', + ['enabled'] = '~g~aktiveret~s~', + ['disabled'] = '~r~deaktiveret~s~', + + -- Locale settings + ['locale_digit_grouping_symbol'] = ',', + ['locale_currency'] = 'DKK%s', + + -- Weapons + + -- Melee + ['weapon_dagger'] = 'Dagger', + ['weapon_bat'] = 'Bat', + ['weapon_battleaxe'] = 'Battle Axe', + ['weapon_bottle'] = 'Bottle', + ['weapon_crowbar'] = 'Crowbar', + ['weapon_flashlight'] = 'Flashlight', + ['weapon_golfclub'] = 'Golf Club', + ['weapon_hammer'] = 'Hammer', + ['weapon_hatchet'] = 'Hatchet', + ['weapon_knife'] = 'Knife', + ['weapon_knuckle'] = 'Knuckledusters', + ['weapon_machete'] = 'Machete', + ['weapon_nightstick'] = 'Nightstick', + ['weapon_wrench'] = 'Pipe Wrench', + ['weapon_poolcue'] = 'Pool Cue', + ['weapon_stone_hatchet'] = 'Stone Hatchet', + ['weapon_switchblade'] = 'Switchblade', + + -- Handguns + ['weapon_appistol'] = 'AP Pistol', + ['weapon_ceramicpistol'] = 'Ceramic Pistol', + ['weapon_combatpistol'] = 'Combat Pistol', + ['weapon_doubleaction'] = 'Double-Action Revolver', + ['weapon_navyrevolver'] = 'Navy Revolver', + ['weapon_flaregun'] = 'Flaregun', + ['weapon_gadgetpistol'] = 'Gadget Pistol', + ['weapon_heavypistol'] = 'Heavy Pistol', + ['weapon_revolver'] = 'Heavy Revolver', + ['weapon_revolver_mk2'] = 'Heavy Revolver MK2', + ['weapon_marksmanpistol'] = 'Marksman Pistol', + ['weapon_pistol'] = 'Pistol', + ['weapon_pistol_mk2'] = 'Pistol MK2', + ['weapon_pistol50'] = 'Pistol .50', + ['weapon_snspistol'] = 'SNS Pistol', + ['weapon_snspistol_mk2'] = 'SNS Pistol MK2', + ['weapon_stungun'] = 'Taser', + ['weapon_raypistol'] = 'Up-N-Atomizer', + ['weapon_vintagepistol'] = 'Vintage Pistol', + + -- Shotguns + ['weapon_assaultshotgun'] = 'Assault Shotgun', + ['weapon_autoshotgun'] = 'Auto Shotgun', + ['weapon_bullpupshotgun'] = 'Bullpup Shotgun', + ['weapon_combatshotgun'] = 'Combat Shotgun', + ['weapon_dbshotgun'] = 'Double Barrel Shotgun', + ['weapon_heavyshotgun'] = 'Heavy Shotgun', + ['weapon_musket'] = 'Musket', + ['weapon_pumpshotgun'] = 'Pump Shotgun', + ['weapon_pumpshotgun_mk2'] = 'Pump Shotgun MK2', + ['weapon_sawnoffshotgun'] = 'Sawed Off Shotgun', + + -- SMG & LMG + ['weapon_assaultsmg'] = 'Assault SMG', + ['weapon_combatmg'] = 'Combat MG', + ['weapon_combatmg_mk2'] = 'Combat MG MK2', + ['weapon_combatpdw'] = 'Combat PDW', + ['weapon_gusenberg'] = 'Gusenberg Sweeper', + ['weapon_machinepistol'] = 'Machine Pistol', + ['weapon_mg'] = 'MG', + ['weapon_microsmg'] = 'Micro SMG', + ['weapon_minismg'] = 'Mini SMG', + ['weapon_smg'] = 'SMG', + ['weapon_smg_mk2'] = 'SMG MK2', + ['weapon_raycarbine'] = 'Unholy Hellbringer', + + -- Rifles + ['weapon_advancedrifle'] = 'Advanced Rifle', + ['weapon_assaultrifle'] = 'Assault Rifle', + ['weapon_assaultrifle_mk2'] = 'Assault Rifle MK2', + ['weapon_bullpuprifle'] = 'Bullpup Rifle', + ['weapon_bullpuprifle_mk2'] = 'Bullpup Rifle MK2', + ['weapon_carbinerifle'] = 'Carbine Rifle', + ['weapon_carbinerifle_mk2'] = 'Carbine Rifle MK2', + ['weapon_compactrifle'] = 'Compact Rifle', + ['weapon_militaryrifle'] = 'Military Rifle', + ['weapon_specialcarbine'] = 'Special Carbine', + ['weapon_specialcarbine_mk2'] = 'Special Carbine MK2', + + -- Sniper + ['weapon_heavysniper'] = 'Heavy Sniper', + ['weapon_heavysniper_mk2'] = 'Heavy Sniper MK2', + ['weapon_marksmanrifle'] = 'Marksman Rifle', + ['weapon_marksmanrifle_mk2'] = 'Marksman Rifle MK2', + ['weapon_sniperrifle'] = 'Sniper Rifle', + + -- Heavy / Launchers + ['weapon_compactlauncher'] = 'Compact Launcher', + ['weapon_firework'] = 'Firework Launcher', + ['weapon_grenadelauncher'] = 'Grenade Launcher', + ['weapon_hominglauncher'] = 'Homing Launcher', + ['weapon_minigun'] = 'Minigun', + ['weapon_railgun'] = 'Railgun', + ['weapon_rpg'] = 'Rocket Launcher', + ['weapon_rayminigun'] = 'Widowmaker', + + -- Criminal Enterprises DLC + ['weapon_metaldetector'] = 'Metal Detector', + ['weapon_precisionrifle'] = 'Precision Rifle', + ['weapon_tactilerifle'] = 'Service Carbine', + + -- Thrown + ['weapon_ball'] = 'Baseball', + ['weapon_bzgas'] = 'BZ Gas', + ['weapon_flare'] = 'Flare', + ['weapon_grenade'] = 'Grenade', + ['weapon_petrolcan'] = 'Jerrycan', + ['weapon_hazardcan'] = 'Hazardous Jerrycan', + ['weapon_molotov'] = 'Molotov Cocktail', + ['weapon_proxmine'] = 'Proximity Mine', + ['weapon_pipebomb'] = 'Pipe Bomb', + ['weapon_snowball'] = 'Snowball', + ['weapon_stickybomb'] = 'Sticky Bomb', + ['weapon_smokegrenade'] = 'Tear Gas', + + -- Special + ['weapon_fireextinguisher'] = 'Fire Extinguisher', + ['weapon_digiscanner'] = 'Digital Scanner', + ['weapon_garbagebag'] = 'Garbage Bag', + ['weapon_handcuffs'] = 'Handcuffs', + ['gadget_nightvision'] = 'Night Vision', + ['gadget_parachute'] = 'parachute', + + -- Weapon Components + ['component_knuckle_base'] = 'base Model', + ['component_knuckle_pimp'] = 'the Pimp', + ['component_knuckle_ballas'] = 'the Ballas', + ['component_knuckle_dollar'] = 'the Hustler', + ['component_knuckle_diamond'] = 'the Rock', + ['component_knuckle_hate'] = 'the Hater', + ['component_knuckle_love'] = 'the Lover', + ['component_knuckle_player'] = 'the Player', + ['component_knuckle_king'] = 'the King', + ['component_knuckle_vagos'] = 'the Vagos', + + ['component_luxary_finish'] = 'luxary Weapon Finish', + + ['component_handle_default'] = 'default Handle', + ['component_handle_vip'] = 'vIP Handle', + ['component_handle_bodyguard'] = 'bodyguard Handle', + + ['component_vip_finish'] = 'vIP Finish', + ['component_bodyguard_finish'] = 'bodyguard Finish', + + ['component_camo_finish'] = 'digital Camo', + ['component_camo_finish2'] = 'brushstroke Camo', + ['component_camo_finish3'] = 'woodland Camo', + ['component_camo_finish4'] = 'skull Camo', + ['component_camo_finish5'] = 'sessanta Nove Camo', + ['component_camo_finish6'] = 'perseus Camo', + ['component_camo_finish7'] = 'leopard Camo', + ['component_camo_finish8'] = 'zebra Camo', + ['component_camo_finish9'] = 'geometric Camo', + ['component_camo_finish10'] = 'boom Camo', + ['component_camo_finish11'] = 'patriotic Camo', + + ['component_camo_slide_finish'] = 'digital Slide Camo', + ['component_camo_slide_finish2'] = 'brushstroke Slide Camo', + ['component_camo_slide_finish3'] = 'woodland Slide Camo', + ['component_camo_slide_finish4'] = 'skull Slide Camo', + ['component_camo_slide_finish5'] = 'sessanta Nove Slide Camo', + ['component_camo_slide_finish6'] = 'perseus Slide Camo', + ['component_camo_slide_finish7'] = 'leopard Slide Camo', + ['component_camo_slide_finish8'] = 'zebra Slide Camo', + ['component_camo_slide_finish9'] = 'geometric Slide Camo', + ['component_camo_slide_finish10'] = 'boom Slide Camo', + ['component_camo_slide_finish11'] = 'patriotic Slide Camo', + + ['component_clip_default'] = 'default Magazine', + ['component_clip_extended'] = 'extended Magazine', + ['component_clip_drum'] = 'drum Magazine', + ['component_clip_box'] = 'box Magazine', + + ['component_scope_holo'] = 'holographic Scope', + ['component_scope_small'] = 'small Scope', + ['component_scope_medium'] = 'medium Scope', + ['component_scope_large'] = 'large Scope', + ['component_scope'] = 'mounted Scope', + ['component_scope_advanced'] = 'advanced Scope', + ['component_ironsights'] = 'ironsights', + + ['component_suppressor'] = 'suppressor', + ['component_compensator'] = 'compensator', + + ['component_muzzle_flat'] = 'flat Muzzle Brake', + ['component_muzzle_tactical'] = 'tactical Muzzle Brake', + ['component_muzzle_fat'] = 'fat-End Muzzle Brake', + ['component_muzzle_precision'] = 'precision Muzzle Brake', + ['component_muzzle_heavy'] = 'heavy Duty Muzzle Brake', + ['component_muzzle_slanted'] = 'slanted Muzzle Brake', + ['component_muzzle_split'] = 'split-End Muzzle Brake', + ['component_muzzle_squared'] = 'squared Muzzle Brake', + + ['component_flashlight'] = 'flashlight', + ['component_grip'] = 'grip', + + ['component_barrel_default'] = 'default Barrel', + ['component_barrel_heavy'] = 'heavy Barrel', + + ['component_ammo_tracer'] = 'tracer Ammo', + ['component_ammo_incendiary'] = 'incendiary Ammo', + ['component_ammo_hollowpoint'] = 'hollowpoint Ammo', + ['component_ammo_fmj'] = 'fMJ Ammo', + ['component_ammo_armor'] = 'armor Piercing Ammo', + ['component_ammo_explosive'] = 'armor Piercing Incendiary Ammo', + + ['component_shells_default'] = 'default Shells', + ['component_shells_incendiary'] = 'dragons Breath Shells', + ['component_shells_armor'] = 'steel Buckshot Shells', + ['component_shells_hollowpoint'] = 'flechette Shells', + ['component_shells_explosive'] = 'explosive Slug Shells', + + -- Weapon Ammo + ['ammo_rounds'] = 'round(s)', + ['ammo_shells'] = 'shell(s)', + ['ammo_charge'] = 'charge', + ['ammo_petrol'] = 'gallons of fuel', + ['ammo_firework'] = 'firework(s)', + ['ammo_rockets'] = 'rocket(s)', + ['ammo_grenadelauncher'] = 'grenade(s)', + ['ammo_grenade'] = 'grenade(s)', + ['ammo_stickybomb'] = 'bomb(s)', + ['ammo_pipebomb'] = 'bomb(s)', + ['ammo_smokebomb'] = 'bomb(s)', + ['ammo_molotov'] = 'cocktail(s)', + ['ammo_proxmine'] = 'mine(s)', + ['ammo_bzgas'] = 'can(s)', + ['ammo_ball'] = 'ball(s)', + ['ammo_snowball'] = 'snowball(s)', + ['ammo_flare'] = 'flare(s)', + ['ammo_flaregun'] = 'flare(s)', + + -- Weapon Tints + ['tint_default'] = 'default skin', + ['tint_green'] = 'green skin', + ['tint_gold'] = 'gold skin', + ['tint_pink'] = 'pink skin', + ['tint_army'] = 'army skin', + ['tint_lspd'] = 'blue skin', + ['tint_orange'] = 'orange skin', + ['tint_platinum'] = 'platinum skin', + } + From 501519cd65ab691f1e0415ad35ea5af3288c1845 Mon Sep 17 00:00:00 2001 From: Ducko Date: Mon, 30 Jan 2023 16:12:00 +0100 Subject: [PATCH 17/53] Create da.lua --- [core]/esx_identity/locales/da.lua | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 [core]/esx_identity/locales/da.lua diff --git a/[core]/esx_identity/locales/da.lua b/[core]/esx_identity/locales/da.lua new file mode 100644 index 00000000..3903d175 --- /dev/null +++ b/[core]/esx_identity/locales/da.lua @@ -0,0 +1,39 @@ +Locales['en'] = { + ['show_active_character'] = 'Vis aktiv karakter', + ['active_character'] = 'Aktiv karakter: %s', + ['error_active_character'] = 'Der opstod en fejl under indhentning af dine data.', + ['delete_character'] = 'Slet din nuværende karakter.', + ['deleted_character'] = 'Karakter slettet', + ['error_delete_character'] = 'Der opstod et problem med at slette din karakter.', + ['thank_you_for_registering'] = 'Registreringen lykkedes. God fornøjelse!', + ['debug_xPlayer_get_first_name'] = 'Returnerer dit fornavn', + ['debug_xPlayer_get_last_name'] = 'Returnerer dit efternavn', + ['debug_xPlayer_get_full_name'] = 'Returnerer dit fulde navn', + ['debug_xPlayer_get_sex'] = 'Returnerer dit køn', + ['debug_xPlayer_get_dob'] = 'Returnerer din fødselsdato', + ['debug_xPlayer_get_height'] = 'Giver din højde tilbage', + ['error_debug_xPlayer_get_first_name'] = 'Der opstod et problem med at få dit fornavn.', + ['error_debug_xPlayer_get_last_name'] = 'Der opstod et problem med at få dit efternavn.', + ['error_debug_xPlayer_get_full_name'] = 'Der opstod et problem under indhentning af dit fulde navn.', + ['error_debug_xPlayer_get_sex'] = 'Der var et problem med at få dit sex.', + ['error_debug_xPlayer_get_dob'] = 'Der var et problem med at få din fødselsdato.', + ['error_debug_xPlayer_get_height'] = 'Der var et problem med at få din højde.', + ['return_debug_xPlayer_get_first_name'] = 'Fornavn: %s', + ['return_debug_xPlayer_get_last_name'] = 'Efternavn: %s', + ['return_debug_xPlayer_get_full_name'] = 'Fulde Navn: %s', + ['return_debug_xPlayer_get_sex'] = 'Køn: %s', + ['return_debug_xPlayer_get_dob'] = 'Fødselsdato: %s', + ['return_debug_xPlayer_get_height'] = 'Højde: %s Tommer', + ['data_incorrect'] = 'Ugyldige data. Prøv venligst igen.', + ['invalid_format'] = 'Ugyldigt dataformat. Prøv venligst igen.', + ['no_identifier'] = '[ESX Identitet]\nDer var et problem under indlæsning af din karakter!\nFejlkode: identifikator mangler\n\nDette skyldes, at din identifikator mangler. Venligst vend tilbage senere eller rapporter dette problem til serverejeren.', + ['missing_identity'] = '[ESX Identitet]\nDer var et problem med at indlæse din karakter!\nFejlkode: identitet mangler\n\nDet ser ud til, at din identitet mangler, prøv at oprette forbindelse igen.', + ['deleted_identity'] = 'Tegn slettet. Tilmeld dig igen for at oprette en ny karakter.', + ['already_registered'] = 'Du har allerede tilmeldt dig.', + ['invalid_firstname_format'] = 'Ugyldigt format (fornavn): Prøv venligst igen.', + ['invalid_lastname_format'] = 'Ugyldigt format (efternavn): Prøv igen.', + ['invalid_dob_format'] = 'Ugyldigt format (DOB): Prøv venligst igen.', + ['invalid_sex_format'] = 'Ugyldigt format (køn): Prøv venligst igen.', + ['invalid_height_format'] = 'Ugyldigt format (højde): Prøv venligst igen.' + } + From d126908ddd8b8b4b489752dffd6eed657e195cab Mon Sep 17 00:00:00 2001 From: Ducko Date: Mon, 30 Jan 2023 16:12:22 +0100 Subject: [PATCH 18/53] Create da.lua --- [core]/esx_multicharacter/da.lua | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 [core]/esx_multicharacter/da.lua diff --git a/[core]/esx_multicharacter/da.lua b/[core]/esx_multicharacter/da.lua new file mode 100644 index 00000000..b4c602df --- /dev/null +++ b/[core]/esx_multicharacter/da.lua @@ -0,0 +1,33 @@ +Locales["en"] = { + ["male"] = "Mand", + ["female"] = "Kvinde", + ["select_char"] = "Vælg karakter", + ["select_char_description"] = "Vælg en karakter at spille som.", + ["create_char"] = "Ny Karakter", + ["char_play"] = "Spil", + ["char_play_description"] = "Fortsæt ind i byen.", + ["char_disabled"] = "Deaktiveret", + ["char_disabled_description"] = "Denne karakter er ubrugelig.", + ["char_delete"] = "Slet", + ["char_delete_description"] = "Fjern denne karakter permanent.", + ["char_delete_confirmation"] = "Slet bekræftelse", + ["char_delete_confirmation_description"] = "Er du sikker på at fjerne det valgte karakter?", + ["char_delete_yes_description"] = "Ja, jeg er sikker på at fjerne det valgte karakter", + ["char_delete_no_description"] = "Nej, vend tilbage til karakter-indstillinger", + ["character"] = "Karakter: %s", + ["return"] = "Tilbage", + ["return_description"] = "Vend tilbage til valg af karaktere.", + ["command_setslots"] = "Indstil flerkarakters slotsnummer for en spiller", + ["command_remslots"] = "Fjern flerkarakters slotsnummer for en spiller", + ["command_enablechar"] = "Aktiver en valgt karakter af en spiller", + ["command_disablechar"] = "Deaktiver en valgt karakter af en spiller", + ["command_charslot"] = "Karakterens plads nummer", + ["command_identifier"] = "Spiller-id", + ["command_slots"] = "# af slots", + ["slotsadd"] = "Du føjede %s slots til %s", + ["slotsedit"] = "Du indstillerde %s slots til %s", + ["slotsrem"] = "Du fjernede slots til %s", + ["charenabled"] = "Du aktiverede karakter #%s af %s", + ["chardisabled"] = "Du deaktiverede tegn #%s af %s", + ["charnotfound"] = "Karakter #%s af %s eksisterer ikke", +} From 230087fd3d9f2d4c4719a035e9f49c15af9e7319 Mon Sep 17 00:00:00 2001 From: Csoki Date: Mon, 30 Jan 2023 21:44:49 +0100 Subject: [PATCH 19/53] fix(es_extended/client/modules/npwd.lua): phoneItem count check --- [core]/es_extended/client/modules/npwd.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/[core]/es_extended/client/modules/npwd.lua b/[core]/es_extended/client/modules/npwd.lua index fb04f356..b8de8dab 100644 --- a/[core]/es_extended/client/modules/npwd.lua +++ b/[core]/es_extended/client/modules/npwd.lua @@ -5,7 +5,8 @@ local function checkPhone() return end - npwd:setPhoneDisabled((ESX.SearchInventory('phone').count or 0) <= 0) + local phoneItem = ESX.SearchInventory('phone') + npwd:setPhoneDisabled((phoneItem and phoneItem.count or 0) <= 0) end RegisterNetEvent('esx:playerLoaded', checkPhone) From 541850ade82641b00a0e3474497f5fda4c5da9bd Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Tue, 31 Jan 2023 13:08:41 +0100 Subject: [PATCH 20/53] 1.9.1 Version fix --- [core]/es_extended/server/common.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua index 6aaf87c8..3e4b9671 100644 --- a/[core]/es_extended/server/common.lua +++ b/[core]/es_extended/server/common.lua @@ -94,7 +94,7 @@ MySQL.ready(function() ESX.Jobs = Jobs end - print('[^2INFO^7] ESX ^5Legacy 1.9.0^0 initialized!') + print('[^2INFO^7] ESX ^5Legacy 1.9.1^0 initialized!') StartDBSync() StartPayCheck() end) From 0b5a816e912e3eb33510a40bbe7912e4d8d42efc Mon Sep 17 00:00:00 2001 From: Ducko Date: Tue, 31 Jan 2023 15:09:29 +0100 Subject: [PATCH 21/53] Update da.lua --- [core]/es_extended/locales/da.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/locales/da.lua b/[core]/es_extended/locales/da.lua index c21b2437..5340a7aa 100644 --- a/[core]/es_extended/locales/da.lua +++ b/[core]/es_extended/locales/da.lua @@ -1,6 +1,6 @@ -Locales['en'] = { +Locales['da'] = { -- Inventory - ['inventory'] = 'Inventory ( Vægt %s / %s )', + ['inventory'] = 'Inventar ( Vægt %s / %s )', ['use'] = 'Brug', ['give'] = 'Giv', ['remove'] = 'Smid', From 9f9d4f9e63200a9f5e3e1466fdc8a6df76bea2cb Mon Sep 17 00:00:00 2001 From: Ducko Date: Tue, 31 Jan 2023 15:09:46 +0100 Subject: [PATCH 22/53] Update da.lua --- [core]/esx_identity/locales/da.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/esx_identity/locales/da.lua b/[core]/esx_identity/locales/da.lua index 3903d175..ab126312 100644 --- a/[core]/esx_identity/locales/da.lua +++ b/[core]/esx_identity/locales/da.lua @@ -1,4 +1,4 @@ -Locales['en'] = { +Locales['da'] = { ['show_active_character'] = 'Vis aktiv karakter', ['active_character'] = 'Aktiv karakter: %s', ['error_active_character'] = 'Der opstod en fejl under indhentning af dine data.', From 70f4b9c1b9e75b845cd51fc358978ec0d96a11ee Mon Sep 17 00:00:00 2001 From: Ducko Date: Thu, 2 Feb 2023 14:20:20 +0100 Subject: [PATCH 23/53] Delete da.lua --- [core]/esx_multicharacter/da.lua | 33 -------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 [core]/esx_multicharacter/da.lua diff --git a/[core]/esx_multicharacter/da.lua b/[core]/esx_multicharacter/da.lua deleted file mode 100644 index b4c602df..00000000 --- a/[core]/esx_multicharacter/da.lua +++ /dev/null @@ -1,33 +0,0 @@ -Locales["en"] = { - ["male"] = "Mand", - ["female"] = "Kvinde", - ["select_char"] = "Vælg karakter", - ["select_char_description"] = "Vælg en karakter at spille som.", - ["create_char"] = "Ny Karakter", - ["char_play"] = "Spil", - ["char_play_description"] = "Fortsæt ind i byen.", - ["char_disabled"] = "Deaktiveret", - ["char_disabled_description"] = "Denne karakter er ubrugelig.", - ["char_delete"] = "Slet", - ["char_delete_description"] = "Fjern denne karakter permanent.", - ["char_delete_confirmation"] = "Slet bekræftelse", - ["char_delete_confirmation_description"] = "Er du sikker på at fjerne det valgte karakter?", - ["char_delete_yes_description"] = "Ja, jeg er sikker på at fjerne det valgte karakter", - ["char_delete_no_description"] = "Nej, vend tilbage til karakter-indstillinger", - ["character"] = "Karakter: %s", - ["return"] = "Tilbage", - ["return_description"] = "Vend tilbage til valg af karaktere.", - ["command_setslots"] = "Indstil flerkarakters slotsnummer for en spiller", - ["command_remslots"] = "Fjern flerkarakters slotsnummer for en spiller", - ["command_enablechar"] = "Aktiver en valgt karakter af en spiller", - ["command_disablechar"] = "Deaktiver en valgt karakter af en spiller", - ["command_charslot"] = "Karakterens plads nummer", - ["command_identifier"] = "Spiller-id", - ["command_slots"] = "# af slots", - ["slotsadd"] = "Du føjede %s slots til %s", - ["slotsedit"] = "Du indstillerde %s slots til %s", - ["slotsrem"] = "Du fjernede slots til %s", - ["charenabled"] = "Du aktiverede karakter #%s af %s", - ["chardisabled"] = "Du deaktiverede tegn #%s af %s", - ["charnotfound"] = "Karakter #%s af %s eksisterer ikke", -} From eca88ada64a8aa654f62e24ee7d1bc78d5b5c1fc Mon Sep 17 00:00:00 2001 From: Ducko Date: Thu, 2 Feb 2023 14:20:31 +0100 Subject: [PATCH 24/53] Create da.lua --- [core]/esx_multicharacter/locales/da.lua | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 [core]/esx_multicharacter/locales/da.lua diff --git a/[core]/esx_multicharacter/locales/da.lua b/[core]/esx_multicharacter/locales/da.lua new file mode 100644 index 00000000..648138cf --- /dev/null +++ b/[core]/esx_multicharacter/locales/da.lua @@ -0,0 +1,33 @@ +Locales["da"] = { + ["male"] = "Mand", + ["female"] = "Kvinde", + ["select_char"] = "Vælg karakter", + ["select_char_description"] = "Vælg en karakter at spille som.", + ["create_char"] = "Ny Karakter", + ["char_play"] = "Spil", + ["char_play_description"] = "Fortsæt ind i byen.", + ["char_disabled"] = "Deaktiveret", + ["char_disabled_description"] = "Denne karakter er ubrugelig.", + ["char_delete"] = "Slet", + ["char_delete_description"] = "Fjern denne karakter permanent.", + ["char_delete_confirmation"] = "Slet bekræftelse", + ["char_delete_confirmation_description"] = "Er du sikker på at fjerne det valgte karakter?", + ["char_delete_yes_description"] = "Ja, jeg er sikker på at fjerne det valgte karakter", + ["char_delete_no_description"] = "Nej, vend tilbage til karakter-indstillinger", + ["character"] = "Karakter: %s", + ["return"] = "Tilbage", + ["return_description"] = "Vend tilbage til valg af karaktere.", + ["command_setslots"] = "Indstil flerkarakters slotsnummer for en spiller", + ["command_remslots"] = "Fjern flerkarakters slotsnummer for en spiller", + ["command_enablechar"] = "Aktiver en valgt karakter af en spiller", + ["command_disablechar"] = "Deaktiver en valgt karakter af en spiller", + ["command_charslot"] = "Karakterens plads nummer", + ["command_identifier"] = "Spiller-id", + ["command_slots"] = "# af slots", + ["slotsadd"] = "Du føjede %s slots til %s", + ["slotsedit"] = "Du indstillerde %s slots til %s", + ["slotsrem"] = "Du fjernede slots til %s", + ["charenabled"] = "Du aktiverede karakter #%s af %s", + ["chardisabled"] = "Du deaktiverede tegn #%s af %s", + ["charnotfound"] = "Karakter #%s af %s eksisterer ikke", +} From 06c45f928ec948d81e39c090960a1c70ef08872e Mon Sep 17 00:00:00 2001 From: Naifen || Developer Date: Fri, 3 Feb 2023 14:40:15 +0100 Subject: [PATCH 25/53] Update(DefaultSpawn): Easier now --- [SQL]/legacy.sql | 2 +- [core]/es_extended/config.lua | 2 ++ [core]/es_extended/server/main.lua | 7 +------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql index 2ba76874..36eeceb6 100644 --- a/[SQL]/legacy.sql +++ b/[SQL]/legacy.sql @@ -389,7 +389,7 @@ CREATE TABLE `users` ( `job` varchar(20) DEFAULT 'unemployed', `job_grade` int(11) DEFAULT 0, `loadout` longtext DEFAULT NULL, - `position` varchar(255) DEFAULT '{"x":-269.4,"y":-955.3,"z":31.2,"heading":205.8}', + `position` longtext NOT NULL, `firstname` varchar(16) DEFAULT NULL, `lastname` varchar(16) DEFAULT NULL, `dateofbirth` varchar(10) DEFAULT NULL, diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua index 2f465f82..ea043be2 100644 --- a/[core]/es_extended/config.lua +++ b/[core]/es_extended/config.lua @@ -18,6 +18,8 @@ Config.Accounts = { Config.StartingAccountMoney = {bank = 50000} +Config.DefaultSpawn = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8} + Config.EnableSocietyPayouts = false -- pay from the society account that the player is employed at? Requirement: esx_society Config.MaxWeight = 24 -- the max inventory weight without backpack Config.PaycheckInterval = 7 * 60000 -- how often to recieve pay checks in milliseconds diff --git a/[core]/es_extended/server/main.lua b/[core]/es_extended/server/main.lua index 8b4c00d3..1628fb13 100644 --- a/[core]/es_extended/server/main.lua +++ b/[core]/es_extended/server/main.lua @@ -243,12 +243,7 @@ function loadESXPlayer(identifier, playerId, isNew) end -- Position - if result.position and result.position ~= '' then - userData.coords = json.decode(result.position) - else - print('[^3WARNING^7] Column ^5"position"^0 in ^5"users"^0 table is missing required default value. Using backup coords, fix your database.') - userData.coords = {x = -269.4, y = -955.3, z = 31.2, heading = 205.8} - end + userData.coords = json.decode(result.position) or Config.DefaultSpawn -- Skin if result.skin and result.skin ~= '' then From 2004303d360df4cc905031cd33b73da9b14a7416 Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sun, 5 Feb 2023 10:30:40 +0100 Subject: [PATCH 26/53] Fixed --- [core]/es_extended/es_extended.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/es_extended.sql b/[core]/es_extended/es_extended.sql index ab224110..89da4be6 100644 --- a/[core]/es_extended/es_extended.sql +++ b/[core]/es_extended/es_extended.sql @@ -15,7 +15,7 @@ CREATE TABLE `users` ( `job` VARCHAR(20) NULL DEFAULT 'unemployed', `job_grade` INT NULL DEFAULT 0, `loadout` LONGTEXT NULL DEFAULT NULL, - `position` VARCHAR(255) NULL DEFAULT '{"x":-269.4,"y":-955.3,"z":31.2,"heading":205.8}', + `position` longtext NOT NULL, PRIMARY KEY (`identifier`) ) ENGINE=InnoDB; From 1642ad5927859ca5f9e3ce0fa053a09662e3f70d Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sun, 5 Feb 2023 10:32:50 +0100 Subject: [PATCH 27/53] Revert "Fixed" This reverts commit 2004303d360df4cc905031cd33b73da9b14a7416. --- [core]/es_extended/es_extended.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/es_extended.sql b/[core]/es_extended/es_extended.sql index 89da4be6..ab224110 100644 --- a/[core]/es_extended/es_extended.sql +++ b/[core]/es_extended/es_extended.sql @@ -15,7 +15,7 @@ CREATE TABLE `users` ( `job` VARCHAR(20) NULL DEFAULT 'unemployed', `job_grade` INT NULL DEFAULT 0, `loadout` LONGTEXT NULL DEFAULT NULL, - `position` longtext NOT NULL, + `position` VARCHAR(255) NULL DEFAULT '{"x":-269.4,"y":-955.3,"z":31.2,"heading":205.8}', PRIMARY KEY (`identifier`) ) ENGINE=InnoDB; From 77fdfd3fd49673b83d56ac6b27b902b57ae4ebff Mon Sep 17 00:00:00 2001 From: TheFantomas <117121911+TheFantomas@users.noreply.github.com> Date: Sun, 5 Feb 2023 10:33:49 +0100 Subject: [PATCH 28/53] fix( es_extended/es_exntended.sql): Synchronized with legacy.sql --- [core]/es_extended/es_extended.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/es_extended.sql b/[core]/es_extended/es_extended.sql index ab224110..89da4be6 100644 --- a/[core]/es_extended/es_extended.sql +++ b/[core]/es_extended/es_extended.sql @@ -15,7 +15,7 @@ CREATE TABLE `users` ( `job` VARCHAR(20) NULL DEFAULT 'unemployed', `job_grade` INT NULL DEFAULT 0, `loadout` LONGTEXT NULL DEFAULT NULL, - `position` VARCHAR(255) NULL DEFAULT '{"x":-269.4,"y":-955.3,"z":31.2,"heading":205.8}', + `position` longtext NOT NULL, PRIMARY KEY (`identifier`) ) ENGINE=InnoDB; From f65359c79a68422a3a9ec98b0b2c439db767a81d Mon Sep 17 00:00:00 2001 From: TheFantomas Date: Sun, 5 Feb 2023 10:51:10 +0100 Subject: [PATCH 29/53] fix(es_extended/sql): default value of field position --- [SQL]/legacy.sql | 2 +- [core]/es_extended/es_extended.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql index 36eeceb6..ecf145c7 100644 --- a/[SQL]/legacy.sql +++ b/[SQL]/legacy.sql @@ -389,7 +389,7 @@ CREATE TABLE `users` ( `job` varchar(20) DEFAULT 'unemployed', `job_grade` int(11) DEFAULT 0, `loadout` longtext DEFAULT NULL, - `position` longtext NOT NULL, + `position` longtext NULL DEFAULT NULL, `firstname` varchar(16) DEFAULT NULL, `lastname` varchar(16) DEFAULT NULL, `dateofbirth` varchar(10) DEFAULT NULL, diff --git a/[core]/es_extended/es_extended.sql b/[core]/es_extended/es_extended.sql index 89da4be6..bb156c90 100644 --- a/[core]/es_extended/es_extended.sql +++ b/[core]/es_extended/es_extended.sql @@ -15,7 +15,7 @@ CREATE TABLE `users` ( `job` VARCHAR(20) NULL DEFAULT 'unemployed', `job_grade` INT NULL DEFAULT 0, `loadout` LONGTEXT NULL DEFAULT NULL, - `position` longtext NOT NULL, + `position` longtext NULL DEFAULT NULL, PRIMARY KEY (`identifier`) ) ENGINE=InnoDB; From 48ab741f1984c60f1b8d12b8702b750588ddfabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= <69343477+Rav3n95@users.noreply.github.com> Date: Sun, 5 Feb 2023 18:18:09 +0100 Subject: [PATCH 30/53] refactor(actions) (#869) --- [core]/es_extended/client/modules/actions.lua | 30 +- [core]/es_extended/server/modules/actions.lua | 12 +- [core]/esx_example/LICENSE | 674 ------------------ [core]/esx_example/README.md | 51 -- [core]/esx_example/client/main.lua | 72 -- [core]/esx_example/fxmanifest.lua | 15 - [core]/esx_example/server/main.lua | 43 -- [core]/esx_multicharacter/server/main.lua | 8 +- 8 files changed, 27 insertions(+), 878 deletions(-) delete mode 100644 [core]/esx_example/LICENSE delete mode 100644 [core]/esx_example/README.md delete mode 100644 [core]/esx_example/client/main.lua delete mode 100644 [core]/esx_example/fxmanifest.lua delete mode 100644 [core]/esx_example/server/main.lua diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua index 499649b1..af27393a 100644 --- a/[core]/es_extended/client/modules/actions.lua +++ b/[core]/es_extended/client/modules/actions.lua @@ -1,6 +1,6 @@ local isInVehicle, isEnteringVehicle, isJumping, inPauseMenu = false, false, false, false -local currentVehicle, currentSeat, currentPlate = nil, nil, nil local playerPed = PlayerPedId() +local current = {} local function GetPedVehicleSeat(ped, vehicle) for i = -1, 16 do @@ -10,7 +10,10 @@ local function GetPedVehicleSeat(ped, vehicle) end local function GetData(vehicle) - local model = GetEntityModel(currentVehicle) + if not DoesEntityExist(vehicle) then + return + end + local model = GetEntityModel(vehicle) local displayName = GetDisplayNameFromVehicleModel(model) local netId = VehToNet(vehicle) return displayName, netId @@ -51,7 +54,7 @@ CreateThread(function() local displayName, netId = GetData(vehicle) isEnteringVehicle = true TriggerEvent('esx:enteringVehicle', vehicle, plate, seat, netId) - TriggerServerEvent('esx:enteringVehicle', vehicle, plate, seat, netId) + TriggerServerEvent('esx:enteringVehicle', plate, seat, netId) elseif not DoesEntityExist(GetVehiclePedIsTryingToEnter(playerPed)) and not IsPedInAnyVehicle(playerPed, true) and isEnteringVehicle then -- vehicle entering aborted @@ -62,23 +65,20 @@ CreateThread(function() -- suddenly appeared in a vehicle, possible teleport isEnteringVehicle = false isInVehicle = true - currentVehicle = GetVehiclePedIsUsing(playerPed) - currentSeat = GetPedVehicleSeat(playerPed, currentVehicle) - currentPlate = GetVehicleNumberPlateText(currentVehicle) - local displayName, netId = GetData(currentVehicle) - TriggerEvent('esx:enteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) - TriggerServerEvent('esx:enteredVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) + current.vehicle = GetVehiclePedIsUsing(playerPed) + current.seat = GetPedVehicleSeat(playerPed, current.vehicle) + current.plate = GetVehicleNumberPlateText(current.vehicle) + current.displayName, current.netId = GetData(current.vehicle) + TriggerEvent('esx:enteredVehicle', current.vehicle, current.plate, current.seat, current.displayName, current.netId) + TriggerServerEvent('esx:enteredVehicle', current.plate, current.seat, current.displayName, current.netId) end elseif isInVehicle then if not IsPedInAnyVehicle(playerPed, false) or IsPlayerDead(PlayerId()) then -- bye, vehicle - local displayName, netId = GetData(currentVehicle) - TriggerEvent('esx:exitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) - TriggerServerEvent('esx:exitedVehicle', currentVehicle, currentPlate, currentSeat, displayName, netId) + TriggerEvent('esx:exitedVehicle', current.vehicle, current.plate, current.seat, current.displayName, current.netId) + TriggerServerEvent('esx:exitedVehicle', current.plate, current.seat, current.displayName, current.netId) isInVehicle = false - currentVehicle = nil - currentSeat = nil - currentPlate = nil + current = {} end end Wait(200) diff --git a/[core]/es_extended/server/modules/actions.lua b/[core]/es_extended/server/modules/actions.lua index 7bd6c29d..049e0ca1 100644 --- a/[core]/es_extended/server/modules/actions.lua +++ b/[core]/es_extended/server/modules/actions.lua @@ -15,20 +15,20 @@ if Config.EnableDebug then print('esx:playerJumping', source) end) - AddEventHandler('esx:enteringVehicle', function(vehicle, plate, seat, netId) - print('esx:enteringVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'netId', netId) + AddEventHandler('esx:enteringVehicle', function(plate, seat, netId) + print('esx:enteringVehicle', 'source', source, 'plate', plate, 'seat', seat, 'netId', netId) end) AddEventHandler('esx:enteringVehicleAborted', function() print('esx:enteringVehicleAborted', source) end) - AddEventHandler('esx:enteredVehicle', function(vehicle, plate, seat, displayName, netId) - print('esx:enteredVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) + AddEventHandler('esx:enteredVehicle', function(plate, seat, displayName, netId) + print('esx:enteredVehicle', 'source', source, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) end) - AddEventHandler('esx:exitedVehicle', function(vehicle, plate, seat, displayName, netId) - print('esx:exitedVehicle', 'source', source, 'vehicle', vehicle, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) + AddEventHandler('esx:exitedVehicle', function(plate, seat, displayName, netId) + print('esx:exitedVehicle', 'source', source, 'plate', plate, 'seat', seat, 'displayName', displayName, 'netId', netId) end) end \ No newline at end of file diff --git a/[core]/esx_example/LICENSE b/[core]/esx_example/LICENSE deleted file mode 100644 index 9f54b358..00000000 --- a/[core]/esx_example/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - esx_example - Copyright (C) 2015-2023 Jérémie N'gadi - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - esx_example Copyright (C) 2015-2023 Jérémie N'gadi - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/[core]/esx_example/README.md b/[core]/esx_example/README.md deleted file mode 100644 index c23e9e9c..00000000 --- a/[core]/esx_example/README.md +++ /dev/null @@ -1,51 +0,0 @@ -### ESX Imports -##### Similar to importing the ESX locale functions or MySQL-Async, there is now an import for ESX -- Define `shared_script '@es_extended/imports.lua'` above all other scripts in your fxmanifest -- This will define the ESX object for both the client and server -##### The following event handler will also be created on the client -```lua - AddEventHandler('esx:setPlayerData', function(key, val) - if GetInvokingResource() == 'es_extended' then - ESX.PlayerData[key] = val - if OnPlayerData ~= nil then OnPlayerData(key, val) end - end - end) - ``` -- You will now receive updated ESX.PlayerData values whenever they change - - This does not include inventory or loadout data and it should still be retrieved with `ESX.GetPlayerData()` - - You can add your own functions to the import if you believe they will be useful in your resources - - You can trigger certain events or functions based on the key and value received (example in client.lua) - - The idea of this function is ensuring up-to-date values for `job, accounts, ped, and dead` - - You can set any data this way if you want to share it between resources - - Using `ESX.SetPlayerData('cuffed', true)` will create and set a new value that you can now reference anywhere - - If you are using OneSync you could set certain values to set a state bag (useful for other players to reference) - - -### Replacement for ESX.GetPlayers() -##### Old resources would utilise the ESX.GetPlayers() function in a loop with ESX.GetPlayerFromId() to retrieve xPlayer data -- This can be referred to as an xPlayer loop, and has been the cause for server hitches in resources such as esx_society and esx_status -- It is commonly used in robbery scripts to get the active number of cops, or for determining the number of EMS in other places -##### This method is outdated and should be replaced if you are using ESX Legacy -```lua - local xPlayers = ESX.GetPlayers() - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayers[i], 'You are a cop!') - end - end -``` -##### This new method retrieves all xPlayer data at once, reducing the number of function references being called -```lua - local xPlayers = ESX.GetExtendedPlayers() -- Returns all xPlayers - for _, xPlayer in pairs(xPlayers) do - if xPlayer.job.name == 'police' then - TriggerClientEvent('esx:showNotification', xPlayer.source, 'You are a cop!') - end - end - - local xPlayers = ESX.GetExtendedPlayers('job', 'police') -- Returns xPlayers with the police job - for _, xPlayer in pairs(xPlayers) do - TriggerClientEvent('esx:showNotification', xPlayer.source, 'You are a cop!') - end -``` diff --git a/[core]/esx_example/client/main.lua b/[core]/esx_example/client/main.lua deleted file mode 100644 index 696a6fa8..00000000 --- a/[core]/esx_example/client/main.lua +++ /dev/null @@ -1,72 +0,0 @@ -RegisterNetEvent('esx:playerLoaded') -- Store the players data -AddEventHandler('esx:playerLoaded', function(xPlayer, isNew) - print(('Player Loaded. New | %s'):format(isNew)) - ESX.PlayerData = xPlayer - ESX.PlayerLoaded = true -end) - -RegisterNetEvent('esx:playerLogout') -- When a player logs out (multicharacter), reset their data -AddEventHandler('esx:playerLogout', function() - ESX.PlayerLoaded = false - ESX.PlayerData = {} -end) - --- These two functions can perform the same task -RegisterNetEvent('esx:setJob') -AddEventHandler('esx:setJob', function(job) - print('PlayerData.job was set to '..job) - if ESX.PlayerData.job.name ~= job.name then - print('You are now in a different job') - end - ESX.PlayerData.job = job -end) - -function OnPlayerData(key, val, last) - if type(val) == 'table' then val = json.encode(val) end - print(('PlayerData.%s was set to %s'):format(key, val)) - if key == 'job' then - if last.name ~= val.name then - print('You are now in a different job') - end - elseif key == 'dead' then -- However, this function can be used for other PlayerData - if val == true then - print('You die too easily') - SetTimeout(2000, function() - if ESX.PlayerData.dead then - print('Why are you still dead?') - end - end) - end - end -end ------------------------------------------------ - -RegisterCommand('closestobject', function() - local result = ESX.Game.GetClosestObject(GetEntityCoords(PlayerPedId())) - print(result) -end) - -RegisterCommand('closestped', function() - local result = ESX.Game.GetClosestPed(GetEntityCoords(PlayerPedId())) - print(result) -end) - -RegisterCommand('closestplayer', function() - local result = ESX.Game.GetClosestPlayer(GetEntityCoords(PlayerPedId())) - print(result) -end) - -RegisterCommand('closestvehicle', function() - local result = ESX.Game.GetClosestVehicle(GetEntityCoords(PlayerPedId())) - print(result) -end) - -RegisterCommand('areaplayer', function() - local result = ESX.Game.GetPlayersInArea(GetEntityCoords(PlayerPedId()), 20) - print(json.encode(result)) -end) - -RegisterCommand('areavehicle', function() - local result = ESX.Game.GetVehiclesInArea(GetEntityCoords(PlayerPedId()), 20) - print(json.encode(result)) -end) diff --git a/[core]/esx_example/fxmanifest.lua b/[core]/esx_example/fxmanifest.lua deleted file mode 100644 index be55f747..00000000 --- a/[core]/esx_example/fxmanifest.lua +++ /dev/null @@ -1,15 +0,0 @@ -fx_version 'adamant' - -game 'gta5' - -description 'ESX Boilerplate' - -shared_script '@es_extended/imports.lua' - -server_scripts { - 'server/main.lua' -} - -client_scripts { - 'client/main.lua' -} diff --git a/[core]/esx_example/server/main.lua b/[core]/esx_example/server/main.lua deleted file mode 100644 index cc333502..00000000 --- a/[core]/esx_example/server/main.lua +++ /dev/null @@ -1,43 +0,0 @@ -CreateThread(function() - Wait(3000) - print('^1Do not run this resource in a live environment, it is solely intended for showcasing ESX functions^0') -end) - -RegisterNetEvent('esx:playerLoaded') -- When a player loads in, we can store some basic information about them locally -AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) - print("Player | ".. playerId .. "spawned in") - ESX.Players[playerId] = xPlayer.job.name -end) - -RegisterNetEvent('esx:setJob') -- The stored data does not sync with the framework unless we tell it to -AddEventHandler('esx:setJob', function(playerId, job) - print("Player | ".. playerId .. " | Changed Job. Job |".. job.label) - ESX.Players[playerId] = job.name -end) - -AddEventHandler('esx:playerDropped', function(playerId, reason) -- Remove any cached data once the player no longer exists - print("Player | ".. playerId .. "Dropped. Reason | ".. reason) - ESX.Players[playerId] = nil -end) - -AddEventHandler('onResourceStart', function(resourceName) -- The resource just restarted so we actually have a fresh copy of ESX.Players from the framework - if (GetCurrentResourceName() == resourceName) then -- Useful if we need to run functions or send events after a restart - local players = {} - for _, xPlayer in pairs(ESX.Players) do - players[xPlayer.source] = xPlayer.job.name - print( ('%s %s is online with player id %s'):format(xPlayer.job.grade_label, xPlayer.name, xPlayer.source) ) - end - ESX.Players = players -- Replace the data as it is a waste of memory - end -end) - -ESX.RegisterCommand('get', 'user', function(xPlayer, args) - print("Player |".. xPlayer.source.. "| Fetching all users.") - local xPlayers = ESX.GetExtendedPlayers(args.key, args.val) -- New hitchless xPlayer loop, with the ability to only return players with specific data - for _, xTarget in pairs(xPlayers) do -- Job and any non-table variable will work, ie. name, group, identifier, source - print("ID - ".. xTarget.source.." | Name - "..xTarget.getName().." | Job - ".. xTarget.job.label) - end -end, true, {help = 'Display all online players with specific player data', validate = false, arguments = { - {name = 'key', help = 'Variable to check (ie. job)', type = 'string'}, - {name = 'val', help = 'Value required (ie. police)', type = 'any'} -}}) diff --git a/[core]/esx_multicharacter/server/main.lua b/[core]/esx_multicharacter/server/main.lua index 782fc43b..65d84d46 100644 --- a/[core]/esx_multicharacter/server/main.lua +++ b/[core]/esx_multicharacter/server/main.lua @@ -94,8 +94,12 @@ elseif ESX.GetConfig().Multichar == true then local identifier = GetIdentifier(source) if identifier then - if ESX.Players[identifier] then - deferrals.done(('A player is already connected to the server with this identifier.\nYour identifier: %s:%s'):format(PRIMARY_IDENTIFIER, identifier)) + if not ESX.GetConfig().EnableDebug then + if ESX.Players[identifier] then + deferrals.done(('A player is already connected to the server with this identifier.\nYour identifier: %s:%s'):format(PRIMARY_IDENTIFIER, identifier)) + else + deferrals.done() + end else deferrals.done() end From f2e5d6323450927cc91ad79f12c84c764a62d853 Mon Sep 17 00:00:00 2001 From: Csoki Date: Sun, 5 Feb 2023 18:18:31 +0100 Subject: [PATCH 31/53] refactor(esx_progressbar): remove jquery (#867) --- [core]/esx_progressbar/Progress.lua | 76 ++++++++--------- [core]/esx_progressbar/nui/index.html | 4 +- [core]/esx_progressbar/nui/js/script.js | 106 ++++++++++++------------ 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/[core]/esx_progressbar/Progress.lua b/[core]/esx_progressbar/Progress.lua index e82cb05c..96a638fb 100644 --- a/[core]/esx_progressbar/Progress.lua +++ b/[core]/esx_progressbar/Progress.lua @@ -1,50 +1,50 @@ local CurrentProgress = nil local function Progressbar(message,length,Options) - local Canceled = false - if not CurrentProgress then - CurrentProgress = Options or {} - if CurrentProgress.animation then - if CurrentProgress.animation.type == "anim" then - ESX.Streaming.RequestAnimDict(CurrentProgress.animation.dict, function() - TaskPlayAnim(ESX.PlayerData.ped, CurrentProgress.animation.dict, CurrentProgress.animation.lib, 1.0, 1.0, length, 1, 1.0, false,false,false) - RemoveAnimDict(CurrentProgress.animation.dict) - end) - elseif CurrentProgress.animation.type == "Scenario" then - TaskStartScenarioInPlace(ESX.PlayerData.ped, CurrentProgress.animation.Scenario, 0, true) - end + if CurrentProgress then + return false + end + CurrentProgress = Options or {} + if CurrentProgress.animation then + if CurrentProgress.animation.type == "anim" then + ESX.Streaming.RequestAnimDict(CurrentProgress.animation.dict, function() + TaskPlayAnim(ESX.PlayerData.ped, CurrentProgress.animation.dict, CurrentProgress.animation.lib, 1.0, 1.0, length, 1, 1.0, false,false,false) + RemoveAnimDict(CurrentProgress.animation.dict) + end) + elseif CurrentProgress.animation.type == "Scenario" then + TaskStartScenarioInPlace(ESX.PlayerData.ped, CurrentProgress.animation.Scenario, 0, true) end - if CurrentProgress.FreezePlayer then FreezeEntityPosition(PlayerPedId(),CurrentProgress.FreezePlayer) end - SendNuiMessage(json.encode({ - type = "Progressbar", - length = length or 3000, - message = message or "ESX-Framework" - })) - CurrentProgress.length = length or 3000 - while CurrentProgress ~= nil do - if CurrentProgress.length > 0 then - CurrentProgress.length -= 1000 - else - ClearPedTasks(ESX.PlayerData.ped) - if CurrentProgress.FreezePlayer then FreezeEntityPosition(PlayerPedId(), false) end - if CurrentProgress.onFinish then CurrentProgress.onFinish() end - CurrentProgress = nil - end - Wait(1000) + end + if CurrentProgress.FreezePlayer then FreezeEntityPosition(PlayerPedId(), CurrentProgress.FreezePlayer) end + SendNUIMessage({ + type = "Progressbar", + length = length or 3000, + message = message or "ESX-Framework" + }) + CurrentProgress.length = length or 3000 + while CurrentProgress ~= nil do + if CurrentProgress.length > 0 then + CurrentProgress.length -= 1000 + else + ClearPedTasks(ESX.PlayerData.ped) + if CurrentProgress.FreezePlayer then FreezeEntityPosition(PlayerPedId(), false) end + if CurrentProgress.onFinish then CurrentProgress.onFinish() end + CurrentProgress = nil end + Wait(1000) end end ESX.RegisterInput("cancelprog", "[ProgressBar] Cancel Progressbar", "keyboard", "BACK", function() if not CurrentProgress then return end if not CurrentProgress.onCancel then return end - SendNuiMessage(json.encode({ + SendNUIMessage({ type = "Close" - })) - ClearPedTasks(ESX.PlayerData.ped) - if CurrentProgress.FreezePlayer then FreezeEntityPosition(PlayerPedId(), false) end - CurrentProgress.canceled = true - CurrentProgress.length = 0 - CurrentProgress.onCancel() - CurrentProgress = nil + }) + ClearPedTasks(ESX.PlayerData.ped) + if CurrentProgress.FreezePlayer then FreezeEntityPosition(PlayerPedId(), false) end + CurrentProgress.canceled = true + CurrentProgress.length = 0 + CurrentProgress.onCancel() + CurrentProgress = nil end) -exports('Progressbar', Progressbar) \ No newline at end of file +exports('Progressbar', Progressbar) diff --git a/[core]/esx_progressbar/nui/index.html b/[core]/esx_progressbar/nui/index.html index dcf006ee..390c6c7c 100644 --- a/[core]/esx_progressbar/nui/index.html +++ b/[core]/esx_progressbar/nui/index.html @@ -1,10 +1,8 @@ - -
@@ -13,8 +11,10 @@

+
+