From 93f4545c9d3f927a3380d30fb010b7402f2712f8 Mon Sep 17 00:00:00 2001 From: Musiker15 Date: Mon, 29 Jun 2026 18:18:41 +0200 Subject: [PATCH] refactor: keep only msk_core integration per maintainer guidelines Remove msk_fuel and msk_vehiclekeys providers (below 100-server threshold). Retain msk_core Notify + ProgressBar integration. --- modules/fuel/msk_fuel/client.lua | 33 ------------------- .../msk_vehiclekeys/client/client.lua | 33 ------------------- settings/clientConfig.lua | 4 +-- 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 modules/fuel/msk_fuel/client.lua delete mode 100644 modules/vehiclekey/msk_vehiclekeys/client/client.lua diff --git a/modules/fuel/msk_fuel/client.lua b/modules/fuel/msk_fuel/client.lua deleted file mode 100644 index acca07b..0000000 --- a/modules/fuel/msk_fuel/client.lua +++ /dev/null @@ -1,33 +0,0 @@ ----@diagnostic disable: duplicate-set-field -local resourceName = "msk_fuel" -if GetResourceState(resourceName) == 'missing' then return end -Fuel = Fuel or {} - ----@description Returns the name of the active fuel resource. ----@return string -Fuel.GetResourceName = function() - return resourceName -end - ----@description Returns the current fuel level of a vehicle. ----@param vehicle number The vehicle entity handle. ----@return number The vehicle fuel level. -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports.msk_fuel:GetVehicleFuel(vehicle) -end - ----@description Sets the fuel level of a vehicle. ----@param vehicle number The vehicle entity handle. ----@param fuel number The fuel level to assign. ----@param type? string The fuel type, used only in ti_fuel / msk_fuel. (default: nil) ----@return nil -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - exports.msk_fuel:SetVehicleFuel(vehicle, fuel) - if type then - exports.msk_fuel:SetVehicleFuelType(vehicle, type) - end -end - -return Fuel diff --git a/modules/vehiclekey/msk_vehiclekeys/client/client.lua b/modules/vehiclekey/msk_vehiclekeys/client/client.lua deleted file mode 100644 index 1928c15..0000000 --- a/modules/vehiclekey/msk_vehiclekeys/client/client.lua +++ /dev/null @@ -1,33 +0,0 @@ ----@diagnostic disable: duplicate-set-field -local resourceName = "msk_vehiclekeys" -if GetResourceState(resourceName) == 'missing' then return end - -VehicleKey = VehicleKey or {} - ----Gives the player (self) the keys of the specified vehicle. ----@param vehicle number The vehicle entity handle. ----@param plate? string The plate of the vehicle. ----@return nil -VehicleKey.GiveKeys = function(vehicle, plate) - assert(vehicle, "vehicle is nil") - assert(DoesEntityExist(vehicle), "vehicle does not exist") - - exports.msk_vehiclekeys:AddPrimaryKey(vehicle) -end - ----Removes the keys of the specified vehicle from the player (self). ----@param vehicle number The vehicle entity handle. ----@param plate? string The plate of the vehicle. ----@return nil -VehicleKey.RemoveKeys = function(vehicle, plate) - assert(vehicle, "vehicle is nil") - assert(DoesEntityExist(vehicle), "vehicle does not exist") - - exports.msk_vehiclekeys:RemovePrimaryKey(vehicle) -end - -VehicleKey.GetResourceName = function() - return resourceName -end - -return VehicleKey diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 8168116..69dc9e5 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -2,8 +2,8 @@ BridgeClientConfig = {} BridgeClientConfig.InputSystem = "auto" -- [ auto | ox_lib | lation_ui | qb-input ] BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox_lib | wasabi_uikit | lation_ui | qb-menu ] BridgeClientConfig.ProgressBarSystem = "auto" -- [ auto | ox_lib | wasabi_uikit | lation_ui | ZSX_UIV2 | keep-progressbar | progressbar | msk_core ] -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 | msk_vehiclekeys -BridgeClientConfig.Fuel = "auto" -- [ auto | LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | cdn-fuel | esx-sna-fuel | BigDaddy-Fuel | okokGasStation | msk_fuel ] +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" -- [ 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 = "auto" -- [ auto | ox_target | qb-target | sleepless_interact ] -- sleepless is only partially supported and would need another system in place BridgeClientConfig.Debug = false return BridgeClientConfig