Merge branch 'staging'

Author: MattFiler

CathodeLib/CathodeLib.csproj

@@ -10,10 +10,10 @@
     <Authors>Matt Filer</Authors>
     <Description>Provides support for parsing and writing common Alien: Isolation formats from the Cathode engine.</Description>
     <Copyright>Matt Filer 2025</Copyright>
-    <Version>0.9.0</Version>
+    <Version>0.9.1</Version>
     <OutputType>Library</OutputType>
-    <AssemblyVersion>0.9.0.0</AssemblyVersion>
-    <FileVersion>0.9.0.0</FileVersion>
+    <AssemblyVersion>0.9.1.0</AssemblyVersion>
+    <FileVersion>0.9.1.0</FileVersion>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageTags>alien, modding, alien isolation, mod tool, file utility</PackageTags>

CathodeLib/Scripts/CATHODE/Commands/Parsers/CommandsBIN.cs

@@ -479,8 +479,8 @@ public static void Read(byte[] content, out ShortGuid[] EntryPoints, out List<Co
                 }
             }
 
-            EntryPoints[1] = Entries.FirstOrDefault(o => o.name == "GLOBAL").shortGUID;
-            EntryPoints[2] = Entries.FirstOrDefault(o => o.name == "PAUSEMENU").shortGUID;
+            EntryPoints[1] = Entries.FirstOrDefault(o => o.name.ToUpper() == "GLOBAL").shortGUID;
+            EntryPoints[2] = Entries.FirstOrDefault(o => o.name.ToUpper() == "PAUSEMENU").shortGUID;
         }
 
         public static void Write(ShortGuid[] EntryPoints, List<Composite> Entries, out byte[] content)

CathodeLib/Scripts/CATHODE/MaterialMappings.cs

@@ -1,4 +1,6 @@
-using CathodeLib;
+using CATHODE.Scripting;
+using CathodeLib;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -8,48 +10,38 @@ namespace CATHODE
     /* DATA/ENV/PRODUCTION/x/WORLD/MATERIAL_MAPPINGS.PAK */
     public class MaterialMappings : CathodeFile
     {
-        public List<Mapping> Entries = new List<Mapping>();
+        public List<Entry> Entries = new List<Entry>();
         public static new Implementation Implementation = Implementation.LOAD | Implementation.SAVE;
         public MaterialMappings(string path) : base(path) { }
-        
-        private byte[] _headerJunk = new byte[8];
+
+        //This is always the start of the mapping filepath - remove it for ease when adding new ones
+        private const string _path = "n:/content/build/library/_material_libraries_/mappings/";
 
         #region FILE_IO
         override protected bool LoadInternal()
         {
             using (BinaryReader reader = new BinaryReader(File.OpenRead(_filepath)))
             {
-                //Parse header
-                _headerJunk = reader.ReadBytes(8); //TODO: Work out what this contains
+                reader.BaseStream.Position += 8; //magic, version
                 int entryCount = reader.ReadInt32();
 
-                //Parse entries (XML is broken in the build files - doesn't get shipped)
                 for (int x = 0; x < entryCount; x++)
                 {
-                    //This entry
-                    Mapping entry = new Mapping();
-                    entry.MapHeader = reader.ReadBytes(4); //TODO: Work out the significance of this value, to be able to construct new PAKs from scratch.
-                    entry.MapEntryCoupleCount = reader.ReadInt32();
-                    entry.MapJunk = reader.ReadBytes(4); //TODO: Work out if this is always null.
-                    for (int p = 0; p < (entry.MapEntryCoupleCount * 2) + 1; p++)
+                    Entry entry = new Entry();
+                    reader.BaseStream.Position += 4; //shortguid hash of filename (useful?)
+                    int count = reader.ReadInt32();
+                    reader.BaseStream.Position += 4; //this is to->from id count, stored last, but always empty
+                    int strLength = reader.ReadInt32();
+                    entry.Name = Utilities.ReadString(reader.ReadBytes(strLength));
+                    entry.Name = entry.Name.Substring(_path.Length, entry.Name.Length - 4 - _path.Length);
+                    for (int p = 0; p < count; p++)
                     {
-                        //String
-                        int length = reader.ReadInt32();
-                        string materialString = "";
-                        for (int i = 0; i < length; i++)
-                        {
-                            materialString += reader.ReadChar();
-                        }
-
-                        //First string is filename, others are materials
-                        if (p == 0)
-                        {
-                            entry.MapFilename = materialString;
-                        }
-                        else
-                        {
-                            entry.MapMatEntries.Add(materialString);
-                        }
+                        Entry.Mapping mapping = new Entry.Mapping();
+                        strLength = reader.ReadInt32();
+                        mapping.from = Utilities.ReadString(reader.ReadBytes(strLength));
+                        strLength = reader.ReadInt32();
+                        mapping.to = Utilities.ReadString(reader.ReadBytes(strLength));
+                        entry.Mappings.Add(mapping);
                     }
                     Entries.Add(entry);
                 }
@@ -62,19 +54,23 @@ override protected bool SaveInternal()
             using (BinaryWriter writer = new BinaryWriter(File.OpenWrite(_filepath)))
             {
                 writer.BaseStream.SetLength(0);
-                writer.Write(_headerJunk);
+                writer.Write(new byte[4] { 0xAE, 0xB0, 0xEB, 0xDE });
+                writer.Write(4);
                 writer.Write(Entries.Count);
-                foreach (Mapping entry in Entries)
+                foreach (Entry entry in Entries)
                 {
-                    writer.Write(entry.MapHeader);
-                    writer.Write(entry.MapEntryCoupleCount);
-                    writer.Write(entry.MapJunk);
-                    writer.Write(entry.MapFilename.Length);
-                    Utilities.WriteString(entry.MapFilename, writer);
-                    foreach (string name in entry.MapMatEntries)
+                    string fullPath = _path + entry.Name + ".xml";
+                    Utilities.Write(writer, ShortGuidUtils.Generate(fullPath, false));
+                    writer.Write(entry.Mappings.Count);
+                    writer.Write(0);
+                    writer.Write(fullPath.Length);
+                    Utilities.WriteString(fullPath, writer);
+                    foreach (Entry.Mapping mapping in entry.Mappings)
                     {
-                        writer.Write(name.Length);
-                        Utilities.WriteString(name, writer);
+                        writer.Write(mapping.from.Length);
+                        Utilities.WriteString(mapping.from, writer);
+                        writer.Write(mapping.to.Length);
+                        Utilities.WriteString(mapping.to, writer);
                     }
                 }
             }
@@ -83,13 +79,26 @@ override protected bool SaveInternal()
         #endregion
 
         #region STRUCTURES
-        public class Mapping
+        public class Entry
         {
-            public byte[] MapHeader = new byte[4];
-            public byte[] MapJunk = new byte[4]; //I think this is always null
-            public string MapFilename = "";
-            public int MapEntryCoupleCount = 0; //materials will be 2* this number
-            public List<string> MapMatEntries = new List<string>();
+            public string Name;
+            public List<Mapping> Mappings = new List<Mapping>();
+
+            public class Mapping
+            {
+                public string from;
+                public string to;
+
+                public override string ToString()
+                {
+                    return from + "->" + to;
+                }
+            }
+
+            public override string ToString()
+            {
+                return Name + " [" + Mappings.Count + "]";
+            }
         }
         #endregion
     }