From e04d313893c069fa3f0c0005d58f281f6e933fd6 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:55:32 +0100
Subject: [PATCH 1/5] fix: Warning: could not find
---
.github/CHANGELOG.md | 3 ++-
server-data/resources/[phone]/npwd/fxmanifest.lua | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index f0f3d660a..50cfe765d 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -69,4 +69,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
42. [esx_joblisting]: refactor: correct the good year for the license + varius fix @bitpredator
43. [EUP]: delete: removed package [EUP] @bitpredator
44. [bpt_ammujob]: refactor: bpt_ammujob inventory implementation @bitpredator
-45. [SQL]: fix: es_extended.sql "addon_inventory" syntax error @bitpredator
\ No newline at end of file
+45. [SQL]: fix: es_extended.sql "addon_inventory" syntax error @bitpredator
+46. [npwd]: fix: Warning: could not find @bitpredator
\ No newline at end of file
diff --git a/server-data/resources/[phone]/npwd/fxmanifest.lua b/server-data/resources/[phone]/npwd/fxmanifest.lua
index b9fc447d7..11f2a2177 100644
--- a/server-data/resources/[phone]/npwd/fxmanifest.lua
+++ b/server-data/resources/[phone]/npwd/fxmanifest.lua
@@ -6,13 +6,11 @@ version("1.8.6")
client_scripts({
"dist/game/client/client.js",
"dist/game/client/*.lua",
- "apps/game/client/*.lua",
})
server_script({
-- This is a file that lives purely in source code and isn't compiled alongside
-- rest of the release. It's used to detect whether a user can read or not.
- "build-detector.js",
"dist/game/server/server.js",
})
From 00449576a012ea03315a8b5f02863cce394ba84e Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 5 Dec 2023 14:13:40 +0100
Subject: [PATCH 2/5] fix: Couldn't find resource
---
.github/CHANGELOG.md | 3 ++-
server-data/server.cfg | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 50cfe765d..1d80d88e9 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -70,4 +70,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
43. [EUP]: delete: removed package [EUP] @bitpredator
44. [bpt_ammujob]: refactor: bpt_ammujob inventory implementation @bitpredator
45. [SQL]: fix: es_extended.sql "addon_inventory" syntax error @bitpredator
-46. [npwd]: fix: Warning: could not find @bitpredator
\ No newline at end of file
+46. [npwd]: fix: Warning: could not find @bitpredator
+47. [server.cfg]: fix: Couldn't find resource @bitpredator
\ No newline at end of file
diff --git a/server-data/server.cfg b/server-data/server.cfg
index 7a53b99ea..de34c08dd 100644
--- a/server-data/server.cfg
+++ b/server-data/server.cfg
@@ -49,11 +49,9 @@ ensure [bpt_cars]
ensure [ox]
ensure [wasabi]
ensure [maps]
-ensure [EUP]
ensure [sqz]
## [phone]
-ensure npwd_crypto
ensure [phone]
#Executables cfg
From a25b7db7caddcb604d94700aa820abe61b0312dc Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 5 Dec 2023 14:28:04 +0100
Subject: [PATCH 3/5] fix: No such export getSharedObject in resource
es_extended
---
.github/CHANGELOG.md | 3 ++-
.../resources/[esx]/es_extended/imports.lua | 9 ++++-----
.../resources/[phone]/esx-radio/fxmanifest.lua | 18 ++++++++++++------
.../resources/[sqz]/sqz_carkeys/fxmanifest.lua | 1 +
.../resources/[sqz]/sqz_rental/fxmanifest.lua | 2 ++
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 1d80d88e9..6d62a3b85 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -71,4 +71,5 @@ fix lint error: unused argument last; accessing undefined variable Invoke; unuse
44. [bpt_ammujob]: refactor: bpt_ammujob inventory implementation @bitpredator
45. [SQL]: fix: es_extended.sql "addon_inventory" syntax error @bitpredator
46. [npwd]: fix: Warning: could not find @bitpredator
-47. [server.cfg]: fix: Couldn't find resource @bitpredator
\ No newline at end of file
+47. [server.cfg]: fix: Couldn't find resource @bitpredator
+48. fix: No such export getSharedObject in resource es_extended @bitpredator
\ No newline at end of file
diff --git a/server-data/resources/[esx]/es_extended/imports.lua b/server-data/resources/[esx]/es_extended/imports.lua
index 0f1301197..a55befdce 100644
--- a/server-data/resources/[esx]/es_extended/imports.lua
+++ b/server-data/resources/[esx]/es_extended/imports.lua
@@ -1,13 +1,12 @@
----@diagnostic disable: missing-fields
ESX = exports['es_extended']:getSharedObject()
if not IsDuplicityVersion() then -- Only register this event for the client
- AddEventHandler('esx:setPlayerData', function(key, val)
+ AddEventHandler('esx:setPlayerData', function(key, val, last)
if GetInvokingResource() == 'es_extended' then
ESX.PlayerData[key] = val
- -- if OnPlayerData then not used?
- -- OnPlayerData(key, val, last)
- -- end
+ if OnPlayerData then
+ OnPlayerData(key, val, last)
+ end
end
end)
diff --git a/server-data/resources/[phone]/esx-radio/fxmanifest.lua b/server-data/resources/[phone]/esx-radio/fxmanifest.lua
index 87e35cec9..413a932f6 100644
--- a/server-data/resources/[phone]/esx-radio/fxmanifest.lua
+++ b/server-data/resources/[phone]/esx-radio/fxmanifest.lua
@@ -2,10 +2,13 @@ fx_version 'cerulean'
game 'gta5'
description 'Cool Radio for ESX, Coverted By Mycroft & Benzo'
-version '2.0.0'
-
+version '1.0.0'
+lua54 'yes'
-shared_scripts {'@es_extended/imports.lua', 'config.lua'}
+shared_scripts {
+ '@es_extended/imports.lua',
+ 'config.lua'
+}
server_script 'server.lua'
@@ -13,6 +16,9 @@ client_scripts {'client.lua'}
ui_page('html/ui.html')
-files {'html/ui.html', 'html/js/script.js', 'html/css/style.css', 'html/img/radio.png'}
-
-lua54 'yes'
+files {
+ 'html/ui.html',
+ 'html/js/script.js',
+ 'html/css/style.css',
+ 'html/img/radio.png'
+}
diff --git a/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua b/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua
index 86accb8b0..0acd8a36a 100644
--- a/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua
+++ b/server-data/resources/[sqz]/sqz_carkeys/fxmanifest.lua
@@ -8,6 +8,7 @@ version '1.0.0'
shared_scripts {
'@es_extended/locale.lua',
'locales/*.lua',
+ '@es_extended/imports.lua',
'config.lua'
}
diff --git a/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua b/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua
index 5c7849bf6..b792d0e73 100644
--- a/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua
+++ b/server-data/resources/[sqz]/sqz_rental/fxmanifest.lua
@@ -5,6 +5,8 @@ author 'Squizer#3020'
description 'Script that allows you to borrow vehicles.'
version '1.0.0'
+shared_script '@es_extended/imports.lua'
+
client_scripts {
'warmenu.lua',
'config.lua',
From 735a31e1d55f1673afb5a46443d61e095ffc69e6 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 5 Dec 2023 17:54:07 +0100
Subject: [PATCH 4/5] fix: No such export getSharedObject
---
.../[esx_addons]/esx_lscustom/client/main.lua | 136 +++--
.../[esx_addons]/esx_lscustom/config.lua | 77 ++-
.../[esx_addons]/esx_lscustom/fxmanifest.lua | 4 +-
.../[esx_addons]/esx_lscustom/locales/en.lua | 10 +-
.../[esx_addons]/esx_lscustom/locales/fr.lua | 552 +++++++++---------
.../[esx_addons]/esx_lscustom/locales/he.lua | 280 +++++++++
.../[esx_addons]/esx_lscustom/locales/it.lua | 29 +-
.../[esx_addons]/esx_lscustom/server/main.lua | 6 +-
8 files changed, 730 insertions(+), 364 deletions(-)
create mode 100644 server-data/resources/[esx_addons]/esx_lscustom/locales/he.lua
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/client/main.lua b/server-data/resources/[esx_addons]/esx_lscustom/client/main.lua
index 862f7054a..668bddca1 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/client/main.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/client/main.lua
@@ -1,5 +1,5 @@
local Vehicles, myCar = {}, {}
-local lsMenuIsShowed, HintDisplayed = false, false
+local lsMenuIsShowed, HintDisplayed, isInLSMarker = false, false, false
RegisterNetEvent('esx:playerLoaded')
AddEventHandler('esx:playerLoaded', function()
@@ -71,6 +71,9 @@ function OpenLSMenu(elems, menuName, menuTitle, parent)
if data.current.modType == "modFrontWheels" then
isRimMod = true
end
+ if data.current.modType == "modBackWheels" then
+ isRimMod = true
+ end
for k, v in pairs(Config.Menus) do
@@ -82,7 +85,6 @@ function OpenLSMenu(elems, menuName, menuTitle, parent)
TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar, NetworkGetNetworkIdFromEntity(vehicle))
else
local vehiclePrice = 50000
- local price
for i = 1, #Vehicles, 1 do
if GetEntityModel(vehicle) == joaat(Vehicles[i].model) then
@@ -116,7 +118,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent)
if not found then
GetAction(data.current)
end
- end, function(_, menu) -- on cancel
+ end, function(data, menu) -- on cancel
menu.close()
TriggerEvent('esx_lscustom:cancelInstallMod')
@@ -126,12 +128,12 @@ function OpenLSMenu(elems, menuName, menuTitle, parent)
if parent == nil then
lsMenuIsShowed = false
- local _ = GetVehiclePedIsIn(PlayerPedId(), false)
+ local vehicle = GetVehiclePedIsIn(PlayerPedId(), false)
FreezeEntityPosition(vehicle, false)
TriggerServerEvent('esx_lscustom:stopModing', myCar.plate)
myCar = {}
end
- end, function(data) -- on change
+ end, function(data, menu) -- on change
UpdateMods(data.current)
end)
end
@@ -224,13 +226,13 @@ function GetAction(data)
label = " " .. _U('by_default'),
modType = k,
modNum = false
- }
+ }
elseif v.modType == 'neonColor' or v.modType == 'tyreSmokeColor' then -- disable neon
elements[#elements + 1] = {
label = " " .. _U('by_default'),
modType = k,
modNum = {0, 0, 0}
- }
+ }
elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType ==
'wheelColor' then
local num = myCar[v.modType]
@@ -238,13 +240,13 @@ function GetAction(data)
label = " " .. _U('by_default'),
modType = k,
modNum = num
- }
+ }
elseif v.modType == 17 then
elements[#elements + 1] = {
label = " " .. _U('no_turbo'),
modType = k,
modNum = false
- }
+ }
elseif v.modType == 23 then
elements[#elements + 1] = {
label = " " .. _U('by_default'),
@@ -252,39 +254,47 @@ function GetAction(data)
modNum = -1,
wheelType = -1,
price = Config.DefaultWheelsPriceMultiplier
- }
+ }
+ elseif v.modType == 24 then
+ elements[#elements + 1] = {
+ label = " " .. _U('by_default'),
+ modType = "modBackWheels",
+ modNum = -1,
+ wheelType = -1,
+ price = Config.DefaultWheelsPriceMultiplier
+ }
else
elements[#elements + 1] = {
label = " " .. _U('by_default'),
modType = k,
modNum = -1
- }
+ }
end
if v.modType == 14 then -- HORNS
for j = 0, 51, 1 do
- local _label
+ local _label = ''
if j == currentMods.modHorns then
_label = GetHornName(j) .. ' - ' .. _U('installed') ..
''
else
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
_label = GetHornName(j) .. ' - $' .. price .. ' '
end
elements[#elements + 1] = {
label = _label,
modType = k,
modNum = j
- }
+ }
end
elseif v.modType == 'plateIndex' then -- PLATES
for j = 0, 4, 1 do
- local _label
+ local _label = ''
if j == currentMods.plateIndex then
_label = GetPlatesName(j) .. ' - ' .. _U('installed') ..
''
else
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
_label = GetPlatesName(j) .. ' - $' .. price .. ' '
end
elements[#elements + 1] = {
@@ -294,11 +304,11 @@ function GetAction(data)
}
end
elseif v.modType == 22 then -- NEON
- local _label
+ local _label = ''
if currentMods.modXenon then
_label = _U('neon') .. ' - ' .. _U('installed') .. ''
else
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
_label = _U('neon') .. ' - $' .. price .. ' '
end
elements[#elements + 1] = {
@@ -308,53 +318,53 @@ function GetAction(data)
}
elseif v.modType == 'xenonColor' then -- XENON COLOR
local xenonColors = GetXenonColors()
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
for i = 1, #xenonColors, 1 do
elements[#elements + 1] = {
label = xenonColors[i].label .. ' - $' .. price .. '',
modType = k,
modNum = xenonColors[i].index
- }
+ }
end
elseif v.modType == 'neonColor' or v.modType == 'tyreSmokeColor' then -- NEON & SMOKE COLOR
local neons = GetNeons()
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
for i = 1, #neons, 1 do
elements[#elements + 1] = {
label = '' .. neons[i].label .. ' - $' .. price .. '',
modType = k,
modNum = {neons[i].r, neons[i].g, neons[i].b}
- }
+ }
end
elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType ==
'wheelColor' then -- RESPRAYS
local colors = GetColors(data.color)
for j = 1, #colors, 1 do
- local _label
- local price = math.floor(vehiclePrice * v.price / 100)
+ local _label = ''
+ price = math.floor(vehiclePrice * v.price / 100)
_label = colors[j].label .. ' - $' .. price .. ' '
elements[#elements + 1] = {
label = _label,
modType = k,
modNum = colors[j].index
- }
+ }
end
elseif v.modType == 'windowTint' then -- WINDOWS TINT
for j = 1, 5, 1 do
- local _label
- if j == currentMods.modHorns then
+ local _label = ''
+ if j == currentMods.windowTint then
_label = GetWindowName(j) .. ' - ' .. _U('installed') ..
''
else
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
_label = GetWindowName(j) .. ' - $' .. price .. ' '
end
elements[#elements + 1] = {
label = _label,
modType = k,
modNum = j
- }
+ }
end
elseif v.modType == 23 then -- WHEELS RIM & TYPE
local props = {}
@@ -366,12 +376,12 @@ function GetAction(data)
for j = 0, modCount, 1 do
local modName = GetModTextLabel(vehicle, v.modType, j)
if modName then
- local _label
+ local _label = ''
if j == currentMods.modFrontWheels then
_label = GetLabelText(modName) .. ' - ' ..
_U('installed') .. ''
else
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
_label = GetLabelText(modName) .. ' - $' .. price ..
' '
end
@@ -381,33 +391,61 @@ function GetAction(data)
modNum = j,
wheelType = v.wheelType,
price = v.price
- }
+ }
+ end
+ end
+ elseif v.modType == 24 then -- MOTORCYCLES BACK WHEELS
+ local props = {}
+
+ props['wheels'] = v.wheelType
+ ESX.Game.SetVehicleProperties(vehicle, props)
+
+ local modCount = GetNumVehicleMods(vehicle, v.modType)
+ for j = 0, modCount, 1 do
+ local modName = GetModTextLabel(vehicle, v.modType, j)
+ if modName then
+ local _label = ''
+ if j == currentMods.modBackWheels then
+ _label = GetLabelText(modName) .. ' - ' ..
+ _U('installed') .. ''
+ else
+ price = math.floor(vehiclePrice * v.price / 100)
+ _label = GetLabelText(modName) .. ' - $' .. price ..
+ ' '
+ end
+ elements[#elements + 1] = {
+ label = _label,
+ modType = 'modBackWheels',
+ modNum = j,
+ wheelType = v.wheelType,
+ price = v.price
+ }
end
end
elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then
SetVehicleModKit(vehicle, 0)
local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES
for j = 0, modCount, 1 do
- local _label
+ local _label = ''
if j == currentMods[k] then
_label =
_U('level', j + 1) .. ' - ' .. _U('installed') ..
''
else
- local price = math.floor(vehiclePrice * v.price[j + 1] / 100)
+ price = math.floor(vehiclePrice * v.price[j + 1] / 100)
_label = _U('level', j + 1) .. ' - $' .. price .. ' '
end
elements[#elements + 1] = {
label = _label,
modType = k,
modNum = j
- }
+ }
if j == modCount - 1 then
break
end
end
elseif v.modType == 17 then -- TURBO
- local _label
+ local _label = ''
if currentMods[k] then
_label = 'Turbo - ' .. _U('installed') .. ''
else
@@ -419,18 +457,18 @@ function GetAction(data)
label = _label,
modType = k,
modNum = true
- }
+ }
else
local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS
for j = 0, modCount, 1 do
local modName = GetModTextLabel(vehicle, v.modType, j)
if modName then
- local _label
+ local _label = ''
if j == currentMods[k] then
_label = GetLabelText(modName) .. ' - ' ..
_U('installed') .. ''
else
- local price = math.floor(vehiclePrice * v.price / 100)
+ price = math.floor(vehiclePrice * v.price / 100)
_label = GetLabelText(modName) .. ' - $' .. price ..
' '
end
@@ -451,19 +489,19 @@ function GetAction(data)
label = Config.Colors[i].label,
value = 'color1',
color = Config.Colors[i].value
- }
+ }
elseif data.value == 'secondaryRespray' then
elements[#elements + 1] = {
label = Config.Colors[i].label,
value = 'color2',
color = Config.Colors[i].value
- }
+ }
elseif data.value == 'pearlescentRespray' then
elements[#elements + 1] = {
label = Config.Colors[i].label,
value = 'pearlescentColor',
color = Config.Colors[i].value
- }
+ }
elseif data.value == 'modFrontWheelsColor' then
elements[#elements + 1] = {
label = Config.Colors[i].label,
@@ -478,7 +516,7 @@ function GetAction(data)
elements[#elements + 1] = {
label = w,
value = l
- }
+ }
end
end
end
@@ -496,7 +534,7 @@ end
-- Blips
CreateThread(function()
- for _, v in pairs(Config.Zones) do
+ for k, v in pairs(Config.Zones) do
local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z)
SetBlipSprite(blip, 72)
@@ -518,11 +556,11 @@ CreateThread(function()
if IsPedInAnyVehicle(playerPed, false) then
local coords = GetEntityCoords(playerPed)
+ local currentZone, zone, lastZone
if (ESX.PlayerData.job and ESX.PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then
- for _, v in pairs(Config.Zones) do
- local zonePos = vector3(v.Pos.x, v.Pos.y, v.Pos.z)
- if #(coords - zonePos) < 10.0 then
+ for k, v in pairs(Config.Zones) do
+ if #(coords - v.Pos) < Config.DrawDistance then
Near = true
Sleep = 0
if not lsMenuIsShowed then
@@ -548,7 +586,7 @@ CreateThread(function()
-- Prevent Free Tunning Bug
CreateThread(function()
while true do
- local _ = 1000
+ local Sleep = 1000
if lsMenuIsShowed then
Sleep = 0
DisableControlAction(2, 288, true)
@@ -575,4 +613,4 @@ CreateThread(function()
end
Wait(Sleep)
end
-end)
+end)
\ No newline at end of file
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/config.lua b/server-data/resources/[esx_addons]/esx_lscustom/config.lua
index 880c53458..e1208504b 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/config.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/config.lua
@@ -6,46 +6,31 @@ Config.IsMechanicJobOnly = false
Config.Zones = {
ls1 = {
- Pos = { x = -337.38, y = -136.92, z = 38.57},
- Size = {x = 3.0, y = 3.0, z = 0.2},
- Color = {r = 204, g = 204, b = 0},
- Marker= 1,
+ Pos = vector3(-337.38, -136.92, 38.57),
Name = _U('blip_name'),
Hint = _U('press_custom')
},
ls2 = {
- Pos = { x = -1155.53, y = -2007.18, z = 12.74},
- Size = {x = 3.0, y = 3.0, z = 0.2},
- Color = {r = 204, g = 204, b = 0},
- Marker= 1,
+ Pos = vector3(-1155.53, -2007.18, 12.74),
Name = _U('blip_name'),
Hint = _U('press_custom')
},
ls3 = {
- Pos = { x = 731.81, y = -1088.82, z = 21.73},
- Size = {x = 3.0, y = 3.0, z = 0.2},
- Color = {r = 204, g = 204, b = 0},
- Marker= 1,
+ Pos = vector3(731.81, -1088.82, 21.73),
Name = _U('blip_name'),
Hint = _U('press_custom')
},
ls4 = {
- Pos = { x = 1175.04, y = 2640.21, z = 37.32},
- Size = {x = 3.0, y = 3.0, z = 0.2},
- Color = {r = 204, g = 204, b = 0},
- Marker= 1,
+ Pos = vector3(1175.04, 2640.21, 37.32),
Name = _U('blip_name'),
Hint = _U('press_custom')
},
ls5 = {
- Pos = { x = 110.99, y = 6626.39, z = 30.89},
- Size = {x = 3.0, y = 3.0, z = 0.2},
- Color = {r = 204, g = 204, b = 0},
- Marker= 1,
+ Pos = vector3(110.99, 6626.39, 30.89),
Name = _U('blip_name'),
Hint = _U('press_custom')
}
@@ -489,7 +474,7 @@ Config.Menus = {
label = _U('brakes'),
parent = 'upgrades',
modType = 12,
- price = {4.65, 9.3, 18.6, 13.95}
+ price = {4.65, 9.3, 13.95, 18.6}
},
modTransmission = {
label = _U('transmission'),
@@ -708,7 +693,13 @@ Config.Menus = {
modFrontWheelsType4 = _U('allterrain'),
modFrontWheelsType5 = _U('tuning'),
modFrontWheelsType6 = _U('motorcycle'),
- modFrontWheelsType7 = _U('highend')
+ modBackWheelsType6 = _U('motorcycle2'),
+ modFrontWheelsType7 = _U('highend'),
+ modFrontWheelsType8 = _U('dragster'),
+ modFrontWheelsType9 = _U('street'),
+ modFrontWheelsType10 = _U('bennys'),
+ modFrontWheelsType11 = _U('bennysv2'),
+ modFrontWheelsType12 = _U('rally'),
},
modFrontWheelsType0 = {
label = _U('sport'),
@@ -758,6 +749,13 @@ Config.Menus = {
modType = 23,
wheelType = 6,
price = 3.26
+ },
+ modBackWheelsType6 = {
+ label = _U('motorcycle'),
+ parent = 'modBackWheelsTypes',
+ modType = 24,
+ wheelType = 6,
+ price = 3.26
},
modFrontWheelsType7 = {
label = _U('highend'),
@@ -765,6 +763,41 @@ Config.Menus = {
modType = 23,
wheelType = 7,
price = 5.12
+ },
+ modFrontWheelsType8 = {
+ label = _U('dragster'),
+ parent = 'modFrontWheelsTypes',
+ modType = 23,
+ wheelType = 10,
+ price = 5.12
+ },
+ modFrontWheelsType9 = {
+ label = _U('street'),
+ parent = 'modFrontWheelsTypes',
+ modType = 23,
+ wheelType = 11,
+ price = 4.19
+ },
+ modFrontWheelsType10 = {
+ label = _U('bennys'),
+ parent = 'modFrontWheelsTypes',
+ modType = 23,
+ wheelType = 8,
+ price = 5.12
+ },
+ modFrontWheelsType11 = {
+ label = _U('bennysv2'),
+ parent = 'modFrontWheelsTypes',
+ modType = 23,
+ wheelType = 9,
+ price = 5.12
+ },
+ modFrontWheelsType12 = {
+ label = _U('rally'),
+ parent = 'modFrontWheelsTypes',
+ modType = 23,
+ wheelType = 12,
+ price = 4.19
},
modFrontWheelsColor = {
label = _U('wheel_color'),
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/fxmanifest.lua b/server-data/resources/[esx_addons]/esx_lscustom/fxmanifest.lua
index 958ef67ec..c9474ac4d 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/fxmanifest.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX LS Customs'
lua54 'yes'
-version '0.0.4'
+version '1.0.0'
shared_script '@es_extended/imports.lua'
@@ -21,4 +21,4 @@ client_scripts {
'locales/*.lua',
'config.lua',
'client/main.lua'
-}
\ No newline at end of file
+}
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/locales/en.lua b/server-data/resources/[esx_addons]/esx_lscustom/locales/en.lua
index 937538d5f..d897ee486 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/locales/en.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/locales/en.lua
@@ -240,8 +240,14 @@ Locales['en'] = {
['suv'] = 'SUV',
['allterrain'] = 'all terrain',
['tuning'] = 'tuning',
- ['motorcycle'] = 'motorcycle',
- ['highend'] = 'high end',
+ ["motorcycle"] = "motorcycle Front",
+ ["highend"] = "high end",
+ ['motorcycle2'] = 'motorcycle Back',
+ ['dragster'] = 'dragster',
+ ['street'] = 'street',
+ ['bennys'] = 'bennys',
+ ['bennysv2'] = 'bennys v2',
+ ['rally'] = 'race',
['modplateholder'] = 'plate - Back',
['modvanityplate'] = 'plate - Front',
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/locales/fr.lua b/server-data/resources/[esx_addons]/esx_lscustom/locales/fr.lua
index 22a52b91c..444d3fcb2 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/locales/fr.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/locales/fr.lua
@@ -1,276 +1,282 @@
-Locales['fr'] = {
- ['by_default'] = 'par défaut',
- ['installed'] = 'installé',
- ['already_own'] = 'vous possédez déjà: %s',
- ['not_enough_money'] = 'vous n\'avez pas assez d\'argent!',
- ['purchased'] = 'achat effectué!',
- ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.',
- ['level'] = 'niveau %s',
- ['neon'] = 'neon',
- ['blip_name'] = 'los Santos Customs',
--- Paint Colors
- -- Black
- ['black'] = 'noir',
- ['graphite'] = 'graphite',
- ['black_metallic'] = 'noir Méttallisé',
- ['caststeel'] = 'acier Fondu',
- ['black_anth'] = 'noir Anthracite',
- ['matteblack'] = 'noir Mat',
- ['darknight'] = 'nuit Sombre',
- ['deepblack'] = 'noir Profond',
- ['oil'] = 'pétrol',
- ['carbon'] = 'carbon',
- -- White
- ['white'] = 'blanc',
- ['vanilla'] = 'vanille',
- ['creme'] = 'crème',
- ['polarwhite'] = 'blanc Polair',
- ['beige'] = 'beige',
- ['mattewhite'] = 'blanc Mat',
- ['snow'] = 'neige',
- ['cotton'] = 'coton',
- ['alabaster'] = 'albâtre',
- ['purewhite'] = 'blanc Pure',
- -- Grey
- ['grey'] = 'gris',
- ['silver'] = 'Argenté',
- ['metallicgrey'] = 'Gris Métallisé',
- ['laminatedsteel'] = 'Acier Laminé',
- ['darkgray'] = 'Gris Foncé',
- ['rockygray'] = 'Gris Rocheux',
- ['graynight'] = 'Gris Nuit',
- ['aluminum'] = 'Aluminium',
- ['graymat'] = 'Gris Mat',
- ['lightgrey'] = 'Gris Clair',
- ['asphaltgray'] = 'Gris Bitume',
- ['grayconcrete'] = 'Gris Béton',
- ['darksilver'] = 'Argent Sombre',
- ['magnesite'] = 'Magnésite',
- ['nickel'] = 'nickel',
- ['zinc'] = 'zinc',
- ['dolomite'] = 'dolomite',
- ['bluesilver'] = 'Argent Bleuté',
- ['titanium'] = 'Titane',
- ['steelblue'] = 'Acier Bleui',
- ['champagne'] = 'Champagne',
- ['grayhunter'] = 'Gris Chasseur',
- -- Red
- ['red'] = 'rouge',
- ['torino_red'] = 'Rouge Turin',
- ['poppy'] = 'Coquelicot',
- ['copper_red'] = 'Rouge Cuivré',
- ['cardinal'] = 'Rouge Cardinal',
- ['brick'] = 'Rouge Brique',
- ['garnet'] = 'Grenat',
- ['cabernet'] = 'Pourpre',
- ['candy'] = 'Framboise',
- ['matte_red'] = 'Rouge Mat',
- ['dark_red'] = 'Rouge Foncé',
- ['red_pulp'] = 'Rouge Pulpeux',
- ['bril_red'] = 'Rouge Brillant',
- ['pale_red'] = 'Rouge Pale',
- ['wine_red'] = 'Rouge Vin',
- ['volcano'] = 'Volcano',
- -- Pink
- ['pink'] = 'rose',
- ['electricpink'] = 'rose Electrique',
- ['brightpink'] = 'rose pétant',
- ['salmon'] = 'rose Saumon',
- ['sugarplum'] = 'rose Dragée',
- -- Blue
- ['blue'] = 'bleu',
- ['topaz'] = 'topaze',
- ['light_blue'] = 'bleu clair',
- ['galaxy_blue'] = 'bleu galaxy',
- ['dark_blue'] = 'bleu foncé',
- ['azure'] = 'bleu azur',
- ['navy_blue'] = 'bleu marine',
- ['lapis'] = 'lapis lazuli',
- ['blue_diamond'] = 'bleu diamant',
- ['surfer'] = 'surfer',
- ['pastel_blue'] = 'pastel',
- ['celeste_blue'] = 'bleu celeste',
- ['rally_blue'] = 'bleu rally',
- ['blue_paradise'] = 'bleu paradis',
- ['blue_night'] = 'bleu nuit',
- ['cyan_blue'] = 'bleu cyan',
- ['cobalt'] = 'cobalt',
- ['electric_blue'] = 'bleu electrique',
- ['horizon_blue'] = 'bleu horizon',
- ['metallic_blue'] = 'bleu métallisé',
- ['aquamarine'] = 'aigue marine',
- ['blue_agathe'] = 'bleu agathe',
- ['zirconium'] = 'zirconium',
- ['spinel'] = 'spinelle',
- ['tourmaline'] = 'tourmaline',
- ['paradise'] = 'paradis',
- ['bubble_gum'] = 'bubble gum',
- ['midnight_blue'] = 'bleu minuit',
- ['forbidden_blue'] = 'bleu interdit',
- ['glacier_blue'] = 'bleu glacier',
- -- Yellow
- ['yellow'] = 'jaune',
- ['wheat'] = 'Jaune Blé',
- ['raceyellow'] = 'Jaune Rally',
- ['paleyellow'] = 'Jaune Clair',
- ['lightyellow'] = 'Jaune Pâle',
- -- Green
- ['green'] = 'vert',
- ['met_dark_green'] = 'Vert Foncé',
- ['rally_green'] = 'Vert Rally',
- ['pine_green'] = 'Vert Sapin',
- ['olive_green'] = 'Vert Olive',
- ['light_green'] = 'Vert Clair',
- ['lime_green'] = 'Vert Lime',
- ['forest_green'] = 'Vert Forêt',
- ['lawn_green'] = 'Vert Pelouse',
- ['imperial_green'] = 'Vert Impérial',
- ['green_bottle'] = 'Vert Bouteille',
- ['citrus_green'] = 'Vert Citrus',
- ['green_anis'] = 'Vert Anis',
- ['khaki'] = 'Kaki',
- ['army_green'] = 'Vert Army',
- ['dark_green'] = 'Vert Sombre',
- ['hunter_green'] = 'Vert Chasseur',
- ['matte_foilage_green'] = 'Amarylisse',
- -- Orange
- ['orange'] = 'orange',
- ['tangerine'] = 'Tangerine',
- ['matteorange'] = 'Orange Mat',
- ['lightorange'] = 'Orange Clair',
- ['peach'] = 'Pèche',
- ['pumpkin'] = 'Citrouille',
- ['orangelambo'] = 'Orange Lambo',
- -- Brown
- ['brown'] = 'marron',
- ['copper'] = 'Cuivre',
- ['lightbrown'] = 'Marronclair',
- ['darkbrown'] = 'Marron Foncé',
- ['bronze'] = 'Bronze',
- ['brownmetallic'] = 'Marron Métallisé',
- ['expresso'] = 'Expresso',
- ['chocolate'] = 'Chocolat',
- ['terracotta'] = 'Terre Cuite',
- ['marble'] = 'Marbre',
- ['sand'] = 'Sable',
- ['sepia'] = 'Sépia',
- ['bison'] = 'Bison',
- ['palm'] = 'Palmier',
- ['caramel'] = 'Caramel',
- ['rust'] = 'Rouille',
- ['chestnut'] = 'Chataigne',
- ['hazelnut'] = 'Noisette',
- ['shell'] = 'Coquillage',
- ['mahogany'] = 'Acajou',
- ['cauldron'] = 'Chaudron',
- ['blond'] = 'Blond',
- ['gravel'] = 'Gravillon',
- ['darkearth'] = 'Terre Foncé',
- ['desert'] = 'Désert',
- -- Purple
- ['purple'] = 'violet',
- ['indigo'] = 'Indigo',
- ['deeppurple'] = 'Violet Profond',
- ['darkviolet'] = 'Violet Foncé',
- ['amethyst'] = 'Améthyste',
- ['mysticalviolet'] = 'Violet Mystique',
- ['purplemetallic'] = 'Violet Métallisé',
- ['matteviolet'] = 'Violet Mat',
- ['mattedeeppurple'] = 'Violet Profond Mat',
- -- Chrome
- ['chrome'] = 'chrome',
- ['brushedchrome'] = 'chrome Brossé',
- ['blackchrome'] = 'chrome Noir',
- ['brushedaluminum'] = 'aluminum Brossé',
- -- Metal
- ['gold'] = 'or',
- ['puregold'] = 'Or Pure',
- ['brushedgold'] = 'Or Brossé',
- ['lightgold'] = 'Or Clair',
--- License Plates
- ['blue_on_white_1'] = 'bleu sur fond Blanc 1',
- ['yellow_on_black'] = 'jaune sur fond Noir',
- ['yellow_blue'] = 'jaune sur fond Bleu',
- ['blue_on_white_2'] = 'bleu sur fond Blanc 2',
- ['blue_on_white_3'] = 'bleu sur fond Blanc 3',
--- Upgrades
- ['upgrades'] = 'upgrades',
- ['engine'] = 'moteur',
- ['brakes'] = 'freins',
- ['transmission'] = 'transmission',
- ['suspension'] = 'suspension',
- ['armor'] = 'armure',
- ['turbo'] = 'turbo',
- ['no_turbo'] = 'pas de turbo',
--- Cosmetics
- ['cosmetics'] = 'cosmétiques',
- -- Body Parts
- ['bodyparts'] = 'carosserie',
- ['leftfender'] = 'aile gauche',
- ['rightfender'] = 'aile droite',
- ['spoilers'] = 'aileron',
- ['sideskirt'] = 'bas de caisse',
- ['cage'] = 'cage',
- ['hood'] = 'capot',
- ['grille'] = 'grille',
- ['rearbumper'] = 'pare-choc arrière',
- ['frontbumper'] = 'pare-choc avant',
- ['exhaust'] = 'pot d\'échappement',
- ['roof'] = 'toit',
- -- Paint
- ['respray'] = 'peinture',
- ['primary'] = 'primaire',
- ['secondary'] = 'secondaire',
- ['pearlescent'] = 'nacré',
- -- Misc
- ['headlights'] = 'phares',
- ['licenseplates'] = 'plaque',
- ['windowtint'] = 'fenêtres',
- ['horns'] = 'klaxon',
- -- Neon
- ['neons'] = 'néons',
- -- Wheels
- ['wheels'] = 'roues',
- ['tiresmoke'] = 'fumée des pneus',
- ['wheel_type'] = 'types de Jantes',
- ['wheel_color'] = 'couleurs jantes',
- ['sport'] = 'Jantes Sport',
- ['muscle'] = 'Jantes Muscle',
- ['lowrider'] = 'Jantes Lowrider',
- ['suv'] = 'Jantes SUV',
- ['allterrain'] = 'Jantes Tout-terrain',
- ['tuning'] = 'Jantes Tuning',
- ['motorcycle'] = 'Jantes Moto',
- ['highend'] = 'Jantes Haut de gamme',
+Locales["fr"] = {
+ ["by_default"] = "par défaut",
+ ["installed"] = "installé",
+ ["already_own"] = "vous possédez déjà: %s",
+ ["not_enough_money"] = "vous n'avez pas assez d'argent!",
+ ["purchased"] = "achat effectué!",
+ ["press_custom"] = "appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.",
+ ["level"] = "niveau %s",
+ ["neon"] = "neon",
+ ["blip_name"] = "los Santos customs",
+ -- Paint colors
+ -- Black
+ ["black"] = "noir",
+ ["graphite"] = "graphite",
+ ["black_metallic"] = "noir méttallisé",
+ ["caststeel"] = "acier fondu",
+ ["black_anth"] = "noir anthracite",
+ ["matteblack"] = "noir mat",
+ ["darknight"] = "nuit sombre",
+ ["deepblack"] = "noir profond",
+ ["oil"] = "pétrol",
+ ["carbon"] = "carbon",
+ -- White
+ ["white"] = "blanc",
+ ["vanilla"] = "vanille",
+ ["creme"] = "crème",
+ ["polarwhite"] = "blanc polair",
+ ["beige"] = "beige",
+ ["mattewhite"] = "blanc mat",
+ ["snow"] = "neige",
+ ["cotton"] = "coton",
+ ["alabaster"] = "albâtre",
+ ["purewhite"] = "blanc pure",
+ -- Grey
+ ["grey"] = "gris",
+ ["silver"] = "argenté",
+ ["metallicgrey"] = "gris métallisé",
+ ["laminatedsteel"] = "acier laminé",
+ ["darkgray"] = "gris foncé",
+ ["rockygray"] = "gris rocheux",
+ ["graynight"] = "gris nuit",
+ ["aluminum"] = "gluminium",
+ ["graymat"] = "gris mat",
+ ["lightgrey"] = "gris clair",
+ ["asphaltgray"] = "gris bitume",
+ ["grayconcrete"] = "gris béton",
+ ["darksilver"] = "argent sombre",
+ ["magnesite"] = "magnésite",
+ ["nickel"] = "nickel",
+ ["zinc"] = "zinc",
+ ["dolomite"] = "dolomite",
+ ["bluesilver"] = "argent bleuté",
+ ["titanium"] = "titane",
+ ["steelblue"] = "acier bleui",
+ ["champagne"] = "champagne",
+ ["grayhunter"] = "gris chasseur",
+ -- Red
+ ["red"] = "rouge",
+ ["torino_red"] = "rouge turin",
+ ["poppy"] = "coquelicot",
+ ["copper_red"] = "rouge cuivré",
+ ["cardinal"] = "rouge cardinal",
+ ["brick"] = "rouge brique",
+ ["garnet"] = "grenat",
+ ["cabernet"] = "pourpre",
+ ["candy"] = "framboise",
+ ["matte_red"] = "rouge mat",
+ ["dark_red"] = "rouge foncé",
+ ["red_pulp"] = "rouge pulpeux",
+ ["bril_red"] = "rouge brillant",
+ ["pale_red"] = "rouge pale",
+ ["wine_red"] = "rouge vin",
+ ["volcano"] = "volcano",
+ -- Pink
+ ["pink"] = "rose",
+ ["electricpink"] = "rose electrique",
+ ["brightpink"] = "rose pétant",
+ ["salmon"] = "rose saumon",
+ ["sugarplum"] = "rose dragée",
+ -- Blue
+ ["blue"] = "bleu",
+ ["topaz"] = "topaze",
+ ["light_blue"] = "bleu clair",
+ ["galaxy_blue"] = "bleu galaxy",
+ ["dark_blue"] = "bleu foncé",
+ ["azure"] = "bleu azur",
+ ["navy_blue"] = "bleu marine",
+ ["lapis"] = "lapis lazuli",
+ ["blue_diamond"] = "bleu diamant",
+ ["surfer"] = "surfer",
+ ["pastel_blue"] = "pastel",
+ ["celeste_blue"] = "bleu celeste",
+ ["rally_blue"] = "bleu rally",
+ ["blue_paradise"] = "bleu paradis",
+ ["blue_night"] = "bleu nuit",
+ ["cyan_blue"] = "bleu cyan",
+ ["cobalt"] = "cobalt",
+ ["electric_blue"] = "bleu electrique",
+ ["horizon_blue"] = "bleu horizon",
+ ["metallic_blue"] = "bleu métallisé",
+ ["aquamarine"] = "aigue marine",
+ ["blue_agathe"] = "bleu agathe",
+ ["zirconium"] = "zirconium",
+ ["spinel"] = "spinelle",
+ ["tourmaline"] = "tourmaline",
+ ["paradise"] = "paradis",
+ ["bubble_gum"] = "bubble gum",
+ ["midnight_blue"] = "bleu minuit",
+ ["forbidden_blue"] = "bleu interdit",
+ ["glacier_blue"] = "bleu glacier",
+ -- Yellow
+ ["yellow"] = "jaune",
+ ["wheat"] = "jaune blé",
+ ["raceyellow"] = "jaune rally",
+ ["paleyellow"] = "jaune clair",
+ ["lightyellow"] = "jaune pâle",
+ -- Green
+ ["green"] = "vert",
+ ["met_dark_green"] = "vert foncé",
+ ["rally_green"] = "vert rally",
+ ["pine_green"] = "vert sapin",
+ ["olive_green"] = "vert olive",
+ ["light_green"] = "vert clair",
+ ["lime_green"] = "vert lime",
+ ["forest_green"] = "vert forêt",
+ ["lawn_green"] = "vert pelouse",
+ ["imperial_green"] = "vert impérial",
+ ["green_bottle"] = "vert bouteille",
+ ["citrus_green"] = "vert citrus",
+ ["green_anis"] = "vert anis",
+ ["khaki"] = "vert kaki",
+ ["army_green"] = "vert militaire",
+ ["dark_green"] = "vert sombre",
+ ["hunter_green"] = "vert chasseur",
+ ["matte_foilage_green"] = "vert amarylisse",
+ -- Orange
+ ["orange"] = "orange",
+ ["tangerine"] = "tangerine",
+ ["matteorange"] = "orange mat",
+ ["lightorange"] = "orange clair",
+ ["peach"] = "orange pèche",
+ ["pumpkin"] = "orange citrouille",
+ ["orangelambo"] = "orange lambo",
+ -- Brown
+ ["brown"] = "marron",
+ ["copper"] = "cuivre",
+ ["lightbrown"] = "marron clair",
+ ["darkbrown"] = "marron foncé",
+ ["bronze"] = "bronze",
+ ["brownmetallic"] = "marron métallisé",
+ ["expresso"] = "marron expresso",
+ ["chocolate"] = "chocolat",
+ ["terracotta"] = "terre cuite",
+ ["marble"] = "marbre",
+ ["sand"] = "sable",
+ ["sepia"] = "sépia",
+ ["bison"] = "bison",
+ ["palm"] = "palmier",
+ ["caramel"] = "caramel",
+ ["rust"] = "rouille",
+ ["chestnut"] = "chataigne",
+ ["hazelnut"] = "noisette",
+ ["shell"] = "coquillage",
+ ["mahogany"] = "acajou",
+ ["cauldron"] = "chaudron",
+ ["blond"] = "blond",
+ ["gravel"] = "gravillon",
+ ["darkearth"] = "terre foncé",
+ ["desert"] = "désert",
+ -- Purple
+ ["purple"] = "violet",
+ ["indigo"] = "indigo",
+ ["deeppurple"] = "violet profond",
+ ["darkviolet"] = "violet foncé",
+ ["amethyst"] = "améthyste",
+ ["mysticalviolet"] = "violet mystique",
+ ["purplemetallic"] = "violet métallisé",
+ ["matteviolet"] = "violet mat",
+ ["mattedeeppurple"] = "violet profond mat",
+ -- Chrome
+ ["chrome"] = "chrome",
+ ["brushedchrome"] = "chrome brossé",
+ ["blackchrome"] = "chrome noir",
+ ["brushedaluminum"] = "aluminum brossé",
+ -- Metal
+ ["gold"] = "or",
+ ["puregold"] = "or pure",
+ ["brushedgold"] = "or brossé",
+ ["lightgold"] = "or clair",
+ -- License Plates
+ ["blue_on_white_1"] = "bleu sur fond blanc 1",
+ ["yellow_on_black"] = "jaune sur fond noir",
+ ["yellow_blue"] = "jaune sur fond bleu",
+ ["blue_on_white_2"] = "bleu sur fond blanc 2",
+ ["blue_on_white_3"] = "bleu sur fond blanc 3",
+ -- Upgrades
+ ["upgrades"] = "upgrades",
+ ["engine"] = "moteur",
+ ["brakes"] = "freins",
+ ["transmission"] = "transmission",
+ ["suspension"] = "suspension",
+ ["armor"] = "armure",
+ ["turbo"] = "turbo",
+ ["no_turbo"] = "pas de turbo",
+ -- Cosmetics
+ ["cosmetics"] = "cosmétiques",
+ -- Body Parts
+ ["bodyparts"] = "carosserie",
+ ["leftfender"] = "aile gauche",
+ ["rightfender"] = "aile droite",
+ ["spoilers"] = "aileron",
+ ["sideskirt"] = "bas de caisse",
+ ["cage"] = "cage",
+ ["hood"] = "capot",
+ ["grille"] = "grille",
+ ["rearbumper"] = "pare-choc arrière",
+ ["frontbumper"] = "pare-choc avant",
+ ["exhaust"] = "pot d'échappement",
+ ["roof"] = "toit",
+ -- Paint
+ ["respray"] = "peinture",
+ ["primary"] = "primaire",
+ ["secondary"] = "secondaire",
+ ["pearlescent"] = "nacré",
+ -- Misc
+ ["headlights"] = "phares",
+ ["licenseplates"] = "plaque",
+ ["windowtint"] = "fenêtres",
+ ["horns"] = "klaxon",
+ -- Neon
+ ["neons"] = "néons",
+ -- Wheels
+ ["wheels"] = "roues",
+ ["tiresmoke"] = "fumée des pneus",
+ ["wheel_type"] = "types de jantes",
+ ["wheel_color"] = "couleurs jantes",
+ ["sport"] = "jantes sport",
+ ["muscle"] = "jantes muscle",
+ ["lowrider"] = "jantes lowrider",
+ ["suv"] = "jantes SUV",
+ ["allterrain"] = "jantes tout-terrain",
+ ["tuning"] = "jantes tuning",
+ ["motorcycle"] = "jantes moto AV",
+ ["highend"] = "jantes haut de gamme",
+ ['motorcycle2'] = 'Jantes Moto AR',
+ ['dragster'] = 'Jantes de dragster',
+ ['street'] = 'Jantes de rue',
+ ['bennys'] = 'Jantes de bennys',
+ ['bennysv2'] = 'Jantes de bennys v2',
+ ['rally'] = 'Jantes de Courses',
- ['modplateholder'] = 'plaque - Arrière',
- ['modvanityplate'] = 'plate - Avant',
- ['interior'] = 'intérieur',
- ['trim'] = 'accessoires',
- ['dashboard'] = 'tableau de bord',
- ['speedometer'] = 'compteur de vitesse',
- ['door_speakers'] = 'haut-parleurs - portières',
- ['seats'] = 'sièges',
- ['steering_wheel'] = 'volant',
- ['gear_lever'] = 'levier de vitesse',
- ['quarter_deck'] = 'plage arrière',
- ['speakers'] = 'haut-parleurs',
- ['trunk'] = 'coffre',
- ['hydraulic'] = 'suspension hydraulique',
- ['engine_block'] = 'bloc moteur',
- ['air_filter'] = 'filtre à air',
- ['struts'] = 'entretoises',
- ['arch_cover'] = 'pare-boue des ailes',
- ['aerials'] = 'antennes',
- ['wings'] = 'ailes',
- ['fuel_tank'] = 'bouchon du réservoir',
- ['windows'] = 'fenêtres',
- ['stickers'] = 'autocollants',
+ ["modplateholder"] = "plaque - arrière",
+ ["modvanityplate"] = "plate - avant",
+ ["interior"] = "intérieur",
+ ["trim"] = "accessoires",
+ ["dashboard"] = "tableau de bord",
+ ["speedometer"] = "compteur de vitesse",
+ ["door_speakers"] = "haut-parleurs - portières",
+ ["seats"] = "sièges",
+ ["steering_wheel"] = "volant",
+ ["gear_lever"] = "levier de vitesse",
+ ["quarter_deck"] = "plage arrière",
+ ["speakers"] = "haut-parleurs",
+ ["trunk"] = "coffre",
+ ["hydraulic"] = "suspension hydraulique",
+ ["engine_block"] = "bloc moteur",
+ ["air_filter"] = "filtre à air",
+ ["struts"] = "entretoises",
+ ["arch_cover"] = "pare-boue des ailes",
+ ["aerials"] = "antennes",
+ ["wings"] = "ailes",
+ ["fuel_tank"] = "bouchon du réservoir",
+ ["windows"] = "fenêtres",
+ ["stickers"] = "autocollants",
--- Xenon Colors
- ['mintgreen'] = 'Mint Green',
- ['goldenshower'] = 'Golden Shower',
- ['ponypink'] = 'Pony Pink',
- ['hotpink'] = 'Hot Pink',
- ['blacklight'] = 'Blacklight',
+ -- Xenon colors
+ ["mintgreen"] = "vert menthe",
+ ["goldenshower"] = "douche dorée",
+ ["ponypink"] = "rose poney",
+ ["hotpink"] = "rose vif",
+ ["blacklight"] = "lumière noire",
}
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/locales/he.lua b/server-data/resources/[esx_addons]/esx_lscustom/locales/he.lua
new file mode 100644
index 000000000..261e2f862
--- /dev/null
+++ b/server-data/resources/[esx_addons]/esx_lscustom/locales/he.lua
@@ -0,0 +1,280 @@
+Locales["he"] = {
+ ["by_default"] = "ברירת המחדל",
+ ["installed"] = "מותקן",
+ ["already_own"] = "כבר ברשותך: %s",
+ ["not_enough_money"] = "אין לך מספיק כסף עבור המוד הזה!",
+ ["purchased"] = "רכשת את המוד!",
+ ["press_custom"] = "לחץ ~b~[E]~s~ להתאמה אישית של הרכב שלך",
+ ["level"] = "רמה %s",
+ ["neon"] = "ניאון",
+ ["blip_name"] = "לוס סנטוס קסטומס",
+ -- צבעי ציור
+ -- שחור
+ ["black"] = "שחור",
+ ["graphite"] = "גרפיט",
+ ["black_metallic"] = "שחור מטאלי",
+ ["caststeel"] = "ברזל מיצק",
+ ["black_anth"] = "אנטרציט שחור",
+ ["matteblack"] = "שחור מט",
+ ["darknight"] = "לילה אפל",
+ ["deepblack"] = "שחור עמוק",
+ ["oil"] = "שמן",
+ ["carbon"] = "קרבון",
+ -- לבן
+ ["white"] = "לבן",
+ ["vanilla"] = "וניל",
+ ["creme"] = "קרם",
+ ["polarwhite"] = "לבן קר",
+ ["beige"] = "בז",
+ ["mattewhite"] = "לבן מט",
+ ["snow"] = "שלג",
+ ["cotton"] = "כותנה",
+ ["alabaster"] = "אלבסטר",
+ ["purewhite"] = "לבן טהור",
+ -- אפור
+ ["grey"] = "אפור",
+ ["silver"] = "כסף",
+ ["metallicgrey"] = "אפור מטאלי",
+ ["laminatedsteel"] = "ברזל מרופד",
+ ["darkgray"] = "אפור כהה",
+ ["rockygray"] = "אפור סלעים",
+ ["graynight"] = "לילה אפור",
+ ["aluminum"] = "אלומיניום",
+ ["graymat"] = "אפור מט",
+ ["lightgrey"] = "אפור בהיר",
+ ["asphaltgray"] = "אפור אספלט",
+ ["grayconcrete"] = "אפור בטון",
+ ["darksilver"] = "כסף כהה",
+ ["magnesite"] = "מגנזיט",
+ ["nickel"] = "ניקל",
+ ["zinc"] = "צינך",
+ ["dolomite"] = "דולומיט",
+ ["bluesilver"] = "כסף כחול",
+ ["titanium"] = "טיטניום",
+ ["steelblue"] = "כחול מתכתי",
+ ["champagne"] = "שמפניה",
+ ["grayhunter"] = "אפור צייד",
+ -- אדום
+ ["red"] = "אדום",
+ ["torino_red"] = "טורינו אדום",
+ ["poppy"] = "פופי",
+ ["copper_red"] = "אדום נחושת",
+ ["cardinal"] = "קרדינל אדום",
+ ["brick"] = "לבני",
+ ["garnet"] = "גרנט",
+ ["cabernet"] = "קברנה אדום",
+ ["candy"] = "אדום סוכר",
+ ["matte_red"] = "אדום מט",
+ ["dark_red"] = "אדום כהה",
+ ["red_pulp"] = "אדום דגם",
+ ["bril_red"] = "אדום בריליאנטי",
+ ["pale_red"] = "אדום פנימי",
+ ["wine_red"] = "אדום יין",
+ ["volcano"] = "אדום געש",
+ -- ורוד
+ ["pink"] = "ורוד",
+ ["electricpink"] = "ורוד אלקטרו",
+ ["brightpink"] = "ורוד בהיר",
+ ["salmon"] = "סלמון",
+ ["sugarplum"] = "סוכרייה",
+ -- כחול
+ ["blue"] = "כחול",
+ ["topaz"] = "טופז",
+ ["light_blue"] = "כחול בהיר",
+ ["galaxy_blue"] = "כחול גלקסי",
+ ["dark_blue"] = "כחול כהה",
+ ["azure"] = "תכלת",
+ ["navy_blue"] = "כחול צהוב",
+ ["lapis"] = "לפיס לזולי",
+ ["blue_diamond"] = "כחול יהלום",
+ ["surfer"] = "גלשן",
+ ["pastel_blue"] = "כחול פסטל",
+ ["celeste_blue"] = "כחול סלסט",
+ ["rally_blue"] = "כחול ראלי",
+ ["blue_paradise"] = "כחול פרדייז",
+ ["blue_night"] = "כחול לילה",
+ ["cyan_blue"] = "כחול ציאן",
+ ["cobalt"] = "קובלט",
+ ["electric_blue"] = "כחול אלקטרו",
+ ["horizon_blue"] = "כחול אופק",
+ ["metallic_blue"] = "כחול מטאלי",
+ ["aquamarine"] = "אקוואמרין",
+ ["blue_agathe"] = "כחול אגת",
+ ["zirconium"] = "זירקוניום",
+ ["spinel"] = "ספינל",
+ ["tourmaline"] = "טורמלין",
+ ["paradise"] = "פרדייז",
+ ["bubble_gum"] = "סבון חיך",
+ ["midnight_blue"] = "כחול לילה חצות",
+ ["forbidden_blue"] = "כחול אסור",
+ ["glacier_blue"] = "כחול קרח",
+ -- צהוב
+ ["yellow"] = "צהוב",
+ ["wheat"] = "חיטה",
+ ["raceyellow"] = "צהוב רייס",
+ ["paleyellow"] = "צהוב פנימי",
+ ["lightyellow"] = "צהוב בהיר",
+ -- ירוק
+ ["green"] = "ירוק",
+ ["met_dark_green"] = "ירוק כהה מטאלי",
+ ["rally_green"] = "ירוק ראלי",
+ ["pine_green"] = "ירוק אורן",
+ ["olive_green"] = "ירוק זית",
+ ["light_green"] = "ירוק בהיר",
+ ["lime_green"] = "ירוק ליים",
+ ["forest_green"] = "ירוק יער",
+ ["lawn_green"] = "ירוק דשא",
+ ["imperial_green"] = "ירוק אימפריאלי",
+ ["green_bottle"] = "ירוק בקבוק",
+ ["citrus_green"] = "ירוק ציטרוס",
+ ["green_anis"] = "ירוק אניס",
+ ["khaki"] = "קאקי",
+ ["army_green"] = "ירוק צבאי",
+ ["dark_green"] = "ירוק כהה",
+ ["hunter_green"] = "ירוק צייד",
+ ["matte_foilage_green"] = "ירוק מט עלים",
+ -- כתום
+ ["orange"] = "כתום",
+ ["tangerine"] = "תפוח סמדר",
+ ["matteorange"] = "כתום מט",
+ ["lightorange"] = "כתום בהיר",
+ ["peach"] = "דרדר",
+ ["pumpkin"] = "דלעת",
+ ["orangelambo"] = "למבורגיני כתום",
+ -- חום
+ ["brown"] = "חום",
+ ["copper"] = "נחושת",
+ ["lightbrown"] = "חום בהיר",
+ ["darkbrown"] = "חום כהה",
+ ["bronze"] = "ברונזה",
+ ["brownmetallic"] = "חום מטאלי",
+ ["expresso"] = "אספרסו",
+ ["chocolate"] = "שוקולד",
+ ["terracotta"] = "טרקוטה",
+ ["marble"] = "שיש",
+ ["sand"] = "חול",
+ ["sepia"] = "ספיה",
+ ["bison"] = "ביזון",
+ ["palm"] = "דקל",
+ ["caramel"] = "קרמל",
+ ["rust"] = "חליל",
+ ["chestnut"] = "פושמן",
+ ["hazelnut"] = "בוטנים",
+ ["shell"] = "קורט",
+ ["mahogany"] = "מהגוני",
+ ["cauldron"] = "קורוט",
+ ["blond"] = "בלונד",
+ ["gravel"] = "קרטיה",
+ ["darkearth"] = "אדמת חושך",
+ ["desert"] = "מדבר",
+ -- סגול
+ ["purple"] = "סגול",
+ ["indigo"] = "אינדיגו",
+ ["deeppurple"] = "סגול כהה",
+ ["darkviolet"] = "ורוד כהה",
+ ["amethyst"] = "אמתיסט",
+ ["mysticalviolet"] = "סגול מיסטי",
+ ["purplemetallic"] = "סגול מטאלי",
+ ["matteviolet"] = "סגול מט",
+ ["mattedeeppurple"] = "סגול כהה מט",
+ -- כרום
+ ["chrome"] = "כרום",
+ ["brushedchrome"] = "כרום מרוקע",
+ ["blackchrome"] = "כרום שחור",
+ ["brushedaluminum"] = "אלומיניום מרוקע",
+ -- מתכת
+ ["gold"] = "זהב",
+ ["puregold"] = "זהב טהור",
+ ["brushedgold"] = "זהב מרוקע",
+ ["lightgold"] = "זהב בהיר",
+ -- לוחות רישוי
+ ["blue_on_white_1"] = "כחול על לבן 1",
+ ["yellow_on_black"] = "צהוב על שחור",
+ ["yellow_blue"] = "צהוב על כחול",
+ ["blue_on_white_2"] = "כחול על לבן 2",
+ ["blue_on_white_3"] = "כחול על לבן 3",
+ -- שדרוגים
+ ["upgrades"] = "שדרוגים",
+ ["engine"] = "מנוע",
+ ["brakes"] = "בלמים",
+ ["transmission"] = "תיבת הילוכים",
+ ["suspension"] = "תומך",
+ ["armor"] = "פנימיות",
+ ["turbo"] = "טורבו",
+ ["no_turbo"] = "ללא טורבו",
+ -- קוסמטיקה
+ ["cosmetics"] = "קוסמטיקה",
+ -- חלקי גוף
+ ["bodyparts"] = "חלקי גוף",
+ ["leftfender"] = "גינת שמאל",
+ ["rightfender"] = "גינת ימין",
+ ["spoilers"] = "ספוילר",
+ ["sideskirt"] = "סף צדדי",
+ ["cage"] = "גביע",
+ ["hood"] = "קפוט",
+ ["grille"] = "גריל",
+ ["rearbumper"] = "אחורי",
+ ["frontbumper"] = "קדמי",
+ ["exhaust"] = "פליטה",
+ ["roof"] = "גג",
+ -- ציור
+ ["respray"] = "צביעה מחדש",
+ ["primary"] = "ראשי",
+ ["secondary"] = "משני",
+ ["pearlescent"] = "לוץ",
+ -- שונות
+ ["headlights"] = "פנסי ראש",
+ ["licenseplates"] = "לוח רישוי",
+ ["windowtint"] = "צביעת חלון",
+ ["horns"] = "קרניות",
+ -- ניאון
+ ["neons"] = "ניאון",
+ -- גלגלים
+ ["wheels"] = "גלגלים",
+ ["tiresmoke"] = "עשן מצמיגים",
+ ["wheel_type"] = "סוג גלגלים",
+ ["wheel_color"] = "צבע גלגלים",
+ ["sport"] = "ספורט",
+ ["muscle"] = "גוף גרמני",
+ ["lowrider"] = "לואו ריידר",
+ ["suv"] = "גלגלי SUV",
+ ["allterrain"] = "כל דרכות",
+ ["tuning"] = "כיוון",
+ ["motorcycle"] = "אופנוע קדמי",
+ ["highend"] = "גבוה סוף",
+ ["motorcycle2"] = "אופנוע אחורי",
+ ["dragster"] = "דראגסטר",
+ ["street"] = "רחוב",
+ ["bennys"] = "בניס",
+ ["bennysv2"] = "בניס v2",
+ ["rally"] = "ראלי",
+ ["modplateholder"] = "תושבת לוח רישוי - אחורי",
+ ["modvanityplate"] = "תושבת לוח רישוי - קדמי",
+ ["interior"] = "פנימי",
+ ["trim"] = "פס",
+ ["dashboard"] = "לוח מחוונים",
+ ["speedometer"] = "מד דרך",
+ ["door_speakers"] = "רמקולים בדלתות",
+ ["seats"] = "מושבים",
+ ["steering_wheel"] = "תפריטה",
+ ["gear_lever"] = "מקדנות",
+ ["quarter_deck"] = "רשת בגג",
+ ["speakers"] = "רמקולים",
+ ["trunk"] = "מזוודה",
+ ["hydraulic"] = "ידראוליקה",
+ ["engine_block"] = "בלוק מנוע",
+ ["air_filter"] = "מסנן אוויר",
+ ["struts"] = "מתלי",
+ ["arch_cover"] = "כיסוי גלגל",
+ ["aerials"] = "אנטנות",
+ ["wings"] = "כנפיים",
+ ["fuel_tank"] = "מיכל דלק",
+ ["windows"] = "חלונות",
+ ["stickers"] = "סמלים",
+ -- צבעי ניאון
+ ["mintgreen"] = "ירוק מנטה",
+ ["goldenshower"] = "גולדן שאוור",
+ ["ponypink"] = "ורוד פוני",
+ ["hotpink"] = "ורוד חם",
+ ["blacklight"] = "אור שחור"
+}
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/locales/it.lua b/server-data/resources/[esx_addons]/esx_lscustom/locales/it.lua
index cdaab425f..e1cf7dbd6 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/locales/it.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/locales/it.lua
@@ -1,5 +1,5 @@
Locales['it'] = {
- ['by_default'] = 'modifica base',
+ ['by_default'] = 'default',
['installed'] = 'installato',
['already_own'] = 'possiedi già: %s',
['not_enough_money'] = 'non puoi permetterti questa modifica!',
@@ -8,7 +8,8 @@ Locales['it'] = {
['level'] = 'livello %s',
['neon'] = 'neon',
['blip_name'] = 'los Santos Customs',
- -- Paint Colors
+-- Paint Colors
+ -- Black
['black'] = 'nero',
['graphite'] = 'grafite',
['black_metallic'] = 'nero metallico',
@@ -126,7 +127,7 @@ Locales['it'] = {
['imperial_green'] = 'verde imperiale',
['green_bottle'] = 'verde bottiglia',
['citrus_green'] = 'verde agrumi',
- ['green_anis'] = 'verde anice',
+ ['green_anis'] = 'verde anici',
['khaki'] = 'cachi',
['army_green'] = 'verde militare',
['dark_green'] = 'verde scuro',
@@ -137,8 +138,8 @@ Locales['it'] = {
['tangerine'] = 'mandarino',
['matteorange'] = 'arancio opaco',
['lightorange'] = 'arancione chiaro',
- ['peach'] = 'arancione pesca',
- ['pumpkin'] = 'arancione zucca',
+ ['peach'] = 'pesca',
+ ['pumpkin'] = 'zucca',
['orangelambo'] = 'arancione Lambo',
-- Brown
['brown'] = 'marrone',
@@ -186,13 +187,13 @@ Locales['it'] = {
['puregold'] = 'oro puro',
['brushedgold'] = 'oro spazzolato',
['lightgold'] = 'oro chiaro',
- -- License Plates
+-- License Plates
['blue_on_white_1'] = 'blu su bianco 1',
['yellow_on_black'] = 'giallo su nero',
['yellow_blue'] = 'giallo su blu',
['blue_on_white_2'] = 'blu su bianco 2',
['blue_on_white_3'] = 'blu su bianco 3',
- -- Upgrades
+-- Upgrades
['upgrades'] = 'aggiornamenti',
['engine'] = 'motore',
['brakes'] = 'freni',
@@ -201,7 +202,7 @@ Locales['it'] = {
['armor'] = 'armatura',
['turbo'] = 'turbo',
['no_turbo'] = 'no turbo',
- -- Cosmetics
+-- Cosmetics
['cosmetics'] = 'cosmetici',
-- Body Parts
['bodyparts'] = 'parti del corpo',
@@ -217,7 +218,7 @@ Locales['it'] = {
['exhaust'] = 'scarico',
['roof'] = 'tetto',
-- Paint
- ['respray'] = 'vernici',
+ ['respray'] = 'verici',
['primary'] = 'primaria',
['secondary'] = 'secondaria',
['pearlescent'] = 'perlescente',
@@ -241,6 +242,7 @@ Locales['it'] = {
['tuning'] = 'tuning',
['motorcycle'] = 'moto',
['highend'] = 'fascia alta',
+
['modplateholder'] = 'targa - posteriore',
['modvanityplate'] = 'targa - anteriore',
['interior'] = 'interni',
@@ -252,7 +254,7 @@ Locales['it'] = {
['steering_wheel'] = 'volante',
['gear_lever'] = 'leva del cambio',
['quarter_deck'] = 'quarter-deck',
- ['speakers'] = 'auto parlanti',
+ ['speakers'] = 'altoparlanti',
['trunk'] = 'tronco',
['hydraulic'] = 'idraulica',
['engine_block'] = 'blocco motore',
@@ -264,10 +266,11 @@ Locales['it'] = {
['fuel_tank'] = 'serbatoio carburante',
['windows'] = 'finestrini',
['stickers'] = 'Livrea',
- -- Xenon Colors
+
+-- Xenon Colors
['mintgreen'] = 'Verde Menta',
['goldenshower'] = 'Pioggia Dorata',
['ponypink'] = 'Rosa Pony',
- ['hotpink'] = 'rosa acceso',
+ ['hotpink'] = 'Rosa Shocking',
['blacklight'] = 'Luce Scura',
-}
\ No newline at end of file
+}
diff --git a/server-data/resources/[esx_addons]/esx_lscustom/server/main.lua b/server-data/resources/[esx_addons]/esx_lscustom/server/main.lua
index e4ff2c41a..1759d44ad 100644
--- a/server-data/resources/[esx_addons]/esx_lscustom/server/main.lua
+++ b/server-data/resources/[esx_addons]/esx_lscustom/server/main.lua
@@ -22,7 +22,7 @@ AddEventHandler('esx:playerDropped', function(src)
src = tostring(src)
local playersCount = #GetPlayers()
if Customs[src] then
- for _, v in pairs(Customs[src]) do
+ for k, v in pairs(Customs[src]) do
local entity = NetworkGetEntityFromNetworkId(v.netId)
if DoesEntityExist(entity) then
if playersCount > 0 then
@@ -108,9 +108,9 @@ RegisterNetEvent('esx_lscustom:refreshOwnedVehicle', function(vehicleProps, netI
end)
end)
-ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(_, cb)
+ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb)
if not Vehicles then
Vehicles = MySQL.query.await('SELECT model, price FROM vehicles')
end
cb(Vehicles)
-end)
\ No newline at end of file
+end)
From a63b20599ae754a63165f2f2e6059c273f466e04 Mon Sep 17 00:00:00 2001
From: bitpredator <67551273+bitpredator@users.noreply.github.com>
Date: Tue, 5 Dec 2023 18:50:10 +0100
Subject: [PATCH 5/5] chore: updated export methods
---
.../resources/[bpt_addons]/bpt_crafting/client/main.lua | 1 -
.../resources/[bpt_addons]/bpt_crafting/server/main.lua | 1 -
.../resources/[bpt_addons]/bpt_farmer/fxmanifest.lua | 2 +-
.../resources/[bpt_addons]/bpt_hud/client/status.lua | 1 -
server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua | 4 +++-
.../resources/[bpt_addons]/bpt_lumberjack/client/main.lua | 1 -
.../resources/[bpt_addons]/bpt_lumberjack/server/main.lua | 1 -
.../resources/[bpt_addons]/bpt_teleport/fxmanifest.lua | 4 +++-
.../[esx_addons]/esx_ambulancejob/client/main.lua | 8 +-------
.../[esx_addons]/esx_ambulancejob/server/main.lua | 1 -
.../resources/[esx_addons]/esx_uteknark1/sv_uteknark.lua | 1 -
server-data/resources/[sqz]/sqz_carkeys/client/client.lua | 4 +---
12 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua
index 9019bb92b..635175a38 100644
--- a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua
+++ b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua
@@ -10,7 +10,6 @@ local Keys = {
["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118
}
-ESX = nil
local labels = {}
local craftingQueue = {}
local job = ""
diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua
index 387d696f0..7339ffa38 100644
--- a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua
+++ b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua
@@ -1,4 +1,3 @@
-ESX = nil
ESX = exports["es_extended"]:getSharedObject()
function setCraftingLevel(identifier, level)
MySQL.Async.execute(
diff --git a/server-data/resources/[bpt_addons]/bpt_farmer/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_farmer/fxmanifest.lua
index fd9dfde38..552beb387 100644
--- a/server-data/resources/[bpt_addons]/bpt_farmer/fxmanifest.lua
+++ b/server-data/resources/[bpt_addons]/bpt_farmer/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
game 'gta5'
description 'bpt_farmer, introduces various collection points for the crafting system (not a job)'
author'bitpredator'
-version'0.0.4'
+version'1.0.0'
shared_script '@es_extended/imports.lua'
diff --git a/server-data/resources/[bpt_addons]/bpt_hud/client/status.lua b/server-data/resources/[bpt_addons]/bpt_hud/client/status.lua
index 05206342b..5a1035d4f 100644
--- a/server-data/resources/[bpt_addons]/bpt_hud/client/status.lua
+++ b/server-data/resources/[bpt_addons]/bpt_hud/client/status.lua
@@ -3,7 +3,6 @@ local armor = 0
local food = 0
local thirst = 0
local posi = "bottom"
-ESX = nil
ESX = exports["es_extended"]:getSharedObject()
diff --git a/server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua
index 74ee97155..b96e6d13f 100644
--- a/server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua
+++ b/server-data/resources/[bpt_addons]/bpt_hud/fxmanifest.lua
@@ -3,10 +3,12 @@ fx_version 'adamant'
game 'gta5'
author 'bitpredator'
description 'bitpredator HUD'
-version '0.0.4'
+version '1.0.0'
ui_page 'html/ui.html'
+shared_script '@es_extended/imports.lua'
+
files {
'html/*.css',
'html/*.js',
diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua
index c81c58187..3e4c53f16 100644
--- a/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua
+++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/client/main.lua
@@ -10,7 +10,6 @@ Keys = {
["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118
}
-ESX = nil
local menuOpen = false
CreateThread(function()
diff --git a/server-data/resources/[bpt_addons]/bpt_lumberjack/server/main.lua b/server-data/resources/[bpt_addons]/bpt_lumberjack/server/main.lua
index 9c9de2b54..9737a40f4 100644
--- a/server-data/resources/[bpt_addons]/bpt_lumberjack/server/main.lua
+++ b/server-data/resources/[bpt_addons]/bpt_lumberjack/server/main.lua
@@ -1,4 +1,3 @@
-ESX = nil
ESX = exports["es_extended"]:getSharedObject()
RegisterServerEvent('bpt_woodcutter:pickedUpWood')
diff --git a/server-data/resources/[bpt_addons]/bpt_teleport/fxmanifest.lua b/server-data/resources/[bpt_addons]/bpt_teleport/fxmanifest.lua
index 7ec190622..3ebb3630a 100644
--- a/server-data/resources/[bpt_addons]/bpt_teleport/fxmanifest.lua
+++ b/server-data/resources/[bpt_addons]/bpt_teleport/fxmanifest.lua
@@ -6,7 +6,9 @@ author 'bitpredator'
description 'bpt_teleport'
-version '0.0.4'
+version '1.0.0'
+
+shared_script '@es_extended/imports.lua'
client_scripts {
'@es_extended/locale.lua',
diff --git a/server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua b/server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua
index 2b0df1222..ff1cf7919 100644
--- a/server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua
+++ b/server-data/resources/[esx_addons]/esx_ambulancejob/client/main.lua
@@ -1,7 +1,6 @@
local firstSpawn, PlayerLoaded = true, false
isDead, isSearched, medic = false, false, 0
-ESX = nil
AddEventHandler("onClientMapStart", function()
exports.spawnmanager:spawnPlayer()
@@ -10,15 +9,10 @@ AddEventHandler("onClientMapStart", function()
end)
CreateThread(function()
- while ESX == nil do
- ESX = exports["es_extended"]:getSharedObject()
- Wait(0)
- end
-
+ ESX = exports["es_extended"]:getSharedObject()
while ESX.GetPlayerData().job == nil do
Wait(100)
end
-
PlayerLoaded = true
ESX.PlayerData = ESX.GetPlayerData()
end)
diff --git a/server-data/resources/[esx_addons]/esx_ambulancejob/server/main.lua b/server-data/resources/[esx_addons]/esx_ambulancejob/server/main.lua
index 266ce5db5..a1eabd7b6 100644
--- a/server-data/resources/[esx_addons]/esx_ambulancejob/server/main.lua
+++ b/server-data/resources/[esx_addons]/esx_ambulancejob/server/main.lua
@@ -1,4 +1,3 @@
-ESX = nil
local playersHealing, deadPlayers = {}, {}
ESX = exports["es_extended"]:getSharedObject()
diff --git a/server-data/resources/[esx_addons]/esx_uteknark1/sv_uteknark.lua b/server-data/resources/[esx_addons]/esx_uteknark1/sv_uteknark.lua
index 797516a35..0c0548612 100644
--- a/server-data/resources/[esx_addons]/esx_uteknark1/sv_uteknark.lua
+++ b/server-data/resources/[esx_addons]/esx_uteknark1/sv_uteknark.lua
@@ -1,4 +1,3 @@
-local ESX = nil
local oneSyncEnabled = GetConvar('onesync_enabled', false)
local VERBOSE = false
local lastPlant = {}
diff --git a/server-data/resources/[sqz]/sqz_carkeys/client/client.lua b/server-data/resources/[sqz]/sqz_carkeys/client/client.lua
index a3c21ee0b..51f61bda1 100644
--- a/server-data/resources/[sqz]/sqz_carkeys/client/client.lua
+++ b/server-data/resources/[sqz]/sqz_carkeys/client/client.lua
@@ -1,6 +1,4 @@
-CreateThread(function()
- ESX = exports["es_extended"]:getSharedObject()
-end)
+ESX = exports["es_extended"]:getSharedObject()
RegisterCommand('lockvehicle', function()