From aede7a3d2a8d2f3b221fcbfd0d3423921b258e32 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:24:19 -0500 Subject: [PATCH] vehicle keys moved to new auto/config format --- modules/vehicleKey/F_RealCarKeysSystem/client/client.lua | 4 +++- modules/vehicleKey/MrNewbVehicleKeys/client/client.lua | 4 +++- modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/cd_garage/client/client.lua | 4 +++- modules/vehicleKey/jacksam/client.lua | 5 ++++- modules/vehicleKey/mk_vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/mono_carkeys/client/client.lua | 4 +++- modules/vehicleKey/okokGarage/client/client.lua | 4 +++- modules/vehicleKey/qb-vehiclekeys/client/client.lua | 5 ++++- modules/vehicleKey/qbx_vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/qs-vehiclekeys/client/client.lua | 4 +++- modules/vehicleKey/t1ger_keys/client/client.lua | 4 +++- modules/vehicleKey/wasabi_carlock/client/client.lua | 5 ++++- settings/clientConfig.lua | 2 +- 14 files changed, 43 insertions(+), 14 deletions(-) diff --git a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua index cbc4c75..6013011 100644 --- a/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua +++ b/modules/vehicleKey/F_RealCarKeysSystem/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('F_RealCarKeysSystem') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "F_RealCarKeysSystem" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "F_RealCarKeysSystem" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua index 259df39..7cf6df9 100644 --- a/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua +++ b/modules/vehicleKey/MrNewbVehicleKeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('MrNewbVehicleKeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "MrNewbVehicleKeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "MrNewbVehicleKeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua index 6558428..4344bb7 100644 --- a/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua +++ b/modules/vehicleKey/Renewed-Vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('Renewed-Vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "Renewed-Vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "Renewed-Vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/cd_garage/client/client.lua b/modules/vehicleKey/cd_garage/client/client.lua index d9998be..936e1d0 100644 --- a/modules/vehicleKey/cd_garage/client/client.lua +++ b/modules/vehicleKey/cd_garage/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('cd_garage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "cd_garage" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "cd_garage" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/jacksam/client.lua b/modules/vehicleKey/jacksam/client.lua index 67b2908..2b2f643 100644 --- a/modules/vehicleKey/jacksam/client.lua +++ b/modules/vehicleKey/jacksam/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('jaksams_VehiclesKeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "jaksam" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "jaksams_VehiclesKeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/mk_vehiclekeys/client/client.lua b/modules/vehicleKey/mk_vehiclekeys/client/client.lua index 7f5cc6a..c39def4 100644 --- a/modules/vehicleKey/mk_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/mk_vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('mk_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "mk_vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "mk_vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/mono_carkeys/client/client.lua b/modules/vehicleKey/mono_carkeys/client/client.lua index da85cc3..03790d3 100644 --- a/modules/vehicleKey/mono_carkeys/client/client.lua +++ b/modules/vehicleKey/mono_carkeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('mono_carkeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "mono_carkeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "mono_carkeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/okokGarage/client/client.lua b/modules/vehicleKey/okokGarage/client/client.lua index 3da9e3f..3d62e22 100644 --- a/modules/vehicleKey/okokGarage/client/client.lua +++ b/modules/vehicleKey/okokGarage/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('okokGarage') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "okokGarage" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "okokGarage" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/qb-vehiclekeys/client/client.lua b/modules/vehicleKey/qb-vehiclekeys/client/client.lua index 7c2b10d..3ab78a2 100644 --- a/modules/vehicleKey/qb-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qb-vehiclekeys/client/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('qb-vehiclekeys') ~= 'started' and not GetResourceState("qbx_vehiclekeys") == "started" or (BridgeClientConfig.VehicleKey ~= "qb-vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "qb-vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua index 7358f04..8e554a8 100644 --- a/modules/vehicleKey/qbx_vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qbx_vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('qbx_vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qbx" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "qbx_vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/qs-vehiclekeys/client/client.lua b/modules/vehicleKey/qs-vehiclekeys/client/client.lua index b0ed802..d9a4423 100644 --- a/modules/vehicleKey/qs-vehiclekeys/client/client.lua +++ b/modules/vehicleKey/qs-vehiclekeys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('qs-vehiclekeys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "qs-vehiclekeys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "qs-vehiclekeys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/t1ger_keys/client/client.lua b/modules/vehicleKey/t1ger_keys/client/client.lua index 8482f8c..23dd224 100644 --- a/modules/vehicleKey/t1ger_keys/client/client.lua +++ b/modules/vehicleKey/t1ger_keys/client/client.lua @@ -1,4 +1,6 @@ -if GetResourceState('t1ger_keys') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "t1ger_keys" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "t1ger_keys" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end VehicleKey = VehicleKey or {} diff --git a/modules/vehicleKey/wasabi_carlock/client/client.lua b/modules/vehicleKey/wasabi_carlock/client/client.lua index 11e0fe7..8f03b0f 100644 --- a/modules/vehicleKey/wasabi_carlock/client/client.lua +++ b/modules/vehicleKey/wasabi_carlock/client/client.lua @@ -1,4 +1,7 @@ -if GetResourceState('wasabi_carlock') ~= 'started' or (BridgeClientConfig.VehicleKey ~= "wasabi_carlock" and BridgeClientConfig.VehicleKey ~= "auto") then return end +local resourceName = "wasabi_carlock" +local configValue = BridgeClientConfig.VehicleKey +if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end + VehicleKey = VehicleKey or {} VehicleKey.GiveKeys = function(vehicle, plate) diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 8817544..af0d021 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -6,7 +6,7 @@ BridgeClientConfig.InputSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | qb-menu ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox | qb ] BridgeClientConfig.ZoneSystem = "ox" -- [ ox | poly ] -BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | wasabi | jaksam | qbx | cd | f_real | mk | okok | qs | renewed | t1ger | mono ] +BridgeClientConfig.VehicleKey = "auto" -- [ auto | qb-vehiclekeys | MrNewbVehicleKeys | jaksams_VehiclesKeys | wasabi_carlock | mk_vehiclekeys | qbx_vehiclekeys | qs-vehiclekeys | t1ger_keys | Renewed-Vehiclekeys | mono_carkeys| cd_garage | okokGarage | F_RealCarKeysSystem BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation ] BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place