rename files

newmodels_reborn/core/client_logic.lua

@@ -259,7 +259,7 @@ end)
 
 local function restoreElementBaseModels()
     -- Restore the base models of all elements with custom models
-    for _, elementType in pairs(ELEMENT_TYPES) do
+    for _, elementType in pairs(VALID_ELEMENT_TYPES) do
         for _, element in pairs(getElementsByType(elementType, root, true)) do
             local model = _getElementModel(element)
             for _, loadedModel in pairs(loadedModels) do
@@ -282,7 +282,7 @@ addEventHandler("newmodels_reborn:receiveCustomModels", resourceRoot, function(c
 
     customModels = customModelsFromServer
 
-    for _, elementType in pairs(ELEMENT_TYPES) do
+    for _, elementType in pairs(VALID_ELEMENT_TYPES) do
         for _, element in pairs(getElementsByType(elementType, root, true)) do
             setElementCustomModel(element)
         end

newmodels_reborn/core/shared.lua → newmodels_reborn/core/shared_exported.lua

@@ -1,6 +1,9 @@
-ELEMENT_TYPES = { "vehicle", "ped", "player", "object", "pickup" }
+-- !! THIS SCRIPT IS ENTIRELY EXPORTED !!
 
-customModels = {}
+VALID_ELEMENT_TYPES = { "vehicle", "ped", "player", "object", "pickup" }
+
+local resources = {}
+local isClientsideScript = localPlayer ~= nil
 
 _createObject = createObject
 _createVehicle = createVehicle
@@ -12,11 +15,9 @@ _setPickupType = setPickupType
 _getElementModel = getElementModel
 _setElementModel = setElementModel
 
-local resources = {}
-local isClientsideScript = localPlayer ~= nil
-
 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 }
+
 local function isDefaultObjectID(id)
     if id < 321 or id > 18630 then
         return false
@@ -33,6 +34,7 @@ local function isDefaultObjectID(id)
     end
     return true
 end
+
 function isDefaultID(elementType, id)
     id = tonumber(id)
     if not id then return false end
@@ -75,7 +77,7 @@ end
 
 function isValidElement(element)
     local elementType = getElementType(element)
-    for _, elementType2 in pairs(ELEMENT_TYPES) do
+    for _, elementType2 in pairs(VALID_ELEMENT_TYPES) do
         if elementType == elementType2 then
             return true
         end

newmodels_reborn/core/shared_local.lua

@@ -0,0 +1 @@
+customModels = {}

newmodels_reborn/meta.xml

@@ -6,7 +6,8 @@
     <min_mta_version client="1.6.0-9.22505.0" server="1.6.0-9.22505.0"></min_mta_version>
 
     <!-- Main Scripts -->
-    <script src="core/shared.lua" type="shared"/>
+    <script src="core/shared_local.lua" type="shared"/>
+    <script src="core/shared_exported.lua" type="shared"/>
     <script src="core/client_logic.lua" type="client"/>
     <script src="core/server_logic.lua" type="server"/>
     <!-- Exported functions -->
@@ -34,7 +35,7 @@
     <script src="optional/debug/s_debug.lua" type="server"/>
 
     <!-- Backwards compatibility with newmodels 3.3.0 -->
-    <script src="optional/compatibility/shared.lua" type="shared"/>
+    <script src="optional/compatibility/shared_exported.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.lua → newmodels_reborn/optional/compatibility/shared_exported.lua

@@ -1,3 +1,5 @@
+-- !! THIS SCRIPT IS ENTIRELY EXPORTED !!
+
 -- Backwards compatibility with newmodels 3.3.0
 
 -- Configurable variables