From 1461983069898f1a14262841444c1427b3bb512b Mon Sep 17 00:00:00 2001
From: Mohab <mohabcodex@gmail.com>
Date: Mon, 28 Jul 2025 15:22:58 +0300
Subject: [PATCH 1/3] feat: GUI vehicle test spawning

---
 [examples]/test_vehicles/c_test_gui.lua | 69 +++++++++++++++++++++++++
 [examples]/test_vehicles/meta.xml       |  1 +
 [examples]/test_vehicles/s_test_cmd.lua | 21 ++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 [examples]/test_vehicles/c_test_gui.lua

diff --git a/[examples]/test_vehicles/c_test_gui.lua b/[examples]/test_vehicles/c_test_gui.lua
new file mode 100644
index 0000000..874e674
--- /dev/null
+++ b/[examples]/test_vehicles/c_test_gui.lua
@@ -0,0 +1,69 @@
+local screenW, screenH = guiGetScreenSize()
+
+local windowW, windowH = 300, 200
+local windowX, windowY = (screenW - windowW) / 2, (screenH - windowH) / 2
+local window = guiCreateWindow(windowX, windowY, windowW, windowH, "Vehicle Spawner", false)
+
+local label = guiCreateLabel(20, 40, 260, 30, "Enter Vehicle ID:", false, window)
+guiLabelSetHorizontalAlign(label, "center")
+
+local input = guiCreateEdit(50, 70, 200, 30, "", false, window)
+
+local spawnButton = guiCreateButton(50, 120, 200, 40, "Spawn Vehicle", false, window)
+
+guiSetVisible(window, false)
+
+function requestVehicleSpawn()
+    local vehicleIDText = guiGetText(input)
+    local vehicleID = tonumber(vehicleIDText)
+
+    if not vehicleID then
+        outputChatBox("Error: Please enter a valid number!", 255, 0, 0)
+        return
+    end
+
+    local x, y, z = getElementPosition(localPlayer)
+    local rot = getPedRotation(localPlayer)
+
+    local offsetDistance = 5
+    local spawnX = x + offsetDistance * math.sin(math.rad(-rot))
+    local spawnY = y + offsetDistance * math.cos(math.rad(-rot))
+
+    guiSetVisible(window, false)
+    showCursor(false)
+
+    guiSetText(input, "")
+    triggerServerEvent("spawnVehicleServer", resourceRoot, localPlayer, vehicleID, spawnX, spawnY, z, rot)
+end
+
+addEventHandler("onClientGUIClick", spawnButton, requestVehicleSpawn, false)
+
+addEvent("vehicleSpawnResult", true)
+addEventHandler("vehicleSpawnResult", localPlayer, function(success, message)
+    if success then
+        outputChatBox(message, 0, 255, 0)
+    else
+        outputChatBox(message, 255, 0, 0)
+    end
+end)
+
+function onInputEnter()
+    if source == input then
+        requestVehicleSpawn()
+    end
+end
+
+addEventHandler("onClientGUIAccepted", input, onInputEnter)
+
+function toggleGUI()
+    local visible = guiGetVisible(window)
+    guiSetVisible(window, not visible)
+    showCursor(not visible)
+
+    if not visible then
+        guiBringToFront(input)
+        guiFocus(input)
+    end
+end
+
+bindKey("F4", "down", toggleGUI)
diff --git a/[examples]/test_vehicles/meta.xml b/[examples]/test_vehicles/meta.xml
index 3815a66..8bbf630 100644
--- a/[examples]/test_vehicles/meta.xml
+++ b/[examples]/test_vehicles/meta.xml
@@ -3,6 +3,7 @@
     <script src="s_vehicles.lua" type="server"/>
     <script src="s_vehicles_alt.lua" type="server"/>
     <script src="s_test_cmd.lua" type="server"/>
+    <script src="c_test_gui.lua" type="client"/>
     <aclrequest>
         <right name="function.loadstring" access="true"/>
     </aclrequest>
diff --git a/[examples]/test_vehicles/s_test_cmd.lua b/[examples]/test_vehicles/s_test_cmd.lua
index e5d84a3..73ee240 100644
--- a/[examples]/test_vehicles/s_test_cmd.lua
+++ b/[examples]/test_vehicles/s_test_cmd.lua
@@ -19,3 +19,24 @@ addCommandHandler("myvehicle", function(player)
         outputChatBox("This vehicle has the custom model ID " .. customModel .. ", which is based on the default model ID " .. baseModel .. " ("..(tostring(getVehicleNameFromModel(baseModel)) or "")..")", player, 0, 255, 0)
     end
 end, false, false)
+
+addEvent("spawnVehicleServer", true)
+addEventHandler("spawnVehicleServer", resourceRoot, function(player, vehicleID, x, y, z, rot)
+    
+    local customModels = exports['newmodels_azul']:getCustomModels()
+    local isValidCustomModel = customModels[vehicleID] and true or false
+    local isValidDefaultID = exports['newmodels_azul']:isDefaultID("vehicle", vehicleID)
+    
+    if not isValidCustomModel and not isValidDefaultID then
+        triggerClientEvent(player, "vehicleSpawnResult", player, false, "Invalid ID")
+        return
+    end
+    
+    local vehicle = exports['newmodels_azul']:createVehicle(vehicleID, x, y, z, 0, 0, rot)
+    
+    if isElement(vehicle) then
+        triggerClientEvent(player, "vehicleSpawnResult", player, true, "Vehicle spawned")
+    else
+        triggerClientEvent(player, "vehicleSpawnResult", player, false, "Failed")
+    end
+end)

From bc252d42ea02103fae4abcbfd74b8133f4a399e9 Mon Sep 17 00:00:00 2001
From: Mohab <mohabcodex@gmail.com>
Date: Mon, 28 Jul 2025 17:02:29 +0300
Subject: [PATCH 2/3] refactor: streamline vehicle spawn handling

---
 [examples]/test_vehicles/c_test_gui.lua | 24 +++++++++++++-----------
 [examples]/test_vehicles/s_test_cmd.lua | 10 +++++-----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/[examples]/test_vehicles/c_test_gui.lua b/[examples]/test_vehicles/c_test_gui.lua
index 874e674..d1214dc 100644
--- a/[examples]/test_vehicles/c_test_gui.lua
+++ b/[examples]/test_vehicles/c_test_gui.lua
@@ -13,10 +13,7 @@ local spawnButton = guiCreateButton(50, 120, 200, 40, "Spawn Vehicle", false, wi
 
 guiSetVisible(window, false)
 
-function requestVehicleSpawn()
-    local vehicleIDText = guiGetText(input)
-    local vehicleID = tonumber(vehicleIDText)
-
+function spawnVehicleByID(vehicleID)
     if not vehicleID then
         outputChatBox("Error: Please enter a valid number!", 255, 0, 0)
         return
@@ -24,22 +21,25 @@ function requestVehicleSpawn()
 
     local x, y, z = getElementPosition(localPlayer)
     local rot = getPedRotation(localPlayer)
-
     local offsetDistance = 5
     local spawnX = x + offsetDistance * math.sin(math.rad(-rot))
     local spawnY = y + offsetDistance * math.cos(math.rad(-rot))
+    
+    triggerServerEvent("newmodels-test_vehicles:requestVehicleSpawn", resourceRoot, localPlayer, vehicleID, spawnX, spawnY, z, rot)
+end
 
+function requestVehicleSpawn()
+    local vehicleID = tonumber(guiGetText(input))
+    spawnVehicleByID(vehicleID)
     guiSetVisible(window, false)
     showCursor(false)
-
     guiSetText(input, "")
-    triggerServerEvent("spawnVehicleServer", resourceRoot, localPlayer, vehicleID, spawnX, spawnY, z, rot)
 end
 
 addEventHandler("onClientGUIClick", spawnButton, requestVehicleSpawn, false)
 
-addEvent("vehicleSpawnResult", true)
-addEventHandler("vehicleSpawnResult", localPlayer, function(success, message)
+addEvent("newmodels-test_vehicles:vehicleSpawnResponse", true)
+addEventHandler("newmodels-test_vehicles:vehicleSpawnResponse", localPlayer, function(success, message)
     if success then
         outputChatBox(message, 0, 255, 0)
     else
@@ -55,7 +55,7 @@ end
 
 addEventHandler("onClientGUIAccepted", input, onInputEnter)
 
-function toggleGUI()
+function toggleSpawnerGUI()
     local visible = guiGetVisible(window)
     guiSetVisible(window, not visible)
     showCursor(not visible)
@@ -66,4 +66,6 @@ function toggleGUI()
     end
 end
 
-bindKey("F4", "down", toggleGUI)
+bindKey("F4", "down", toggleSpawnerGUI)
+addCommandHandler("vspawner", toggleSpawnerGUI, false)
+addCommandHandler("spawnveh", function(cmd, id) spawnVehicleByID(tonumber(id)) end, false)
diff --git a/[examples]/test_vehicles/s_test_cmd.lua b/[examples]/test_vehicles/s_test_cmd.lua
index 73ee240..dc1ebc9 100644
--- a/[examples]/test_vehicles/s_test_cmd.lua
+++ b/[examples]/test_vehicles/s_test_cmd.lua
@@ -20,23 +20,23 @@ addCommandHandler("myvehicle", function(player)
     end
 end, false, false)
 
-addEvent("spawnVehicleServer", true)
-addEventHandler("spawnVehicleServer", resourceRoot, function(player, vehicleID, x, y, z, rot)
+addEvent("newmodels-test_vehicles:requestVehicleSpawn", true)
+addEventHandler("newmodels-test_vehicles:requestVehicleSpawn", resourceRoot, function(player, vehicleID, x, y, z, rot)
     
     local customModels = exports['newmodels_azul']:getCustomModels()
     local isValidCustomModel = customModels[vehicleID] and true or false
     local isValidDefaultID = exports['newmodels_azul']:isDefaultID("vehicle", vehicleID)
     
     if not isValidCustomModel and not isValidDefaultID then
-        triggerClientEvent(player, "vehicleSpawnResult", player, false, "Invalid ID")
+        triggerClientEvent(player, "newmodels-test_vehicles:vehicleSpawnResponse", player, false, "Invalid ID")
         return
     end
     
     local vehicle = exports['newmodels_azul']:createVehicle(vehicleID, x, y, z, 0, 0, rot)
     
     if isElement(vehicle) then
-        triggerClientEvent(player, "vehicleSpawnResult", player, true, "Vehicle spawned")
+        triggerClientEvent(player, "newmodels-test_vehicles:vehicleSpawnResponse", player, true, "Vehicle spawned")
     else
-        triggerClientEvent(player, "vehicleSpawnResult", player, false, "Failed")
+        triggerClientEvent(player, "newmodels-test_vehicles:vehicleSpawnResponse", player, false, "Failed")
     end
 end)

From bc7dfcb1483c3b5453164ba0663a060ddca0e726 Mon Sep 17 00:00:00 2001
From: Mohab <mohabcodex@gmail.com>
Date: Tue, 29 Jul 2025 01:51:14 +0300
Subject: [PATCH 3/3] refactor: change function declarations to local scope in
 vehicle spawner

---
 [examples]/test_vehicles/c_test_gui.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/[examples]/test_vehicles/c_test_gui.lua b/[examples]/test_vehicles/c_test_gui.lua
index d1214dc..e25b490 100644
--- a/[examples]/test_vehicles/c_test_gui.lua
+++ b/[examples]/test_vehicles/c_test_gui.lua
@@ -13,7 +13,7 @@ local spawnButton = guiCreateButton(50, 120, 200, 40, "Spawn Vehicle", false, wi
 
 guiSetVisible(window, false)
 
-function spawnVehicleByID(vehicleID)
+local function spawnVehicleByID(vehicleID)
     if not vehicleID then
         outputChatBox("Error: Please enter a valid number!", 255, 0, 0)
         return
@@ -28,7 +28,7 @@ function spawnVehicleByID(vehicleID)
     triggerServerEvent("newmodels-test_vehicles:requestVehicleSpawn", resourceRoot, localPlayer, vehicleID, spawnX, spawnY, z, rot)
 end
 
-function requestVehicleSpawn()
+local function requestVehicleSpawn()
     local vehicleID = tonumber(guiGetText(input))
     spawnVehicleByID(vehicleID)
     guiSetVisible(window, false)
@@ -47,7 +47,7 @@ addEventHandler("newmodels-test_vehicles:vehicleSpawnResponse", localPlayer, fun
     end
 end)
 
-function onInputEnter()
+local function onInputEnter()
     if source == input then
         requestVehicleSpawn()
     end
@@ -55,7 +55,7 @@ end
 
 addEventHandler("onClientGUIAccepted", input, onInputEnter)
 
-function toggleSpawnerGUI()
+local function toggleSpawnerGUI()
     local visible = guiGetVisible(window)
     guiSetVisible(window, not visible)
     showCursor(not visible)