From a759e9c27bebbb1a8f668de8927764a34dfed0ee Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:03:49 -0500 Subject: [PATCH] fuels folder fix --- modules/fuel.zip | Bin 0 -> 7538 bytes modules/fuel/BigDaddy-Fuel/client.lua | 14 -------------- modules/fuel/LegacyFuel/client.lua | 14 -------------- modules/fuel/Renewed-Fuel/client.lua | 13 ------------- modules/fuel/_defualts/client.lua | 11 ----------- modules/fuel/cdn-fuel/client.lua | 14 -------------- modules/fuel/esx-sna-fuel/client.lua | 14 -------------- modules/fuel/okokGasStation/client.lua | 14 -------------- modules/fuel/ox_fuel/client.lua | 15 --------------- modules/fuel/ps-fuel/client.lua | 14 -------------- modules/fuel/qs-fuelstations/client.lua | 14 -------------- modules/fuel/ti_fuel/client.lua | 15 --------------- modules/fuel/x-fuel/client.lua | 15 --------------- settings/clientConfig.lua | 2 +- 14 files changed, 1 insertion(+), 168 deletions(-) create mode 100644 modules/fuel.zip delete mode 100644 modules/fuel/BigDaddy-Fuel/client.lua delete mode 100644 modules/fuel/LegacyFuel/client.lua delete mode 100644 modules/fuel/Renewed-Fuel/client.lua delete mode 100644 modules/fuel/_defualts/client.lua delete mode 100644 modules/fuel/cdn-fuel/client.lua delete mode 100644 modules/fuel/esx-sna-fuel/client.lua delete mode 100644 modules/fuel/okokGasStation/client.lua delete mode 100644 modules/fuel/ox_fuel/client.lua delete mode 100644 modules/fuel/ps-fuel/client.lua delete mode 100644 modules/fuel/qs-fuelstations/client.lua delete mode 100644 modules/fuel/ti_fuel/client.lua delete mode 100644 modules/fuel/x-fuel/client.lua diff --git a/modules/fuel.zip b/modules/fuel.zip new file mode 100644 index 0000000000000000000000000000000000000000..621c4243e2562b3ab06eafa46bc49ce6a5c2752f GIT binary patch literal 7538 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 Z|2+?A0^qa)ff#{5tw5ZlU@i(k{{wbVX5at- literal 0 HcmV?d00001 diff --git a/modules/fuel/BigDaddy-Fuel/client.lua b/modules/fuel/BigDaddy-Fuel/client.lua deleted file mode 100644 index b9a3ff2..0000000 --- a/modules/fuel/BigDaddy-Fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('BigDaddy-Fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "BigDaddy" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['BigDaddy-Fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - exports['BigDaddy-Fuel']:SetFuel(vehicle, fuel) -end diff --git a/modules/fuel/LegacyFuel/client.lua b/modules/fuel/LegacyFuel/client.lua deleted file mode 100644 index 61c6655..0000000 --- a/modules/fuel/LegacyFuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('LegacyFuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "LegacyFuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('LegacyFuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['LegacyFuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['LegacyFuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/Renewed-Fuel/client.lua b/modules/fuel/Renewed-Fuel/client.lua deleted file mode 100644 index 48d1072..0000000 --- a/modules/fuel/Renewed-Fuel/client.lua +++ /dev/null @@ -1,13 +0,0 @@ -if GetResourceState('Renewed-Fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "Renewed-Fuel" and BridgeClientConfig.Fuel ~= "auto") then return end ---if GetResourceState('Renewed-Fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['Renewed-Fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['Renewed-Fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/_defualts/client.lua b/modules/fuel/_defualts/client.lua deleted file mode 100644 index 7b1055b..0000000 --- a/modules/fuel/_defualts/client.lua +++ /dev/null @@ -1,11 +0,0 @@ -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return GetVehicleFuelLevel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return SetVehicleFuelLevel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua deleted file mode 100644 index 97e570a..0000000 --- a/modules/fuel/cdn-fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('cdn-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "cdn" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('cdn-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['cdn-fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['cdn-fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua deleted file mode 100644 index 9abc9c7..0000000 --- a/modules/fuel/esx-sna-fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('esx-sna-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "sna" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('esx-sna-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['esx-sna-fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - exports['esx-sna-fuel']:SetFuel(vehicle, fuel) -end diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua deleted file mode 100644 index 219730c..0000000 --- a/modules/fuel/okokGasStation/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('okokGasStation') ~= 'started' or (BridgeClientConfig.Fuel ~= "okokGasStation" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('okokGasStation') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['okokGasStation']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['okokGasStation']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua deleted file mode 100644 index bcd820a..0000000 --- a/modules/fuel/ox_fuel/client.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('ox_fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ox_fuel" and BridgeClientConfig.Fuel ~= "auto") then return end ---if GetResourceState('ox_fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return Entity(vehicle).state.fuel -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - local currentFuel = Entity(vehicle).state.fuel - Entity(vehicle).state.fuel = currentFuel + fuel - return Entity(vehicle).state.fuel -end \ No newline at end of file diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua deleted file mode 100644 index 61f0468..0000000 --- a/modules/fuel/ps-fuel/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('ps-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ps-fuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('ps-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['ps-fuel']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel, type) - if not DoesEntityExist(vehicle) then return end - return exports['ps-fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua deleted file mode 100644 index d0bcbfa..0000000 --- a/modules/fuel/qs-fuelstations/client.lua +++ /dev/null @@ -1,14 +0,0 @@ -if GetResourceState('qs-fuelstations') ~= 'started' or (BridgeClientConfig.Fuel ~= "qs-fuelstations" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('qs-fuelstations') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - return exports['qs-fuelstations']:GetFuel(vehicle) -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['qs-fuelstations']:SetFuel(vehicle, fuel) -end diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua deleted file mode 100644 index a075d29..0000000 --- a/modules/fuel/ti_fuel/client.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('ti_fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "ti_fuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('ti_fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - local level, _ = exports["ti_fuel"]:getFuel(vehicle) - return level -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['ti_fuel']:setFuel(vehicle, fuel, "RON91") -end \ No newline at end of file diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua deleted file mode 100644 index db18170..0000000 --- a/modules/fuel/x-fuel/client.lua +++ /dev/null @@ -1,15 +0,0 @@ -if GetResourceState('x-fuel') ~= 'started' or (BridgeClientConfig.Fuel ~= "x-fuel" and BridgeClientConfig.Fuel ~= "auto") then return end - ---if GetResourceState('x-fuel') ~= 'started' then return end -Fuel = Fuel or {} - -Fuel.GetFuel = function(vehicle) - if not DoesEntityExist(vehicle) then return 0.0 end - local level, _ = exports["x-fuel"]:getFuel(vehicle) - return level -end - -Fuel.SetFuel = function(vehicle, fuel) - if not DoesEntityExist(vehicle) then return end - return exports['x-fuel']:SetFuel(vehicle, fuel) -end \ No newline at end of file diff --git a/settings/clientConfig.lua b/settings/clientConfig.lua index 7aab942..9fb4326 100644 --- a/settings/clientConfig.lua +++ b/settings/clientConfig.lua @@ -7,7 +7,7 @@ BridgeClientConfig.MenuSystem = "auto" -- [ auto | ox | qb ] 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.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] +BridgeClientConfig.Fuel = "auto" -- [ LegacyFuel | ox_fuel | ps-fuel | qs-fuelstations | Renewed-Fuel | ti_fuel | lc_fuel | x-fuel | okokGasStation | BigDaddy | cdn | sna | ] BridgeClientConfig.TargetSystem = "ox" -- [ ox | qb | sleepless | auto ] -- sleepless is only partially supported and would need another system in place return BridgeClientConfig \ No newline at end of file