Merge pull request #501 from Mustachedom/main

- `refactor` Quality of life changes

Author: Qwerty1Verified

client/afk.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 local isLoggedIn = LocalPlayer.state.isLoggedIn
 local checkUser = true
 local prevPos, time = nil, nil

client/carwash.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 local washingVeh, listen = false, false
 local washPoly = {}
 

client/consumables.lua

@@ -1,6 +1,5 @@
 -- Variables
 
-local QBCore = exports['qb-core']:GetCoreObject()
 local alcoholCount = 0
 local healing, parachuteEquipped = false, false
 local currVest, currVestTexture = nil, nil

client/cruise.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 local vehicleClasses = {
     [0] = true,
     [1] = true,
@@ -31,9 +31,20 @@ local function triggerCruiseControl(veh)
         if speed > 0 and GetVehicleCurrentGear(veh) > 0 then
             speed = GetEntitySpeed(veh)
             local isTurningOrHandbraking = IsControlPressed(2, 76) or IsControlPressed(2, 63) or IsControlPressed(2, 64)
+            if GetResourceState('qb-fuel') == 'started' then
+                if exports['qb-fuel']:GetFuel(veh) <= 10 then
+                    QBCore.Functions.Notify(Lang:t('cruise.not_Enough_Fuel'), 'error')
+                    return
+                end
+            end
+            if GetResourceState('LegacyFuel') == 'started' then
+                if exports['LegacyFuel']:GetFuel(veh) <= 10 then
+                    QBCore.Functions.Notify(Lang:t('cruise.not_Enough_Fuel'), 'error')
+                    return
+                end
+            end
             TriggerEvent('seatbelt:client:ToggleCruise', true)
             QBCore.Functions.Notify(Lang:t('cruise.activated'))
-
             CreateThread(function()
                 while speed > 0 and GetPedInVehicleSeat(veh, -1) == ped do
                     Wait(0)
@@ -76,4 +87,4 @@ RegisterCommand('togglecruise', function()
     end
 end, false)
 
-RegisterKeyMapping('togglecruise', 'Toggle Cruise Control', 'keyboard', 'Y')
+RegisterKeyMapping('togglecruise', 'Toggle Cruise Control', 'keyboard', 'Y')

client/discord.lua

@@ -1,4 +1,3 @@
-local QBCore = exports['qb-core']:GetCoreObject()
 
 CreateThread(function()
     while Config.Discord.isEnabled do

client/fireworks.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 local fireworkTime = 0
 local fireworkLoc = nil
 local fireworkList = {
@@ -35,42 +35,20 @@ local fireworkList = {
     }
 }
 
-local function DrawText3D(x, y, z, text)
-    SetTextScale(0.35, 0.35)
-    SetTextFont(4)
-    SetTextProportional(true)
-    SetTextColour(255, 255, 255, 215)
-    BeginTextCommandDisplayText('STRING')
-    SetTextCentre(true)
-    AddTextComponentSubstringPlayerName(text)
-    SetDrawOrigin(x, y, z, 0)
-    EndTextCommandDisplayText(0.0, 0.0)
-    local factor = (string.len(text)) / 370
-    DrawRect(0.0, 0.0 + 0.0125, 0.017 + factor, 0.03, 0, 0, 0, 75)
-    ClearDrawOrigin()
-end
-
-local function fireworkText()
-    CreateThread(function()
-        while true do
-            Wait(0)
-            if fireworkTime > 0 and fireworkLoc then
-                DrawText3D(fireworkLoc.x, fireworkLoc.y, fireworkLoc.z, Lang:t('firework.time_left') .. fireworkTime)
-            end
-            if fireworkTime <= 0 then break end
-        end
-    end)
-end
 
 local function startFirework(asset, coords)
     fireworkTime = Config.Fireworks.delay
     fireworkLoc = { x = coords.x, y = coords.y, z = coords.z }
+    local pedCoords = GetEntityCoords(PlayerPedId())
     CreateThread(function()
-        fireworkText()
         while fireworkTime > 0 do
+            if #(pedCoords - vector3(coords.x, coords.y, coords.z)) < 50.0 then
+               exports['qb-core']:DrawText(Lang:t('firework.time_left') .. ' ' .. fireworkTime)
+            end
             Wait(1000)
             fireworkTime -= 1
         end
+        exports['qb-core']:HideText()
         UseParticleFxAssetNextCall('scr_indep_fireworks')
         for _ = 1, math.random(5, 10), 1 do
             local firework = fireworkList[asset][math.random(1, #fireworkList[asset])]

client/seatbelt.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 local seatbeltOn = false
 local harnessOn = false
 local harnessHp = Config.HarnessUses

client/tackle.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 
 local function tackleAnim()
     local ped = PlayerPedId()

client/vehiclepush.lua

@@ -66,6 +66,10 @@ CreateThread(function()
                 icon = 'fas fa-wrench',
                 label = 'Push Vehicle',
                 action = function(entity)
+                    if GetEntityHealth(entity) > Config.DamageNeeded then
+                        QBCore.Functions.Notify(Lang:t('pushcar.notDamaged'), 'error')
+                        return
+                    end
                     TriggerEvent('vehiclepush:client:push', entity)
                 end,
                 distance = 1.3

client/vehicletext.lua

@@ -1,4 +1,4 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+
 
 CreateThread(function()
     for _, v in pairs(QBCore.Shared.Vehicles) do