@etothepii/satisfactory-file-parser 0.3.7 → 0.4.3

package/build/parser/satisfactory/objects/DataFields.d.ts

@@ -1,10 +1,10 @@
-import { ByteWriter } from "../../..";
 import { BinaryReadable } from "../../byte/binary-readable.interface";
+import { ByteWriter } from '../../byte/byte-writer.class';
 import { SaveWriter } from "../save/save-writer";
 import { vec3 } from "../structs/util.types";
-import { ObjectReference } from "./ObjectReference";
 import { AbstractBaseProperty } from "./Property";
 import { SaveObject } from "./SaveObject";
+import { ObjectReference } from "./values/ObjectReference";
 export type SpecialAnyProperty = {} | PowerLineSpecialProperty | PlayerSpecialProperty;
 export type PowerLineSpecialProperty = {
     num: number;

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

@@ -63,8 +63,8 @@ class DataFields {
                     target: Property_1.ObjectProperty.ReadValue(reader)
                 };
                 if (remainingLen - (reader.getBufferPosition() - start) >= 24) {
-                    property.sourceTranslation = (0, util_types_1.ParseVec3f)(reader);
-                    property.targetTranslation = (0, util_types_1.ParseVec3f)(reader);
+                    property.sourceTranslation = util_types_1.vec3.ParseF(reader);
+                    property.targetTranslation = util_types_1.vec3.ParseF(reader);
                 }
                 break;
             case '/Game/FactoryGame/Character/Player/BP_PlayerState.BP_PlayerState_C':

package/build/parser/satisfactory/objects/GUIDInfo.d.ts

@@ -1,5 +1,6 @@
-import { BinaryReadable, ByteWriter } from '../../../';
-import { GUID } from './ue/GUID';
+import { BinaryReadable } from '../../byte/binary-readable.interface';
+import { ByteWriter } from '../../byte/byte-writer.class';
+import { GUID } from './values/GUID';
 export type GUIDInfo = undefined | GUID;
 export declare namespace GUIDInfo {
     const read: (reader: BinaryReadable) => GUIDInfo;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GUIDInfo = void 0;
-const GUID_1 = require("./ue/GUID");
+const GUID_1 = require("./values/GUID");
 var GUIDInfo;
 (function (GUIDInfo) {
     GUIDInfo.read = (reader) => {
@@ -22,5 +22,5 @@ var GUIDInfo;
             GUID_1.GUID.write(writer, guid);
         }
     };
-})(GUIDInfo = exports.GUIDInfo || (exports.GUIDInfo = {}));
+})(GUIDInfo || (exports.GUIDInfo = GUIDInfo = {}));
 ;

package/build/parser/satisfactory/objects/Property.d.ts

@@ -1,8 +1,8 @@
-import { ByteWriter } from "../../..";
 import { BinaryReadable } from "../../byte/binary-readable.interface";
+import { ByteWriter } from '../../byte/byte-writer.class';
 import { col4, vec3, vec4 } from "../structs/util.types";
 import { GUIDInfo } from './GUIDInfo';
-import { ObjectReference } from "./ObjectReference";
+import { ObjectReference } from "./values/ObjectReference";
 export type PropertiesMap = {
     [name: string]: AbstractBaseProperty | AbstractBaseProperty[];
 };
@@ -186,9 +186,13 @@ export type RailroadTrackPositionStructPropertyValue = {
 export type InventoryItemStructPropertyValue = {
     unk1: number;
     itemName: string;
-    unk2: string;
-    unk3: string;
-    properties: any[];
+    hasItemState: number;
+    itemState?: {
+        unk: number;
+        pathName: string;
+        binarySize: number;
+        itemStateRaw: number[];
+    };
 };
 export type FICFrameRangeStructPropertyValue = {
     begin: string;
@@ -198,7 +202,14 @@ export type DynamicStructPropertyValue = {
     type: string;
     properties: PropertiesMap;
 };
-export type GENERIC_STRUCT_PROPERTY_VALUE = BasicMultipleStructPropertyValue | BasicStructPropertyValue | BoxStructPropertyValue | RailroadTrackPositionStructPropertyValue | InventoryItemStructPropertyValue | FICFrameRangeStructPropertyValue | DynamicStructPropertyValue | col4 | vec3 | vec4 | string;
+export type ClientIdentityInfo = {
+    id: string;
+    clientUnk1: number;
+    clientUnk2: number;
+    clientHashSize: number;
+    someClientHash: number[];
+};
+export type GENERIC_STRUCT_PROPERTY_VALUE = BasicMultipleStructPropertyValue | BasicStructPropertyValue | BoxStructPropertyValue | RailroadTrackPositionStructPropertyValue | InventoryItemStructPropertyValue | FICFrameRangeStructPropertyValue | ClientIdentityInfo | DynamicStructPropertyValue | col4 | vec3 | vec4 | string;
 export declare class StructProperty extends AbstractBaseProperty {
     subtype: string;
     guid: number;
@@ -246,7 +257,6 @@ export type GENERIC_MAP_VALUE_TYPE = number | ObjectReference | boolean | GENERI
 export declare class MapProperty extends BasicProperty {
     keyType: string;
     valueType: string;
-    structKeyProxy: MAP_STRUCT_KEY_PROXY;
     modeType: number;
     modeUnk1: string | undefined;
     modeUnk2: string;

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

@@ -4,7 +4,9 @@ exports.SerializeFINLuaProcessorStateStorage = exports.ReadFINLuaProcessorStateS
 const util_types_1 = require("../structs/util.types");
 const DataFields_1 = require("./DataFields");
 const GUIDInfo_1 = require("./GUIDInfo");
-const ObjectReference_1 = require("./ObjectReference");
+const GUID_1 = require("./values/GUID");
+const ObjectReference_1 = require("./values/ObjectReference");
+const SoftObjectReference_1 = require("./values/SoftObjectReference");
 class AbstractProperty {
     constructor(type, index) {
         this.type = type;
@@ -496,29 +498,29 @@ class StructProperty extends AbstractBaseProperty {
         let value;
         switch (subtype) {
             case 'Color':
-                value = (0, util_types_1.ParseCol4BGRA)(reader);
+                value = util_types_1.col4.ParseBGRA(reader);
                 break;
             case 'LinearColor':
-                value = (0, util_types_1.ParseCol4RGBA)(reader);
+                value = util_types_1.col4.ParseRGBA(reader);
                 break;
             case 'Vector':
             case 'Rotator':
             case 'Vector2D':
-                value = (size === 12) ? (0, util_types_1.ParseVec3f)(reader) : (0, util_types_1.ParseVec3)(reader);
+                value = (size === 12) ? util_types_1.vec3.ParseF(reader) : util_types_1.vec3.Parse(reader);
                 break;
             case 'Quat':
             case 'Vector4':
             case 'Vector4D':
-                value = (size === 16) ? (0, util_types_1.ParseVec4f)(reader) : (0, util_types_1.ParseVec4)(reader);
+                value = (size === 16) ? util_types_1.vec4.ParseF(reader) : util_types_1.vec4.Parse(reader);
                 break;
             case 'Box':
                 value = (size === 25) ? {
-                    min: (0, util_types_1.ParseVec3f)(reader),
-                    max: (0, util_types_1.ParseVec3f)(reader),
+                    min: util_types_1.vec3.ParseF(reader),
+                    max: util_types_1.vec3.ParseF(reader),
                     isValid: reader.readByte() >= 1
                 } : {
-                    min: (0, util_types_1.ParseVec3)(reader),
-                    max: (0, util_types_1.ParseVec3)(reader),
+                    min: util_types_1.vec3.Parse(reader),
+                    max: util_types_1.vec3.Parse(reader),
                     isValid: reader.readByte() >= 1
                 };
                 break;
@@ -536,14 +538,32 @@ class StructProperty extends AbstractBaseProperty {
             case 'Guid':
                 value = reader.readString();
                 break;
+            case 'ClientIdentityInfo':
+                const id = reader.readString();
+                const clientUnk1 = reader.readInt32();
+                const clientUnk2 = reader.readByte();
+                const clientHashSize = reader.readInt32();
+                const someClientHash = Array.from(reader.readBytes(clientHashSize));
+                value = { id, clientUnk1, clientUnk2, clientHashSize, someClientHash };
+                break;
             case 'InventoryItem':
                 value = {
                     unk1: reader.readInt32(),
                     itemName: reader.readString(),
-                    unk2: reader.readString(),
-                    unk3: reader.readString(),
-                    properties: [],
+                    hasItemState: reader.readInt32(),
                 };
+                if (value.hasItemState >= 1) {
+                    const stateUnk = reader.readInt32();
+                    const statePathName = reader.readString();
+                    const stateBinarySize = reader.readInt32();
+                    const itemStateRaw = Array.from(reader.readBytes(stateBinarySize));
+                    value.itemState = {
+                        unk: stateUnk,
+                        pathName: statePathName,
+                        binarySize: stateBinarySize,
+                        itemStateRaw: itemStateRaw
+                    };
+                }
                 break;
             case 'FluidBox':
                 value = {
@@ -591,28 +611,28 @@ class StructProperty extends AbstractBaseProperty {
         switch (subtype) {
             case 'Color':
                 value = value;
-                (0, util_types_1.SerializeCol4BGRA)(writer, value);
+                util_types_1.col4.SerializeBGRA(writer, value);
                 break;
             case 'LinearColor':
                 value = value;
-                (0, util_types_1.SerializeCol4RGBA)(writer, value);
+                util_types_1.col4.SerializeRGBA(writer, value);
                 break;
             case 'Vector':
             case 'Rotator':
             case 'Vector2D':
                 value = value;
-                (0, util_types_1.SerializeVec3)(writer, value);
+                util_types_1.vec3.Serialize(writer, value);
                 break;
             case 'Quat':
             case 'Vector4':
             case 'Vector4D':
                 value = value;
-                (0, util_types_1.SerializeVec4)(writer, value);
+                util_types_1.vec4.Serialize(writer, value);
                 break;
             case 'Box':
                 value = value;
-                (0, util_types_1.SerializeVec3)(writer, value.min);
-                (0, util_types_1.SerializeVec3)(writer, value.max);
+                util_types_1.vec3.Serialize(writer, value.min);
+                util_types_1.vec3.Serialize(writer, value.max);
                 writer.writeByte(value.isValid ? 1 : 0);
                 break;
             case 'RailroadTrackPosition':
@@ -630,12 +650,26 @@ class StructProperty extends AbstractBaseProperty {
                 value = value;
                 writer.writeString(value);
                 break;
+            case 'ClientIdentityInfo':
+                value = value;
+                writer.writeString(value.id);
+                writer.writeInt32(value.clientUnk1);
+                writer.writeByte(value.clientUnk2);
+                writer.writeInt32(value.clientHashSize);
+                writer.writeBytesArray(value.someClientHash);
+                break;
             case 'InventoryItem':
                 value = value;
                 writer.writeInt32(value.unk1);
                 writer.writeString(value.itemName);
-                writer.writeString(value.unk2);
-                writer.writeString(value.unk3);
+                writer.writeInt32(value.hasItemState);
+                if (value.hasItemState >= 1) {
+                    writer.writeInt32(value.itemState.unk);
+                    writer.writeString(value.itemState.pathName);
+                    writer.writeInt32(value.itemState.binarySize);
+                    writer.writeBytesArray(value.itemState.itemStateRaw);
+                }
+                break;
                 break;
             case 'FluidBox':
                 value = value;
@@ -678,7 +712,7 @@ class ArrayProperty extends BasicProperty {
     }
     static Parse(reader, ueType, index, propertyName) {
         const subtype = reader.readString();
-        reader.skipBytes();
+        reader.skipBytes(1);
         let property;
         const elementCount = reader.readInt32();
         switch (subtype) {
@@ -713,6 +747,9 @@ class ArrayProperty extends BasicProperty {
             case "ObjectProperty":
                 property = new ArrayProperty(subtype, new Array(elementCount).fill(0).map(() => ObjectProperty.ReadValue(reader)), ueType, index);
                 break;
+            case "SoftObjectProperty":
+                property = new ArrayProperty(subtype, new Array(elementCount).fill(0).map(() => SoftObjectReference_1.SoftObjectReference.read(reader)), ueType, index);
+                break;
             case "StructProperty":
                 const name = reader.readString();
                 const type = reader.readString();
@@ -794,6 +831,9 @@ class ArrayProperty extends BasicProperty {
             case "ObjectProperty":
                 property.values.forEach(v => ObjectProperty.SerializeValue(writer, v));
                 break;
+            case "SoftObjectProperty":
+                property.values.forEach(v => SoftObjectReference_1.SoftObjectReference.write(writer, v));
+                break;
             case "StructProperty":
                 writer.writeString(propertyName);
                 writer.writeString(property.subtype);
@@ -841,6 +881,14 @@ class SetProperty extends BasicProperty {
             case "NameProperty":
                 property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => StrProperty.ReadValue(reader)), ueType, index);
                 break;
+            case "StructProperty":
+                if (propertyName === 'mDestroyedPickups') {
+                    property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => GUID_1.GUID.read(reader)), ueType, index);
+                }
+                else {
+                    throw new Error(`Not Implemented SetProperty of StructProperty for property ${propertyName}.`);
+                }
+                break;
             default:
                 throw new Error(`Not Implemented SetProperty of ${subtype}.`);
         }
@@ -870,7 +918,16 @@ class SetProperty extends BasicProperty {
                 property.values.forEach(v => StrProperty.SerializeValue(writer, v));
                 break;
             case "StructProperty":
-                property.values.forEach(v => (0, util_types_1.SerializeVec3f)(writer, v));
+                if (property.name === 'mRemovalLocations') {
+                    console.warn('serializing mRemovalLocations, this is still under investigation.');
+                    property.values.forEach(v => util_types_1.vec3.SerializeF(writer, v));
+                }
+                else if (property.name === 'mDestroyedPickups') {
+                    property.values.forEach(v => GUID_1.GUID.write(writer, v));
+                }
+                else {
+                    throw new Error(`Not Implemented serializing SetProperty of StructProperty for property ${property.name}.`);
+                }
                 break;
             default:
                 throw new Error(`Not Implemented SetProperty of ${property.subtype}.`);
@@ -883,7 +940,6 @@ class MapProperty extends BasicProperty {
         super('MapProperty', ueType, undefined, index);
         this.keyType = keyType;
         this.valueType = valueType;
-        this.structKeyProxy = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
         this.modeType = 0;
         this.modeUnk2 = '';
         this.modeUnk3 = '';
@@ -901,8 +957,7 @@ class MapProperty extends BasicProperty {
             switch (property.keyType) {
                 case 'StructProperty':
                     if (propertyName === 'mSaveData' || propertyName === 'mUnresolvedSaveData') {
-                        key = propertyName;
-                        property.structKeyProxy = Array.from(reader.readBytes(12));
+                        key = Array.from(reader.readBytes(12));
                     }
                     else {
                         key = (0, exports.ParseDynamicStructData)(reader, 0, property.keyType);
@@ -946,6 +1001,9 @@ class MapProperty extends BasicProperty {
                 case 'Int32Property':
                     value = Int32Property.ReadValue(reader);
                     break;
+                case 'Int64Property':
+                    value = Int64Property.ReadValue(reader);
+                    break;
                 case 'ByteProperty':
                     value = ByteProperty.ReadValue(reader);
                     break;
@@ -969,7 +1027,7 @@ class MapProperty extends BasicProperty {
             switch (property.keyType) {
                 case 'StructProperty':
                     if (property.name === 'mSaveData' || property.name === 'mUnresolvedSaveData') {
-                        writer.writeBytesArray(property.structKeyProxy);
+                        writer.writeBytesArray(entry[0]);
                     }
                     else {
                         (0, exports.SerializeDynamicStructData)(writer, 0, entry[0]);
@@ -1013,6 +1071,9 @@ class MapProperty extends BasicProperty {
                 case 'Int32Property':
                     Int32Property.SerializeValue(writer, entry[1]);
                     break;
+                case 'Int64Property':
+                    Int64Property.SerializeValue(writer, entry[1]);
+                    break;
                 case 'ByteProperty':
                     ByteProperty.SerializeValue(writer, entry[1]);
                     break;

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

@@ -27,5 +27,5 @@ class SaveComponent extends SaveObject_1.SaveObject {
         SaveObject_1.SaveObject.ParseData(component, length, reader, buildVersion, typePath);
     }
 }
-SaveComponent.TypeID = 0;
 exports.SaveComponent = SaveComponent;
+SaveComponent.TypeID = 0;

package/build/parser/satisfactory/objects/SaveEntity.d.ts

@@ -1,8 +1,8 @@
 import { BinaryReadable } from "../../byte/binary-readable.interface";
 import { ByteWriter } from "../../byte/byte-writer.class";
 import { Transform } from "../structs/util.types";
-import { ObjectReference } from "./ObjectReference";
 import { SaveObject, SaveObjectHeader } from "./SaveObject";
+import { ObjectReference } from "./values/ObjectReference";
 export declare const isSaveEntity: (obj: any) => obj is SaveEntity;
 export interface SaveEntityHeader extends SaveObjectHeader {
     needTransform: boolean;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SaveEntity = exports.isSaveEntity = void 0;
 const util_types_1 = require("../structs/util.types");
-const ObjectReference_1 = require("./ObjectReference");
 const SaveObject_1 = require("./SaveObject");
+const ObjectReference_1 = require("./values/ObjectReference");
 const isSaveEntity = (obj) => {
     return obj.type === 'SaveEntity';
 };
@@ -30,7 +30,7 @@ class SaveEntity extends SaveObject_1.SaveObject {
     static ParseHeader(reader, obj) {
         SaveObject_1.SaveObject.ParseHeader(reader, obj);
         obj.needTransform = reader.readInt32() == 1;
-        obj.transform = (0, util_types_1.ParseTransform)(reader);
+        obj.transform = util_types_1.Transform.Parse(reader);
         obj.wasPlacedInLevel = reader.readInt32() == 1;
     }
     static ParseData(entity, length, reader, buildVersion, typePath) {
@@ -48,7 +48,7 @@ class SaveEntity extends SaveObject_1.SaveObject {
     static SerializeHeader(writer, entity) {
         SaveObject_1.SaveObject.SerializeHeader(writer, entity);
         writer.writeInt32(entity.needTransform ? 1 : 0);
-        (0, util_types_1.SerializeTransform)(writer, entity.transform);
+        util_types_1.Transform.Serialize(writer, entity.transform);
         writer.writeInt32(entity.wasPlacedInLevel ? 1 : 0);
     }
     static SerializeData(writer, entity, buildVersion) {
@@ -62,5 +62,5 @@ class SaveEntity extends SaveObject_1.SaveObject {
         SaveObject_1.SaveObject.SerializeData(writer, entity, buildVersion);
     }
 }
-SaveEntity.TypeID = 1;
 exports.SaveEntity = SaveEntity;
+SaveEntity.TypeID = 1;

package/build/parser/satisfactory/objects/ue/MD5Hash.d.ts

@@ -1,4 +1,5 @@
-import { ByteReader, ByteWriter } from '../../../..';
+import { ByteReader } from '../../../byte/byte-reader.class';
+import { ByteWriter } from '../../../byte/byte-writer.class';
 export type MD5Hash = {
     isValid: boolean;
     hash?: number[];

package/build/parser/satisfactory/objects/ue/MD5Hash.js

@@ -17,5 +17,5 @@ var MD5Hash;
             writer.writeBytesArray(md5Hash.hash);
         }
     };
-})(MD5Hash = exports.MD5Hash || (exports.MD5Hash = {}));
+})(MD5Hash || (exports.MD5Hash = MD5Hash = {}));
 ;

package/build/parser/satisfactory/objects/values/GUID.d.ts

@@ -0,0 +1,7 @@
+import { BinaryReadable } from '../../../byte/binary-readable.interface';
+import { ByteWriter } from '../../../byte/byte-writer.class';
+export type GUID = [number, number, number, number];
+export declare namespace GUID {
+    const read: (reader: BinaryReadable) => GUID;
+    const write: (writer: ByteWriter, guid: GUID) => void;
+}

package/build/parser/satisfactory/objects/values/GUID.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GUID = void 0;
+var GUID;
+(function (GUID) {
+    GUID.read = (reader) => {
+        return [
+            reader.readUint32(),
+            reader.readUint32(),
+            reader.readUint32(),
+            reader.readUint32(),
+        ];
+    };
+    GUID.write = (writer, guid) => {
+        writer.writeUint32(guid[0]);
+        writer.writeUint32(guid[1]);
+        writer.writeUint32(guid[2]);
+        writer.writeUint32(guid[3]);
+    };
+})(GUID || (exports.GUID = GUID = {}));
+;

package/build/parser/satisfactory/objects/values/ObjectReference.d.ts

@@ -0,0 +1,10 @@
+import { BinaryReadable } from "../../../byte/binary-readable.interface";
+import { ByteWriter } from "../../../byte/byte-writer.class";
+export type ObjectReference = {
+    levelName: string;
+    pathName: string;
+};
+export declare namespace ObjectReference {
+    const read: (reader: BinaryReadable) => ObjectReference;
+    const write: (writer: ByteWriter, ref: ObjectReference) => void;
+}

package/build/parser/satisfactory/objects/values/ObjectReference.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectReference = void 0;
+var ObjectReference;
+(function (ObjectReference) {
+    ObjectReference.read = (reader) => {
+        return {
+            levelName: reader.readString(),
+            pathName: reader.readString()
+        };
+    };
+    ObjectReference.write = (writer, ref) => {
+        writer.writeString(ref.levelName);
+        writer.writeString(ref.pathName);
+    };
+})(ObjectReference || (exports.ObjectReference = ObjectReference = {}));
+;

package/build/parser/satisfactory/objects/values/SoftObjectReference.d.ts

@@ -0,0 +1,11 @@
+import { BinaryReadable } from "../../../byte/binary-readable.interface";
+import { ByteWriter } from "../../../byte/byte-writer.class";
+export type SoftObjectReference = {
+    instanceName: string;
+    pathName: string;
+    unk: number;
+};
+export declare namespace SoftObjectReference {
+    const read: (reader: BinaryReadable) => SoftObjectReference;
+    const write: (writer: ByteWriter, ref: SoftObjectReference) => void;
+}

package/build/parser/satisfactory/objects/values/SoftObjectReference.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SoftObjectReference = void 0;
+var SoftObjectReference;
+(function (SoftObjectReference) {
+    SoftObjectReference.read = (reader) => {
+        return {
+            pathName: reader.readString(),
+            instanceName: reader.readString(),
+            unk: reader.readInt32()
+        };
+    };
+    SoftObjectReference.write = (writer, ref) => {
+        writer.writeString(ref.pathName);
+        writer.writeString(ref.instanceName);
+        writer.writeInt32(ref.unk);
+    };
+})(SoftObjectReference || (exports.SoftObjectReference = SoftObjectReference = {}));
+;

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

@@ -1,9 +1,9 @@
 import { BinaryReadable } from "../../byte/binary-readable.interface";
 import { ByteWriter } from "../../byte/byte-writer.class";
-import { ObjectReference } from "../objects/ObjectReference";
 import { SaveComponent } from "../objects/SaveComponent";
 import { SaveEntity } from "../objects/SaveEntity";
 import { SaveObject } from "../objects/SaveObject";
+import { ObjectReference } from "../objects/values/ObjectReference";
 import { SaveReader } from "./save-reader";
 export declare class Level {
     name: string;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Level = void 0;
-const ObjectReference_1 = require("../objects/ObjectReference");
 const SaveComponent_1 = require("../objects/SaveComponent");
 const SaveEntity_1 = require("../objects/SaveEntity");
+const ObjectReference_1 = require("../objects/values/ObjectReference");
 class Level {
     constructor(name) {
         this.name = name;

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

@@ -1,5 +1,5 @@
 import { ChunkCompressionInfo } from "../../file.types";
-import { ObjectReference } from "../objects/ObjectReference";
+import { ObjectReference } from "../objects/values/ObjectReference";
 import { Level } from "./level.class";
 import { ByteArray4, Grids } from "./save-reader";
 import { SatisfactorySaveHeader } from "./save.types";

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

@@ -1,6 +1,6 @@
 import { ByteReader } from "../../byte/byte-reader.class";
 import { ChunkCompressionInfo } from "../../file.types";
-import { ObjectReference } from "../objects/ObjectReference";
+import { ObjectReference } from "../objects/values/ObjectReference";
 import { Level } from "./level.class";
 import { RoughSaveVersion, SatisfactorySaveHeader } from "./save.types";
 export type ReadMode = 'stream' | 'whole';

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

@@ -41,14 +41,14 @@ class SaveReader extends byte_reader_class_1.ByteReader {
                 const gridHash = this.readUint32();
                 grids[parentName] = { checksum: parentChecksumIdOrSmth, children: {}, cellSize, gridHash };
                 for (let i = 0; i < childrenCount; i++) {
-                    const cellHash = this.readUint32();
+                    const cellBinSizeMaybe = this.readUint32();
                     const levelInstanceName = this.readString();
-                    grids[parentName].children[levelInstanceName] = cellHash;
+                    grids[parentName].children[levelInstanceName] = cellBinSizeMaybe;
                 }
             };
-            readGrid(1379);
+            readGrid(1289);
             readGrid(0);
-            readGrid(972);
+            readGrid(758);
             readGrid(0);
             readGrid(0);
             const unk5 = this.readInt32();
@@ -189,10 +189,14 @@ class SaveReader extends byte_reader_class_1.ByteReader {
         return levels;
     }
 }
+exports.SaveReader = SaveReader;
 SaveReader.EPOCH_TICKS = 621355968000000000n;
 SaveReader.getRoughSaveVersion = (saveVersion, headerTypeVersion) => {
-    if (headerTypeVersion >= 13) {
-        return 'U8+';
+    if (saveVersion >= 46) {
+        return 'U1.0+';
+    }
+    else if (headerTypeVersion >= 13) {
+        return 'U8';
     }
     else if (saveVersion >= 29) {
         return 'U6/U7';
@@ -201,4 +205,3 @@ SaveReader.getRoughSaveVersion = (saveVersion, headerTypeVersion) => {
         return '<U6';
     }
 };
-exports.SaveReader = SaveReader;

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

@@ -64,7 +64,6 @@ class SaveWriter extends byte_writer_class_1.ByteWriter {
             }
             level_class_1.Level.WriteLevel(writer, level, buildVersion);
         }
-        level_class_1.Level.SerializeCollectablesList(writer, save.trailingCollectedObjects ?? []);
     }
     static GenerateCompressedChunksFromData(bufferArray, compressionInfo, onBinaryBeforeCompressing, onChunk, alignment = alignment_enum_1.Alignment.LITTLE_ENDIAN) {
         const errors = [];
@@ -122,6 +121,7 @@ class SaveWriter extends byte_writer_class_1.ByteWriter {
         return chunkSummary;
     }
 }
+exports.SaveWriter = SaveWriter;
 SaveWriter.WriteSaveBodyHash = (writer, hash) => {
     writer.writeInt32(0);
     writer.writeInt32(6);
@@ -144,4 +144,3 @@ SaveWriter.WriteGrids = (writer, grids) => {
     }
     writer.writeInt32(0);
 };
-exports.SaveWriter = SaveWriter;

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

@@ -28,7 +28,7 @@ export interface SatisfactorySaveHeader {
     consistencyHashBytes?: MD5Hash;
     creativeModeEnabled?: boolean;
 }
-export type RoughSaveVersion = '<U6' | 'U6/U7' | 'U8+';
+export type RoughSaveVersion = '<U6' | 'U6/U7' | 'U8' | 'U1.0+';
 export type ResourceNodeEntry = {
     purity: string;
     pathName: string;