From df9e453bcc9c063799c2e5a2ecb5262e2a6af16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:25:43 +0200 Subject: [PATCH 01/44] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..b492ab18 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_status +FXServer ESX Status From 088364f78d594aa7966d9205bc47e18192808ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:31:53 +0200 Subject: [PATCH 02/44] Update README.md --- README.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/README.md b/README.md index b492ab18..c17f0960 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,36 @@ # fxserver-esx_status FXServer ESX Status +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_status esx_status +``` +3) Add this in your server.cfg : + +``` +start esx_status +``` + +[HOWTO] + +server.lua +```lua + +local name = 'hunger' +local default = 1000000 +local color = '#CFAD0F' + +TriggerEvent('esx_status:registerStatus', name, default, color, + function(status) -- Visible calllback, if it return true the status will be visible + return true + end, + function(status) -- Tick callback, what to do at each tick + status.remove(200) + end, + {remove = 200} -- Client action (add / remove) so the client can be in sync with server +) + + +``` From 944de1000dc11a63fff6a847b3de04619412aee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:33:15 +0200 Subject: [PATCH 03/44] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c17f0960..476ac2fc 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ FXServer ESX Status ``` git clone https://github.com/FXServer-ESX/fxserver-esx_status esx_status ``` -3) Add this in your server.cfg : +3) Import esx_status.sql in your database +4) Add this in your server.cfg : ``` start esx_status From 09d76deef3457761441e8d63fc278e5b9452623d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:35:52 +0200 Subject: [PATCH 04/44] Add files --- __resource.lua | 23 +++++ client/main.lua | 97 +++++++++++++++++++ config.lua | 5 + esx_status.sql | 3 + html/css/app.css | 20 ++++ html/scripts/app.js | 57 +++++++++++ html/ui.html | 14 +++ server/classes/status.lua | 52 ++++++++++ server/main.lua | 198 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 469 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 esx_status.sql create mode 100644 html/css/app.css create mode 100644 html/scripts/app.js create mode 100644 html/ui.html create mode 100644 server/classes/status.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..f3fe55e6 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,23 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Status' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/classes/status.lua', + 'server/main.lua' +} + +client_scripts { + 'config.lua', + 'client/main.lua' +} + +ui_page 'html/ui.html' + +files { + 'html/ui.html', + 'html/css/app.css', + 'html/scripts/app.js' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..fd69e2e4 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,97 @@ +local Status = {} +local loaded = false + +RegisterNetEvent('esx_status:update') +AddEventHandler('esx_status:update', function(status) + + Status = status + + SendNUIMessage({ + update = true, + status = Status + }) + + if not loaded then + TriggerEvent('esx_status:loaded') + loaded = true + end + +end) + +AddEventHandler('esx_status:getStatus', function(name, cb) + + for i=1, #Status, 1 do + if Status[i].name == name then + cb(Status[i]) + return + end + end + +end) + +AddEventHandler('esx_status:setDisplay', function(val) + + SendNUIMessage({ + setDisplay = true, + display = val + }) + +end) + +-- Calculate status +Citizen.CreateThread(function() + while true do + + for i=1, #Status, 1 do + + if Status[i].clientAction.add ~= nil then + + local val = Status[i].clientAction.add + + if Status[i].val + val > Config.StatusMax then + Status[i].val = StatusMax + else + Status[i].val = Status[i].val + val + end + + end + + if Status[i].clientAction.remove ~= nil then + + local val = Status[i].clientAction.remove + + if Status[i].val - val < 0 then + Status[i].val = 0 + else + Status[i].val = Status[i].val - val + end + + end + + end + + SendNUIMessage({ + update = true, + status = Status + }) + + Citizen.Wait(Config.TickTime) + + end +end) + +-- Pause menu disable hud display +local isPaused = false + +Citizen.CreateThread(function() + while true do + Citizen.Wait(1) + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) + end + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..862ec1bd --- /dev/null +++ b/config.lua @@ -0,0 +1,5 @@ +Config = {} + +Config.StatusMax = 1000000 +Config.TickTime = 1000 +Config.UpdateClientTime = 60000 \ No newline at end of file diff --git a/esx_status.sql b/esx_status.sql new file mode 100644 index 00000000..b62fd8dd --- /dev/null +++ b/esx_status.sql @@ -0,0 +1,3 @@ +USE `essentialmode`; + +ALTER TABLE `users` ADD COLUMN `status` LONGTEXT NULL; diff --git a/html/css/app.css b/html/css/app.css new file mode 100644 index 00000000..d92580fa --- /dev/null +++ b/html/css/app.css @@ -0,0 +1,20 @@ +#status_list { + position: absolute; + left : 23; + bottom : 21%; + width : 14.5%; + opacity: 0.3; +} + +.status { + padding: 1px; + margin: 0.3em; +} + +.status_inner { + padding: 1px; +} + +.status_val { + height : 0.5em; +} \ No newline at end of file diff --git a/html/scripts/app.js b/html/scripts/app.js new file mode 100644 index 00000000..e009ce7e --- /dev/null +++ b/html/scripts/app.js @@ -0,0 +1,57 @@ +(function(){ + + let status = [] + + let renderStatus = function(){ + + $('#status_list').html(''); + + for(let i=0; i' + + '
' + + '
' + + '
' + + ''); + + statusDiv.find('.status_inner') + .css({'border' : '1px solid ' + status[i].color}) + ; + + statusDiv.find('.status_val') + .css({ + 'background-color' : status[i].color, + 'width' : (status[i].val / 10000) + '%' + }) + ; + + $('#status_list').append(statusDiv) + } + + } + + window.onData = function(data){ + + if(data.update){ + + status.length = 0; + + for(let i=0; i + + + + + + +
+ + + + + + \ No newline at end of file diff --git a/server/classes/status.lua b/server/classes/status.lua new file mode 100644 index 00000000..f400eb53 --- /dev/null +++ b/server/classes/status.lua @@ -0,0 +1,52 @@ +function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clientAction) + + local self = {} + + self.val = default + self.xPlayer = xPlayer + self.name = name + self.default = default + self.color = color + self.visible = visible + self.tickCallback = tickCallback + self.clientAction = clientAction + + self._set = function(k, v) + self[k] = v + end + + self._get = function(k) + return self[k] + end + + self.onTick = function() + self.tickCallback(self) + end + + self.set = function(val) + self.val = val + end + + self.add = function(val) + if self.val + val > Config.StatusMax then + self.val = StatusMax + else + self.val = self.val + val + end + end + + self.remove = function(val) + if self.val - val < 0 then + self.val = 0 + else + self.val = self.val - val + end + end + + self.updateClient = function() + TriggerEvent('esx_status:updateClient', self.xPlayer.source) + end + + return self + +end diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..6358de60 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,198 @@ +ESX = nil +local RegisteredStatus = {} + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback, clientAction) + + table.insert(RegisteredStatus, { + name = name, + default = default, + color = color, + visible = visible, + tickCallback = tickCallback, + clientAction = clientAction + }) + +end) + +AddEventHandler('esx:playerLoaded', function(source) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + MySQL.Async.fetchAll( + 'SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = xPlayer.identifier + }, + function(result) + + local data = {} + local savedStatus = {} + + if result[1].status ~= nil then + data = json.decode(result[1].status) + end + + for i=1, #data, 1 do + savedStatus[data[i].name] = data[i] + end + + local status = {} + + for i=1, #RegisteredStatus, 1 do + + local s = RegisteredStatus[i] + local default = nil + + if savedStatus[s.name] ~= nil then + default = savedStatus[s.name].val + else + default = s.default + end + + table.insert(status, CreateStatus(xPlayer, s.name, default, s.color, s.visible, s.tickCallback, s.clientAction)) + end + + xPlayer.set('status', status) + + TriggerEvent('esx_status:updateClient', _source) + + end + ) + +end) + +AddEventHandler('esx:playerDropped', function(source) + + local xPlayer = ESX.GetPlayerFromId(source) + + local data = {} + local status = xPlayer.get('status') + + for i=1, #status, 1 do + + local s = status[i] + + table.insert(data, { + name = s._get('name'), + val = s._get('val') + }) + end + + MySQL.Async.execute( + 'UPDATE users SET status = @status WHERE identifier = @identifier', + { + ['@status'] = json.encode(data), + ['@identifier'] = xPlayer.identifier + } + ) + +end) + +AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) + + local xPlayer = ESX.GetPlayerFromId(playerId) + local status = xPlayer.get('status') + + for i=1, #status, 1 do + if status[i]._get('name') == statusName then + cb(status[i]) + break + end + end + +end) + +AddEventHandler('esx_status:updateClient', function(playerId) + + local xPlayer = ESX.GetPlayerFromId(playerId) + local data = {} + local status = xPlayer.get('status') + + for i=1, #status, 1 do + table.insert(data, { + name = status[i]._get('name'), + val = status[i]._get('val'), + color = status[i]._get('color'), + visible = status[i]._get('visible')(status[i]), + clientAction = status[i]._get('clientAction'), + max = Config.StatusMax + }) + end + + TriggerClientEvent('esx_status:update', playerId, data) + +end) + +function TickStatus() + + local xPlayers = ESX.GetPlayers() + + for k,v in pairs(xPlayers) do + + local status = v.get('status') + + if status ~= nil then + + for i=1, #status, 1 do + status[i]._get('onTick')() + end + + end + + end + + SetTimeout(Config.TickTime, TickStatus) + +end + +function UpdateClients() + + local xPlayers = ESX.GetPlayers() + + for k,v in pairs(xPlayers) do + TriggerEvent('esx_status:updateClient', v.source) + end + + SetTimeout(Config.UpdateClientTime, UpdateClients) + +end + +function SaveData() + + local xPlayers = ESX.GetPlayers() + + for k,v in pairs(xPlayers) do + + local data = {} + local status = v.get('status') + + for i=1, #status, 1 do + + local s = status[i] + + table.insert(data, { + name = s._get('name'), + val = s._get('val') + }) + end + + MySQL.Async.execute( + 'UPDATE users SET status = @status WHERE identifier = @identifier', + { + ['@status'] = json.encode(data), + ['@identifier'] = v.identifier + } + ) + + end + + SetTimeout(60000, SaveData) + +end + +TickStatus() +UpdateClients() +SaveData() \ No newline at end of file From 6e0a1a31ed70d7c51e9b705d5f4285f89ab5df73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 13:12:59 +0200 Subject: [PATCH 05/44] Fix StatusMax --- server/classes/status.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/classes/status.lua b/server/classes/status.lua index f400eb53..b81969cc 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -2,7 +2,7 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie local self = {} - self.val = default + self.val = default self.xPlayer = xPlayer self.name = name self.default = default @@ -29,7 +29,7 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie self.add = function(val) if self.val + val > Config.StatusMax then - self.val = StatusMax + self.val = Config.StatusMax else self.val = self.val + val end From ba645e080a346885ea4067acca031018c6ff35d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 22:51:53 +0200 Subject: [PATCH 06/44] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + 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. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + 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: + + {project} Copyright (C) {year} {fullname} + 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 From 6384476016471cafbc5e1a5913510c619e24fa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 00:58:59 +0200 Subject: [PATCH 07/44] Fix GetPlayers() + add GetPercent() --- server/classes/status.lua | 4 ++++ server/main.lua | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/server/classes/status.lua b/server/classes/status.lua index b81969cc..7cf02782 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -43,6 +43,10 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie end end + self.getPercent = function() + return (self.val / Config.StatusMax) * 100 + end + self.updateClient = function() TriggerEvent('esx_status:updateClient', self.xPlayer.source) end diff --git a/server/main.lua b/server/main.lua index 6358de60..493065cd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -130,16 +130,15 @@ function TickStatus() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - local status = v.get('status') + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local status = xPlayer.get('status') if status ~= nil then - for i=1, #status, 1 do status[i]._get('onTick')() end - end end @@ -152,8 +151,9 @@ function UpdateClients() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do - TriggerEvent('esx_status:updateClient', v.source) + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + TriggerEvent('esx_status:updateClient', xPlayer.source) end SetTimeout(Config.UpdateClientTime, UpdateClients) @@ -164,10 +164,11 @@ function SaveData() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - local data = {} - local status = v.get('status') + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local data = {} + local status = xPlayer.get('status') for i=1, #status, 1 do @@ -183,7 +184,7 @@ function SaveData() 'UPDATE users SET status = @status WHERE identifier = @identifier', { ['@status'] = json.encode(data), - ['@identifier'] = v.identifier + ['@identifier'] = xPlayer.identifier } ) From 1dfeee2a18272ca30212ffa5e0e38a6242a24232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 10:17:58 +0200 Subject: [PATCH 08/44] Increase TickTime --- client/main.lua | 6 +++--- config.lua | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index fd69e2e4..4db12de3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -46,7 +46,7 @@ Citizen.CreateThread(function() if Status[i].clientAction.add ~= nil then - local val = Status[i].clientAction.add + local val = math.floor(Status[i].clientAction.add / (Config.TickTime / Config.ClientTickTime)) if Status[i].val + val > Config.StatusMax then Status[i].val = StatusMax @@ -58,7 +58,7 @@ Citizen.CreateThread(function() if Status[i].clientAction.remove ~= nil then - local val = Status[i].clientAction.remove + local val = math.floor(Status[i].clientAction.remove / (Config.TickTime / Config.ClientTickTime)) if Status[i].val - val < 0 then Status[i].val = 0 @@ -75,7 +75,7 @@ Citizen.CreateThread(function() status = Status }) - Citizen.Wait(Config.TickTime) + Citizen.Wait(Config.ClientqTickTime) end end) diff --git a/config.lua b/config.lua index 862ec1bd..1baf3075 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,6 @@ Config = {} Config.StatusMax = 1000000 -Config.TickTime = 1000 -Config.UpdateClientTime = 60000 \ No newline at end of file +Config.TickTime = 30000 +Config.ClientTickTime = 1000 +Config.UpdateClientTime = 65000 \ No newline at end of file From 58ab6be31e51320eaa099e54c657356d6736feb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 2 Sep 2017 12:15:18 +0200 Subject: [PATCH 09/44] Fix lags --- __resource.lua | 2 +- client/classes/status.lua | 50 +++++++++++ client/main.lua | 176 +++++++++++++++++++++++++++----------- config.lua | 7 +- server/main.lua | 129 +++------------------------- 5 files changed, 194 insertions(+), 170 deletions(-) create mode 100644 client/classes/status.lua diff --git a/__resource.lua b/__resource.lua index f3fe55e6..6db3c800 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,12 +5,12 @@ description 'ESX Status' server_scripts { '@mysql-async/lib/MySQL.lua', 'config.lua', - 'server/classes/status.lua', 'server/main.lua' } client_scripts { 'config.lua', + 'client/classes/status.lua', 'client/main.lua' } diff --git a/client/classes/status.lua b/client/classes/status.lua new file mode 100644 index 00000000..c478a98d --- /dev/null +++ b/client/classes/status.lua @@ -0,0 +1,50 @@ +function CreateStatus(name, default, color, visible, tickCallback) + + local self = {} + + self.val = default + self.name = name + self.default = default + self.color = color + self.visible = visible + self.tickCallback = tickCallback + + self._set = function(k, v) + self[k] = v + end + + self._get = function(k) + return self[k] + end + + self.onTick = function() + self.tickCallback(self) + end + + self.set = function(val) + self.val = val + end + + self.add = function(val) + if self.val + val > Config.StatusMax then + self.val = Config.StatusMax + else + self.val = self.val + val + end + end + + self.remove = function(val) + if self.val - val < 0 then + self.val = 0 + else + self.val = self.val - val + end + end + + self.getPercent = function() + return (self.val / Config.StatusMax) * 100 + end + + return self + +end diff --git a/client/main.lua b/client/main.lua index 4db12de3..140d79ed 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,21 +1,126 @@ local Status = {} -local loaded = false -RegisterNetEvent('esx_status:update') -AddEventHandler('esx_status:update', function(status) +function GetStatusData(minimal) + + local status = {} + + for i=1, #Status, 1 do + + if minimal then + + table.insert(status, { + name = Status[i].name, + val = Status[i].val, + }) + + else + + table.insert(status, { + name = Status[i].name, + val = Status[i].val, + color = Status[i].color, + visible = Status[i].visible(Status[i]), + max = Status[i].max, + }) + + end + + end + + return status + +end + +AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback) + local s = CreateStatus(name, default, color, visible, tickCallback) + table.insert(Status, s) +end) + +RegisterNetEvent('esx_status:load') +AddEventHandler('esx_status:load', function(status) + + for i=1, #Status, 1 do + for j=1, #status, 1 do + if Status[i].name == status[j].name then + Status[i].set(status[j].val) + end + end + end + + Citizen.CreateThread(function() + while true do + + for i=1, #Status, 1 do + Status[i].onTick() + end + + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + + Citizen.Wait(Config.TickTime) + + end + end) + +end) + +RegisterNetEvent('esx_status:set') +AddEventHandler('esx_status:set', function(name, val) - Status = status + for i=1, #Status, 1 do + if Status[i].name == name then + Status[i].set(val) + break + end + end SendNUIMessage({ update = true, - status = Status + status = GetStatusData() }) - if not loaded then - TriggerEvent('esx_status:loaded') - loaded = true + TriggerServerEvent('esx_status:update', GetStatusData(true)) + +end) + +RegisterNetEvent('esx_status:add') +AddEventHandler('esx_status:add', function(name, val) + + for i=1, #Status, 1 do + if Status[i].name == name then + Status[i].add(val) + break + end end + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + + TriggerServerEvent('esx_status:update', GetStatusData(true)) + +end) + +RegisterNetEvent('esx_status:remove') +AddEventHandler('esx_status:remove', function(name, val) + + for i=1, #Status, 1 do + if Status[i].name == name then + Status[i].remove(val) + break + end + end + + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + + TriggerServerEvent('esx_status:update', GetStatusData(true)) + end) AddEventHandler('esx_status:getStatus', function(name, cb) @@ -38,48 +143,6 @@ AddEventHandler('esx_status:setDisplay', function(val) end) --- Calculate status -Citizen.CreateThread(function() - while true do - - for i=1, #Status, 1 do - - if Status[i].clientAction.add ~= nil then - - local val = math.floor(Status[i].clientAction.add / (Config.TickTime / Config.ClientTickTime)) - - if Status[i].val + val > Config.StatusMax then - Status[i].val = StatusMax - else - Status[i].val = Status[i].val + val - end - - end - - if Status[i].clientAction.remove ~= nil then - - local val = math.floor(Status[i].clientAction.remove / (Config.TickTime / Config.ClientTickTime)) - - if Status[i].val - val < 0 then - Status[i].val = 0 - else - Status[i].val = Status[i].val - val - end - - end - - end - - SendNUIMessage({ - update = true, - status = Status - }) - - Citizen.Wait(Config.ClientqTickTime) - - end -end) - -- Pause menu disable hud display local isPaused = false @@ -94,4 +157,17 @@ Citizen.CreateThread(function() TriggerEvent('esx_status:setDisplay', 0.5) end end +end) + +-- Loaded event +Citizen.CreateThread(function() + TriggerEvent('esx_status:loaded') +end) + +-- Update server +Citizen.CreateThread(function() + while true do + Citizen.Wait(Config.UpdateInterval) + TriggerServerEvent('esx_status:update', GetStatusData(true)) + end end) \ No newline at end of file diff --git a/config.lua b/config.lua index 1baf3075..3b444340 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,5 @@ Config = {} -Config.StatusMax = 1000000 -Config.TickTime = 30000 -Config.ClientTickTime = 1000 -Config.UpdateClientTime = 65000 \ No newline at end of file +Config.StatusMax = 1000000 +Config.TickTime = 1000 +Config.UpdateInterval = 10000 \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 493065cd..29d75b17 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,19 +3,6 @@ local RegisteredStatus = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback, clientAction) - - table.insert(RegisteredStatus, { - name = name, - default = default, - color = color, - visible = visible, - tickCallback = tickCallback, - clientAction = clientAction - }) - -end) - AddEventHandler('esx:playerLoaded', function(source) local _source = source @@ -28,36 +15,15 @@ AddEventHandler('esx:playerLoaded', function(source) }, function(result) - local data = {} - local savedStatus = {} + local data = {} if result[1].status ~= nil then data = json.decode(result[1].status) end - for i=1, #data, 1 do - savedStatus[data[i].name] = data[i] - end + xPlayer.set('status', data) - local status = {} - - for i=1, #RegisteredStatus, 1 do - - local s = RegisteredStatus[i] - local default = nil - - if savedStatus[s.name] ~= nil then - default = savedStatus[s.name].val - else - default = s.default - end - - table.insert(status, CreateStatus(xPlayer, s.name, default, s.color, s.visible, s.tickCallback, s.clientAction)) - end - - xPlayer.set('status', status) - - TriggerEvent('esx_status:updateClient', _source) + TriggerClientEvent('esx_status:load', _source, data) end ) @@ -71,20 +37,10 @@ AddEventHandler('esx:playerDropped', function(source) local data = {} local status = xPlayer.get('status') - for i=1, #status, 1 do - - local s = status[i] - - table.insert(data, { - name = s._get('name'), - val = s._get('val') - }) - end - MySQL.Async.execute( 'UPDATE users SET status = @status WHERE identifier = @identifier', { - ['@status'] = json.encode(data), + ['@status'] = json.encode(status), ['@identifier'] = xPlayer.identifier } ) @@ -97,7 +53,7 @@ AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) local status = xPlayer.get('status') for i=1, #status, 1 do - if status[i]._get('name') == statusName then + if status[i].name == statusName then cb(status[i]) break end @@ -105,61 +61,16 @@ AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) end) -AddEventHandler('esx_status:updateClient', function(playerId) - - local xPlayer = ESX.GetPlayerFromId(playerId) - local data = {} - local status = xPlayer.get('status') - - for i=1, #status, 1 do - table.insert(data, { - name = status[i]._get('name'), - val = status[i]._get('val'), - color = status[i]._get('color'), - visible = status[i]._get('visible')(status[i]), - clientAction = status[i]._get('clientAction'), - max = Config.StatusMax - }) - end - - TriggerClientEvent('esx_status:update', playerId, data) +RegisterServerEvent('esx_status:update') +AddEventHandler('esx_status:update', function(status) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + xPlayer.set('status', status) end) -function TickStatus() - - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local status = xPlayer.get('status') - - if status ~= nil then - for i=1, #status, 1 do - status[i]._get('onTick')() - end - end - - end - - SetTimeout(Config.TickTime, TickStatus) - -end - -function UpdateClients() - - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - TriggerEvent('esx_status:updateClient', xPlayer.source) - end - - SetTimeout(Config.UpdateClientTime, UpdateClients) - -end - function SaveData() local xPlayers = ESX.GetPlayers() @@ -170,30 +81,18 @@ function SaveData() local data = {} local status = xPlayer.get('status') - for i=1, #status, 1 do - - local s = status[i] - - table.insert(data, { - name = s._get('name'), - val = s._get('val') - }) - end - MySQL.Async.execute( 'UPDATE users SET status = @status WHERE identifier = @identifier', { - ['@status'] = json.encode(data), + ['@status'] = json.encode(status), ['@identifier'] = xPlayer.identifier } ) end - SetTimeout(60000, SaveData) + SetTimeout(10 * 60 * 1000, SaveData) end -TickStatus() -UpdateClients() SaveData() \ No newline at end of file From a6e54c9aa2628e1cd318d8c9d8283469f517f7f7 Mon Sep 17 00:00:00 2001 From: renaiku Date: Mon, 11 Sep 2017 03:18:00 +0200 Subject: [PATCH 10/44] fixed source at playerdrop --- server/main.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 29d75b17..5cc9ef69 100644 --- a/server/main.lua +++ b/server/main.lua @@ -32,7 +32,8 @@ end) AddEventHandler('esx:playerDropped', function(source) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) local data = {} local status = xPlayer.get('status') From d39a9605523c8ec7d034fa9623b8982482afdf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 12 Sep 2017 11:11:14 +0200 Subject: [PATCH 11/44] Add status percent --- client/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 140d79ed..089c7de0 100644 --- a/client/main.lua +++ b/client/main.lua @@ -9,8 +9,9 @@ function GetStatusData(minimal) if minimal then table.insert(status, { - name = Status[i].name, - val = Status[i].val, + name = Status[i].name, + val = Status[i].val, + percent = (Status[i].val / Config.StatusMax) * 100, }) else @@ -21,6 +22,7 @@ function GetStatusData(minimal) color = Status[i].color, visible = Status[i].visible(Status[i]), max = Status[i].max, + percent = (Status[i].val / Config.StatusMax) * 100, }) end From 90dd6bc967fd47a8414ea26d51712506252ab070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:18:45 +0200 Subject: [PATCH 12/44] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..f1e87985 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ 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. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_status + Copyright (C) 2015 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 @@ -652,7 +652,7 @@ 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: - {project} Copyright (C) {year} {fullname} + fxserver-esx_status Copyright (C) 2015 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. From 3cfe679ef27dc967850feff1425c2cfcc7664b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:43:25 +0200 Subject: [PATCH 13/44] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 6db3c800..57b90da0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Status' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', 'config.lua', From 94fa8619f3670584daa48861ef07bf434d8aacdc Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 9 Apr 2018 01:49:11 +0200 Subject: [PATCH 14/44] Fixed error setting status on a unknown player --- client/main.lua | 2 +- server/main.lua | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/client/main.lua b/client/main.lua index 089c7de0..17a7aac7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -150,7 +150,7 @@ local isPaused = false Citizen.CreateThread(function() while true do - Citizen.Wait(1) + Citizen.Wait(10) if IsPauseMenuActive() and not isPaused then isPaused = true TriggerEvent('esx_status:setDisplay', 0.0) diff --git a/server/main.lua b/server/main.lua index 5cc9ef69..b0f8c46a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,6 @@ local RegisteredStatus = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) AddEventHandler('esx:playerLoaded', function(source) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) @@ -31,7 +30,6 @@ AddEventHandler('esx:playerLoaded', function(source) end) AddEventHandler('esx:playerDropped', function(source) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) @@ -49,7 +47,6 @@ AddEventHandler('esx:playerDropped', function(source) end) AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) - local xPlayer = ESX.GetPlayerFromId(playerId) local status = xPlayer.get('status') @@ -64,18 +61,17 @@ end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.set('status', status) - + if xPlayer ~= nil then + xPlayer.set('status', status) + end end) function SaveData() - local xPlayers = ESX.GetPlayers() - + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) @@ -93,7 +89,6 @@ function SaveData() end SetTimeout(10 * 60 * 1000, SaveData) - end SaveData() \ No newline at end of file From 043d406461e7126aaa70c0a2baf3da027fac7d34 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:56:03 -0400 Subject: [PATCH 15/44] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 74653246b0d2fc7731699fa4546a0a4635b6d05e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Nov 2018 21:53:44 +0100 Subject: [PATCH 16/44] Performance, respect EnableHud from ESX --- client/main.lua | 73 +++++++++++++++------------------------ html/scripts/app.js | 54 +++++++++++++++-------------- html/ui.html | 24 +++++++------ server/classes/status.lua | 2 +- server/main.lua | 60 +++++++++++--------------------- 5 files changed, 89 insertions(+), 124 deletions(-) diff --git a/client/main.lua b/client/main.lua index 17a7aac7..4a4dbb1c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,46 +1,38 @@ local Status = {} +local isPaused = false function GetStatusData(minimal) - local status = {} for i=1, #Status, 1 do - if minimal then - table.insert(status, { name = Status[i].name, val = Status[i].val, - percent = (Status[i].val / Config.StatusMax) * 100, + percent = (Status[i].val / Config.StatusMax) * 100 }) - else - table.insert(status, { name = Status[i].name, val = Status[i].val, color = Status[i].color, visible = Status[i].visible(Status[i]), max = Status[i].max, - percent = (Status[i].val / Config.StatusMax) * 100, + percent = (Status[i].val / Config.StatusMax) * 100 }) - end - end return status - end AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback) - local s = CreateStatus(name, default, color, visible, tickCallback) - table.insert(Status, s) + local status = CreateStatus(name, default, color, visible, tickCallback) + table.insert(Status, status) end) RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) - for i=1, #Status, 1 do for j=1, #status, 1 do if Status[i].name == status[j].name then @@ -50,27 +42,23 @@ AddEventHandler('esx_status:load', function(status) end Citizen.CreateThread(function() - while true do - - for i=1, #Status, 1 do - Status[i].onTick() - end + while true do + for i=1, #Status, 1 do + Status[i].onTick() + end SendNUIMessage({ update = true, status = GetStatusData() }) - Citizen.Wait(Config.TickTime) - - end + Citizen.Wait(Config.TickTime) + end end) - end) RegisterNetEvent('esx_status:set') AddEventHandler('esx_status:set', function(name, val) - for i=1, #Status, 1 do if Status[i].name == name then Status[i].set(val) @@ -84,12 +72,10 @@ AddEventHandler('esx_status:set', function(name, val) }) TriggerServerEvent('esx_status:update', GetStatusData(true)) - end) RegisterNetEvent('esx_status:add') AddEventHandler('esx_status:add', function(name, val) - for i=1, #Status, 1 do if Status[i].name == name then Status[i].add(val) @@ -103,12 +89,10 @@ AddEventHandler('esx_status:add', function(name, val) }) TriggerServerEvent('esx_status:update', GetStatusData(true)) - end) RegisterNetEvent('esx_status:remove') AddEventHandler('esx_status:remove', function(name, val) - for i=1, #Status, 1 do if Status[i].name == name then Status[i].remove(val) @@ -122,44 +106,40 @@ AddEventHandler('esx_status:remove', function(name, val) }) TriggerServerEvent('esx_status:update', GetStatusData(true)) - end) AddEventHandler('esx_status:getStatus', function(name, cb) - for i=1, #Status, 1 do if Status[i].name == name then cb(Status[i]) return end end - end) AddEventHandler('esx_status:setDisplay', function(val) - SendNUIMessage({ setDisplay = true, display = val }) - end) -- Pause menu disable hud display -local isPaused = false +if ESX.GetConfig().EnableHud then + Citizen.CreateThread(function() + while true do + Citizen.Wait(300) -Citizen.CreateThread(function() - while true do - Citizen.Wait(10) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end - end -end) + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) + end + end + end) +end -- Loaded event Citizen.CreateThread(function() @@ -170,6 +150,7 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(Config.UpdateInterval) + TriggerServerEvent('esx_status:update', GetStatusData(true)) end -end) \ No newline at end of file +end) diff --git a/html/scripts/app.js b/html/scripts/app.js index e009ce7e..8e01f20c 100644 --- a/html/scripts/app.js +++ b/html/scripts/app.js @@ -1,15 +1,15 @@ -(function(){ +(function () { + let status = []; - let status = [] - - let renderStatus = function(){ + let renderStatus = function () { $('#status_list').html(''); - for(let i=0; i' + @@ -17,41 +17,43 @@ '
' + '' + ''); - + statusDiv.find('.status_inner') - .css({'border' : '1px solid ' + status[i].color}) - ; + .css({ 'border': '1px solid ' + status[i].color }) + ; statusDiv.find('.status_val') .css({ - 'background-color' : status[i].color, - 'width' : (status[i].val / 10000) + '%' + 'background-color': status[i].color, + 'width': (status[i].val / 10000) + '%' }) - ; + ; - $('#status_list').append(statusDiv) + $('#status_list').append(statusDiv); } - } + }; - window.onData = function(data){ - - if(data.update){ - + window.onData = function (data) { + if (data.update) { status.length = 0; - for(let i=0; i - - - - - - -
- - - - + + + + + + + +
+ + + + + \ No newline at end of file diff --git a/server/classes/status.lua b/server/classes/status.lua index 7cf02782..226daa60 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -1,5 +1,5 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clientAction) - + local self = {} self.val = default diff --git a/server/main.lua b/server/main.lua index b0f8c46a..eed4d956 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,5 +1,4 @@ -ESX = nil -local RegisteredStatus = {} +ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -7,43 +6,30 @@ AddEventHandler('esx:playerLoaded', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - MySQL.Async.fetchAll( - 'SELECT * FROM users WHERE identifier = @identifier', - { + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier - }, - function(result) - - local data = {} - - if result[1].status ~= nil then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - - TriggerClientEvent('esx_status:load', _source, data) + }, function(result) + local data = {} + if result[1].status ~= nil then + data = json.decode(result[1].status) end - ) + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', _source, data) + end) end) AddEventHandler('esx:playerDropped', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - local data = {} local status = xPlayer.get('status') - MySQL.Async.execute( - 'UPDATE users SET status = @status WHERE identifier = @identifier', - { - ['@status'] = json.encode(status), - ['@identifier'] = xPlayer.identifier - } - ) - + MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { + ['@status'] = json.encode(status), + ['@identifier'] = xPlayer.identifier + }) end) AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) @@ -56,14 +42,13 @@ AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) break end end - end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - + if xPlayer ~= nil then xPlayer.set('status', status) end @@ -71,24 +56,19 @@ end) function SaveData() local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) local data = {} local status = xPlayer.get('status') - MySQL.Async.execute( - 'UPDATE users SET status = @status WHERE identifier = @identifier', - { - ['@status'] = json.encode(status), - ['@identifier'] = xPlayer.identifier - } - ) - + MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { + ['@status'] = json.encode(status), + ['@identifier'] = xPlayer.identifier + }) end SetTimeout(10 * 60 * 1000, SaveData) end -SaveData() \ No newline at end of file +SaveData() From e56d700df44517713632e1060e4585963be12d36 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 14:10:57 +0100 Subject: [PATCH 17/44] Revert respect ESX config --- client/main.lua | 24 +++++++++++------------- server/main.lua | 5 ++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/client/main.lua b/client/main.lua index 4a4dbb1c..ae8e51ad 100644 --- a/client/main.lua +++ b/client/main.lua @@ -125,21 +125,19 @@ AddEventHandler('esx_status:setDisplay', function(val) end) -- Pause menu disable hud display -if ESX.GetConfig().EnableHud then - Citizen.CreateThread(function() - while true do - Citizen.Wait(300) +Citizen.CreateThread(function() + while true do + Citizen.Wait(300) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) end - end) -end + end +end) -- Loaded event Citizen.CreateThread(function() diff --git a/server/main.lua b/server/main.lua index eed4d956..ab6b18c5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -46,10 +46,9 @@ end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer ~= nil then + if xPlayer then xPlayer.set('status', status) end end) From 4b46663c965478511c58c54fb863f11d4e2b4efa Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 2 Dec 2018 20:30:20 +0100 Subject: [PATCH 18/44] Trigger esx_status:onTick on tick --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index ae8e51ad..3376614b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -52,6 +52,7 @@ AddEventHandler('esx_status:load', function(status) status = GetStatusData() }) + TriggerEvent('esx_status:onTick', GetStatusData(true)) Citizen.Wait(Config.TickTime) end end) From 77a7080e38c01274aa1fd76bc3d891759eb17659 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 8 Jun 2019 13:11:28 +0200 Subject: [PATCH 19/44] Implemented unregisterStatus and fixed restarting script midgame --- client/classes/status.lua | 2 +- client/main.lua | 20 ++++++++++++++++++-- server/main.lua | 38 +++++++++++++++++++++++++++----------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/client/classes/status.lua b/client/classes/status.lua index c478a98d..b71f6889 100644 --- a/client/classes/status.lua +++ b/client/classes/status.lua @@ -1,5 +1,5 @@ function CreateStatus(name, default, color, visible, tickCallback) - + local self = {} self.val = default diff --git a/client/main.lua b/client/main.lua index 3376614b..c97b61db 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,5 +1,12 @@ -local Status = {} -local isPaused = false +ESX = nil +local Status, isPaused = {}, false + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) function GetStatusData(minimal) local status = {} @@ -31,6 +38,15 @@ AddEventHandler('esx_status:registerStatus', function(name, default, color, visi table.insert(Status, status) end) +AddEventHandler('esx_status:unregisterStatus', function(name) + for k,v in ipairs(Status) do + if v.name == name then + table.remove(Status, k) + break + end + end +end) + RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) for i=1, #Status, 1 do diff --git a/server/main.lua b/server/main.lua index ab6b18c5..246800dc 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,28 +2,45 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('esx:playerLoaded', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) +Citizen.CreateThread(function() + Citizen.Wait(1000) + local players = ESX.GetPlayers() - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + for _,playerId in ipairs(players) do + local xPlayer = ESX.GetPlayerFromId(playerId) + + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', playerId, data) + end) + end +end) + +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier }, function(result) local data = {} - if result[1].status ~= nil then + if result[1].status then data = json.decode(result[1].status) end xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', _source, data) + TriggerClientEvent('esx_status:load', playerId, data) end) end) -AddEventHandler('esx:playerDropped', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - local data = {} +AddEventHandler('esx:playerDropped', function(playerId, reason) + local xPlayer = ESX.GetPlayerFromId(playerId) local status = xPlayer.get('status') MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { @@ -58,7 +75,6 @@ function SaveData() for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local data = {} local status = xPlayer.get('status') MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { From bb13bd9092e56d3261ee00fd5a9b1acd33867dc4 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:27:54 +0100 Subject: [PATCH 20/44] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 476ac2fc..b678dc87 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# fxserver-esx_status -FXServer ESX Status +# esx_status +ESX Status [INSTALLATION] 1) CD in your resources/[esx] folder 2) Clone the repository ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_status esx_status +git clone https://github.com/ESX-Org/esx_status esx_status ``` 3) Import esx_status.sql in your database 4) Add this in your server.cfg : From e98ad1f1a57d076cf588ed2cd66262fad28503e8 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:28:35 +0100 Subject: [PATCH 21/44] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename __resource.lua => fxmanifest.lua (82%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 82% rename from __resource.lua rename to fxmanifest.lua index 57b90da0..fa08f8d4 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Status' @@ -22,4 +24,4 @@ files { 'html/ui.html', 'html/css/app.css', 'html/scripts/app.js' -} \ No newline at end of file +} From 59c51e6daf425fa76a7922c8cbc65586af821463 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:53:17 +0200 Subject: [PATCH 22/44] Update esx_status.sql --- esx_status.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_status.sql b/esx_status.sql index b62fd8dd..beabf83d 100644 --- a/esx_status.sql +++ b/esx_status.sql @@ -1,3 +1,3 @@ -USE `essentialmode`; +USE `es_extended`; ALTER TABLE `users` ADD COLUMN `status` LONGTEXT NULL; From 6e072d6f83c01bbff3af73c5dfafa0a4cfa5fdf9 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Fri, 15 May 2020 17:21:49 -0500 Subject: [PATCH 23/44] Update esx_status Edited to not show UI until loading screen is off --- client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index c97b61db..f903674e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -156,8 +156,8 @@ Citizen.CreateThread(function() end end) --- Loaded event -Citizen.CreateThread(function() +-- Loading screen off event +AddEventHandler('esx:loadingScreenOff', function() TriggerEvent('esx_status:loaded') end) From a101f4d3ddac77941a246319c9115e386e5f0a21 Mon Sep 17 00:00:00 2001 From: PainedPsyche Date: Wed, 4 Nov 2020 20:03:50 +0100 Subject: [PATCH 24/44] fix for a bug where satus values were not properly loading database data client side resulting in the values resetting to default on login --- client/main.lua | 5 ++++- html/css/app.css | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index f903674e..178073de 100644 --- a/client/main.lua +++ b/client/main.lua @@ -49,6 +49,7 @@ end) RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) + TriggerEvent('esx_status:loaded') for i=1, #Status, 1 do for j=1, #status, 1 do if Status[i].name == status[j].name then @@ -158,7 +159,9 @@ end) -- Loading screen off event AddEventHandler('esx:loadingScreenOff', function() - TriggerEvent('esx_status:loaded') + if not isPaused then + TriggerEvent('esx_status:setDisplay', 0.3) + end end) -- Update server diff --git a/html/css/app.css b/html/css/app.css index d92580fa..8b2aacf5 100644 --- a/html/css/app.css +++ b/html/css/app.css @@ -3,7 +3,7 @@ left : 23; bottom : 21%; width : 14.5%; - opacity: 0.3; + opacity: 0.0; } .status { From 925bd4559e2b318cb83bb05102ffad6fdeadd4fb Mon Sep 17 00:00:00 2001 From: Stephen York Date: Mon, 4 Jan 2021 12:53:56 +1100 Subject: [PATCH 25/44] Update main.lua Replace recursive call to saveData with CreateThread and a timer. Loop now builds when and where clauses for a set operation update against multiple records with a single mysql execute rather than a single update PER player. --- server/main.lua | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/server/main.lua b/server/main.lua index 246800dc..c1252f0f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -70,20 +70,51 @@ AddEventHandler('esx_status:update', function(status) end end) +Citizen.CreateThread(function() + while(true) do + Citizen.Wait(10 * 60 * 1000) + + SaveData() + + end + +end) + function SaveData() local xPlayers = ESX.GetPlayers() + -- Example of a bulk update statement that we are building below + --[[ + UPDATE users + SET status = (case when identifier = 'license:123' then '{hunger:45, thirst:23}' + when identifier = 'license:456' then '{hunger:1000, thirst:1000}' + when identifier = 'license:789' then '{hunger:1000, thirst:1000}' + end) + WHERE identifier in ('license:123', 'license:456', 'license:789') + + ]] + local updateStatement = 'UPDATE users SET status = (case %s end) where identifier in (%s)' + local whenList = '' + local whereList = '' + local firstItem = true + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) local status = xPlayer.get('status') - MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { - ['@status'] = json.encode(status), - ['@identifier'] = xPlayer.identifier - }) + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + + if firstItem == false then + whereList = whereList .. ', ' + end + whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + + firstItem = false + end - SetTimeout(10 * 60 * 1000, SaveData) -end + local sql = string.format(updateStatement, whenList, whereList) -SaveData() + MySQL.Async.execute(sql) + +end From a12046120c2c3101bfa67a4e5df74e00f920e435 Mon Sep 17 00:00:00 2001 From: Stephen York Date: Thu, 7 Jan 2021 10:29:05 +1100 Subject: [PATCH 26/44] Update main.lua Added player count to avoid running script when no players are on --- server/main.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index c1252f0f..469fd5dd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -97,6 +97,7 @@ function SaveData() local whenList = '' local whereList = '' local firstItem = true + local playerCount = 0 for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) @@ -110,11 +111,14 @@ function SaveData() whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) firstItem = false + playerCount = playerCount + 1 + end + + if playerCount > 0 then + local sql = string.format(updateStatement, whenList, whereList) + + MySQL.Async.execute(sql) end - local sql = string.format(updateStatement, whenList, whereList) - - MySQL.Async.execute(sql) - end From 49f1668b0a231bdda0a4b5ddfadb6830220e28a5 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Sat, 23 Jan 2021 21:19:32 +0100 Subject: [PATCH 27/44] Fix server hitch warning --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 469fd5dd..fd1c5b94 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,7 +3,7 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.CreateThread(function() - Citizen.Wait(1000) + Citizen.Wait(5000) local players = ESX.GetPlayers() for _,playerId in ipairs(players) do From ea844e81da2daab0dfb974206009181f81d3a5ac Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Sun, 24 Jan 2021 21:17:01 +0100 Subject: [PATCH 28/44] Better just to remove this... Too many hitch --- server/main.lua | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/server/main.lua b/server/main.lua index fd1c5b94..138b0c57 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,28 +2,6 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -Citizen.CreateThread(function() - Citizen.Wait(5000) - local players = ESX.GetPlayers() - - for _,playerId in ipairs(players) do - local xPlayer = ESX.GetPlayerFromId(playerId) - - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', playerId, data) - end) - end -end) - AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier From 74335672ea232d47b7fc48412ce14205516c55f2 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Tue, 2 Feb 2021 19:28:48 -0100 Subject: [PATCH 29/44] Fixed losing functionality when restarting script --- server/main.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/server/main.lua b/server/main.lua index 138b0c57..57b5b6f4 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,6 +2,31 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +AddEventHandler('onResourceStart', function(resourceName) + if (GetCurrentResourceName() ~= resourceName) then + return + end + + local players = ESX.GetPlayers() + + for _,playerId in ipairs(players) do + local xPlayer = ESX.GetPlayerFromId(playerId) + + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', playerId, data) + end) + end +end) + AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier From ae9cde16e8c34acf9f563089d8417ba4bcccb476 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 09:55:32 +1000 Subject: [PATCH 30/44] improvement(server/main): Use the new xPlayer loop when using ESX Legacy --- server/main.lua | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/server/main.lua b/server/main.lua index 57b5b6f4..55223566 100644 --- a/server/main.lua +++ b/server/main.lua @@ -84,7 +84,17 @@ Citizen.CreateThread(function() end) function SaveData() - local xPlayers = ESX.GetPlayers() + + local xPlayers + if ESX.GetExtendedPlayers then + xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) + else + xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) + end + + for i=1, 100 do + xPlayers[#xPlayers+1] = xPlayers[1] + end -- Example of a bulk update statement that we are building below --[[ @@ -102,24 +112,39 @@ function SaveData() local firstItem = true local playerCount = 0 - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local status = xPlayer.get('status') + if ESX.GetExtendedPlayers then -- Retrieve all xPlayer data directly (ESX Legacy) + for k,v in pairs(xPlayers) do + local status = v.get('status') - whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', v.identifier, json.encode(status)) - if firstItem == false then - whereList = whereList .. ', ' + if firstItem == false then + whereList = whereList .. ', ' + end + whereList = whereList .. string.format('\'%s\'', v.identifier) + + firstItem = false + playerCount = playerCount + 1 end - whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + else + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local status = xPlayer.get('status') - firstItem = false - playerCount = playerCount + 1 + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + + if firstItem == false then + whereList = whereList .. ', ' + end + whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + + firstItem = false + playerCount = playerCount + 1 + end end if playerCount > 0 then local sql = string.format(updateStatement, whenList, whereList) - MySQL.Async.execute(sql) end From b823e7d5578a7028adab44c848b773387887fd7c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 09:58:24 +1000 Subject: [PATCH 31/44] fix(legacy/multichar): Clear player status when logging out --- client/main.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/main.lua b/client/main.lua index 178073de..0f6fa6ce 100644 --- a/client/main.lua +++ b/client/main.lua @@ -47,6 +47,11 @@ AddEventHandler('esx_status:unregisterStatus', function(name) end end) +RegisterNetEvent('esx:onPlayerLogout') +AddEventHandler('esx:onPlayerLogout', function() + Status = {} +end) + RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) TriggerEvent('esx_status:loaded') From d876399babdaaa21fcdc12f19d7d8e0ff59da097 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 10:08:26 +1000 Subject: [PATCH 32/44] chore(server/main): Removed leftover debug code --- server/main.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index 55223566..85f15982 100644 --- a/server/main.lua +++ b/server/main.lua @@ -92,10 +92,6 @@ function SaveData() xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) end - for i=1, 100 do - xPlayers[#xPlayers+1] = xPlayers[1] - end - -- Example of a bulk update statement that we are building below --[[ UPDATE users From ee3d1d024f64d54ee7a8500a97752fe12609b9dd Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 10:29:02 +1000 Subject: [PATCH 33/44] improvement(server/main): Use the new xPlayer loop when restarting the resource --- server/main.lua | 54 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/server/main.lua b/server/main.lua index 85f15982..ceba0e04 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,23 +7,45 @@ AddEventHandler('onResourceStart', function(resourceName) return end - local players = ESX.GetPlayers() + local xPlayers + if ESX.GetExtendedPlayers then + xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) + else + xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) + end - for _,playerId in ipairs(players) do - local xPlayer = ESX.GetPlayerFromId(playerId) - - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', playerId, data) - end) + if ESX.GetExtendedPlayers then + for k,v in pairs(xPlayers) do + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = v.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + v.set('status', data) + TriggerClientEvent('esx_status:load', k, data) + end) + end + else + for _,playerId in ipairs(xPlayers) do + local xPlayer = ESX.GetPlayerFromId(playerId) + + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', playerId, data) + end) + end end end) From 0cc776dfc3d88fab9650001ba9b1ac24f1216c1d Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:12:09 +1000 Subject: [PATCH 34/44] refactor(server/main): Removed duplicate code and use type when defining xPlayer --- server/main.lua | 93 +++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 64 deletions(-) diff --git a/server/main.lua b/server/main.lua index ceba0e04..7334224b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -13,39 +13,21 @@ AddEventHandler('onResourceStart', function(resourceName) else xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) end - - if ESX.GetExtendedPlayers then - for k,v in pairs(xPlayers) do - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = v.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end - - v.set('status', data) - TriggerClientEvent('esx_status:load', k, data) - end) - end - else - for _,playerId in ipairs(xPlayers) do - local xPlayer = ESX.GetPlayerFromId(playerId) - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} + for k,v in pairs(xPlayers) do + local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end - if result[1].status then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', playerId, data) - end) - end + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', k, data) + end) end end) @@ -106,14 +88,6 @@ Citizen.CreateThread(function() end) function SaveData() - - local xPlayers - if ESX.GetExtendedPlayers then - xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) - else - xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) - end - -- Example of a bulk update statement that we are building below --[[ UPDATE users @@ -130,35 +104,26 @@ function SaveData() local firstItem = true local playerCount = 0 - if ESX.GetExtendedPlayers then -- Retrieve all xPlayer data directly (ESX Legacy) - for k,v in pairs(xPlayers) do - local status = v.get('status') - - whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', v.identifier, json.encode(status)) - - if firstItem == false then - whereList = whereList .. ', ' - end - whereList = whereList .. string.format('\'%s\'', v.identifier) - - firstItem = false - playerCount = playerCount + 1 - end + local xPlayers + if ESX.GetExtendedPlayers then + xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) else - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local status = xPlayer.get('status') + xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) + end + + for k,v in pairs(xPlayers) do + local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + local status = xPlayer.get('status') - whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) - if firstItem == false then - whereList = whereList .. ', ' - end - whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) - - firstItem = false - playerCount = playerCount + 1 + if firstItem == false then + whereList = whereList .. ', ' end + whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + + firstItem = false + playerCount = playerCount + 1 end if playerCount > 0 then From 97289e615b5f693382ab4d66f1b32826a39df76d Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:41:57 +1000 Subject: [PATCH 35/44] fix(client/main): Prevent multiple onTick threads from running at once after relogging --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 0f6fa6ce..86c54175 100644 --- a/client/main.lua +++ b/client/main.lua @@ -64,7 +64,7 @@ AddEventHandler('esx_status:load', function(status) end Citizen.CreateThread(function() - while true do + while #Status > 0 do for i=1, #Status, 1 do Status[i].onTick() end From 5a8e750287304323f6fc61dde6dc1ab719e48321 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:45:22 +1000 Subject: [PATCH 36/44] fix(client/main): Disable status bars after relogging --- client/main.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/main.lua b/client/main.lua index 86c54175..ad629ff4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -50,6 +50,10 @@ end) RegisterNetEvent('esx:onPlayerLogout') AddEventHandler('esx:onPlayerLogout', function() Status = {} + SendNUIMessage({ + update = true, + status = Status + }) end) RegisterNetEvent('esx_status:load') From 98687c3b380cb7a492e3ec194c595ec5abc1f173 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 12:59:15 +1000 Subject: [PATCH 37/44] fix(nui/js): Use the percent value already being sent by Lua --- html/scripts/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/scripts/app.js b/html/scripts/app.js index 8e01f20c..a5a53575 100644 --- a/html/scripts/app.js +++ b/html/scripts/app.js @@ -25,7 +25,7 @@ statusDiv.find('.status_val') .css({ 'background-color': status[i].color, - 'width': (status[i].val / 10000) + '%' + 'width': (status[i].percent) + '%' }) ; @@ -56,4 +56,4 @@ }); }; -})(); \ No newline at end of file +})(); From 20b2319e977e195242555a5d5ddd14524e1823d0 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:14:56 +1000 Subject: [PATCH 38/44] refactor(client/main): Remove unused variable; optimisations - Status.max was never defined anywhere (always nil) and was not referenced anywhere - Add a toggle for status bars (Config.Display); setting to false reduces CPU usage - onTick thread no longer retrieves StatusData twice; receives the minimal data then adds the other variables if Display is enabled --- client/main.lua | 95 +++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/client/main.lua b/client/main.lua index ad629ff4..0d233df4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -13,20 +13,19 @@ function GetStatusData(minimal) for i=1, #Status, 1 do if minimal then - table.insert(status, { + status[#status+1] = { name = Status[i].name, val = Status[i].val, percent = (Status[i].val / Config.StatusMax) * 100 - }) + } else - table.insert(status, { + status[#status+1] { name = Status[i].name, val = Status[i].val, color = Status[i].color, - visible = Status[i].visible(Status[i]), - max = Status[i].max, + visible = Status[i].visible(), percent = (Status[i].val / Config.StatusMax) * 100 - }) + } end end @@ -50,10 +49,12 @@ end) RegisterNetEvent('esx:onPlayerLogout') AddEventHandler('esx:onPlayerLogout', function() Status = {} - SendNUIMessage({ - update = true, - status = Status - }) + if Config.Display then + SendNUIMessage({ + update = true, + status = Status + }) + end end) RegisterNetEvent('esx_status:load') @@ -72,13 +73,21 @@ AddEventHandler('esx_status:load', function(status) for i=1, #Status, 1 do Status[i].onTick() end + local data = GetStatusData(true) + + if Config.Display then + local fullData = data + for i=1, #data, 1 do + fullData[i].color = Status[i].color + fullData[i].visible = Status[i].visible() + end + SendNUIMessage({ + update = true, + status = fullData + }) + end - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - - TriggerEvent('esx_status:onTick', GetStatusData(true)) + TriggerEvent('esx_status:onTick', data) Citizen.Wait(Config.TickTime) end end) @@ -92,12 +101,12 @@ AddEventHandler('esx_status:set', function(name, val) break end end - - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - + if Config.Display then + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + end TriggerServerEvent('esx_status:update', GetStatusData(true)) end) @@ -109,12 +118,12 @@ AddEventHandler('esx_status:add', function(name, val) break end end - - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - + if Config.Display then + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + end TriggerServerEvent('esx_status:update', GetStatusData(true)) end) @@ -126,12 +135,12 @@ AddEventHandler('esx_status:remove', function(name, val) break end end - - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - + if Config.Display then + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + end TriggerServerEvent('esx_status:update', GetStatusData(true)) end) @@ -154,15 +163,17 @@ end) -- Pause menu disable hud display Citizen.CreateThread(function() while true do - Citizen.Wait(300) + if Config.Display then + Citizen.Wait(300) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) + end + else Citizen.Wait(1000) end end end) From 16d97ec1e3fc87175af21e150e83c8b067abc52c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:15:44 +1000 Subject: [PATCH 39/44] chore(config): Define the default value for Display --- config.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 3b444340..9eb09cb2 100644 --- a/config.lua +++ b/config.lua @@ -2,4 +2,5 @@ Config = {} Config.StatusMax = 1000000 Config.TickTime = 1000 -Config.UpdateInterval = 10000 \ No newline at end of file +Config.UpdateInterval = 10000 +Config.Display = true -- Enable the esx_status bars (disable if you are using another HUD) From 16b1fc3316277dff341202d3efa1ccbe63f1ec1d Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sat, 5 Jun 2021 12:35:16 +1000 Subject: [PATCH 40/44] refactor(server/main): Cache if ESX.GetExtendedPlayers() exists; use short-circuit evaluation to define xPlayers --- server/main.lua | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/server/main.lua b/server/main.lua index 7334224b..1b02b173 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,18 +1,14 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +local isLegacy = not not ESX.GetExtendedPlayers AddEventHandler('onResourceStart', function(resourceName) if (GetCurrentResourceName() ~= resourceName) then return end - local xPlayers - if ESX.GetExtendedPlayers then - xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) - else - xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) - end + local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) @@ -104,12 +100,7 @@ function SaveData() local firstItem = true local playerCount = 0 - local xPlayers - if ESX.GetExtendedPlayers then - xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) - else - xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) - end + local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) From b3c20e174bcd0f120508d4ff15ecca8b1737749b Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sun, 6 Jun 2021 05:57:46 +1000 Subject: [PATCH 41/44] fix(server/main): Fix incorrect values (if v is table, xPlayer equals v; else GetPlayerFromId(v)) --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1b02b173..0d80cc83 100644 --- a/server/main.lua +++ b/server/main.lua @@ -11,7 +11,7 @@ AddEventHandler('onResourceStart', function(resourceName) local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do - local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier }, function(result) @@ -103,7 +103,7 @@ function SaveData() local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do - local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) local status = xPlayer.get('status') whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) From 97d7e5186b3c883db88b89bedbf4285c2e4303f3 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:07:10 +1000 Subject: [PATCH 42/44] fix(client/main): Ensure the hud displays initially; get the visibility of statusbars correctly --- client/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 0d233df4..afe7498e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -23,7 +23,7 @@ function GetStatusData(minimal) name = Status[i].name, val = Status[i].val, color = Status[i].color, - visible = Status[i].visible(), + visible = Status[i].visible(Status[i]), percent = (Status[i].val / Config.StatusMax) * 100 } end @@ -68,6 +68,8 @@ AddEventHandler('esx_status:load', function(status) end end + if Config.Display then TriggerEvent('esx_status:setDisplay', 0.5) end + Citizen.CreateThread(function() while #Status > 0 do for i=1, #Status, 1 do @@ -79,7 +81,7 @@ AddEventHandler('esx_status:load', function(status) local fullData = data for i=1, #data, 1 do fullData[i].color = Status[i].color - fullData[i].visible = Status[i].visible() + fullData[i].visible = Status[i].visible(Status[i]) end SendNUIMessage({ update = true, From acb264c0270d69f50fdb5c3648dad52e5fe2ad0c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 7 Jun 2021 11:14:54 +1000 Subject: [PATCH 43/44] revert(client/main): Go back to table.insert for GetStatusData Not even sure why I did it as size+1 and not i; but doesn't seem to work with index anyway. Fixes nil value after dying --- client/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index afe7498e..b6776f64 100644 --- a/client/main.lua +++ b/client/main.lua @@ -13,19 +13,19 @@ function GetStatusData(minimal) for i=1, #Status, 1 do if minimal then - status[#status+1] = { + table.insert(status, { name = Status[i].name, val = Status[i].val, percent = (Status[i].val / Config.StatusMax) * 100 - } + }) else - status[#status+1] { + table.insert(status, { name = Status[i].name, val = Status[i].val, color = Status[i].color, visible = Status[i].visible(Status[i]), percent = (Status[i].val / Config.StatusMax) * 100 - } + }) end end From 4aa9525fcf0b6f8105076f5667453dfca200bb7c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 14 Jun 2021 17:49:00 +1000 Subject: [PATCH 44/44] fix(client/main): Remove update triggerserverevent when modifying statuses (it only needed to trigger with the interval) --- client/main.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index b6776f64..d9beefd7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -109,7 +109,6 @@ AddEventHandler('esx_status:set', function(name, val) status = GetStatusData() }) end - TriggerServerEvent('esx_status:update', GetStatusData(true)) end) RegisterNetEvent('esx_status:add') @@ -126,7 +125,6 @@ AddEventHandler('esx_status:add', function(name, val) status = GetStatusData() }) end - TriggerServerEvent('esx_status:update', GetStatusData(true)) end) RegisterNetEvent('esx_status:remove') @@ -143,7 +141,6 @@ AddEventHandler('esx_status:remove', function(name, val) status = GetStatusData() }) end - TriggerServerEvent('esx_status:update', GetStatusData(true)) end) AddEventHandler('esx_status:getStatus', function(name, cb)