rename files

Fernando-A-Rocha · Aug 1, 2024 · 8583591 · 8583591
1 parent d739d01
commit 8583591
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 25 deletions.
diff --git a/newmodels_reborn/core/client.lua → newmodels_reborn/core/client_logic.lua b/newmodels_reborn/core/client.lua → newmodels_reborn/core/client_logic.lua
@@ -7,8 +7,6 @@ local reusableModelElements = {}
 local currFreeIdDelay = 9500 -- ms
 local FREE_ID_DELAY_STEP = 500 -- ms
 
-function getLoadedModels() return loadedModels end
-
 local function applyElementCustomModel(element)
     local customModel = tonumber(getElementData(element, getCustomModelDataKey(element)))
     if not customModel then return end

diff --git a/newmodels_reborn/core/server.lua → newmodels_reborn/core/server_logic.lua b/newmodels_reborn/core/server.lua → newmodels_reborn/core/server_logic.lua
diff --git a/newmodels_reborn/meta.xml b/newmodels_reborn/meta.xml
@@ -7,8 +7,8 @@
 
     <!-- Main Scripts -->
     <script src="core/shared.lua" type="shared"/>
-    <script src="core/client.lua" type="client"/>
-    <script src="core/server.lua" type="server"/>
+    <script src="core/client_logic.lua" type="client"/>
+    <script src="core/server_logic.lua" type="server"/>
     <!-- Exported functions -->
     <export function="isDefaultID" type="shared"/>
     <export function="createObject" type="shared"/>
@@ -20,7 +20,6 @@
     <export function="setElementModel" type="shared"/>
     <export function="getElementModel" type="shared"/>
     <export function="getBaseModelIdFromCustomModelId" type="shared"/>
-    <export function="getLoadedModels" type="client"/>
 
     <!-- Files -->
     <file src="models/**/*.col"/>
@@ -35,9 +34,8 @@
     <script src="optional/debug/s_debug.lua" type="server"/>
 
     <!-- Backwards compatibility with newmodels 3.3.0 -->
-    <script src="optional/compatibility/shared/config.lua" type="shared"/>
-    <script src="optional/compatibility/shared/funcs.lua" type="shared"/>
-    <script src="optional/compatibility/server/funcs.lua" type="server"/>
+    <script src="optional/compatibility/shared.lua" type="shared"/>
+    <script src="optional/compatibility/server_funcs.lua" type="server"/>
     <!-- Exported functions (Client & Server) -->
     <export type="shared" function="getModList"/>
     <export type="shared" function="getDataNameFromType"/>

diff --git a/...n/optional/compatibility/server/funcs.lua → ...n/optional/compatibility/server_funcs.lua b/...n/optional/compatibility/server/funcs.lua → ...n/optional/compatibility/server_funcs.lua
diff --git a/...n/optional/compatibility/shared/funcs.lua → ..._reborn/optional/compatibility/shared.lua b/...n/optional/compatibility/shared/funcs.lua → ..._reborn/optional/compatibility/shared.lua
@@ -1,4 +1,22 @@
 -- Backwards compatibility with newmodels 3.3.0
+
+-- Configurable variables
+
+OLD_DATA_NAMES = {
+    ped = "skinID",
+    vehicle = "vehicleID",
+    object = "objectID",
+}
+OLD_DATA_NAMES.pickup = OLD_DATA_NAMES.object
+OLD_DATA_NAMES.player = OLD_DATA_NAMES.ped
+
+OLD_BASE_DATA_NAME = "baseID"
+
+-- NandoCrypt | https://github.com/Fernando-A-Rocha/mta-nandocrypt
+-- The decrypt function needs to be named ncDecrypt inside a decrypter script (named nando_decrypter by default)
+ENABLE_NANDOCRYPT = true
+NANDOCRYPT_EXT = ".nandocrypt"
+
 -- Exported functions from old newmodels working with the new system
 
 local isClientsideScript = localPlayer ~= nil

diff --git a/newmodels_reborn/optional/compatibility/shared/config.lua b/newmodels_reborn/optional/compatibility/shared/config.lua