feat(config): Standarize Config files

* feat(config): Standarize Config files

* Fix(linting): Use Config variable

* camalCase

* camalCase V2

bridge/qb/client/main.lua

@@ -1,6 +1,6 @@
 local qbCoreCompat = {}
 qbCoreCompat.PlayerData = QBX.PlayerData
-qbCoreCompat.Config = Config
+qbCoreCompat.Config = lib.table.merge(require 'config.client', require 'config.shared')
 qbCoreCompat.Shared = require 'bridge.qb.shared.main'
 qbCoreCompat.Functions = require 'bridge.qb.client.functions'
 

bridge/qb/server/main.lua

@@ -1,6 +1,6 @@
 local qbCoreCompat = {}
 
-qbCoreCompat.Config = Config
+qbCoreCompat.Config = lib.table.merge(require 'config.server', require 'config.shared')
 qbCoreCompat.Shared = require 'bridge.qb.shared.main'
 qbCoreCompat.Players = QBX.Players
 qbCoreCompat.Player = require 'bridge.qb.server.player'

client/character.lua

@@ -1,7 +1,10 @@
-if Config.Characters.UseExternalCharacters then return end
+local config = require 'config.client'
+local defaultSpawn = require 'config.shared'.DefaultSpawn
+
+if config.Characters.UseExternalCharacters then return end
 
 local previewCam = nil
-local randomLocation = Config.Characters.Locations[math.random(1, #Config.Characters.Locations)]
+local randomLocation = config.Characters.Locations[math.random(1, #config.Characters.Locations)]
 
 local randomPedModels = {
     `a_m_o_soucent_02`,
@@ -50,19 +53,19 @@ end
 local function previewPed(citizenId)
     if not citizenId then
         local model = randomPedModels[math.random(1, #randomPedModels)]
-        lib.requestModel(model, Config.LoadingModelsTimeout)
+        lib.requestModel(model, config.LoadingModelsTimeout)
         SetPlayerModel(cache.playerId, model)
         return
     end
 
     local clothing, model = lib.callback.await('qbx_core:server:getPreviewPedData', false, citizenId)
     if model and clothing then
-        lib.requestModel(model, Config.LoadingModelsTimeout)
+        lib.requestModel(model, config.LoadingModelsTimeout)
         SetPlayerModel(cache.playerId, model)
         pcall(function() exports['illenium-appearance']:setPedAppearance(PlayerPedId(), json.decode(clothing)) end)
     else
         model = randomPedModels[math.random(1, #randomPedModels)]
-        lib.requestModel(model, Config.LoadingModelsTimeout)
+        lib.requestModel(model, config.LoadingModelsTimeout)
         SetPlayerModel(cache.playerId, model)
     end
 end
@@ -133,14 +136,14 @@ end
 ---@return boolean
 local function checkStrings(dialog, input)
     local str = dialog[input]
-    if Config.Characters.ProfanityWords[str:lower()] then return false end
+    if config.Characters.ProfanityWords[str:lower()] then return false end
 
     local split = {string.strsplit(' ', str)}
     if #split > 5 then return false end
 
     for i = 1, #split do
         local word = split[i]
-        if Config.Characters.ProfanityWords[word:lower()] then return false end
+        if config.Characters.ProfanityWords[word:lower()] then return false end
     end
 
     return true
@@ -235,7 +238,7 @@ local function createCharacter(cid)
         spawnDefault()
         TriggerEvent('qb-clothes:client:CreateFirstCharacter')
     else
-        if Config.Characters.StartingApartment then
+        if config.Characters.StartingApartment then
             TriggerEvent('apartments:client:setupSpawnUI', newData)
         else
             TriggerEvent('qbx_core:client:spawnNoApartments')
@@ -247,7 +250,7 @@ local function createCharacter(cid)
 end
 
 local function chooseCharacter()
-    randomLocation = Config.Characters.Locations[math.random(1, #Config.Characters.Locations)]
+    randomLocation = config.Characters.Locations[math.random(1, #config.Characters.Locations)]
 
     DoScreenFadeOut(500)
 
@@ -325,7 +328,7 @@ local function chooseCharacter()
                             destroyPreviewCam()
                         end
                     },
-                    Config.Characters.EnableDeleteButton and {
+                    config.Characters.EnableDeleteButton and {
                         title = Lang:t('info.delete_character'),
                         description = Lang:t('info.delete_character_description', { playerName = name }),
                         icon = 'trash',
@@ -364,8 +367,8 @@ end
 RegisterNetEvent('qbx_core:client:spawnNoApartments', function() -- This event is only for no starting apartments
     DoScreenFadeOut(500)
     Wait(2000)
-    SetEntityCoords(cache.ped, Config.DefaultSpawn.x, Config.DefaultSpawn.y, Config.DefaultSpawn.z, false, false, false, false)
-    SetEntityHeading(cache.ped, Config.DefaultSpawn.w)
+    SetEntityCoords(cache.ped, defaultSpawn.x, defaultSpawn.y, defaultSpawn.z, false, false, false, false)
+    SetEntityHeading(cache.ped, defaultSpawn.w)
     Wait(500)
     destroyPreviewCam()
     SetEntityVisible(cache.ped, true, false)
@@ -391,7 +394,7 @@ CreateThread(function()
         if NetworkIsSessionStarted() then
             pcall(function() exports.spawnmanager:setAutoSpawn(false) end)
             Wait(250)
-            lib.requestModel(model, Config.LoadingModelsTimeout)
+            lib.requestModel(model, config.LoadingModelsTimeout)
             SetPlayerModel(cache.playerId, model)
             chooseCharacter()
             break

client/discord.lua

@@ -1,13 +1,17 @@
+local maxPlayers = GlobalState.MaxPlayers
+local discord = require 'config.client'.Discord
+
 AddStateBagChangeHandler('PlayerCount', nil, function(bagName, _, value)
-     if bagName ~= 'global' or not value then return end
-     local players = 'Players %s/' .. Config.MaxPlayers
-     SetRichPresence((players):format(value))
+    if bagName == 'global' and value then
+        local players = 'Players %s/' .. maxPlayers
+        SetRichPresence((players):format(value))
+    end
 end)
 
-SetDiscordAppId(Config.Discord.AppId)
-SetDiscordRichPresenceAsset(Config.Discord.LargeIcon.icon)
-SetDiscordRichPresenceAssetText(Config.Discord.LargeIcon.text)
-SetDiscordRichPresenceAssetSmall(Config.Discord.SmallIcon.icon)
-SetDiscordRichPresenceAssetSmallText(Config.Discord.SmallIcon.text)
-SetDiscordRichPresenceAction(0, Config.Discord.FirstButton.text, Config.Discord.FirstButton.link)
-SetDiscordRichPresenceAction(1, Config.Discord.SecondButton.text, Config.Discord.SecondButton.link)
+SetDiscordAppId(discord.AppId)
+SetDiscordRichPresenceAsset(discord.LargeIcon.icon)
+SetDiscordRichPresenceAssetText(discord.LargeIcon.text)
+SetDiscordRichPresenceAssetSmall(discord.SmallIcon.icon)
+SetDiscordRichPresenceAssetSmallText(discord.SmallIcon.text)
+SetDiscordRichPresenceAction(0, discord.FirstButton.text, discord.FirstButton.link)
+SetDiscordRichPresenceAction(1, discord.SecondButton.text, discord.SecondButton.link)

client/events.lua

@@ -3,9 +3,11 @@ RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     ShutdownLoadingScreenNui()
     LocalPlayer.state:set('isLoggedIn', true, false)
     QBX.IsLoggedIn = true
-    if not Config.Server.PVP then return end
-    SetCanAttackFriendly(cache.ped, true, false)
-    NetworkSetFriendlyFireOption(true)
+
+    if GlobalState.PVPEnabled then
+        SetCanAttackFriendly(cache.ped, true, false)
+        NetworkSetFriendlyFireOption(true)
+    end
 end)
 
 ---@param val PlayerData
@@ -19,10 +21,12 @@ RegisterNetEvent('QBCore:Client:OnPlayerUnload', function()
     QBX.IsLoggedIn = false
 end)
 
----@param pvp_state boolean
-RegisterNetEvent('QBCore:Client:PvpHasToggled', function(pvp_state)
-    SetCanAttackFriendly(cache.ped, pvp_state, false)
-    NetworkSetFriendlyFireOption(pvp_state)
+---@param value boolean
+AddStateBagChangeHandler('PVPEnabled', nil, function(bagName, _, value)
+    if bagName == 'global' then
+        SetCanAttackFriendly(cache.ped, value, false)
+        NetworkSetFriendlyFireOption(value)
+    end
 end)
 
 -- Teleport Commands
@@ -141,20 +145,10 @@ RegisterNetEvent('qbx_core:client:vehicleSpawned', function(netId, props)
     end
 end)
 
-RegisterNetEvent('QBCore:Command:DeleteVehicle', function()
-    if cache.vehicle then
-        SetEntityAsMissionEntity(cache.vehicle, true, true)
-        DeleteVehicle(cache.vehicle)
-    else
-        local pcoords = GetEntityCoords(cache.ped)
-        local vehicles = GetGamePool('CVehicle')
-        for _, v in pairs(vehicles) do
-            if #(pcoords - GetEntityCoords(v)) <= 5.0 then
-                SetEntityAsMissionEntity(v, true, true)
-                DeleteVehicle(v)
-            end
-        end
-    end
+lib.callback.register('qbx_core:client:getNearestVehicle', function()
+    local vehicle = lib.getClosestVehicle(GetEntityCoords(cache.ped), 5)
+
+    return vehicle and VehToNet(vehicle)
 end)
 
 -- Other stuff

client/functions.lua

@@ -1,3 +1,5 @@
+local NotifyPosition = require 'config.shared'.NotifyPosition
+
 ---Text box popup for player which dissappears after a set time.
 ---@param text table|string text of the notification
 ---@param notifyType? NotificationType informs default styling. Defaults to 'inform'
@@ -18,7 +20,7 @@ function Notify(text, notifyType, duration, subTitle, notifyPosition, notifyStyl
     else
         description = text
     end
-    local position = notifyPosition or Config.NotifyPosition
+    local position = notifyPosition or NotifyPosition
 
     lib.notify({
         id = title,

client/loops.lua

@@ -1,5 +1,7 @@
+local StatusInterval = require 'config.client'.StatusInterval
+
 CreateThread(function()
-    local timeout = 60000 * Config.StatusInterval
+    local timeout = 60000 * StatusInterval
     while true do
         Wait(timeout)
 

client/main.lua

@@ -60,6 +60,6 @@ lib.callback.register('qbx_core:client:setHealth', function(health)
     SetEntityHealth(cache.ped, health)
 end)
 
-local mapText = Config.Server.PauseMapText
+local mapText = require 'config.client'.PauseMapText
 if mapText == '' or type(mapText) ~= 'string' then mapText = 'FiveM' end
 AddTextEntry('FE_THDR_GTAO', mapText)