Merge branch 'main' into develop

spacevx · Jan 3, 2023 · 033b455 · 033b455
2 parents e0f55fc + 8daa70c
commit 033b455
Show file tree

Hide file tree

Showing 56 changed files with 78 additions and 69 deletions.
diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql
@@ -710,7 +710,7 @@ INSERT INTO `vehicle_categories` (`name`, `label`) VALUES
 --
 
 CREATE TABLE `vehicle_sold` (
-  `id` INT(11) NOT NULL AUTO_INCREMENT,
+  `id` INT(11) NOT NULL,
   `client` varchar(50) NOT NULL,
   `model` varchar(50) NOT NULL,
   `plate` varchar(50) NOT NULL,
@@ -852,14 +852,20 @@ ALTER TABLE `vehicle_categories`
 -- Indexes for table `vehicle_sold`
 --
 ALTER TABLE `vehicle_sold`
-  ADD PRIMARY KEY (`plate`);
+ ADD PRIMARY KEY (`id`);
 
 --
 -- Indexes for table `whitelist`
 --
 ALTER TABLE `whitelist`
   ADD PRIMARY KEY (`identifier`);
 
+--
+-- Indexes for table `vehicle_sold`
+--
+ALTER TABLE `vehicle_sold`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
 --
 -- AUTO_INCREMENT for table `addon_account_data`
 --

diff --git a/[esx]/cron/fxmanifest.lua b/[esx]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'cron'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 server_script 'server/main.lua'
diff --git a/[esx]/es_extended/fxmanifest.lua b/[esx]/es_extended/fxmanifest.lua
@@ -5,7 +5,7 @@ game 'gta5'
 description 'ES Extended'
 
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_scripts {
 	'locale.lua',

diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua
@@ -90,7 +90,7 @@ MySQL.ready(function()
     ESX.Jobs = Jobs
   end
 
-  print('[^2INFO^7] ESX ^5Legacy 1.8.5^0 initialized!')
+  print('[^2INFO^7] ESX ^5Legacy 1.9.0^0 initialized!')
   StartDBSync()
   StartPayCheck()
 end)

diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua
@@ -99,14 +99,14 @@ if not Config.Multichar then
     if identifier then
       if ESX.GetPlayerFromIdentifier(identifier) then
         deferrals.done(
-          ('There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
+          ('[ESX] There was an error loading your character!\nError code: identifier-active\n\nThis error is caused by a player on this server who has the same identifier as you have. Make sure you are not playing on the same account.\n\nYour identifier: %s'):format(
             identifier))
       else
         deferrals.done()
       end
     else
       deferrals.done(
-        'There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
+        '[ESX] There was an error loading your character!\nError code: identifier-missing\n\nThe cause of this error is not known, your identifier could not be found. Please come back later or report this problem to the server administration team.')
     end
   end)
 end
@@ -133,9 +133,9 @@ function loadESXPlayer(identifier, playerId, isNew)
     end
     local index = #userData.accounts + 1
     userData.accounts[index] = {
-      name = account, 
+      name = account,
       money = foundAccounts[account] or Config.StartingAccountMoney[account] or 0,
-      label = data.label, 
+      label = data.label,
       round = data.round,
       index = index
     }
@@ -299,13 +299,13 @@ function loadESXPlayer(identifier, playerId, isNew)
 
   xPlayer.triggerEvent('esx:playerLoaded',
     {
-      accounts = xPlayer.getAccounts(), 
-      coords = xPlayer.getCoords(), 
-      identifier = xPlayer.getIdentifier(), 
+      accounts = xPlayer.getAccounts(),
+      coords = xPlayer.getCoords(),
+      identifier = xPlayer.getIdentifier(),
       inventory = xPlayer.getInventory(),
-      job = xPlayer.getJob(), 
-      loadout = xPlayer.getLoadout(), 
-      maxWeight = xPlayer.getMaxWeight(), 
+      job = xPlayer.getJob(),
+      loadout = xPlayer.getLoadout(),
+      maxWeight = xPlayer.getMaxWeight(),
       money = xPlayer.getMoney(),
       sex = xPlayer.get("sex") or "m",
 	  firstName = xPlayer.get("firstName") or "John",

diff --git a/[esx]/es_extended/version.json b/[esx]/es_extended/version.json
@@ -1,5 +1,5 @@
 {
 	"version": "legacy",
-	"commit" : "1.8.5",
+	"commit" : "1.9.0",
 	"changelog": "\n- Add PlayerOveride System, ESX Notify, ESX Progressbar and ESX TextUI"
 }
diff --git a/[esx]/esx_context/fxmanifest.lua b/[esx]/esx_context/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'Offical ESX Legacy Context Menu'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 ui_page 'index.html'
 

diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Identity'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx]/esx_loadingscreen/fxmanifest.lua b/[esx]/esx_loadingscreen/fxmanifest.lua
@@ -1,5 +1,5 @@
 game 'common'
-version '1.8.5'
+version '1.9.0'
 fx_version 'cerulean'
 author 'ESX-Framework'
 lua54 'yes'

diff --git a/[esx]/esx_menu_default/fxmanifest.lua b/[esx]/esx_menu_default/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu Default'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 client_scripts {'@es_extended/imports.lua', 'client/main.lua'}
 

diff --git a/[esx]/esx_menu_dialog/fxmanifest.lua b/[esx]/esx_menu_dialog/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu Dialog'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx]/esx_menu_list/fxmanifest.lua b/[esx]/esx_menu_list/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Menu List'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx]/esx_multicharacter/fxmanifest.lua b/[esx]/esx_multicharacter/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Official Multicharacter System For ESX Legacy'
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 
 dependencies {'es_extended', 'esx_context', 'esx_identity', 'esx_skin'}

diff --git a/[esx]/esx_notify/fxmanifest.lua b/[esx]/esx_notify/fxmanifest.lua
@@ -1,7 +1,7 @@
 fx_version 'adamant'
 lua54 'yes'
 game 'gta5'
-version '1.8.5'
+version '1.9.0'
 author 'ESX-Framework'
 description 'Official NUI Notification system for ESX'
 

diff --git a/[esx]/esx_skin/fxmanifest.lua b/[esx]/esx_skin/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Skin'
 
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx]/esx_textui/fxmanifest.lua b/[esx]/esx_textui/fxmanifest.lua
@@ -1,7 +1,7 @@
 fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
-version '1.8.5'
+version '1.9.0'
 description 'ESX TextUI'
 lua54 'yes'
 client_scripts { 'TextUI.lua' }

diff --git a/[esx]/skinchanger/fxmanifest.lua b/[esx]/skinchanger/fxmanifest.lua
@@ -6,7 +6,7 @@ lua54 'yes'
 
 description 'Official ESX-Legacy resource for handling the Player`s Skin'
 
-version '1.8.5'
+version '1.9.0'
 
 client_scripts {
 	'@es_extended/locale.lua',

diff --git a/[esx_addons]/esx_accessories/fxmanifest.lua b/[esx_addons]/esx_accessories/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Accessories'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx_addons]/esx_addonaccount/fxmanifest.lua b/[esx_addons]/esx_addonaccount/fxmanifest.lua
@@ -5,7 +5,7 @@ game 'gta5'
 author 'ESX-Framework'
 description 'ESX Addon Account'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 server_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx_addons]/esx_addoninventory/fxmanifest.lua b/[esx_addons]/esx_addoninventory/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Addon Inventory'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 server_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx_addons]/esx_allowlist/fxmanifest.lua b/[esx_addons]/esx_allowlist/fxmanifest.lua
@@ -5,7 +5,7 @@ game 'gta5'
 author 'ESX-Framework'
 description 'Offical AllowList script for ESX'
 
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 server_only 'yes'
 

diff --git a/[esx_addons]/esx_allowlist/server/main.lua b/[esx_addons]/esx_allowlist/server/main.lua
@@ -29,11 +29,11 @@ AddEventHandler('playerConnecting', function(name, setCallback, deferrals)
 	local identifier = ESX.GetIdentifier(playerId)
 
 	if ESX.Table.SizeOf(AllowList) == 0 then
-		kickReason = TranslateCap('allowlist_empty')
+		kickReason = "[ESX] " .. TranslateCap('allowlist_empty')
 	elseif not identifier then
-		kickReason = TranslateCap('license_missing')
+		kickReason = "[ESX] " .. TranslateCap('license_missing')
 	elseif not AllowList[identifier] then
-		kickReason = TranslateCap('not_allowlist')
+		kickReason = "[ESX] " .. TranslateCap('not_allowlist')
 	end
 
 	if kickReason then

diff --git a/[esx_addons]/esx_ambulancejob/fxmanifest.lua b/[esx_addons]/esx_ambulancejob/fxmanifest.lua
@@ -5,7 +5,7 @@ game 'gta5'
 description 'ESX Ambulance Job'
 
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_scripts { 
 	'@es_extended/imports.lua',

diff --git a/[esx_addons]/esx_animations/fxmanifest.lua b/[esx_addons]/esx_animations/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Animations'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 client_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx_addons]/esx_bankerjob/fxmanifest.lua b/[esx_addons]/esx_bankerjob/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Banker job'
 
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_barbershop/fxmanifest.lua b/[esx_addons]/esx_barbershop/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Barber Shop'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_basicneeds/client/main.lua b/[esx_addons]/esx_basicneeds/client/main.lua
@@ -108,7 +108,8 @@ end)
 RegisterNetEvent('esx_basicneeds:onEat')
 AddEventHandler('esx_basicneeds:onEat', function(prop_name)
     local Invoke = GetInvokingResource()
-    print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onEat^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/basicneeds^7 for more info!'):format(Invoke))
+
+    print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onEat^7, this method is deprecated and should not be used! Refer to ^5https://documentation.esx-framework.org/addons/esx_basicneeds/events/oneat^7 for more info!'):format(Invoke))
 
     if not prop_name then
         prop_name = 'prop_cs_burger_01'
@@ -119,7 +120,9 @@ end)
 RegisterNetEvent('esx_basicneeds:onDrink')
 AddEventHandler('esx_basicneeds:onDrink', function(prop_name)
     local Invoke = GetInvokingResource()
-    print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onDrink^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/basicneeds^7 for more info!'):format(Invoke))
+
+    print(('[^3WARNING^7] ^5%s^7 used ^5esx_basicneeds:onDrink^7, this method is deprecated and should not be used! Refer to ^5https://documentation.esx-framework.org/addons/esx_basicneeds/events/ondrink^7 for more info!'):format(Invoke))
+
 
     if not prop_name then
         prop_name = 'prop_ld_flow_bottle'

diff --git a/[esx_addons]/esx_basicneeds/fxmanifest.lua b/[esx_addons]/esx_basicneeds/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Basic Needs'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_billing/fxmanifest.lua b/[esx_addons]/esx_billing/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Billing'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_boat/fxmanifest.lua b/[esx_addons]/esx_boat/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Boat'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_clotheshop/fxmanifest.lua b/[esx_addons]/esx_clotheshop/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Clothes Shop'
 
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_cruisecontrol/fxmanifest.lua b/[esx_addons]/esx_cruisecontrol/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'CruiseControl System for ESX'
 
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 dependencies {
   'es_extended'

diff --git a/[esx_addons]/esx_datastore/fxmanifest.lua b/[esx_addons]/esx_datastore/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX Data Store'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 server_scripts {
 	'@es_extended/imports.lua',

diff --git a/[esx_addons]/esx_dmvschool/fxmanifest.lua b/[esx_addons]/esx_dmvschool/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 
 description 'ESX DMV School'
 lua54 'yes'
-version '1.8.5'
+version '1.9.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_drugs/fxmanifest.lua b/[esx_addons]/esx_drugs/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 lua54 'yes'
 description 'ESX Drugs'
 
-version '1.8.5'
+version '1.9.0'
 
 shared_script '@es_extended/imports.lua'
 

diff --git a/[esx_addons]/esx_garage/fxmanifest.lua b/[esx_addons]/esx_garage/fxmanifest.lua
@@ -3,7 +3,7 @@ game 'gta5'
 
 author 'ESX-Framework'
 description 'Official ESX Garage System for ESX Legacy'
-version '1.8.5'
+version '1.9.0'
 lua54 'yes'
 
 shared_script '@es_extended/imports.lua'