refactor: switch from utils to lib

.vscode/settings.json

@@ -1,6 +1,9 @@
 {
     "Lua.diagnostics.globals": [
         "cache",
-        "lib"
+        "lib",
+        "MySQL",
+        "QBX",
+        "qbx"
     ]
 }

client/anpr.lua

@@ -18,7 +18,7 @@ end
 
 local function handleSpeedCam(speedCam, radar)
 	if not cache.vehicle or cache.seat ~= -1 or GetVehicleClass(cache.vehicle) == 18 then return end
-	local plate = GetPlate(cache.vehicle)
+	local plate =  qbx.getVehiclePlate(cache.vehicle)
 	local speed = GetEntitySpeed(cache.vehicle) * (config.useMPH and 2.236936 or 3.6)
 	local overLimit = speed - speedCam.speed
 

client/camera.lua

@@ -79,7 +79,6 @@ local function closeSecurityCamera()
     FreezeEntityPosition(cache.ped, false)
 end
 
--- Events
 RegisterNetEvent('police:client:ActiveCamera', function(camId)
     if GetInvokingResource() then return end
     if config.cameras[camId] then
@@ -198,7 +197,6 @@ local function listenForCamControls()
     end
 end
 
--- Threads
 CreateThread(function()
     while true do
         if createdCam == 0 or currentScaleform == -1 then

client/evidence.lua

@@ -1,4 +1,3 @@
--- Variables
 local config = require 'config.client'
 local currentStatusList = {}
 local casings = {}
@@ -50,7 +49,6 @@ local function dnaHash(s)
     return h
 end
 
--- Events
 RegisterNetEvent('evidence:client:SetStatus', function(statusId, time)
     if time > 0 and statusList[statusId] then
         if not currentStatusList?[statusId] or currentStatusList[statusId].time < 20 then
@@ -167,8 +165,6 @@ RegisterNetEvent('evidence:client:ClearCasingsInArea', function()
     end
 end)
 
--- Threads
-
 local function updateStatus()
     if not IsLoggedIn then return end
     if currentStatusList and next(currentStatusList) then
@@ -241,7 +237,7 @@ end
 ---@param args DrawEvidenceIfInRangeArgs
 local function drawEvidenceIfInRange(args)
     if getPlayerDistanceFromCoords(args.coords) >= 1.5 then return end
-    DrawText3D(args.text, args.coords)
+    qbx.drawText3d({text = args.text, coords = args.coords})
     if IsControlJustReleased(0, 47) then
         TriggerServerEvent(args.serverEventOnPickup, args.evidenceId, args.metadata)
     end

client/heli.lua

@@ -114,7 +114,7 @@ local function renderVehicleInfo(vehicle)
     local pos = GetEntityCoords(vehicle)
     local model = GetEntityModel(vehicle)
     local vehName = GetLabelText(GetDisplayNameFromVehicleModel(model))
-    local licensePlate = GetPlate(vehicle)
+    local licensePlate = qbx.getVehiclePlate(vehicle)
     local speed = math.ceil(GetEntitySpeed(vehicle) * 3.6)
     local street1, street2 = GetStreetNameAtCoord(pos.x, pos.y, pos.z)
     local streetLabel = GetStreetNameFromHashKey(street1)

client/interactions.lua

@@ -1,8 +1,6 @@
--- Variables
 local config = require 'config.client'
 local isEscorting = false
 
--- Functions
 exports('IsHandcuffed', function()
     return QBX.PlayerData.metadata.ishandcuffed
 end)
@@ -92,7 +90,7 @@ end
 local function handcuffedEscorted()
     local sleep = 1000
     local anim = {{dict = 'mp_arresting', anim = 'idle'}, {dict = 'mp_arrest_paired', anim = 'crook_p2_back_right'}}
-    
+
     if not IsLoggedIn then return sleep end
     if isEscorted then
         sleep = 0
@@ -111,7 +109,6 @@ local function handcuffedEscorted()
     return sleep
 end
 
--- Events
 RegisterNetEvent('police:client:SetOutVehicle', function()
     if not cache.vehicle then return end
     TaskLeaveVehicle(cache.ped, cache.vehicle, 16)
@@ -120,7 +117,8 @@ end)
 RegisterNetEvent('police:client:PutInVehicle', function()
     if not QBX.PlayerData.metadata.ishandcuffed and not isEscorted then return end
 
-    local vehicle = exports.qbx_core:GetClosestVehicle()
+    local coords = GetEntityCoords(cache.ped)
+    local vehicle = lib.getClosestVehicle(coords)
     if not DoesEntityExist(vehicle) then return end
 
     for i = GetVehicleMaxNumberOfPassengers(vehicle), 0, -1 do
@@ -149,24 +147,26 @@ local function isTooFar(player, distance, maxDistance)
 end
 
 RegisterNetEvent('police:client:SearchPlayer', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     local playerId = GetPlayerServerId(player)
     exports.ox_inventory:openNearbyInventory()
     TriggerServerEvent('police:server:SearchPlayer', playerId)
 end)
 
 RegisterNetEvent('police:client:SeizeCash', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     local playerId = GetPlayerServerId(player)
     TriggerServerEvent('police:server:SeizeCash', playerId)
 end)
 
 RegisterNetEvent('police:client:RobPlayer', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, playerPed, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
-    local playerPed = GetPlayerPed(player)
     local playerId = GetPlayerServerId(player)
     if not (IsEntityPlayingAnim(playerPed, 'missminuteman_1ig_2', 'handsup_base', 3) or IsEntityPlayingAnim(playerPed, 'mp_arresting', 'idle', 3) or isTargetDead(playerId)) then
         exports.qbx_core:Notify(Lang:t('error.no_rob'), 'error')
@@ -207,7 +207,8 @@ RegisterNetEvent('police:client:RobPlayer', function()
 end)
 
 RegisterNetEvent('police:client:JailPlayer', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     local playerId = GetPlayerServerId(player)
     local dialog = lib.inputDialog(Lang:t('info.jail_time_input'), {
@@ -221,7 +222,8 @@ RegisterNetEvent('police:client:JailPlayer', function()
 end)
 
 RegisterNetEvent('police:client:BillPlayer', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     local playerId = GetPlayerServerId(player)
     local dialog = lib.inputDialog(Lang:t('info.bill'), {
@@ -235,7 +237,8 @@ RegisterNetEvent('police:client:BillPlayer', function()
 end)
 
 local function triggerIfHandsFree(eventName)
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     local playerId = GetPlayerServerId(player)
     if QBX.PlayerData.metadata.ishandcuffed or isEscorted then return end
@@ -255,7 +258,8 @@ RegisterNetEvent('police:client:EscortPlayer', function()
 end)
 
 RegisterNetEvent('police:client:KidnapPlayer', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     local playerId = GetPlayerServerId(player)
     if IsPedInAnyVehicle(GetPlayerPed(player), false) or QBX.PlayerData.metadata.ishandcuffed or isEscorted then return end
@@ -264,7 +268,8 @@ end)
 
 RegisterNetEvent('police:client:CuffPlayerSoft', function()
     if IsPedRagdoll(cache.ped) then return end
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance, 1.5) then return end
     local playerId = GetPlayerServerId(player)
     if IsPedInAnyVehicle(GetPlayerPed(player), false) or cache.vehicle then
@@ -277,8 +282,8 @@ end)
 
 RegisterNetEvent('police:client:CuffPlayer', function()
     if IsPedRagdoll(cache.ped) then return end
-
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if isTooFar(player, distance) then return end
     if exports.ox_inventory:Search('count', config.handcuffItems) == 0 then
         exports.qbx_core:Notify(Lang:t('error.no_cuff'), 'error')
@@ -372,7 +377,6 @@ RegisterNetEvent('police:client:GetCuffed', function(playerId, isSoftcuff)
     end
 end)
 
--- Threads
 CreateThread(function()
     while true do
         Wait(handcuffedEscorted())

client/job.lua

@@ -1,4 +1,3 @@
--- Variables
 local config = require 'config.client'
 local sharedConfig = require 'config.shared'
 local currentGarage = 0
@@ -119,13 +118,12 @@ local function takeOutVehicle(vehicleInfo)
     SetVehicleFuelLevel(veh, 100.0)
     if config.vehicleSettings[vehicleInfo] then
         if config.vehicleSettings[vehicleInfo].extras then
-            SetVehicleExtras(veh, config.vehicleSettings[vehicleInfo].extras)
+            qbx.setVehicleExtras(veh, config.vehicleSettings[vehicleInfo].extras)
         end
         if config.vehicleSettings[vehicleInfo].livery then
             SetVehicleLivery(veh, config.vehicleSettings[vehicleInfo].livery)
         end
     end
-    TriggerServerEvent('inventory:server:addTrunkItems', GetPlate(veh), config.carItems)
     SetVehicleEngineOn(veh, true, true, false)
 end
 
@@ -167,7 +165,7 @@ local function openImpoundMenu()
     else
         local vehicles = exports.qbx_core:GetVehiclesByName()
         for _, v in pairs(result) do
-            local enginePercent = math.round(v.engine / 10, 0)
+            local enginePercent = qbx.math.round(v.engine / 10, 0)
             local currentFuel = v.fuel
             local vName = vehicles[v.vehicle].name
 
@@ -307,13 +305,11 @@ local function uiPrompt(promptType, id)
     end)
 end
 
---NUI Callbacks
 RegisterNUICallback('closeFingerprint', function(_, cb)
     SetNuiFocus(false, false)
     cb('ok')
 end)
 
---Events
 RegisterNetEvent('police:client:showFingerprint', function(playerId)
     openFingerprintUi()
     fingerprintSessionId = playerId
@@ -360,7 +356,8 @@ RegisterNetEvent('police:client:CallAnim', function()
 end)
 
 RegisterNetEvent('police:client:ImpoundVehicle', function(fullImpound, price)
-    local vehicle = GetClosestVehicle()
+    local coords = GetEntityCoords(cache.ped)
+    local vehicle = lib.getClosestVehicle(coords)
     if not DoesEntityExist(vehicle) then return end
 
     local bodyDamage = math.ceil(GetVehicleBodyHealth(vehicle))
@@ -402,7 +399,7 @@ RegisterNetEvent('police:client:ImpoundVehicle', function(fullImpound, price)
         },
     })
     then
-        local plate = GetPlate(vehicle)
+        local plate = qbx.getVehiclePlate(vehicle)
         TriggerServerEvent('police:server:Impound', plate, fullImpound, price, bodyDamage, engineDamage, totalFuel)
         DeleteVehicle(vehicle)
         exports.qbx_core:Notify(Lang:t('success.impounded'), 'success')
@@ -433,8 +430,6 @@ function ToggleDuty()
     TriggerServerEvent('police:server:UpdateCurrentCops')
 end
 
--- Threads
-
 if config.useTarget then
     CreateThread(function()
         for i = 1, #sharedConfig.locations.duty do

client/main.lua

@@ -1,12 +1,9 @@
 local config = require 'config.shared'
-
--- Variables
 cuffType = 1
 isEscorted = false
 IsLoggedIn = LocalPlayer.state.isLoggedIn
 local dutyBlips = {}
 
--- Functions
 local function CreateDutyBlips(playerId, playerLabel, playerJob, playerLocation)
     local ped = GetPlayerPed(playerId)
     local blip = GetBlipFromEntity(ped)
@@ -38,7 +35,6 @@ local function CreateDutyBlips(playerId, playerLabel, playerJob, playerLocation)
     end
 end
 
--- Events
 AddEventHandler('QBCore:Client:OnPlayerLoaded', function()
     TriggerServerEvent('police:server:SetHandcuffStatus', false)
     TriggerServerEvent('police:server:UpdateCurrentCops')
@@ -189,8 +185,6 @@ RegisterNetEvent('police:client:SendPoliceEmergencyAlert', function()
     TriggerServerEvent('hospital:server:ambulanceAlert', Lang:t('info.officer_down', {lastname = QBX.PlayerData.charinfo.lastname, callsign = QBX.PlayerData.metadata.callsign}))
 end)
 
--- Threads
-
 CreateThread(function()
     for _, station in pairs(config.locations.stations) do
         local blip = AddBlipForCoord(station.coords.x, station.coords.y, station.coords.z)

client/objects.lua

@@ -142,7 +142,6 @@ RegisterNetEvent('police:client:SyncSpikes', function(table)
     spawnedSpikes = table
 end)
 
--- Threads
 CreateThread(function()
     while true do
         if IsLoggedIn then

client/tracker.lua

@@ -1,5 +1,6 @@
 RegisterNetEvent('police:client:CheckDistance', function()
-    local player, distance = GetClosestPlayer()
+    local coords = GetEntityCoords(cache.ped)
+    local player, _, distance = lib.getClosestPlayer(coords)
     if player ~= -1 and distance < 2.5 then
         local playerId = GetPlayerServerId(player)
         TriggerServerEvent('police:server:SetTracker', playerId)

fxmanifest.lua

@@ -7,7 +7,7 @@ version '1.0.0'
 
 shared_scripts {
     '@ox_lib/init.lua',
-    '@qbx_core/modules/utils.lua',
+    '@qbx_core/modules/lib.lua',
     '@qbx_core/shared/locale.lua',
     'locales/en.lua',
     'locales/*.lua',

server/commands.lua

@@ -223,7 +223,6 @@ lib.addCommand('flagplate', {
         isflagged = true,
         reason = table.concat(reason, ' ')
     }
-    TriggerClientEvent('ox_lib:notify', source, {description = Lang:t('info.vehicle_flagged', {vehicle = args[1]:upper(), reason = table.concat(reason, ' ')})})
     exports.qbx_core:Notify(source, Lang:t('info.vehicle_flagged', {vehicle = args[1]:upper(), reason = table.concat(reason, ' ')}), 'inform')
 end)
 

server/main.lua

@@ -97,7 +97,7 @@ lib.callback.register('police:GetImpoundedVehicles', function()
 end)
 
 lib.callback.register('qbx_policejob:server:spawnVehicle', function(source, model, coords, plate, warp)
-    local netId = SpawnVehicle(source, model, coords, warp)
+    local netId = qbx.spawnVehicle({spawnSource = source, model = model, coords = coords, warp = warp})
     if not netId or netId == 0 then return end
     local veh = NetworkGetEntityFromNetworkId(netId)
     if not veh or veh == 0 then return end
@@ -241,7 +241,7 @@ RegisterNetEvent('police:server:SetPlayerOutVehicle', function(playerId)
     if not exports.qbx_core:GetPlayer(src) or not escortPlayer then return end
 
     if escortPlayer.PlayerData.metadata.ishandcuffed or escortPlayer.PlayerData.metadata.isdead or escortPlayer.PlayerData.metadata.inlaststand then
-        
+
         TriggerClientEvent('police:client:SetOutVehicle', escortPlayer.PlayerData.source)
     else
         exports.qbx_core:Notify(src, Lang:t('error.not_cuffed_dead'), 'error')