From 00d151cb13d279aef79aa48a30181aaf4fd726e8 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Tue, 17 Oct 2023 22:07:35 +0200 Subject: [PATCH 1/4] [esx_license\server\main.lua]: Replaced print in esx_license:addLicense --- .github/CHANGELOG.md | 3 ++- server-data/resources/[esx_addons]/esx_license/server/main.lua | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 6880a12ac..ff27cffaf 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -12,4 +12,5 @@ [esx_property\client\main.lua]: add copy to clipboard to /getoffset @bitpredator [esx_property\locales\en.lua & it.lua]: corrected typos @bitpredator [esx_property\server\main.lua]: correction of lint errors @bitpredator - [esx_property\config.lua]: correction of lint errors @bitpredator \ No newline at end of file + [esx_property\config.lua]: correction of lint errors @bitpredator +3. [esx_license\server\main.lua]: Replaced print in esx_license:addLicense \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_license/server/main.lua b/server-data/resources/[esx_addons]/esx_license/server/main.lua index 1e74eef7e..a8f440cdb 100644 --- a/server-data/resources/[esx_addons]/esx_license/server/main.lua +++ b/server-data/resources/[esx_addons]/esx_license/server/main.lua @@ -83,13 +83,14 @@ local function isValidLicense(licenseType) return flag end +RegisterNetEvent('esx_license:addLicense') AddEventHandler('esx_license:addLicense', function(target, licenseType, cb) local xPlayer = ESX.GetPlayerFromId(target) if xPlayer then if isValidLicense(licenseType) then AddLicense(xPlayer.getIdentifier(), licenseType, cb) else - print('[esx_license] : missing license type in db ' .. licenseType .. ' or someone try to use lua executor id : ' .. target) + print(('[esx_license]: Missing license type in db ^5%s^0 or someone try to use lua executor ID: ^5%s^0'):format(licenseType, target)) end end end) From 7c655a22ac21c2fe55488c992389ef4a242ce7f6 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Tue, 17 Oct 2023 22:10:11 +0200 Subject: [PATCH 2/4] [esx_license\fxmanifest.lua]: Update fxmanifest.lua to version 1.0.0 --- .github/CHANGELOG.md | 5 ++++- .../resources/[esx_addons]/esx_license/fxmanifest.lua | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index ff27cffaf..f8e628d2f 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -13,4 +13,7 @@ [esx_property\locales\en.lua & it.lua]: corrected typos @bitpredator [esx_property\server\main.lua]: correction of lint errors @bitpredator [esx_property\config.lua]: correction of lint errors @bitpredator -3. [esx_license\server\main.lua]: Replaced print in esx_license:addLicense \ No newline at end of file +3. [esx_license\server\main.lua]: Replaced print in esx_license:addLicense + [esx_license\fxmanifest.lua]: Update fxmanifest.lua to version 1.0.0 + + \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_license/fxmanifest.lua b/server-data/resources/[esx_addons]/esx_license/fxmanifest.lua index 8f1299226..87db86303 100644 --- a/server-data/resources/[esx_addons]/esx_license/fxmanifest.lua +++ b/server-data/resources/[esx_addons]/esx_license/fxmanifest.lua @@ -3,8 +3,8 @@ fx_version 'adamant' game 'gta5' description 'ESX License' - -version '0.0.4' +lua54 'yes' +version '1.0.0' server_scripts { '@es_extended/imports.lua', From f8576165a56c872757a50d9ffbfb89bc57193657 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Tue, 17 Oct 2023 22:13:15 +0200 Subject: [PATCH 3/4] [esx_license\README.md]: update reference links in README.md --- .github/CHANGELOG.md | 1 + server-data/resources/[esx_addons]/esx_license/README.md | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index f8e628d2f..82908c4f5 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -15,5 +15,6 @@ [esx_property\config.lua]: correction of lint errors @bitpredator 3. [esx_license\server\main.lua]: Replaced print in esx_license:addLicense [esx_license\fxmanifest.lua]: Update fxmanifest.lua to version 1.0.0 + [esx_license\README.md]: update reference links in README.md \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_license/README.md b/server-data/resources/[esx_addons]/esx_license/README.md index 90cee8f9e..bab702c5e 100644 --- a/server-data/resources/[esx_addons]/esx_license/README.md +++ b/server-data/resources/[esx_addons]/esx_license/README.md @@ -4,17 +4,17 @@ ### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -fvm install --save --folder=esx esx-org/esx_license +fvm install --save --folder=esx esx-framework/esx_license ``` ### Using Git ``` cd resources -git clone https://github.com/ESX-Org/esx_license [esx]/esx_license +git clone https://github.com/esx-framework/esx_license [esx]/esx_license ``` ### Manually -- Download https://github.com/ESX-Org/esx_license/archive/master.zip +- Download https://github.com/esx-framework/esx_license/archive/master.zip - Put it in the `[esx]` directory ## Installation From 94cf6d655730cb1d969f094994f174e4ddcb157c Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Tue, 17 Oct 2023 22:14:19 +0200 Subject: [PATCH 4/4] [esx_license\LICENSE]: updates the copyright reference year --- .github/CHANGELOG.md | 1 + server-data/resources/[esx_addons]/esx_license/LICENSE | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 82908c4f5..1f4666027 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -16,5 +16,6 @@ 3. [esx_license\server\main.lua]: Replaced print in esx_license:addLicense [esx_license\fxmanifest.lua]: Update fxmanifest.lua to version 1.0.0 [esx_license\README.md]: update reference links in README.md + [esx_license\LICENSE]: updates the copyright reference year \ No newline at end of file diff --git a/server-data/resources/[esx_addons]/esx_license/LICENSE b/server-data/resources/[esx_addons]/esx_license/LICENSE index 12aff0005..6a52769c4 100644 --- a/server-data/resources/[esx_addons]/esx_license/LICENSE +++ b/server-data/resources/[esx_addons]/esx_license/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_license - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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: - esx_license Copyright (C) 2015-2022 Jérémie N'gadi + esx_license Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.