Fix logic

Author: Fernando-A-Rocha

newmodels_azul/scripts/core/client_logic.lua

@@ -9,7 +9,7 @@ local currFreeIdDelay = 9500   -- ms
 local FREE_ID_DELAY_STEP = 500 -- ms
 
 local function applyElementCustomModel(element)
-    local customModel = getElementCustomModel(element)
+    local customModel = elementModels[element]
     if not customModel then return end
     local loadedModel = loadedModels[customModel]
     if not loadedModel then return end
@@ -145,7 +145,7 @@ local function isCustomModelInUse(customModel)
     if loadedModel then
         for _, elementType in pairs(loadedModel.elementTypes) do
             for _, element in pairs(getElementsByType(elementType, root, true)) do
-                if getElementCustomModel(element) == customModel then
+                if elementModels[element] == customModel then
                     return true
                 end
             end
@@ -210,7 +210,7 @@ local function freeAllocatedModel(customModel)
 end
 
 local function attemptApplyElementCustomModel(element)
-    local customModel = getElementCustomModel(element)
+    local customModel = elementModels[element]
     if not customModel then return end
     if not isCustomModelCompatible(customModel, element) then return end
     if not loadedModels[customModel] then
@@ -240,14 +240,15 @@ end)
 
 addEventHandler("onClientElementStreamOut", root, function()
     if not isValidElement(source) then return end
-    local customModel = getElementCustomModel(source)
+    local customModel = elementModels[source]
     if not customModel then return end
     freeAllocatedModel(customModel)
 end)
 
 addEventHandler("onClientElementDestroy", root, function()
     if not isValidElement(source) then return end
-    local customModel = getElementCustomModel(source)
+    local customModel = elementModels[source]
+    elementModels[source] = nil
     if not customModel then return end
     freeAllocatedModel(customModel)
 end)

newmodels_azul/scripts/core/server_logic.lua

@@ -191,3 +191,11 @@ addEventHandler("onPlayerResourceStart", root, function(res)
         triggerClientEvent(source, "newmodels_azul:receiveCustomModels", resourceRoot, customModels, elementModels)
     end
 end)
+
+-- Handle element destroy (clear any custom model ID from the table)
+-- Syncing with clients is not necessary as they already handle onClientElementDestroy
+addEventHandler("onElementDestroy", root, function()
+    if elementModels[source] then
+        elementModels[source] = nil
+    end
+end)

newmodels_azul/scripts/core/shared_exported.lua

@@ -41,6 +41,13 @@ newmodelsUtils.getSharedElementModelsTbl = function()
     return elementModels
 end
 
+newmodelsUtils.setElementCustomModel = function(...)
+    if IS_IMPORTED then
+        return exports["newmodels_azul"]:setElementCustomModel(...)
+    end
+    return setElementCustomModel(...)
+end
+
 function isCustomModelCompatible(id, elementOrElementType)
     assert(type(id) == "number", "Bad argument @ isCustomModelCompatible [expected number at argument 1, got " .. type(id) .. "]")
     assert(type(elementOrElementType) == "string" or isElement(elementOrElementType), "Bad argument @ isCustomModelCompatible [expected string/element at argument 2, got " .. type(elementOrElementType) .. "]")
@@ -66,33 +73,6 @@ function getElementCustomModel(element)
     return tbl[element]
 end
 
--- Passing nil id resets the element's custom model
-function setElementCustomModel(element, id)
-    assert(isElement(element), "Invalid element passed: " .. tostring(element))
-    assert(isValidElement(element), "Invalid element type passed: " .. getElementType(element))
-    id = tonumber(id) or nil
-    if id then
-        -- Check if valid custom model ID
-        local customModelInfo = newmodelsUtils.getSharedCustomModelsTbl()[id]
-        if not customModelInfo then
-            outputDebugString("Invalid custom model ID passed: " .. tostring(id), 1)
-            return false
-        end
-        if not isCustomModelCompatible(id, element) then
-            outputDebugString("Custom model ID " .. id .. " is not compatible with element type " .. getElementType(element), 1)
-            return false
-        end
-    end
-    local tbl = newmodelsUtils.getSharedElementModelsTbl()
-    if not isClientsideScript then
-        tbl[element] = id -- Set serverside
-        triggerClientEvent(getElementsByType("player"), "newmodels_azul:setElementCustomModel", element, id)
-    else
-        triggerEvent("newmodels_azul:setElementCustomModel", element, id)
-    end
-    return true
-end
-
 local IDS_PEDS = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312 }
 local IDS_VEHICLES = { 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611 }
 
@@ -206,7 +186,7 @@ newmodelsUtils.createElementSafe = function(elementType, id, ...)
     end
     if id ~= baseModel then
         -- Custom model
-        setElementCustomModel(element, id)
+        newmodelsUtils.setElementCustomModel(element, id)
     end
     return element
 end
@@ -266,12 +246,12 @@ function setPickupType(thePickup, theType, id, ammo)
         local baseModel = getBaseModelIdFromCustomModelId(id)
         if id ~= baseModel then
             -- Custom model
-            setElementCustomModel(thePickup, id)
+            newmodelsUtils.setElementCustomModel(thePickup, id)
             return true
         end
     end
 
-    setElementCustomModel(thePickup, nil)
+    newmodelsUtils.setElementCustomModel(thePickup, nil)
     return setPickupTypeMTA(thePickup, theType, id, ammo)
 end
 
@@ -311,7 +291,7 @@ function setElementModel(element, id)
         setElementModelMTA(element, baseModelOfNewId)
     end
 
-    return setElementCustomModel(element, (id ~= baseModelOfNewId) and id or nil)
+    return newmodelsUtils.setElementCustomModel(element, (id ~= baseModelOfNewId) and id or nil)
 end
 
 newmodelsUtils.handleResourceStop = function(stoppedRes)

newmodels_azul/scripts/core/shared_local.lua

@@ -1,15 +1,41 @@
+local isClientsideScript = localPlayer ~= nil
+
 -- Shared custom models table:
 customModels = {}
 
 -- Shared element models table:
 elementModels = {}
 
--- Exported
 function getCustomModels()
     return customModels
 end
 
--- Exported
 function getElementModels()
     return elementModels
 end
+
+-- Passing nil id resets the element's custom model
+function setElementCustomModel(element, id)
+    assert(isElement(element), "Invalid element passed: " .. tostring(element))
+    assert(isValidElement(element), "Invalid element type passed: " .. getElementType(element))
+    id = tonumber(id) or nil
+    if id then
+        -- Check if valid custom model ID
+        local customModelInfo = customModels[id]
+        if not customModelInfo then
+            outputDebugString("Invalid custom model ID passed: " .. tostring(id), 1)
+            return false
+        end
+        if not isCustomModelCompatible(id, element) then
+            outputDebugString("Custom model ID " .. id .. " is not compatible with element type " .. getElementType(element), 1)
+            return false
+        end
+    end
+    if not isClientsideScript then
+        elementModels[element] = id -- Set serverside
+        triggerClientEvent(getElementsByType("player"), "newmodels_azul:setElementCustomModel", element, id)
+    else
+        triggerEvent("newmodels_azul:setElementCustomModel", element, id)
+    end
+    return true
+end

newmodels_azul/scripts/optional/debug/c_debug.lua

@@ -43,7 +43,11 @@ local function updateDebugViewInfo()
             loadedModelsStr_ = str .. ", " .. loadedModelsStr_
         end
     end
-    loadedModelsStr = "Loaded new models:\n" .. loadedModelsStr_
+    if loadedModelsStr_ ~= "" then
+        loadedModelsStr = "Loaded new models:\n" .. loadedModelsStr_
+    else
+        loadedModelsStr = "No new models loaded."
+    end
 
     streamedElements = {}
     for _, element in pairs(getElementsByType("vehicle", root, true)) do
@@ -61,7 +65,8 @@ local function updateDebugViewInfo()
 end
 
 local function drawDebug()
-    dxDrawText(loadedModelsStr, SW/2, 30, SW, 0, 0xFFFFFFFF, 1, "default-bold")
+    dxDrawText("Newmodels Azul v5", SW/2, 15, SW/2, 15, 0xff70e2ff, 1.5, "default-bold", "center", "center")
+    dxDrawText(loadedModelsStr, SW/2, 35, SW/2, 35, 0xFFFFFFFF, 1, "default-bold", "center", "top")
 
     for element, customModelStr in pairs(streamedElements) do
         local x, y, z = getElementPosition(element)

newmodels_azul/scripts/optional/debug/s_debug.lua

@@ -68,3 +68,21 @@ addCommandHandler("testspawn", function(thePlayer)
     setElementModel(thePlayer, skinId)
     outputChatBox("Player spawned at current location with skin ID "..skinId..".", thePlayer)
 end, false, false)
+
+addCommandHandler("testvehtemp", function(thePlayer, cmd, id)
+    id = tonumber(id)
+    if not id then
+        return outputChatBox("Syntax: /"..cmd.." <default or custom id>", thePlayer)
+    end
+    local x,y,z = getElementPosition(thePlayer)
+    local rx,ry,rz = getElementRotation(thePlayer)
+    local element = createVehicle(id, x, y, z, rx, ry, rz)
+    if not element then
+        return outputChatBox("Failed to create vehicle.", thePlayer)
+    end
+    setElementDimension(element, getElementDimension(thePlayer))
+    setElementInterior(element, getElementInterior(thePlayer))
+    setElementPosition(thePlayer, x+2, y, z)
+    outputChatBox("TEMPORARY Vehicle created with ID "..id..". It will be destroyed in 5 seconds.", thePlayer)
+    setTimer(destroyElement, 5000, 1, element)
+end, false, false)