Fix BatchParsing path (SubnauticaNitrox#1196)

dartasen · web-flow · commit 0aceade02794 · 2020-08-06T09:55:27.000-07:00
* Fix GameObject FullName &amp; Batch location

* Updated AssetTools

* review changes
diff --git a/Nitrox.Bootloader/Main.cs b/Nitrox.Bootloader/Main.cs
@@ -12,7 +12,7 @@ public static class Main
         {
             // Get path from command args.
             string[] args = Environment.GetCommandLineArgs();
-            for (var i = 0; i < args.Length - 1; i++)
+            for (int i = 0; i < args.Length - 1; i++)
             {
                 if (args[i].Equals("-nitrox", StringComparison.OrdinalIgnoreCase) && Directory.Exists(args[i + 1]))
                 {
@@ -116,4 +116,4 @@ private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEve
             return Assembly.LoadFile(dllPath);
         }
     }
-}
+}
diff --git a/NitroxClient/Communication/Packets/Processors/PingRenamedProcessor.cs b/NitroxClient/Communication/Packets/Processors/PingRenamedProcessor.cs
@@ -2,6 +2,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.MonoBehaviours;
+using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Logger;
 using NitroxModel.Packets;
diff --git a/NitroxClient/GameLogic/Helper/VehicleChildObjectIdentifierHelper.cs b/NitroxClient/GameLogic/Helper/VehicleChildObjectIdentifierHelper.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using NitroxClient.MonoBehaviours;
+using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic;
 using NitroxModel.Logger;
diff --git a/NitroxClient/Unity/Helper/GameObjectHelper.cs b/NitroxClient/Unity/Helper/GameObjectHelper.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Text;
 using NitroxModel.Helper;
 using UnityEngine;
@@ -36,7 +37,7 @@ public static Transform RequireTransform(this Transform tf, string name)
         {
             Transform child = tf.Find(name);
 
-            if (child == null)
+            if (!child)
             {
                 throw new ArgumentNullException(tf + " does not contain \"" + name + "\"");
             }
@@ -104,13 +105,36 @@ public static string GetHierarchyPath(this Component component)
         private static string GetHierarchyPathBuilder(this GameObject obj, StringBuilder builder)
         {
             Transform parent = obj.transform;
+
             while (parent)
             {
                 builder.Insert(0, parent.name);
                 builder.Insert(0, "/");
                 parent = parent.transform.parent;
             }
+
             return builder.ToString();
         }
+
+        public static string GetFullName(this GameObject obj)
+        {
+            Stack<string> stack = new Stack<string>();
+            Transform transform = obj.transform;
+
+            while (transform)
+            {
+                stack.Push(transform.name);
+                transform = transform.parent;
+            }
+
+            StringBuilder stringBuilder = new StringBuilder();
+
+            while (stack.Count > 0)
+            {
+                stringBuilder.AppendFormat("/{0}", stack.Pop());
+            }
+
+            return stringBuilder.ToString();
+        }
     }
 }
diff --git a/NitroxServer-Subnautica/NitroxServer-Subnautica.csproj b/NitroxServer-Subnautica/NitroxServer-Subnautica.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AssetsTools.NET, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AssetsTools.NET.2.0.2\lib\net35\AssetsTools.NET.dll</HintPath>
+      <HintPath>..\packages\AssetsTools.NET.2.0.4\lib\net35\AssetsTools.NET.dll</HintPath>
     </Reference>
     <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/NitroxServer-Subnautica/Serialization/Resources/ResourceAssetsParser.cs b/NitroxServer-Subnautica/Serialization/Resources/ResourceAssetsParser.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using AssetsTools.NET;
-using NitroxModel.DataStructures.Util;
 using NitroxModel.Discovery;
-using NitroxModel.Logger;
 using NitroxServer_Subnautica.Serialization.Resources.Parsers;
 using NitroxServer_Subnautica.Serialization.Resources.Processing;
 using NitroxServer.Serialization.Resources.Datastructures;
@@ -13,15 +11,15 @@ namespace NitroxServer_Subnautica.Serialization.Resources
 {
     public static class ResourceAssetsParser
     {
-        private static Dictionary<AssetIdentifier, uint> assetIdentifierToClassId = new Dictionary<AssetIdentifier, uint>();
+        private static readonly Dictionary<AssetIdentifier, uint> assetIdentifierToClassId = new Dictionary<AssetIdentifier, uint>();
 
-        private static Dictionary<string, int> fileIdByResourcePath = new Dictionary<string, int>();
-        private static HashSet<string> parsedManifests = new HashSet<string>();
+        private static readonly Dictionary<string, int> fileIdByResourcePath = new Dictionary<string, int>();
+        private static readonly HashSet<string> parsedManifests = new HashSet<string>();
 
-        private static PrefabPlaceholderExtractor prefabPlaceholderExtractor = new PrefabPlaceholderExtractor();
+        private static readonly PrefabPlaceholderExtractor prefabPlaceholderExtractor = new PrefabPlaceholderExtractor();
 
         // https://docs.huihoo.com/unity/4.3/Documentation/Manual/ClassIDReference.html
-        private static Dictionary<uint, AssetParser> assetParsersByClassId = new Dictionary<uint, AssetParser>()
+        private static readonly Dictionary<uint, AssetParser> assetParsersByClassId = new Dictionary<uint, AssetParser>()
         {
             { 1, new GameObjectAssetParser()},
             { 4, new TransformAssetParser()},
diff --git a/NitroxServer-Subnautica/packages.config b/NitroxServer-Subnautica/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AssetsTools.NET" version="2.0.2" targetFramework="net40" />
+  <package id="AssetsTools.NET" version="2.0.4" targetFramework="net40" />
   <package id="Autofac" version="3.5.2" targetFramework="net40" />
   <package id="Autofac.Configuration" version="3.3.0" targetFramework="net40" />
   <package id="Mono.Cecil" version="0.11.2" targetFramework="net40" />
diff --git a/NitroxServer/Serialization/BatchCellsParser.cs b/NitroxServer/Serialization/BatchCellsParser.cs
@@ -21,20 +21,23 @@ namespace NitroxServer.Serialization
      * This class consolidates the gameObject, entitySlot, and cellHeader data to
      * create EntitySpawnPoint objects.
      */
-    class BatchCellsParser
+    public class BatchCellsParser
     {
         private readonly EntitySpawnPointFactory entitySpawnPointFactory;
         private readonly ServerProtoBufSerializer serializer;
-        private readonly Dictionary<string, Type> surrogateTypes = new Dictionary<string, Type>();
+        private readonly Dictionary<string, Type> surrogateTypes;
 
         public BatchCellsParser(EntitySpawnPointFactory entitySpawnPointFactory, ServerProtoBufSerializer serializer)
         {
             this.entitySpawnPointFactory = entitySpawnPointFactory;
             this.serializer = serializer;
 
-            surrogateTypes.Add("UnityEngine.Transform", typeof(NitroxTransform));
-            surrogateTypes.Add("UnityEngine.Vector3", typeof(NitroxVector3));
-            surrogateTypes.Add("UnityEngine.Quaternion", typeof(NitroxQuaternion));
+            surrogateTypes = new Dictionary<string, Type>
+            {
+                { "UnityEngine.Transform", typeof(NitroxTransform) },
+                { "UnityEngine.Vector3", typeof(NitroxVector3) },
+                { "UnityEngine.Quaternion", typeof(NitroxQuaternion) }
+            };
         }
 
         public List<EntitySpawnPoint> ParseBatchData(Int3 batchId)
@@ -53,12 +56,12 @@ public void ParseFile(Int3 batchId, string pathPrefix, string prefix, string suf
 
             if (subnauticaPath == null)
             {
-                Log.Info($"Could not locate Subnautica installation directory: {Environment.NewLine}{string.Join(Environment.NewLine, errors)}");
+                Log.Error($"Could not locate Subnautica installation directory: {Environment.NewLine}{string.Join(Environment.NewLine, errors)}");
                 return;
             }
 
-            string path = Path.Combine(subnauticaPath, "SNUnmanagedData", "Build18");
-            string fileName = Path.Combine(path, pathPrefix, prefix + "batch-cells-" + batchId.X + "-" + batchId.Y + "-" + batchId.Z + suffix + ".bin");
+            string path = Path.Combine(subnauticaPath, "Subnautica_Data", "StreamingAssets", "SNUnmanagedData", "Build18");
+            string fileName = Path.Combine(path, pathPrefix, $"{prefix}batch-cells-{batchId.X}-{batchId.Y}-{batchId.Z}{suffix}.bin");
 
             if (!File.Exists(fileName))
             {
@@ -79,25 +82,25 @@ private void ParseCacheCells(Int3 batchId, string fileName, List<EntitySpawnPoin
             {
                 CellsFileHeader cellsFileHeader = serializer.Deserialize<CellsFileHeader>(stream);
 
-                for (int cellCounter = 0; cellCounter < cellsFileHeader.numCells; cellCounter++)
+                for (int cellCounter = 0; cellCounter < cellsFileHeader.NumCells; cellCounter++)
                 {
                     CellHeaderEx cellHeader = serializer.Deserialize<CellHeaderEx>(stream);
 
                     bool wasLegacy;
 
-                    byte[] serialData = new byte[cellHeader.dataLength];
-                    stream.Read(serialData, 0, cellHeader.dataLength);
-                    ParseGameObjectsWithHeader(serialData, batchId, cellHeader.cellId, cellHeader.level, spawnPoints, out wasLegacy);
+                    byte[] serialData = new byte[cellHeader.DataLength];
+                    stream.Read(serialData, 0, cellHeader.DataLength);
+                    ParseGameObjectsWithHeader(serialData, batchId, cellHeader.CellId, cellHeader.Level, spawnPoints, out wasLegacy);
 
                     if (!wasLegacy)
                     {
-                        byte[] legacyData = new byte[cellHeader.legacyDataLength];
-                        stream.Read(legacyData, 0, cellHeader.legacyDataLength);
-                        ParseGameObjectsWithHeader(legacyData, batchId, cellHeader.cellId, cellHeader.level, spawnPoints, out wasLegacy);
+                        byte[] legacyData = new byte[cellHeader.LegacyDataLength];
+                        stream.Read(legacyData, 0, cellHeader.LegacyDataLength);
+                        ParseGameObjectsWithHeader(legacyData, batchId, cellHeader.CellId, cellHeader.Level, spawnPoints, out wasLegacy);
 
-                        byte[] waiterData = new byte[cellHeader.waiterDataLength];
-                        stream.Read(waiterData, 0, cellHeader.waiterDataLength);
-                        ParseGameObjectsFromStream(new MemoryStream(waiterData), batchId, cellHeader.cellId, cellHeader.level, spawnPoints);
+                        byte[] waiterData = new byte[cellHeader.WaiterDataLength];
+                        stream.Read(waiterData, 0, cellHeader.WaiterDataLength);
+                        ParseGameObjectsFromStream(new MemoryStream(waiterData), batchId, cellHeader.CellId, cellHeader.Level, spawnPoints);
                     }
                 }
             }
@@ -164,9 +167,7 @@ private void DeserializeComponents(Stream stream, GameObject gameObject)
             {
                 ComponentHeader componentHeader = serializer.Deserialize<ComponentHeader>(stream);
 
-                Type type = null;
-
-                if (!surrogateTypes.TryGetValue(componentHeader.TypeName, out type))
+                if (!surrogateTypes.TryGetValue(componentHeader.TypeName, out Type type))
                 {
                     type = AppDomain.CurrentDomain.GetAssemblies()
                         .Select(a => a.GetType(componentHeader.TypeName))
@@ -188,29 +189,29 @@ public class CellsFileHeader
     {
         public override string ToString()
         {
-            return string.Format("(version={0}, numCells={1})", version, numCells);
+            return string.Format("(version={0}, numCells={1})", Version, NumCells);
         }
 
         [ProtoMember(1)]
-        public int version;
+        public int Version;
 
         [ProtoMember(2)]
-        public int numCells;
+        public int NumCells;
     }
 
     [ProtoContract]
     public class CellHeader
     {
         public override string ToString()
         {
-            return $"(cellId={cellId}, level={level})";
+            return $"(cellId={CellId}, level={Level})";
         }
 
         [ProtoMember(1)]
-        public Int3 cellId;
+        public Int3 CellId;
 
         [ProtoMember(2)]
-        public int level;
+        public int Level;
     }
 
     [ProtoContract]
@@ -220,28 +221,28 @@ public override string ToString()
         {
             return string.Format("(cellId={0}, level={1}, dataLength={2}, legacyDataLength={3}, waiterDataLength={4})", new object[]
             {
-                cellId,
-                level,
-                dataLength,
-                legacyDataLength,
-                waiterDataLength
+                CellId,
+                Level,
+                DataLength,
+                LegacyDataLength,
+                WaiterDataLength
             });
         }
 
         [ProtoMember(1)]
-        public Int3 cellId;
+        public Int3 CellId;
 
         [ProtoMember(2)]
-        public int level;
+        public int Level;
 
         [ProtoMember(3)]
-        public int dataLength;
+        public int DataLength;
 
         [ProtoMember(4)]
-        public int legacyDataLength;
+        public int LegacyDataLength;
 
         [ProtoMember(5)]
-        public int waiterDataLength;
+        public int WaiterDataLength;
     }
 
     [ProtoContract]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static class Main`
`12`	`12`	`{`
`13`	`13`	`// Get path from command args.`
`14`	`14`	`string[] args = Environment.GetCommandLineArgs();`
`15`		`- for (var i = 0; i < args.Length - 1; i++)`
	`15`	`+ for (int i = 0; i < args.Length - 1; i++)`
`16`	`16`	`{`
`17`	`17`	`if (args[i].Equals("-nitrox", StringComparison.OrdinalIgnoreCase) && Directory.Exists(args[i + 1]))`
`18`	`18`	`{`
`@@ -116,4 +116,4 @@ private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEve`
`116`	`116`	`return Assembly.LoadFile(dllPath);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`		`-}`
	`119`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Text;`
`3`	`4`	`using NitroxModel.Helper;`
`4`	`5`	`using UnityEngine;`
`@@ -36,7 +37,7 @@ public static Transform RequireTransform(this Transform tf, string name)`
`36`	`37`	`{`
`37`	`38`	`Transform child = tf.Find(name);`
`38`	`39`
`39`		`- if (child == null)`
	`40`	`+ if (!child)`
`40`	`41`	`{`
`41`	`42`	`throw new ArgumentNullException(tf + " does not contain \"" + name + "\"");`
`42`	`43`	`}`
`@@ -104,13 +105,36 @@ public static string GetHierarchyPath(this Component component)`
`104`	`105`	`private static string GetHierarchyPathBuilder(this GameObject obj, StringBuilder builder)`
`105`	`106`	`{`
`106`	`107`	`Transform parent = obj.transform;`
	`108`	`+`
`107`	`109`	`while (parent)`
`108`	`110`	`{`
`109`	`111`	`builder.Insert(0, parent.name);`
`110`	`112`	`builder.Insert(0, "/");`
`111`	`113`	`parent = parent.transform.parent;`
`112`	`114`	`}`
	`115`	`+`
`113`	`116`	`return builder.ToString();`
`114`	`117`	`}`
	`118`	`+`
	`119`	`+ public static string GetFullName(this GameObject obj)`
	`120`	`+ {`
	`121`	`+ Stack<string> stack = new Stack<string>();`
	`122`	`+ Transform transform = obj.transform;`
	`123`	`+`
	`124`	`+ while (transform)`
	`125`	`+ {`
	`126`	`+ stack.Push(transform.name);`
	`127`	`+ transform = transform.parent;`
	`128`	`+ }`
	`129`	`+`
	`130`	`+ StringBuilder stringBuilder = new StringBuilder();`
	`131`	`+`
	`132`	`+ while (stack.Count > 0)`
	`133`	`+ {`
	`134`	`+ stringBuilder.AppendFormat("/{0}", stack.Pop());`
	`135`	`+ }`
	`136`	`+`
	`137`	`+ return stringBuilder.ToString();`
	`138`	`+ }`
`115`	`139`	`}`
`116`	`140`	`}`