Fix downloadFile for external files (like SAMP Objects) - v6.0.1

Author: Fernando-A-Rocha

[examples]/sampobj_red/README.md

@@ -4,7 +4,7 @@ With [`newmodels_red`](https://github.com/Fernando-A-Rocha/mta-add-models) (and
 
 ## Large Size ⚠️
 
-There are over 1,400 SA-MP object models! It is recommended to keep `download="false"` in the resource's `meta.xml` as well as `metaDownloadFalse=true` in `server.lua` to prevent clients from downloading all the models when they join your server.
+There are over 1,400 SA-MP object models! It is recommended to keep `download="false"` in the resource's `meta.xml` as well as `metaDownloadFalse=true` in `s_load.lua` to prevent clients from downloading all the models when they join your server.
 
 ## How to install
 

[examples]/sampobj_red/meta.xml

@@ -5,7 +5,7 @@
 
     <info author="Fernando" name="SAMP Objects Red"
      description="uses newmodels functions to add all SA-MP objects"
-     version="6.0.0"
+     version="6.0.1"
      type="script" />
 
     <!-- IMPORTANT TO HAVE THIS VERSION OR HIGHER SO THAT IT WORKS AS EXPECTED
@@ -16,5 +16,6 @@
     <file src="models/*.txd" download="false"/>
     <file src="models/*.dff" download="false"/>
 
-    <script type="server" src="server.lua" />
+    <script type="server" src="s_data.lua" />
+    <script type="server" src="s_load.lua" />
 </meta>

[examples]/sampobj_red/s_data.lua

@@ -0,0 +1,31 @@
+--[[
+	Author: https://github.com/Fernando-A-Rocha
+
+	SA-MP Objects [Red] for Newmodels v6
+
+	Adds all SA-MP objects to the game using the newmodels system
+]]
+
+addEventHandler("onResourceStart", resourceRoot, function()
+	local MODELS_FOLDER = "models/"
+	local folderPath = ":" .. getResourceName(resource) .. "/" .. MODELS_FOLDER
+	local listToAdd = {}
+
+	for id, modelInfo in pairs(getSAMPObjectModels()) do
+		listToAdd[#listToAdd + 1] = {
+			type = "object",
+			base_id = 1337,
+			id = id,
+			name = modelInfo[1]:gsub(".dff", ""),
+			path = {
+				dff = folderPath .. id .. ".dff",
+				txd = folderPath .. id .. ".txd",
+				col = folderPath .. id .. ".col",
+			},
+			metaDownloadFalse = true,
+		}
+	end
+
+	-- Async loading
+	exports["newmodels_red"]:addExternalModels(listToAdd, true)
+end, false)

[examples]/sampobj_red/s_load.lua

@@ -1,5 +1,5 @@
 <meta>
-    <include resource="newmodels_red" minversion="6.0.0"/>
+    <include resource="newmodels_red" minversion="6.0.1"/>
     <script src="s_vehicles.lua" type="server"/>
     <script src="s_vehicles_alt.lua" type="server"/>
     <script src="s_test_cmd.lua" type="server"/>

[examples]/sampobj_red/server.lua

@@ -1,5 +1,5 @@
 <meta>
-    <info author="FernandoMTA" version="6.0.0" type="script" name="newmodels_red"
+    <info author="FernandoMTA" version="6.0.1" type="script" name="newmodels_red"
     description="Codename Newmodels Red - Adds new vehicle/ped/object models, automatically synced with all players."/>
 
     <!-- IMPORTANT TO HAVE THIS VERSION OR HIGHER SO THAT IT WORKS AS EXPECTED

[examples]/test_vehicles/meta.xml

@@ -139,7 +139,6 @@ local function finishLoadCustomModel(customModel)
         },
         disableAutoFree = disableAutoFree or false,
     }
-
     if isElement(elementToApply) then
         applyElementCustomModel(elementToApply)
     end
@@ -282,7 +281,11 @@ local function onFailedToDownloadModFile(customModel, filePath)
 end
 
 -- Handle file downloads requested by this resource
-addEventHandler("onClientFileDownloadComplete", resourceRoot, function(filePath, success)
+addEventHandler("onClientFileDownloadComplete", root, function(filePath, success)
+    if source ~= resourceRoot then
+        -- Append resource name to the path
+        filePath = ":" .. getElementID(source) .. "/" .. filePath
+    end
     if filesBeingPreDownloaded[filePath] then
         if not success then
             outputDebugString(
@@ -341,7 +344,7 @@ addEventHandler("onClientFileDownloadComplete", resourceRoot, function(filePath,
             end
         end
     end
-end, false)
+end)
 
 local function beginDownloadModelFiles(customModel)
     local queuedInfo = loadingQueue[customModel]
@@ -362,7 +365,7 @@ local function beginDownloadModelFiles(customModel)
 
     loadingQueue[customModel].countFilesDownloaded = 0
 
-    -- local totalFilesCount = #queuedInfo.filesList
+    local totalFilesCount = #queuedInfo.filesList
     -- print(customModel, "downloading files...", totalFilesCount)
 
     for _, fileInfo in pairs(queuedInfo.filesList) do
@@ -395,7 +398,6 @@ local function beginLoadCustomModel(customModel, elementToApply)
         -- Start in Phase 1
         phase = LOADING_QUEUE_PHASES.DOWNLOAD_FILES,
     }
-
     beginDownloadModelFiles(customModel)
 end
 

newmodels_red/meta.xml

@@ -185,10 +185,10 @@ if not IS_IMPORTED then
     -- In MTA Elements are always destroyed when the resource that created them is stopped: this cannot be changed.
     -- So we use an internal table to keep track of elements created by resources.
     newmodelsUtils.assignElementToResource = function(theElement, theResource)
-        if not theResource then return end
+        if not isElement(theElement) then return end
+        if not (isElement(theResource) and getElementType(theResource) == "resource") then return end
         local resRoot = getResourceRootElement(theResource)
         if not resRoot then return end
-        if not isElement(theElement) then return end
         local theResName = getResourceName(theResource)
         if not newmodelsUtils.resourceElements[theResName] then
             newmodelsUtils.resourceElements[theResName] = {}

newmodels_red/scripts/core/client_logic.lua

@@ -27,9 +27,9 @@ local function getElementCustomModelString(element)
     local customModel = getElementCustomModel(element)
     if customModel and customModels[customModel] then
         local name, baseModel = customModels[customModel].name, customModels[customModel].baseModel
-        return {("%d \"%s\" (%d)"):format(customModel, name, baseModel), 0xffffa263}
+        return { ("%d \"%s\" (%d)"):format(customModel, name, baseModel), 0xffffa263 }
     else
-        return {("%d"):format(getElementModel(element))}
+        return { ("%d"):format(getElementModel(element)) }
     end
 end
 
@@ -44,9 +44,9 @@ local function updateDebugViewInfo()
         end
     end
     if loadedModelsStr_ ~= "" then
-        loadedModelsStr = "Loaded new models:\n" .. loadedModelsStr_
+        loadedModelsStr = "Loaded new models (client-side):\n" .. loadedModelsStr_
     else
-        loadedModelsStr = "No new models loaded."
+        loadedModelsStr = "No new models loaded (client-side)"
     end
 
     streamedElements = {}
@@ -65,8 +65,8 @@ local function updateDebugViewInfo()
 end
 
 local function drawDebug()
-    dxDrawText("Newmodels v6 Red", SW/2, 15, SW/2, 15, 0xffff7070, 1.5, "default-bold", "center", "center")
-    dxDrawText(loadedModelsStr, SW/2, 32, SW/2, 32, 0xFFFFFFFF, 1, "default-bold", "center", "top")
+    dxDrawText("Newmodels v6 Red", SW / 2, 15, SW / 2, 15, 0xffff7070, 1.5, "default-bold", "center", "center")
+    dxDrawText(loadedModelsStr, SW / 2, 32, SW / 2, 32, 0xFFFFFFFF, 1, "default-bold", "center", "top")
 
     for element, customModelStr in pairs(streamedElements) do
         local x, y, z = getElementPosition(element)
@@ -87,7 +87,9 @@ local function toggleDebugView(cmd)
         addEventHandler("onClientRender", root, drawDebug, false)
         addEventHandler("onClientElementDestroy", root, handleElementDestroyed)
     else
-        if debugTimer and isTimer(debugTimer) then killTimer(debugTimer); debugTimer = nil end
+        if debugTimer and isTimer(debugTimer) then
+            killTimer(debugTimer); debugTimer = nil
+        end
         streamedElements = {}
         removeEventHandler("onClientRender", root, drawDebug)
         removeEventHandler("onClientElementDestroy", root, handleElementDestroyed)
@@ -99,4 +101,4 @@ addCommandHandler("newmodelsdebug", toggleDebugView, false)
 
 if (DEBUG_VIEW_ON_BY_DEFAULT) then
     executeCommandHandler("newmodelsdebug")
-end
+end