refactor: utils to lib and proper function casing

client/admin.lua

@@ -250,7 +250,7 @@ lib.registerMenu({
     title = locale('title.admin_menu'),
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
+        CloseMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_admin_menu = selected

client/dev.lua

@@ -10,7 +10,14 @@ local options = {
         showCoords = not showCoords
         while showCoords do
             local coords, heading = GetEntityCoords(cache.ped), GetEntityHeading(cache.ped)
-            DrawText2D(string.format('~o~vector4~w~(%s, %s, %s, %s)', math.round(coords.x, 2), math.round(coords.y, 2), math.round(coords.z, 2), math.round(heading, 2)), vec2(1.0, 0.5), 1.0, 1.0, 0.5, 6, 255, 255, 255)
+
+            qbx.drawText2d({
+                text = ('~o~vector4~w~(%s, %s, %s, %s)'):format(qbx.math.round(coords.x, 2), qbx.math.round(coords.y, 2), qbx.math.round(coords.z, 2), qbx.math.round(heading, 2)),
+                coords = vec2(1.0, 0.5),
+                scale = 0.5,
+                font = 6
+            })
+
             Wait(0)
         end
     end,
@@ -22,10 +29,30 @@ local options = {
                 local oil, angle, body, class = GetVehicleOilLevel(cache.vehicle), GetVehicleSteeringAngle(cache.vehicle), GetVehicleBodyHealth(cache.vehicle), vehicleTypes[GetVehicleClass(cache.vehicle)]
                 local dirt, maxSpeed, netId, hash = GetVehicleDirtLevel(cache.vehicle), GetVehicleEstimatedMaxSpeed(cache.vehicle), VehToNet(cache.vehicle), GetEntityModel(cache.vehicle)
                 local name = GetLabelText(GetDisplayNameFromVehicleModel(hash))
-                DrawText2D(string.format('~o~Clutch: ~w~ %s | ~o~Gear: ~w~ %s | ~o~Rpm: ~w~ %s | ~o~Temperature: ~w~ %s', math.round(clutch, 4), gear, math.round(rpm, 4), temperature), vec2(1.0, 0.575), 1.0, 1.0, 0.45, 6, 255, 255, 255)
-                DrawText2D(string.format('~o~Oil: ~w~ %s | ~o~Steering Angle: ~w~ %s | ~o~Body: ~w~ %s | ~o~Class: ~w~ %s', math.round(oil, 4), math.round(angle, 4), math.round(body, 4), class), vec2(1.0, 0.600), 1.0, 1.0, 0.45, 6, 255, 255, 255)
-                DrawText2D(string.format('~o~Dirt: ~w~ %s | ~o~Est Max Speed: ~w~ %s | ~o~Net ID: ~w~ %s | ~o~Hash: ~w~ %s', math.round(dirt, 4), math.round(maxSpeed, 4) * 3.6, netId, hash), vec2(1.0, 0.625), 1.0, 1.0, 0.45, 6, 255, 255, 255)
-                DrawText2D(string.format('~o~Vehicle Name: ~w~ %s', name), vec2(1.0, 0.650), 1.0, 1.0, 0.45, 6, 255, 255, 255)
+                qbx.drawText2d({
+                    text = ('~o~Clutch: ~w~ %s | ~o~Gear: ~w~ %s | ~o~Rpm: ~w~ %s | ~o~Temperature: ~w~ %s'):format(qbx.math.round(clutch, 4), gear, qbx.math.round(rpm, 4), temperature),
+                    coords = vec2(1.0, 0.575),
+                    scale = 0.45,
+                    font = 6
+                })
+                qbx.drawText2d({
+                    text = ('~o~Oil: ~w~ %s | ~o~Steering Angle: ~w~ %s | ~o~Body: ~w~ %s | ~o~Class: ~w~ %s'):format(qbx.math.round(oil, 4), qbx.math.round(angle, 4), qbx.math.round(body, 4), class),
+                    coords = vec2(1.0, 0.600),
+                    scale = 0.45,
+                    font = 6
+                })
+                qbx.drawText2d({
+                    text = ('~o~Dirt: ~w~ %s | ~o~Est Max Speed: ~w~ %s | ~o~Net ID: ~w~ %s | ~o~Hash: ~w~ %s'):format(qbx.math.round(dirt, 4), qbx.math.round(maxSpeed, 4) * 3.6, netId, hash),
+                    coords = vec2(1.0, 0.625),
+                    scale = 0.45,
+                    font = 6
+                })
+                qbx.drawText2d({
+                    text = ('~o~Vehicle Name: ~w~ %s'):format(name),
+                    coords = vec2(1.0, 0.650),
+                    scale = 0.45,
+                    font = 6
+                })
                 Wait(0)
             else
                 Wait(800)
@@ -39,7 +66,7 @@ lib.registerMenu({
     title = locale('title.dev_menu'),
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
+        CloseMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_dev_menu = selected

client/main.lua

@@ -5,7 +5,7 @@ lib.registerMenu({
     title = locale('title.main_menu'),
     position = 'top-right',
     onClose = function()
-        closeMenu(true)
+        CloseMenu(true)
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_main_menu = selected
@@ -25,7 +25,7 @@ lib.registerMenu({
     end
 end)
 
-function closeMenu(isFullMenuClose, keyPressed, previousMenu)
+function CloseMenu(isFullMenuClose, keyPressed, previousMenu)
     if isFullMenuClose or not keyPressed or keyPressed == 'Escape' then
         lib.hideMenu(false)
         return

client/player.lua

@@ -143,7 +143,7 @@ function GeneratePlayersMenu()
         title = locale('title.players_menu'),
         position = 'top-right',
         onClose = function(keyPressed)
-            closeMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
+            CloseMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
         end,
         onSelected = function(selected)
             MenuIndexes.qbx_adminmenu_players_menu = selected
@@ -160,7 +160,7 @@ function GeneratePlayersMenu()
             title = player.name,
             position = 'top-right',
             onClose = function(keyPressed)
-                closeMenu(false, keyPressed, 'qbx_adminmenu_players_menu')
+                CloseMenu(false, keyPressed, 'qbx_adminmenu_players_menu')
             end,
             onSelected = function(selected)
                 MenuIndexes[('qbx_adminmenu_player_menu_%s'):format(args[1].id)] = selected
@@ -200,7 +200,7 @@ lib.registerMenu({
     title = locale('player_options.label1'),
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, ('qbx_adminmenu_player_menu_%s'):format(selectedPlayer?.id))
+        CloseMenu(false, keyPressed, ('qbx_adminmenu_player_menu_%s'):format(selectedPlayer?.id))
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_player_general_menu = selected
@@ -232,7 +232,7 @@ lib.registerMenu({
     title = locale('player_options.label2'),
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, ('qbx_adminmenu_player_menu_%s'):format(selectedPlayer?.id))
+        CloseMenu(false, keyPressed, ('qbx_adminmenu_player_menu_%s'):format(selectedPlayer?.id))
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_player_administration_menu = selected
@@ -270,7 +270,7 @@ lib.registerMenu({
     title = locale('player_options.label2'),
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, ('qbx_adminmenu_player_menu_%s'):format(selectedPlayer?.id))
+        CloseMenu(false, keyPressed, ('qbx_adminmenu_player_menu_%s'):format(selectedPlayer?.id))
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_player_extra_menu = selected

client/server.lua

@@ -26,7 +26,7 @@ lib.registerMenu({
     title = locale('title.server_menu'),
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
+        CloseMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_server_menu = selected

client/vectors.lua

@@ -1,8 +1,8 @@
 function CopyToClipboard(dataType)
     local coords = GetEntityCoords(cache.ped)
-    local x, y, z = math.round(coords.x, 2), math.round(coords.y, 2), math.round(coords.z, 2)
+    local x, y, z = qbx.math.round(coords.x, 2), qbx.math.round(coords.y, 2), qbx.math.round(coords.z, 2)
     local heading = GetEntityHeading(cache.ped)
-    local h = math.round(heading, 2)
+    local h = qbx.math.round(heading, 2)
 
     local data
     local message

client/vehicle.lua

@@ -28,14 +28,14 @@ function GenerateVehiclesSpawnMenu()
     end)
 
     for i = 1, #categories do
-        lib.setMenuOptions('qbx_adminmenu_spawn_vehicles_menu', {label = string.firstToUpper(categories[i]), args = {('qbx_adminmenu_spawn_vehicles_menu_%s'):format(categories[i])}}, i)
+        lib.setMenuOptions('qbx_adminmenu_spawn_vehicles_menu', {label = qbx.string.capitalize(categories[i]), args = {('qbx_adminmenu_spawn_vehicles_menu_%s'):format(categories[i])}}, i)
 
         lib.registerMenu({
             id = ('qbx_adminmenu_spawn_vehicles_menu_%s'):format(categories[i]),
             title = categories[i],
             position = 'top-right',
             onClose = function(keyPressed)
-                closeMenu(false, keyPressed, 'qbx_adminmenu_spawn_vehicles_menu')
+                CloseMenu(false, keyPressed, 'qbx_adminmenu_spawn_vehicles_menu')
             end,
             onSelected = function(selected)
                 MenuIndexes[('qbx_adminmenu_spawn_vehicles_menu_%s'):format(categories[i])] = selected
@@ -49,7 +49,7 @@ function GenerateVehiclesSpawnMenu()
                 veh = NetToVeh(vehNetId)
                 Wait(100)
             until DoesEntityExist(veh)
-            TriggerEvent('qb-vehiclekeys:client:AddKeys', GetPlate(veh))
+            TriggerEvent('qb-vehiclekeys:client:AddKeys', qbx.getVehiclePlate(veh))
             SetVehicleNeedsToBeHotwired(veh, false)
             SetVehicleHasBeenOwnedByPlayer(veh, true)
             SetEntityAsMissionEntity(veh, true, false)
@@ -86,7 +86,7 @@ lib.registerMenu({
     title = 'Vehicles',
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
+        CloseMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_vehicles_menu = selected
@@ -165,7 +165,7 @@ lib.registerMenu({
     title = 'Spawn Vehicle',
     position = 'top-right',
     onClose = function(keyPressed)
-        closeMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
+        CloseMenu(false, keyPressed, 'qbx_adminmenu_main_menu')
     end,
     onSelected = function(selected)
         MenuIndexes.qbx_adminmenu_spawn_vehicles_menu = selected

fxmanifest.lua

@@ -9,7 +9,7 @@ ox_lib 'locale'
 
 shared_scripts {
     '@ox_lib/init.lua',
-    '@qbx_core/modules/utils.lua',
+    '@qbx_core/modules/lib.lua',
 }
 
 server_scripts {

server/main.lua

@@ -222,6 +222,15 @@ lib.callback.register('qbx_admin:server:canUseMenu', function(source)
 end)
 
 lib.callback.register('qbx_admin:server:spawnVehicle', function(source, model)
-    local hash = joaat(model)
-    return SpawnVehicle(source, hash, nil, true)
+    local ped = GetPlayerPed(source)
+    local netId = qbx.spawnVehicle({
+        model = model,
+        spawnSource = ped,
+        warp = true,
+    })
+
+    local plate = qbx.getVehiclePlate(NetworkGetEntityFromNetworkId(netId))
+
+    exports.qbx_vehiclekeys:GiveKeys(source, plate)
+    return netId
 end)