From 2fb2edff9bd88e0623748d22ef8e25ecabf309f1 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sat, 19 Apr 2025 14:36:10 -0400 Subject: [PATCH] Fuel.GetFuelName --- modules/fuel/_defualts/client.lua | 6 ++++++ modules/fuel/bigDaddy-Fuel/client.lua | 15 +++++++++++++-- modules/fuel/cdn-fuel/client.lua | 16 ++++++++++++++-- modules/fuel/esx-sna-fuel/client.lua | 18 +++++++++++++++--- modules/fuel/lc_fuel/client.lua | 19 +++++++++++++++---- modules/fuel/legacyfuel/client.lua | 14 +++++++++++++- modules/fuel/okokGasStation/client.lua | 15 ++++++++++++++- modules/fuel/ox_fuel/client.lua | 15 ++++++++++++++- modules/fuel/ps-fuel/client.lua | 15 ++++++++++++++- modules/fuel/qs-fuelstations/client.lua | 17 +++++++++++++++-- modules/fuel/renewed-Fuel/client.lua | 15 ++++++++++++++- modules/fuel/ti_fuel/client.lua | 15 ++++++++++++++- modules/fuel/x-fuel/client.lua | 15 ++++++++++++++- 13 files changed, 175 insertions(+), 20 deletions(-) diff --git a/modules/fuel/_defualts/client.lua b/modules/fuel/_defualts/client.lua index b453052..9663fd4 100644 --- a/modules/fuel/_defualts/client.lua +++ b/modules/fuel/_defualts/client.lua @@ -1,5 +1,11 @@ Fuel = Fuel or {} + +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return 'default' +end ---This will get the fuel level of the vehicle. ---@param vehicle number The vehicle entity ID. ---@return number fuel The fuel level of the vehicle. diff --git a/modules/fuel/bigDaddy-Fuel/client.lua b/modules/fuel/bigDaddy-Fuel/client.lua index f1f0a46..d2e7a92 100644 --- a/modules/fuel/bigDaddy-Fuel/client.lua +++ b/modules/fuel/bigDaddy-Fuel/client.lua @@ -2,15 +2,26 @@ local resourceName = "BigDaddy-Fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading BigDaddy-Fuel") ---if GetResourceState('BigDaddy-Fuel') ~= 'started' then return end Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['BigDaddy-Fuel']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end exports['BigDaddy-Fuel']:SetFuel(vehicle, fuel) diff --git a/modules/fuel/cdn-fuel/client.lua b/modules/fuel/cdn-fuel/client.lua index bb5b1d7..c9ae93a 100644 --- a/modules/fuel/cdn-fuel/client.lua +++ b/modules/fuel/cdn-fuel/client.lua @@ -1,15 +1,27 @@ local resourceName = "cdn-fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end -----print("Fuel: Loading cdn-fuel") ---if GetResourceState('cdn-fuel') ~= 'started' then return end + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['cdn-fuel']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end return exports['cdn-fuel']:SetFuel(vehicle, fuel) diff --git a/modules/fuel/esx-sna-fuel/client.lua b/modules/fuel/esx-sna-fuel/client.lua index acfac8d..6c4588c 100644 --- a/modules/fuel/esx-sna-fuel/client.lua +++ b/modules/fuel/esx-sna-fuel/client.lua @@ -1,16 +1,28 @@ local resourceName = "esx-sna-fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading esx-sna-fuel") ---if GetResourceState('esx-sna-fuel') ~= 'started' then return end + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['esx-sna-fuel']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end exports['esx-sna-fuel']:SetFuel(vehicle, fuel) -end +end \ No newline at end of file diff --git a/modules/fuel/lc_fuel/client.lua b/modules/fuel/lc_fuel/client.lua index d455e9c..5df01b9 100644 --- a/modules/fuel/lc_fuel/client.lua +++ b/modules/fuel/lc_fuel/client.lua @@ -1,17 +1,28 @@ local resourceName = "lc_fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading lc_fuel") -if GetResourceState('lc_fuel') ~= 'started' then return end + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports["lc_fuel"]:GetFuel(vehicle) end - +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel, type) if not DoesEntityExist(vehicle) then return end return exports["lc_fuel"]:SetFuel(vehicle, fuel) -end +end \ No newline at end of file diff --git a/modules/fuel/legacyfuel/client.lua b/modules/fuel/legacyfuel/client.lua index d788982..1eb4e92 100644 --- a/modules/fuel/legacyfuel/client.lua +++ b/modules/fuel/legacyfuel/client.lua @@ -1,15 +1,27 @@ local resourceName = "LegacyFuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading LegacyFuel") Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['LegacyFuel']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel, type) if not DoesEntityExist(vehicle) then return end return exports['LegacyFuel']:SetFuel(vehicle, fuel) diff --git a/modules/fuel/okokGasStation/client.lua b/modules/fuel/okokGasStation/client.lua index 147588f..8c5741b 100644 --- a/modules/fuel/okokGasStation/client.lua +++ b/modules/fuel/okokGasStation/client.lua @@ -1,14 +1,27 @@ local resourceName = "okokGasStation" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading okokGasStation") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['okokGasStation']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel, type) if not DoesEntityExist(vehicle) then return end return exports['okokGasStation']:SetFuel(vehicle, fuel) diff --git a/modules/fuel/ox_fuel/client.lua b/modules/fuel/ox_fuel/client.lua index 730fe27..75da8d7 100644 --- a/modules/fuel/ox_fuel/client.lua +++ b/modules/fuel/ox_fuel/client.lua @@ -1,14 +1,27 @@ local resourceName = "ox_fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading ox_fuel") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return Entity(vehicle).state.fuel end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel, type) if not DoesEntityExist(vehicle) then return end local currentFuel = Entity(vehicle).state.fuel diff --git a/modules/fuel/ps-fuel/client.lua b/modules/fuel/ps-fuel/client.lua index 87ad695..310f484 100644 --- a/modules/fuel/ps-fuel/client.lua +++ b/modules/fuel/ps-fuel/client.lua @@ -1,14 +1,27 @@ local resourceName = "ps-fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading ps-fuel") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports["ps-fuel"]:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel, type) if not DoesEntityExist(vehicle) then return end return exports["ps-fuel"]:SetFuel(vehicle, fuel) diff --git a/modules/fuel/qs-fuelstations/client.lua b/modules/fuel/qs-fuelstations/client.lua index 40007f8..9a4f5d7 100644 --- a/modules/fuel/qs-fuelstations/client.lua +++ b/modules/fuel/qs-fuelstations/client.lua @@ -1,15 +1,28 @@ local resourceName = "qs-fuelstations" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading qs-fuelstations") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['qs-fuelstations']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end return exports['qs-fuelstations']:SetFuel(vehicle, fuel) -end +end \ No newline at end of file diff --git a/modules/fuel/renewed-Fuel/client.lua b/modules/fuel/renewed-Fuel/client.lua index 52cf8ac..ca6e225 100644 --- a/modules/fuel/renewed-Fuel/client.lua +++ b/modules/fuel/renewed-Fuel/client.lua @@ -1,14 +1,27 @@ local resourceName = "Renewed-Fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading Renewed-Fuel") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end return exports['Renewed-Fuel']:GetFuel(vehicle) end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel, type) if not DoesEntityExist(vehicle) then return end return exports['Renewed-Fuel']:SetFuel(vehicle, fuel) diff --git a/modules/fuel/ti_fuel/client.lua b/modules/fuel/ti_fuel/client.lua index 08779a8..253081c 100644 --- a/modules/fuel/ti_fuel/client.lua +++ b/modules/fuel/ti_fuel/client.lua @@ -1,15 +1,28 @@ local resourceName = "ti_fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading ti_fuel") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end local level, _ = exports["ti_fuel"]:getFuel(vehicle) return level end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end return exports['ti_fuel']:setFuel(vehicle, fuel, "RON91") diff --git a/modules/fuel/x-fuel/client.lua b/modules/fuel/x-fuel/client.lua index 0af0b38..6eeaba5 100644 --- a/modules/fuel/x-fuel/client.lua +++ b/modules/fuel/x-fuel/client.lua @@ -1,15 +1,28 @@ local resourceName = "x-fuel" local configValue = BridgeClientConfig.Fuel if (configValue == "auto" and GetResourceState(resourceName) ~= "started") or (configValue ~= "auto" and configValue ~= resourceName) then return end ---print("Fuel: Loading x-fuel") + Fuel = Fuel or {} +---This will get the name of the Fuel being used (if a supported Fuel). +---@return string +Fuel.GetFuelName = function() + return resourceName +end + +---This will get the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@return number fuel The fuel level of the vehicle. Fuel.GetFuel = function(vehicle) if not DoesEntityExist(vehicle) then return 0.0 end local level, _ = exports["x-fuel"]:getFuel(vehicle) return level end +---This will set the fuel level of the vehicle. +---@param vehicle number The vehicle entity ID. +---@param fuel number The fuel level to set. +---@return nil Fuel.SetFuel = function(vehicle, fuel) if not DoesEntityExist(vehicle) then return end return exports['x-fuel']:SetFuel(vehicle, fuel)