@etothepii/satisfactory-file-parser 0.0.34 → 0.1.2

package/README.md

@@ -9,14 +9,18 @@ This parser can read, modify and write:
 - Blueprint Files `.sbp`, `.sbpcfg`
 
 ## Supported Versions
-Game Version Files of U5 and below are NOT supported. However, U6 and above is perfectly fine and parsable.
-- ✅ U7 
-- ✅ U6 
-- ❌ <= U5 
-
-### U8 is on the Horizon!
-We can not promise that U8 saves will work out of the box!
-If there will be changes, those will come very soon as soon as U8 is out on Experimental.
+The version support of the packages is indicated below.
+
+Game Version Files of U5 and below are NOT supported.
+
+U8 has only read support so far and only for save files, not for blueprint files. More coming soon.
+
+| Game Version   |      Package                 |
+|:--------------:|:-----------------------------|
+| <= U5          |  ❌                          |
+| U6 + U7        |  ✅ 0.0.1 - 0.0.34              |
+| U8             |  ⚠️ >= 0.1.0  ( .sav file Reading only so far) |
+
 
 ## Installation via npm
 `npm install @etothepii/satisfactory-file-parser`

package/build/parser/parser.js

@@ -23,8 +23,7 @@ class Parser {
         const save = new satisfactory_save_1.SatisfactorySave(header);
         const inflateResult = reader.inflateChunks();
         onDecompressedSaveBody(reader.getBuffer());
-        const levelParseResult = reader.readLevels();
-        save.levels = reader.levels;
+        save.levels = reader.readLevelsU8();
         save.compressionInfo = reader.compressionInfo;
         save.trailingCollectedObjects = reader.trailingCollectedObjects;
         return save;

package/build/parser/satisfactory/blueprint/blueprint-reader.js

@@ -21,7 +21,7 @@ class BlueprintReader extends byte_reader_class_1.ByteReader {
     }
     static ReadHeader(reader) {
         const unk = reader.readBytes(3 * 4);
-        const positionThingOrWhat = (0, util_types_1.ParseVec3)(reader);
+        const positionThingOrWhat = (0, util_types_1.ParseVec3f)(reader);
         let itemTypeCount = reader.readInt32();
         const itemCosts = new Array(itemTypeCount).fill(['', 0]);
         for (let i = 0; i < itemTypeCount; i++) {
@@ -98,7 +98,7 @@ class BlueprintReader extends byte_reader_class_1.ByteReader {
         const objectHeadersBinarySize = reader.readInt32();
         let objects = [];
         level_class_1.Level.ReadObjectHeaders(reader, objects, () => { });
-        level_class_1.Level.ReadObjectContents(reader, objects, 0, () => { });
+        level_class_1.Level.ReadObjectContents('', reader, objects, 0, () => { });
         return objects;
     }
 }

package/build/parser/satisfactory/objects/DataFields.js

@@ -26,14 +26,22 @@ class DataFields {
         let int1 = reader.readInt32();
         if (int1 !== 0) {
         }
-        fields.specialProperties = DataFields.ParseAdditionalSpecialProperties(reader, typePath, start + length - reader.getBufferPosition() - 4);
+        const remainingLen = length - (reader.getBufferPosition() - start);
+        const oldRemainingLen = start + length - reader.getBufferPosition() - 4;
+        fields.specialProperties = DataFields.ParseAdditionalSpecialProperties(reader, typePath, remainingLen);
         const end = reader.getBufferPosition();
-        let remainingBytes = start + length - end;
-        fields.trailingData = Array.from(reader.readBytes(remainingBytes));
+        const newWayOfCalculatingReminingSize = length - (end - start);
+        if (newWayOfCalculatingReminingSize > 0) {
+            reader.readBytes(newWayOfCalculatingReminingSize);
+        }
+        else if (newWayOfCalculatingReminingSize < 0) {
+            console.warn(`Unexpected. Did i read too much or is save corrupt !? bytes left to read is ${newWayOfCalculatingReminingSize}`);
+        }
         return fields;
     }
     static ParseAdditionalSpecialProperties(reader, typePath, remainingLen) {
         let property;
+        const start = reader.getBufferPosition();
         switch (typePath) {
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk1/Build_ConveyorBeltMk1.Build_ConveyorBeltMk1_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk2/Build_ConveyorBeltMk2.Build_ConveyorBeltMk2_C':
@@ -53,9 +61,9 @@ class DataFields {
                     source: Property_1.ObjectProperty.ReadValue(reader),
                     target: Property_1.ObjectProperty.ReadValue(reader)
                 };
-                if (remainingLen >= 24) {
-                    property.sourceTranslation = (0, util_types_1.ParseVec3)(reader);
-                    property.targetTranslation = (0, util_types_1.ParseVec3)(reader);
+                if (remainingLen - (reader.getBufferPosition() - start) >= 24) {
+                    property.sourceTranslation = (0, util_types_1.ParseVec3f)(reader);
+                    property.targetTranslation = (0, util_types_1.ParseVec3f)(reader);
                 }
                 break;
             case '/Game/FactoryGame/Character/Player/BP_PlayerState.BP_PlayerState_C':
@@ -167,6 +175,7 @@ class DataFields {
         currentProperty.name = propertyName;
         const readBytes = reader.getBufferPosition() - before - overhead;
         if (readBytes !== binarySize) {
+            console.warn(`possibly corrupt. Read ${readBytes} for ${propertyType} ${propertyName}, but ${binarySize} were indicated.`);
             throw new Error(`possibly corrupt. Read ${readBytes} for ${propertyType} ${propertyName}, but ${binarySize} were indicated.`);
         }
         return currentProperty;

package/build/parser/satisfactory/objects/Property.js

@@ -202,7 +202,7 @@ class Uint32Property extends BasicProperty {
         return reader.readUint32();
     }
     static CalcOverhead(property) {
-        throw new Error('unimplemented');
+        return 1;
     }
     static Serialize(writer, property) {
         (0, exports.SerializeGUID)(writer, property.guidInfo);
@@ -493,7 +493,7 @@ class StructProperty extends AbstractBaseProperty {
             struct.unk2 = unk2;
         }
         const unk3 = reader.readInt32();
-        if (unk2 !== 0) {
+        if (unk3 !== 0) {
             struct.unk3 = unk3;
         }
         const unk4 = reader.readByte();
@@ -518,19 +518,27 @@ class StructProperty extends AbstractBaseProperty {
                 value = (0, util_types_1.ParseCol4RGBA)(reader);
                 break;
             case 'Vector':
+                value = (0, util_types_1.ParseVec3)(reader);
+                break;
             case 'Rotator':
             case 'Vector2D':
-                value = (0, util_types_1.ParseVec3)(reader);
+                value = (0, util_types_1.ParseVec3f)(reader);
                 break;
             case 'Quat':
+                value = (0, util_types_1.ParseVec4)(reader);
+                break;
             case 'Vector4':
             case 'Vector4D':
-                value = (0, util_types_1.ParseVec4)(reader);
+                value = (0, util_types_1.ParseVec4f)(reader);
                 break;
             case 'Box':
+                const otherBoxLike = {
+                    other1: (0, util_types_1.ParseVec3f)(reader),
+                    other2: (0, util_types_1.ParseVec3f)(reader)
+                };
                 value = {
-                    min: (0, util_types_1.ParseVec3)(reader),
-                    max: (0, util_types_1.ParseVec3)(reader),
+                    min: (0, util_types_1.ParseVec3f)(reader),
+                    max: (0, util_types_1.ParseVec3f)(reader),
                     isValid: reader.readByte() >= 1
                 };
                 break;
@@ -613,18 +621,18 @@ class StructProperty extends AbstractBaseProperty {
             case 'Rotator':
             case 'Vector2D':
                 value = value;
-                (0, util_types_1.SerializeVec3)(writer, value);
+                (0, util_types_1.SerializeVec3f)(writer, value);
                 break;
             case 'Quat':
             case 'Vector4':
             case 'Vector4D':
                 value = value;
-                (0, util_types_1.SerializeVec4)(writer, value);
+                (0, util_types_1.SerializeVec4f)(writer, value);
                 break;
             case 'Box':
                 value = value;
-                (0, util_types_1.SerializeVec3)(writer, value.min);
-                (0, util_types_1.SerializeVec3)(writer, value.max);
+                (0, util_types_1.SerializeVec3f)(writer, value.min);
+                (0, util_types_1.SerializeVec3f)(writer, value.max);
                 writer.writeByte(value.isValid ? 1 : 0);
                 break;
             case 'RailroadTrackPosition':
@@ -755,8 +763,8 @@ class ArrayProperty extends BasicProperty {
                     struct.value = StructProperty.ParseValue(reader, allStructType, binarySize);
                     return struct;
                 });
-                const readBytees = reader.getBufferPosition() - before;
-                if (readBytees !== binarySize) {
+                const readBytes = reader.getBufferPosition() - before;
+                if (readBytes !== binarySize) {
                     throw new Error('possibly corrupt in array of struct.');
                 }
                 property = new ArrayProperty(subtype, maArr, ueType, index, innerStructValueFields);
@@ -823,8 +831,7 @@ class ArrayProperty extends BasicProperty {
                 writer.writeBinarySizeFromPosition(lenIndicator, before);
                 break;
             default:
-                console.log(property.type, property.ueType);
-                throw new Error();
+                throw new Error(`Unknown array property ${property.ueType}, ${property.type}`);
         }
     }
 }
@@ -853,7 +860,7 @@ class SetProperty extends BasicProperty {
                 break;
             case "StructProperty":
                 if (propertyName === 'mRemovalLocations') {
-                    property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => (0, util_types_1.ParseVec3)(reader)), ueType, index);
+                    property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => (0, util_types_1.ParseVec3f)(reader)), ueType, index);
                 }
                 break;
             default:
@@ -880,7 +887,7 @@ class SetProperty extends BasicProperty {
                 property.values.forEach(v => StrProperty.SerializeValue(writer, v));
                 break;
             case "StructProperty":
-                property.values.forEach(v => (0, util_types_1.SerializeVec3)(writer, v));
+                property.values.forEach(v => (0, util_types_1.SerializeVec3f)(writer, v));
                 break;
             default:
                 throw new Error('Not Implemented.');

package/build/parser/satisfactory/objects/SaveEntity.js

@@ -34,6 +34,9 @@ class SaveEntity extends SaveObject_1.SaveObject {
         obj.wasPlacedInLevel = reader.readInt32() == 1;
     }
     static ParseData(entity, length, reader, buildVersion, typePath) {
+        const typeOrWhat = reader.readInt32();
+        const something = reader.readInt32();
+        const afterSizeIndicator = reader.getBufferPosition();
         var newLen = length - 12;
         entity.parentObjectRoot = reader.readString();
         if (entity.parentObjectRoot.length > 0)
@@ -47,7 +50,8 @@ class SaveEntity extends SaveObject_1.SaveObject {
             entity.components.push(componentRef);
             newLen -= 10 + componentRef.levelName.length + componentRef.pathName.length;
         }
-        return SaveObject_1.SaveObject.ParseData(entity, newLen, reader, buildVersion, typePath);
+        const remainingSize = something - (reader.getBufferPosition() - afterSizeIndicator);
+        return SaveObject_1.SaveObject.ParseData(entity, remainingSize, reader, buildVersion, typePath);
     }
     static SerializeHeader(writer, entity) {
         SaveObject_1.SaveObject.SerializeHeader(writer, entity);

package/build/parser/satisfactory/save/level.class.d.ts

@@ -14,7 +14,7 @@ export declare class Level {
     static WriteLevel(writer: ByteWriter, level: Level, buildVersion: number): void;
     static SerializeObjectContents(writer: ByteWriter, objects: (SaveEntity | SaveComponent)[], buildVersion: number, levelName: string): void;
     static ReadObjectHeaders(reader: BinaryReadable, objectsList: SaveObject[], onProgressCallback: (progress: number, msg?: string) => void): void;
-    static ReadObjectContents(reader: BinaryReadable, objectsList: SaveObject[], buildVersion: number, onProgressCallback: (progress: number, msg?: string) => void): Promise<void>;
+    static ReadObjectContents(levelName: string, reader: BinaryReadable, objectsList: SaveObject[], buildVersion: number, onProgressCallback: (progress: number, msg?: string) => void): Promise<void>;
     static ReadLevel(reader: SaveReader, levelName: string, buildVersion: number): Level;
     static SerializeCollectablesList(writer: ByteWriter, collectables: ObjectReference[]): void;
     static ReadCollectablesList(reader: BinaryReadable): ObjectReference[];

package/build/parser/satisfactory/save/level.class.js

@@ -77,9 +77,9 @@ class Level {
                     break;
             }
         }
+        const unk = reader.readInt32();
     }
-    static async ReadObjectContents(reader, objectsList, buildVersion, onProgressCallback) {
-        const binarySize = reader.readInt32();
+    static async ReadObjectContents(levelName, reader, objectsList, buildVersion, onProgressCallback) {
         const posBefore = reader.getBufferPosition();
         const countEntities = reader.readInt32();
         if (countEntities !== objectsList.length) {
@@ -90,31 +90,53 @@ class Level {
                 onProgressCallback(reader.getBufferProgress());
             }
             const len = reader.readInt32();
+            if (len === 0) {
+                throw new Error(`check number is a wrong value (${len}). This normally indicates a corrupt entity or save.`);
+            }
             const before = reader.getBufferPosition();
             const obj = objectsList[i];
             if ((0, SaveEntity_1.isSaveEntity)(obj)) {
                 SaveEntity_1.SaveEntity.ParseData(obj, len, reader, buildVersion, obj.typePath);
             }
             else if ((0, SaveComponent_1.isSaveComponent)(obj)) {
-                SaveComponent_1.SaveComponent.ParseData(obj, len, reader, buildVersion, obj.typePath);
+                const wtf1 = reader.readInt32();
+                const wtf2 = reader.readInt32();
+                SaveComponent_1.SaveComponent.ParseData(obj, wtf2, reader, buildVersion, obj.typePath);
             }
             const after = reader.getBufferPosition();
             if (after - before !== len) {
-                console.warn('entity may be corrupt', this.name, i);
             }
         }
         const posAfter = reader.getBufferPosition();
-        if (posAfter - posBefore !== binarySize) {
-            console.warn('save seems corrupt.', this.name);
-        }
     }
     static ReadLevel(reader, levelName, buildVersion) {
         const level = new Level(levelName);
-        reader.readInt32();
+        const levelStartPos = reader.getBufferPosition();
+        const placeholderHead = reader.readInt32();
+        if (placeholderHead === 8) {
+            const morePlaceholder = reader.readBytes(28);
+        }
+        else {
+            reader.skipBytes(-4);
+        }
+        const lookahead1 = reader.readInt32();
+        const lookahead2 = reader.readInt32();
+        if (lookahead1 !== 0 && lookahead2 !== 0) {
+            reader.skipBytes(-8);
+            return level;
+        }
+        else if (lookahead1 !== 0 && lookahead2 === 0) {
+            reader.skipBytes(-8);
+        }
+        else {
+            throw new Error('Unexpected. what now? TODO FIXME');
+        }
+        const binLen = reader.readInt32();
+        const unk = reader.readInt32();
         Level.ReadObjectHeaders(reader, level.objects, reader.onProgressCallback);
         reader.onProgressCallback(reader.getBufferProgress());
         level.collectables = Level.ReadCollectablesList(reader);
-        Level.ReadObjectContents(reader, level.objects, buildVersion, reader.onProgressCallback);
+        Level.ReadObjectContents(levelName, reader, level.objects, buildVersion, reader.onProgressCallback);
         reader.onProgressCallback(reader.getBufferProgress());
         Level.ReadCollectablesList(reader);
         return level;
@@ -126,11 +148,18 @@ class Level {
         }
     }
     static ReadCollectablesList(reader) {
-        let countCollected = reader.readInt32();
         const collected = [];
-        for (let i = 0; i < countCollected; i++) {
-            const collectable = ObjectReference_1.ObjectReference.Parse(reader);
-            collected.push(collectable);
+        let countSmthing = reader.readInt32();
+        if (countSmthing > 0) {
+            const lookahead = reader.readInt32();
+            if (lookahead === 0) {
+                return collected;
+            }
+            reader.skipBytes(-4);
+            for (let i = 0; i < countSmthing; i++) {
+                const collectable = ObjectReference_1.ObjectReference.Parse(reader);
+                collected.push(collectable);
+            }
         }
         return collected;
     }

package/build/parser/satisfactory/save/save-reader.d.ts

@@ -5,7 +5,7 @@ import { ObjectReference } from "../objects/ObjectReference";
 import { SaveComponent } from "../objects/SaveComponent";
 import { SaveEntity } from "../objects/SaveEntity";
 import { Level } from "./level.class";
-import { SatisfactorySaveHeader } from "./save.types";
+import { RoughSaveVersion, SatisfactorySaveHeader } from "./save.types";
 export type EntityPathFilter = {
     behavior: 'whitelist' | 'blacklist';
     list: string[];
@@ -16,7 +16,7 @@ export type SaveProjectionConfig = {
 };
 export declare const projectionFilterApplies: (config: SaveProjectionConfig, object: SaveComponent | SaveEntity) => boolean;
 export type ReadMode = 'stream' | 'whole';
-export declare const DEFAULT_SATISFACTORY_CHUNK_HEADER_SIZE = 48;
+export declare const DEFAULT_SATISFACTORY_CHUNK_HEADER_SIZE = 49;
 export declare class SaveReader extends ByteReader {
     onProgressCallback: (progress: number, msg?: string) => void;
     header: SatisfactorySaveHeader | undefined;
@@ -26,10 +26,11 @@ export declare class SaveReader extends ByteReader {
     static readonly EPOCH_TICKS = 621355968000000000n;
     constructor(fileBuffer: ArrayBuffer, onProgressCallback?: (progress: number, msg?: string) => void);
     readHeader(): SatisfactorySaveHeader;
+    static getRoughSaveVersion: (saveVersion: number, headerTypeVersion: number) => RoughSaveVersion;
     inflateChunks(): {
         concatenatedChunkLength: number;
         numChunks: number;
     };
-    readLevels(): Level[];
+    readLevelsU8(): Level[];
     readLevelsAsynchronously(writer: SaveStreamWriter): Promise<Level[]>;
 }

package/build/parser/satisfactory/save/save-reader.js

@@ -30,7 +30,7 @@ const projectionFilterApplies = (config, object) => {
     return cond1 && cond2;
 };
 exports.projectionFilterApplies = projectionFilterApplies;
-exports.DEFAULT_SATISFACTORY_CHUNK_HEADER_SIZE = 48;
+exports.DEFAULT_SATISFACTORY_CHUNK_HEADER_SIZE = 49;
 class SaveReader extends byte_reader_class_1.ByteReader {
     constructor(fileBuffer, onProgressCallback = () => { }) {
         super(fileBuffer, alignment_enum_1.Alignment.LITTLE_ENDIAN);
@@ -81,6 +81,12 @@ class SaveReader extends byte_reader_class_1.ByteReader {
         if (this.header.saveHeaderType >= 10) {
             this.header.saveIdentifier = this.readString();
         }
+        if (this.header.saveHeaderType >= 13) {
+            const unk1 = this.readInt32();
+            const unk2 = this.readInt32();
+            const unk3 = this.readBytes(16);
+            const unk4 = this.readInt32();
+        }
         if (this.header.saveVersion >= 21) {
         }
         else {
@@ -105,8 +111,8 @@ class SaveReader extends byte_reader_class_1.ByteReader {
             if (this.compressionInfo.maxChunkContentSize <= 0) {
                 this.compressionInfo.maxChunkContentSize = chunkHeader.getInt32(8, this.alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
             }
-            const chunkCompressedLength = chunkHeader.getInt32(32, this.alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
-            const chunkUncompressedLength = chunkHeader.getInt32(40, this.alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
+            const chunkCompressedLength = chunkHeader.getInt32(33, this.alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
+            const chunkUncompressedLength = chunkHeader.getInt32(25, this.alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
             totalUncompressedBodySize += chunkUncompressedLength;
             const currentChunkSize = chunkCompressedLength;
             let currentChunk = this.fileBuffer.slice(this.currentByte, this.currentByte + currentChunkSize);
@@ -134,32 +140,74 @@ class SaveReader extends byte_reader_class_1.ByteReader {
         this.maxByte = bigWholeChunk.buffer.byteLength;
         this.bufferView = new DataView(bigWholeChunk.buffer);
         const dataLength = this.readInt32();
-        if (totalUncompressedBodySize !== dataLength + 4) {
-            throw new parser_error_1.CorruptSaveError(`Possibly corrupt. Indicated size of total save body (${dataLength}) does not match the uncompressed real size of ${totalUncompressedBodySize}.`);
+        if (totalUncompressedBodySize !== dataLength + 8) {
+            throw new parser_error_1.CorruptSaveError(`Possibly corrupt. Indicated size of total save body (${dataLength + 8}) does not match the uncompressed real size of ${totalUncompressedBodySize}.`);
         }
         return {
             concatenatedChunkLength: newChunkLength,
             numChunks: currentChunks.length
         };
     }
-    readLevels() {
+    readLevelsU8() {
         if (!this.header) {
             throw new parser_error_1.ParserError('ParserError', 'Header must be set before objects can be read.');
         }
         if (this.header.saveVersion < 29) {
-            throw new parser_error_1.UnsupportedVersionError('Support for < U6 is not yet implemented.');
+            throw new parser_error_1.UnsupportedVersionError('Game Version < U6 is not supported.');
         }
-        const numSubLevels = this.readInt32();
-        this.levels = new Array(numSubLevels + 1);
-        for (let j = 0; j <= numSubLevels; j++) {
-            let levelName = (j === numSubLevels) ? '' + this.header.mapName : this.readString();
-            this.onProgressCallback(this.getBufferProgress(), `reading level [${(j + 1)}/${(numSubLevels + 1)}] ${levelName}`);
-            this.levels[j] = level_class_1.Level.ReadLevel(this, levelName, this.header.buildVersion);
+        if (this.header.saveHeaderType < 13) {
+            throw new parser_error_1.UnsupportedVersionError('Game Version < U8 is not supported in this package version. Consider downgrading to the latest package version supporting it, which is 0.0.34');
+        }
+        const unk = this.readInt32();
+        const cannotBeLevelCountWhatIsIt = this.readInt32();
+        const noneString = this.readString();
+        const unk2 = this.readInt32();
+        const hm1 = this.readInt32();
+        const unk3 = this.readInt32();
+        const noneString2 = this.readString();
+        const grids = {};
+        const readLevelsList = (childrenCount) => {
+            const hmm = this.readInt32();
+            const parentName = this.readString();
+            const whatever = this.readBytes(8);
+            grids[parentName] = {};
+            for (let i = 0; i < childrenCount; i++) {
+                const binaryLenIGuess = this.readInt32();
+                const levelInstanceName = this.readString();
+                const lod = /\_L([0-9]+)\_/.exec(levelInstanceName)[1];
+                const arr = grids[parentName][Number(lod)];
+                if (!arr) {
+                    grids[parentName][Number(lod)] = [];
+                }
+                grids[parentName][Number(lod)].push(levelInstanceName);
+            }
+        };
+        readLevelsList(1379);
+        readLevelsList(0);
+        readLevelsList(972);
+        readLevelsList(0);
+        readLevelsList(0);
+        const unk5 = this.readInt32();
+        const levels = [];
+        const levelCount = this.readInt32();
+        this.onProgressCallback(this.getBufferProgress(), `reading pack of ${levelCount} levels.`);
+        for (let i = 0; i < levelCount; i++) {
+            let levelSingleName = this.readString();
+            levels.push(level_class_1.Level.ReadLevel(this, levelSingleName, this.header.buildVersion));
         }
-        if (this.getBufferPosition() < this.bufferView.byteLength) {
-            this.trailingCollectedObjects = level_class_1.Level.ReadCollectablesList(this);
+        level_class_1.Level.ReadCollectablesList(this);
+        this.onProgressCallback(this.getBufferProgress(), `finished reading levels pack of ${levelCount}.`);
+        if (this.getBufferPosition() < this.getBufferLength()) {
+            const appendedLevel = new level_class_1.Level(this.header.mapName);
+            levels.push(appendedLevel);
+            level_class_1.Level.ReadObjectHeaders(this, appendedLevel.objects, this.onProgressCallback);
+            appendedLevel.collectables = level_class_1.Level.ReadCollectablesList(this);
+            level_class_1.Level.ReadObjectContents(appendedLevel.name, this, appendedLevel.objects, this.header.buildVersion, this.onProgressCallback);
+            level_class_1.Level.ReadCollectablesList(this);
+            level_class_1.Level.ReadCollectablesList(this);
         }
-        return this.levels;
+        this.onProgressCallback(this.getBufferProgress(), 'finished parsing.');
+        return levels;
     }
     async readLevelsAsynchronously(writer) {
         const numSubLevels = this.readInt32();
@@ -175,4 +223,15 @@ class SaveReader extends byte_reader_class_1.ByteReader {
     }
 }
 SaveReader.EPOCH_TICKS = 621355968000000000n;
+SaveReader.getRoughSaveVersion = (saveVersion, headerTypeVersion) => {
+    if (headerTypeVersion >= 13) {
+        return 'U8+';
+    }
+    else if (saveVersion >= 29) {
+        return 'U6/U7';
+    }
+    else {
+        return '<U6';
+    }
+};
 exports.SaveReader = SaveReader;

package/build/parser/satisfactory/save/save-writer.js

@@ -78,7 +78,7 @@ class SaveWriter extends byte_writer_class_1.ByteWriter {
             chunk.set(compressedChunk, compressionInfo.chunkHeaderSize);
             const view = new DataView(chunk.buffer);
             view.setInt32(0, compressionInfo.packageFileTag, alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
-            view.setInt32(4, 0, alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
+            view.setInt32(4, 572662306, alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
             view.setInt32(8, compressionInfo.maxChunkContentSize, alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
             view.setInt32(12, 0, alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);
             view.setInt32(16, compressedChunk.byteLength, alignment === alignment_enum_1.Alignment.LITTLE_ENDIAN);

package/build/parser/satisfactory/save/save.types.d.ts

@@ -22,6 +22,7 @@ export interface SatisfactorySaveHeader {
     saveIdentifier?: string;
     fEditorObjectVersion?: number;
 }
+export type RoughSaveVersion = '<U6' | 'U6/U7' | 'U8+';
 export type ResourceNodeEntry = {
     purity: string;
     pathName: string;

package/build/parser/satisfactory/structs/util.types.d.ts

@@ -15,6 +15,8 @@ export type vec4 = vec3 & {
 };
 export declare const ParseVec4: (reader: BinaryReadable) => vec4;
 export declare const SerializeVec4: (writer: ByteWriter, vec: vec4) => void;
+export declare const ParseVec4f: (reader: BinaryReadable) => vec4;
+export declare const SerializeVec4f: (writer: ByteWriter, vec: vec4) => void;
 export declare const sub: (other: vec3, vec: vec3) => vec3;
 export declare const add: (vec: vec3, other: vec3) => vec3;
 export declare const length: (vec: vec3) => number;
@@ -25,12 +27,16 @@ export type vec3 = vec2 & {
 };
 export declare const ParseVec3: (reader: BinaryReadable) => vec3;
 export declare const SerializeVec3: (writer: ByteWriter, vec: vec3) => void;
+export declare const ParseVec3f: (reader: BinaryReadable) => vec3;
+export declare const SerializeVec3f: (writer: ByteWriter, vec: vec3) => void;
 export type vec2 = {
     x: number;
     y: number;
 };
 export declare const ParseVec2: (reader: BinaryReadable) => vec2;
 export declare const SerializeVec2: (writer: ByteWriter, vec: vec2) => void;
+export declare const ParseVec2f: (reader: BinaryReadable) => vec2;
+export declare const SerializeVec2f: (writer: ByteWriter, vec: vec2) => void;
 export type Transform = {
     rotation: vec4;
     translation: vec3;

package/build/parser/satisfactory/structs/util.types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SerializeTransform = exports.ParseTransform = exports.SerializeVec2 = exports.ParseVec2 = exports.SerializeVec3 = exports.ParseVec3 = exports.norm = exports.mult = exports.length = exports.add = exports.sub = exports.SerializeVec4 = exports.ParseVec4 = exports.ParseCol4BGRA = exports.SerializeCol4BGRA = exports.ParseCol4RGBA = exports.SerializeCol4RGBA = void 0;
+exports.SerializeTransform = exports.ParseTransform = exports.SerializeVec2f = exports.ParseVec2f = exports.SerializeVec2 = exports.ParseVec2 = exports.SerializeVec3f = exports.ParseVec3f = exports.SerializeVec3 = exports.ParseVec3 = exports.norm = exports.mult = exports.length = exports.add = exports.sub = exports.SerializeVec4f = exports.ParseVec4f = exports.SerializeVec4 = exports.ParseVec4 = exports.ParseCol4BGRA = exports.SerializeCol4BGRA = exports.ParseCol4RGBA = exports.SerializeCol4RGBA = void 0;
 const SerializeCol4RGBA = (writer, value) => {
     writer.writeFloat(value.r);
     writer.writeFloat(value.g);
@@ -36,15 +36,27 @@ exports.ParseCol4BGRA = ParseCol4BGRA;
 const ParseVec4 = (reader) => {
     return {
         ...((0, exports.ParseVec3)(reader)),
-        w: reader.readFloat32()
+        w: reader.readDouble()
     };
 };
 exports.ParseVec4 = ParseVec4;
 const SerializeVec4 = (writer, vec) => {
     (0, exports.SerializeVec3)(writer, vec);
-    writer.writeFloat(vec.w);
+    writer.writeDouble(vec.w);
 };
 exports.SerializeVec4 = SerializeVec4;
+const ParseVec4f = (reader) => {
+    return {
+        ...((0, exports.ParseVec3f)(reader)),
+        w: reader.readFloat32()
+    };
+};
+exports.ParseVec4f = ParseVec4f;
+const SerializeVec4f = (writer, vec) => {
+    (0, exports.SerializeVec3f)(writer, vec);
+    writer.writeFloat(vec.w);
+};
+exports.SerializeVec4f = SerializeVec4f;
 const sub = (other, vec) => ({ x: other.x - vec.x, y: other.y - vec.y, z: other.z - vec.z });
 exports.sub = sub;
 const add = (vec, other) => ({ x: vec.x + other.x, y: vec.y + other.y, z: vec.z + other.z });
@@ -58,38 +70,62 @@ exports.norm = norm;
 const ParseVec3 = (reader) => {
     return {
         ...((0, exports.ParseVec2)(reader)),
-        z: reader.readFloat32()
+        z: reader.readDouble()
     };
 };
 exports.ParseVec3 = ParseVec3;
 const SerializeVec3 = (writer, vec) => {
     (0, exports.SerializeVec2)(writer, vec);
-    writer.writeFloat(vec.z);
+    writer.writeDouble(vec.z);
 };
 exports.SerializeVec3 = SerializeVec3;
+const ParseVec3f = (reader) => {
+    return {
+        ...((0, exports.ParseVec2f)(reader)),
+        z: reader.readFloat32()
+    };
+};
+exports.ParseVec3f = ParseVec3f;
+const SerializeVec3f = (writer, vec) => {
+    (0, exports.SerializeVec2f)(writer, vec);
+    writer.writeFloat(vec.z);
+};
+exports.SerializeVec3f = SerializeVec3f;
 const ParseVec2 = (reader) => {
     return {
-        x: reader.readFloat32(),
-        y: reader.readFloat32(),
+        x: reader.readDouble(),
+        y: reader.readDouble(),
     };
 };
 exports.ParseVec2 = ParseVec2;
 const SerializeVec2 = (writer, vec) => {
+    writer.writeDouble(vec.x);
+    writer.writeDouble(vec.y);
+};
+exports.SerializeVec2 = SerializeVec2;
+const ParseVec2f = (reader) => {
+    return {
+        x: reader.readFloat32(),
+        y: reader.readFloat32(),
+    };
+};
+exports.ParseVec2f = ParseVec2f;
+const SerializeVec2f = (writer, vec) => {
     writer.writeFloat(vec.x);
     writer.writeFloat(vec.y);
 };
-exports.SerializeVec2 = SerializeVec2;
+exports.SerializeVec2f = SerializeVec2f;
 const ParseTransform = (reader) => {
     return {
-        rotation: (0, exports.ParseVec4)(reader),
-        translation: (0, exports.ParseVec3)(reader),
-        scale3d: (0, exports.ParseVec3)(reader),
+        rotation: (0, exports.ParseVec4f)(reader),
+        translation: (0, exports.ParseVec3f)(reader),
+        scale3d: (0, exports.ParseVec3f)(reader),
     };
 };
 exports.ParseTransform = ParseTransform;
 const SerializeTransform = (writer, transform) => {
-    (0, exports.SerializeVec4)(writer, transform.rotation);
-    (0, exports.SerializeVec3)(writer, transform.translation);
-    (0, exports.SerializeVec3)(writer, transform.scale3d);
+    (0, exports.SerializeVec4f)(writer, transform.rotation);
+    (0, exports.SerializeVec3f)(writer, transform.translation);
+    (0, exports.SerializeVec3f)(writer, transform.scale3d);
 };
 exports.SerializeTransform = SerializeTransform;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@etothepii/satisfactory-file-parser",
 	"author": "etothepii",
-	"version": "0.0.34",
+	"version": "0.1.2",
 	"description": "A file parser for satisfactory files. Includes save files and blueprint files.",
 	"types": "./build/index.d.ts",
 	"main": "./build/index.js",
@@ -14,7 +14,7 @@
 		"typescript"
 	],
 	"scripts": {
-		"test": "jest --config=jest.config.json",
+		"test": "jest --config=jest.config.json --max_old_space_size=30720",
 		"build": "tsc && npm run bundle",
 		"bundle": "npx webpack && dts-bundle-generator -o dist/index.d.ts src/index.ts",
 		"prepublishOnly": "npm run build && npm version patch"