add import() exported function

newmodels_reborn/core/shared_exported.lua

@@ -1,4 +1,5 @@
 -- !! THIS SCRIPT IS ENTIRELY EXPORTED !!
+-- Variable IS_IMPORTED will be true if this script is imported by another resource
 
 local isClientsideScript = localPlayer ~= nil
 
@@ -16,6 +17,14 @@ _setPickupType = setPickupType
 _getElementModel = getElementModel
 _setElementModel = setElementModel
 
+function getSharedCustomModelsTable()
+    if IS_IMPORTED then
+        return exports["newmodels_reborn"]:getCustomModels()
+    else
+        return customModels
+    end
+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 }
 
@@ -101,7 +110,7 @@ local function setElementResource(element, theResource)
 end
 
 function getBaseModelIdFromCustomModelId(id)
-    local customInfo = customModels[id]
+    local customInfo = getSharedCustomModelsTable()[id]
     if customInfo then
         return customInfo.baseModel
     end
@@ -150,8 +159,9 @@ function createVehicle(id, ...)
 end
 
 function getVehicleType(id)
-    if customModels[id] then
-        return _getVehicleType(customModels[id].baseModel)
+    local customModelInfo = getSharedCustomModelsTable()[id]
+    if customModelInfo then
+        return _getVehicleType(customModelInfo.baseModel)
     end
     return _getVehicleType(id)
 end

newmodels_reborn/core/shared_importfunc.lua

@@ -0,0 +1,21 @@
+-- Exports the entire shared script to the importing resource, so it can be loaded there
+
+local exportScriptString = nil
+function import()
+    if not sourceResource or sourceResource == resource then
+        return error("This function can only be called from another resource.")
+    end
+    if not exportScriptString then
+        local f = fileOpen("core/shared_exported.lua", true)
+        if not f then
+            return error("Failed to open file.")
+        end
+        exportScriptString = fileRead(f, fileGetSize(f))
+        fileClose(f)
+        if not exportScriptString or exportScriptString == "" then
+            return error("Failed to read file.")
+        end
+        exportScriptString = "IS_IMPORTED = true\n\n" .. exportScriptString
+    end
+    return exportScriptString
+end

newmodels_reborn/core/shared_local.lua

@@ -1,2 +1,6 @@
 -- Shared custom models table:
 customModels = {}
+
+function getCustomModels()
+    return customModels
+end

newmodels_reborn/meta.xml

@@ -8,9 +8,11 @@
     <!-- Main Scripts -->
     <script src="core/shared_local.lua" type="shared"/>
     <script src="core/shared_exported.lua" type="shared"/>
+    <script src="core/shared_importfunc.lua" type="shared"/>
     <script src="core/client_logic.lua" type="client"/>
     <script src="core/server_logic.lua" type="server"/>
     <!-- Exported functions -->
+    <export function="getCustomModels" type="shared"/>
     <export function="isDefaultID" type="shared"/>
     <export function="createObject" type="shared"/>
     <export function="createVehicle" type="shared"/>	
@@ -21,6 +23,7 @@
     <export function="setElementModel" type="shared"/>
     <export function="getElementModel" type="shared"/>
     <export function="getBaseModelIdFromCustomModelId" type="shared"/>
+    <export function="import" type="shared"/>
 
     <!-- Files -->
     <file src="models/**/*.col"/>
@@ -36,6 +39,7 @@
 
     <!-- Backwards compatibility with newmodels 3.3.0 -->
     <script src="optional/compatibility/shared_exported.lua" type="shared"/>
+    <script src="optional/compatibility/shared_importfunc.lua" type="shared"/>
     <script src="optional/compatibility/server_funcs.lua" type="server"/>
     <!-- Exported functions (Client & Server) -->
     <export type="shared" function="getModList"/>

newmodels_reborn/optional/compatibility/shared_exported.lua

@@ -1,4 +1,5 @@
 -- !! THIS SCRIPT IS ENTIRELY EXPORTED !!
+-- Variable IS_IMPORTED will be true if this script is imported by another resource
 
 -- Backwards compatibility with newmodels 3.3.0
 
@@ -61,15 +62,15 @@ end
 function getModDataFromID(id)
     id = tonumber(id)
     if not id then return end
-    local customInfo = customModels[id]
+    local customInfo = getSharedCustomModelsTable()[id]
     if not customInfo then return end
     local mod = convertCustomModelInfoToOldFormat(id, customInfo)
     return mod, customInfo.type
 end
 
 function getModList()
     local modList = {}
-    for id, customInfo in pairs(customModels) do
+    for id, customInfo in pairs(getSharedCustomModelsTable()) do
         modList[id] = convertCustomModelInfoToOldFormat(id, customInfo)
     end
     return modList
@@ -81,7 +82,8 @@ function getBaseModel(element)
     else
         local customModel = tonumber(getElementData(element, getCustomModelDataKey(element)))
         if customModel then
-            return customModels[customModel] and customModels[customModel].baseModel or nil
+            local customModelInfo = getSharedCustomModelsTable()[customModel]
+            return customModelInfo and customModelInfo.baseModel or nil
         else
             return getElementModel(element)
         end

newmodels_reborn/optional/compatibility/shared_importfunc.lua

@@ -0,0 +1,21 @@
+-- Backwards compatibility with newmodels 3.3.0
+
+-- Rewrite the import feature to include the shared_exported.lua file
+
+local exportScriptString = nil
+_import = import
+function import()
+    local str = _import()
+    if not exportScriptString then
+        local f = fileOpen("optional/compatibility/shared_exported.lua", true)
+        if not f then
+            return error("Failed to open file.")
+        end
+        exportScriptString = fileRead(f, fileGetSize(f))
+        fileClose(f)
+        if not exportScriptString or exportScriptString == "" then
+            return error("Failed to read file.")
+        end
+    end
+    return str .. "\n" .. exportScriptString
+end