Merge branch 'main' into alert-autofix-569

server-data/resources/[bpt_addons]/bpt_addonaccount/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.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2024 bitpredator
+    Copyright (C) 2024-2025 bitpredator
 
     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:
 
-    bpt_addonaccount  Copyright (C) 2024 bitpredator
+    bpt_addonaccount  Copyright (C) 2024-2025 bitpredator
     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.

server-data/resources/[bpt_addons]/bpt_addonaccount/README.md

@@ -1,7 +1,7 @@
 <h1 align='center'>bpt_addonaccount</a></h1>
 <p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Copyright (C) 2024 bitpredator
+Copyright (C) 2024-2025 bitpredator
 
 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.
 

server-data/resources/[bpt_addons]/bpt_addonaccount/fxmanifest.lua

@@ -4,7 +4,7 @@ game("gta5")
 author("bitpredator")
 description("Allows resources to store account data, such as society funds")
 lua54("yes")
-version("1.0.2")
+version("1.0.3")
 
 server_scripts({
     "@es_extended/imports.lua",

server-data/resources/[bpt_addons]/bpt_addonaccount/server/classes/addonaccount.lua

@@ -1,3 +1,5 @@
+---@diagnostic disable: undefined-global
+
 function CreateAddonAccount(name, owner, money)
     local self = {}
 

server-data/resources/[bpt_addons]/bpt_addonaccount/server/main.lua

@@ -1,3 +1,5 @@
+---@diagnostic disable: undefined-global
+
 local AccountsIndex, Accounts, SharedAccounts = {}, {}, {}
 
 AddEventHandler("onResourceStart", function(resourceName)

server-data/resources/[esx]/vSync/client/client.lua

@@ -44,8 +44,6 @@ AddEventHandler("vSync:updateTime", function(base, offset, freeze)
 end)
 
 Citizen.CreateThread(function()
-    local hour = 0
-    local minute = 0
     while true do
         Citizen.Wait(0)
         local newBaseTime = baseTime
@@ -57,8 +55,8 @@ Citizen.CreateThread(function()
             timeOffset = timeOffset + baseTime - newBaseTime
         end
         baseTime = newBaseTime
-        hour = math.floor(((baseTime + timeOffset) / 60) % 24)
-        minute = math.floor((baseTime + timeOffset) % 60)
+        local hour = math.floor(((baseTime + timeOffset) / 60) % 24)
+        local minute = math.floor((baseTime + timeOffset) % 60)
         NetworkOverrideClockTime(hour, minute, 0)
     end
 end)

server-data/resources/[esx]/vSync/config.lua

@@ -4,7 +4,7 @@ Config.AdminByID = false -- Set to true if you want to set the access to the com
 Config.DynamicWeather = false -- Set this to false if you don't want the weather to change automatically every 10 minutes.
 
 -- On server start
-Config.StartWeather = "XMAS" -- Default weather                       default: 'EXTRASUNNY'
+Config.StartWeather = "EXTRASUNNY" -- Default weather                       default: 'EXTRASUNNY'
 Config.BaseTime = 8 -- Time                                             default: 8
 Config.TimeOffset = 0 -- Time offset                                      default: 0
 Config.FreezeTime = false -- freeze time                                  default: false
@@ -14,29 +14,29 @@ Config.NewWeatherTimer = 10 -- Time (in minutes) between each weather change   d
 Config.Locale = "en" -- Languages : en, fr, pt, tr, pt_br
 
 Config.Admins = { -- Only if Config.AdminByID is set to true
-	"steam/license:STEAMID/LICENSE", -- EXAMPLE : steam:110000145959807 or license:1234975140128921327
+    "steam/license:STEAMID/LICENSE", -- EXAMPLE : steam:110000145959807 or license:1234975140128921327
 }
 
 Config.Ace = { -- Only if Config.AdminByID is set to false
-	"command", -- LEAVE BY DEFAULT TO GIVE ACCESS TO ADMINS AND SUPERADMINS IF U DIDN'T TOUCH ADMIN SYSTEM.
-	--'vsyncr', -- Gives access to weather/time commands only to groups that have access to 'vsyncr' in your server.cfg (like this: add_ace group.admin vsyncr allow)
-	--'yourgroupaccess', -- add_ace group.yourgroup yourgroupaccess allow
+    "command", -- LEAVE BY DEFAULT TO GIVE ACCESS TO ADMINS AND SUPERADMINS IF U DIDN'T TOUCH ADMIN SYSTEM.
+    --'vsyncr', -- Gives access to weather/time commands only to groups that have access to 'vsyncr' in your server.cfg (like this: add_ace group.admin vsyncr allow)
+    --'yourgroupaccess', -- add_ace group.yourgroup yourgroupaccess allow
 }
 
 Config.AvailableWeatherTypes = { -- DON'T TOUCH EXCEPT IF YOU KNOW WHAT YOU ARE DOING
-	"EXTRASUNNY",
-	"CLEAR",
-	"NEUTRAL",
-	"SMOG",
-	"FOGGY",
-	"OVERCAST",
-	"CLOUDS",
-	"CLEARING",
-	"RAIN",
-	"THUNDER",
-	"SNOW",
-	"BLIZZARD",
-	"SNOWLIGHT",
-	"XMAS",
-	"HALLOWEEN",
+    "EXTRASUNNY",
+    "CLEAR",
+    "NEUTRAL",
+    "SMOG",
+    "FOGGY",
+    "OVERCAST",
+    "CLOUDS",
+    "CLEARING",
+    "RAIN",
+    "THUNDER",
+    "SNOW",
+    "BLIZZARD",
+    "SNOWLIGHT",
+    "XMAS",
+    "HALLOWEEN",
 }

server-data/resources/[esx]/vSync/fxmanifest.lua

@@ -2,7 +2,7 @@ fx_version("bodacious")
 game("gta5")
 
 description("vSyncRevamped")
-version("1.0.2")
+version("1.0.3")
 
 server_scripts({
     "config.lua",

server-data/resources/[esx]/vSync/locale.lua

@@ -1,21 +1,17 @@
 Locales = {}
 
 function _(str, ...) -- Translate string
-
-	if Locales[Config.Locale] ~= nil then
-
-		if Locales[Config.Locale][str] ~= nil then
-			return string.format(Locales[Config.Locale][str], ...)
-		else
-			return 'Translation [' .. Config.Locale .. '][' .. str .. '] does not exist'
-		end
-
-	else
-		return 'Locale [' .. Config.Locale .. '] does not exist'
-	end
-
+    if Locales[Config.Locale] ~= nil then
+        if Locales[Config.Locale][str] ~= nil then
+            return string.format(Locales[Config.Locale][str], ...)
+        else
+            return "Translation [" .. Config.Locale .. "][" .. str .. "] does not exist"
+        end
+    else
+        return "Locale [" .. Config.Locale .. "] does not exist"
+    end
 end
 
 function _U(str, ...) -- Translate string first char uppercase
-	return tostring(_(str, ...):gsub("^%l", string.upper))
-end
+    return tostring(_(str, ...):gsub("^%l", string.upper))
+end

server-data/resources/[esx]/vSync/server/server.lua

@@ -4,6 +4,7 @@ local timeOffset = Config.TimeOffset
 local freezeTime = Config.FreezeTime
 local blackout = Config.Blackout
 local newWeatherTimer = Config.NewWeatherTimer
+local isAllowedToChange = {}
 
 RegisterServerEvent("vSync:requestSync")
 AddEventHandler("vSync:requestSync", function()
@@ -329,5 +330,3 @@ function NextWeatherStage()
     end
     TriggerEvent("vSync:requestSync")
 end
-
-print("vSync Revamped by Kalinka loaded!")

server-data/resources/[esx_addons]/esx_garage/LICENSE

@@ -631,8 +631,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    esx_garage
-    Copyright (C) 2015-2024
+    esx_garage Copyright (C) 2015-2025
 
     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
@@ -649,13 +648,13 @@ the "copyright" line and a pointer to where the full notice is found.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
+If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-      esx_garage  Copyright (C) 2015-2024
-    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.
+esx_garage  Copyright (C) 2015-2025
+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

server-data/resources/[esx_addons]/esx_garage/README.md

@@ -1,15 +1,13 @@
-<h1 align='center'>[ESX] Garage</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
+<h1 align='center'>esx_garage</a></h1>
+<p align='center'><a href='https://discord.gg/ksGfNvDEfq'>Discord</a>
 
-Store Your vehicles in style! ESX garage has an amazing New UI to help you be stylish while parking your broken, rusty Nissan Micra!
-
-# Legal
-
-esx_Garage - store vehicles in style!
-
-Copyright (C) ESX-Framework
+Copyright (C) 2024-2025 bitpredator
 
 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 http://www.gnu.org/licenses/.
+ATTENTION:
+You are not authorized to change the name of the resource and the resources within it.
+
+If you want to contribute you can open a pull request.

server-data/resources/[esx_addons]/esx_garage/client/antidespawn.lua

@@ -1,9 +1,8 @@
-local model, coords, heading
-local vehicle = CreateVehicle(model, coords.x, coords.y, coords.z + 1.0, heading, true, false)
+local vehicle
 
 SetVehicleNeedsToBeHotwired(vehicle, false)
 SetVehicleHasBeenOwnedByPlayer(vehicle, true)
 SetEntityAsMissionEntity(vehicle, true, true)
 SetVehicleIsStolen(vehicle, false)
 SetVehicleIsWanted(vehicle, false)
-SetVehRadioStation(vehicle, 'OFF')
+SetVehRadioStation(vehicle, "OFF")

server-data/resources/[esx_addons]/esx_garage/client/main.lua

@@ -1,3 +1,5 @@
+---@diagnostic disable: undefined-global
+
 local LastMarker, LastPart, thisGarage, thisPound = nil, nil, nil, nil
 local next = next
 local nearMarker, menuIsShowed = false, false
@@ -13,9 +15,6 @@ AddEventHandler("esx_garage:closemenu", function()
         hideAll = true,
     })
 
-    if not menuIsShowed and thisGarage then
-        ESX.TextUI(TranslateCap("access_parking"))
-    end
     if not menuIsShowed and thisPound then
         ESX.TextUI(TranslateCap("access_Impound"))
     end
@@ -106,15 +105,9 @@ end)
 
 AddEventHandler("esx_garage:hasEnteredMarker", function(name, part)
     if part == "EntryPoint" then
-        local isInVehicle = IsPedInAnyVehicle(ESX.PlayerData.ped, false)
+        local _ = IsPedInAnyVehicle(ESX.PlayerData.ped, false)
         local garage = Config.Garages[name]
         thisGarage = garage
-
-        if isInVehicle then
-            ESX.TextUI(TranslateCap("park_veh"))
-        else
-            ESX.TextUI(TranslateCap("access_parking"))
-        end
     end
 
     if part == "GetOutPoint" then

server-data/resources/[esx_addons]/esx_garage/config.lua

@@ -35,32 +35,9 @@ Config.Markers = {
 Config.Garages = {
     VespucciBoulevard = {
         EntryPoint = {
-            x = -285.2,
-            y = -886.5,
-            z = 31.0,
-        },
-        SpawnPoint = {
-            x = -309.3,
-            y = -897.0,
-            z = 31.0,
-            heading = 351.8,
-        },
-        Sprite = 357,
-        Scale = 0.8,
-        Colour = 3,
-        ImpoundedName = "LosSantos",
-    },
-    SanAndreasAvenue = {
-        EntryPoint = {
-            x = 216.4,
-            y = -786.6,
-            z = 30.8,
-        },
-        SpawnPoint = {
-            x = 218.9,
-            y = -779.7,
-            z = 30.8,
-            heading = 338.8,
+            x = 394.865936,
+            y = -1637.657104,
+            z = 29.279907,
         },
         Sprite = 357,
         Scale = 0.8,
@@ -87,45 +64,12 @@ Config.Impounds = {
         Colour = 1,
         Cost = 3000,
     },
-    PaletoBay = {
-        GetOutPoint = {
-            x = -211.4,
-            y = 6206.5,
-            z = 31.4,
-        },
-        SpawnPoint = {
-            x = -204.6,
-            y = 6221.6,
-            z = 30.5,
-            heading = 227.2,
-        },
-        Sprite = 524,
-        Scale = 0.8,
-        Colour = 1,
-        Cost = 3000,
-    },
-    SandyShores = {
-        GetOutPoint = {
-            x = 1728.2,
-            y = 3709.3,
-            z = 33.2,
-        },
-        SpawnPoint = {
-            x = 1722.7,
-            y = 3713.6,
-            z = 33.2,
-            heading = 19.9,
-        },
-        Sprite = 524,
-        Scale = 0.8,
-        Colour = 1,
-        Cost = 3000,
-    },
 }
 
 exports("getGarages", function()
     return Config.Garages
 end)
+
 exports("getImpounds", function()
     return Config.Impounds
 end)

server-data/resources/[esx_addons]/esx_garage/fxmanifest.lua

@@ -1,18 +1,18 @@
 fx_version("cerulean")
 game("gta5")
 
-author("ESX-Framework")
+author("ESX-Framework - Rework: Bitpredator")
 description("Allows Players to Store & Retrieve their vehicles")
 
-version("1.0.2")
+version("1.0.3")
 
 lua54("yes")
 
 shared_script("@es_extended/imports.lua")
 
 server_scripts({ "@es_extended/locale.lua", "locales/*.lua", "@oxmysql/lib/MySQL.lua", "config.lua", "server/main.lua" })
 
-client_scripts({ "@es_extended/locale.lua", "locales/*.lua", "config.lua", "client/main.lua" })
+client_scripts({ "@es_extended/locale.lua", "locales/*.lua", "config.lua", "client/*.lua" })
 
 ui_page("nui/ui.html")