@etothepii/satisfactory-file-parser 0.4.4 → 0.4.6

package/README.md

@@ -18,7 +18,7 @@ Game Version Files of U5 and below are NOT supported.
 | <= U5          |  ❌                          |
 | U6 + U7        |  ✅ 0.0.1 - 0.0.34           |
 | U8             |  ✅ 0.1.20 - 0.3.7           |
-| U1.0           |  ✅ >= 0.4.2 (Work in Progress)|
+| U1.0           |  ✅ >= 0.4.6                 |
 
 
 ## Installation via npm

package/build/index.d.ts

@@ -1,15 +1,36 @@
 export * from './parser/satisfactory/blueprint/blueprint.types';
 export { DataFields } from './parser/satisfactory/objects/DataFields';
 export * from './parser/satisfactory/objects/GUIDInfo';
-export * from './parser/satisfactory/objects/Property';
+export * from './parser/satisfactory/objects/property/generic/ArrayProperty';
+export * from './parser/satisfactory/objects/property/generic/BasicProperty';
+export * from './parser/satisfactory/objects/property/generic/BoolProperty';
+export * from './parser/satisfactory/objects/property/generic/ByteProperty';
+export * from './parser/satisfactory/objects/property/generic/DoubleProperty';
+export * from './parser/satisfactory/objects/property/generic/EnumProperty';
+export * from './parser/satisfactory/objects/property/generic/FloatProperty';
+export * from './parser/satisfactory/objects/property/generic/Int32Property';
+export * from './parser/satisfactory/objects/property/generic/Int64Property';
+export * from './parser/satisfactory/objects/property/generic/Int8Property';
+export * from './parser/satisfactory/objects/property/generic/MapProperty';
+export * from './parser/satisfactory/objects/property/generic/ObjectProperty';
+export * from './parser/satisfactory/objects/property/generic/SetProperty';
+export * from './parser/satisfactory/objects/property/generic/StrProperty';
+export * from './parser/satisfactory/objects/property/generic/StructProperty';
+export * from './parser/satisfactory/objects/property/generic/TextProperty';
+export * from './parser/satisfactory/objects/property/generic/Uint32Property';
+export * from './parser/satisfactory/objects/property/generic/Uint64Property';
+export * from './parser/satisfactory/objects/property/generic/Uint8Property';
+export * from './parser/satisfactory/objects/property/special/SpecialAnyProperty';
 export { SaveComponent } from './parser/satisfactory/objects/SaveComponent';
 export { SaveEntity } from './parser/satisfactory/objects/SaveEntity';
 export * from './parser/satisfactory/objects/ue/MD5Hash';
 export * from './parser/satisfactory/objects/values/GUID';
-export { ObjectReference } from './parser/satisfactory/objects/values/ObjectReference';
+export * from './parser/satisfactory/objects/values/ObjectReference';
+export * from './parser/satisfactory/objects/values/SoftObjectReference';
 export { Level } from './parser/satisfactory/save/level.class';
 export { SatisfactorySave } from './parser/satisfactory/save/satisfactory-save';
 export * from './parser/satisfactory/save/save.types';
+export * from './parser/satisfactory/structs/util.types';
 export { BinaryOperable } from './parser/byte/binary-operable.interface';
 export { BinaryReadable } from './parser/byte/binary-readable.interface';
 export { ByteReader } from './parser/byte/byte-reader.class';
@@ -18,7 +39,6 @@ export { BlueprintConfigReader, BlueprintReader } from './parser/satisfactory/bl
 export { BlueprintConfigWriter, BlueprintWriter } from './parser/satisfactory/blueprint/blueprint-writer';
 export { SaveReader } from './parser/satisfactory/save/save-reader';
 export { SaveWriter } from './parser/satisfactory/save/save-writer';
-export * from './parser/satisfactory/structs/util.types';
 export { SaveStreamJsonStringifier } from './parser/stream/reworked/save-stream-json-stringifier';
 export { SaveStreamWriter } from './parser/stream/reworked/save-stream-writer.class';
 export * from './parser/error/parser.error';

package/build/index.js

@@ -14,25 +14,45 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadableStreamParser = exports.Parser = exports.SaveStreamWriter = exports.SaveStreamJsonStringifier = exports.SaveWriter = exports.SaveReader = exports.BlueprintWriter = exports.BlueprintConfigWriter = exports.BlueprintReader = exports.BlueprintConfigReader = exports.ByteWriter = exports.ByteReader = exports.SatisfactorySave = exports.Level = exports.ObjectReference = exports.SaveEntity = exports.SaveComponent = exports.DataFields = void 0;
+exports.ReadableStreamParser = exports.Parser = exports.SaveStreamWriter = exports.SaveStreamJsonStringifier = exports.SaveWriter = exports.SaveReader = exports.BlueprintWriter = exports.BlueprintConfigWriter = exports.BlueprintReader = exports.BlueprintConfigReader = exports.ByteWriter = exports.ByteReader = exports.SatisfactorySave = exports.Level = exports.SaveEntity = exports.SaveComponent = exports.DataFields = void 0;
 __exportStar(require("./parser/satisfactory/blueprint/blueprint.types"), exports);
 var DataFields_1 = require("./parser/satisfactory/objects/DataFields");
 Object.defineProperty(exports, "DataFields", { enumerable: true, get: function () { return DataFields_1.DataFields; } });
 __exportStar(require("./parser/satisfactory/objects/GUIDInfo"), exports);
-__exportStar(require("./parser/satisfactory/objects/Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/ArrayProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/BasicProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/BoolProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/ByteProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/DoubleProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/EnumProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/FloatProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/Int32Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/Int64Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/Int8Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/MapProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/ObjectProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/SetProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/StrProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/StructProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/TextProperty"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/Uint32Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/Uint64Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/generic/Uint8Property"), exports);
+__exportStar(require("./parser/satisfactory/objects/property/special/SpecialAnyProperty"), exports);
 var SaveComponent_1 = require("./parser/satisfactory/objects/SaveComponent");
 Object.defineProperty(exports, "SaveComponent", { enumerable: true, get: function () { return SaveComponent_1.SaveComponent; } });
 var SaveEntity_1 = require("./parser/satisfactory/objects/SaveEntity");
 Object.defineProperty(exports, "SaveEntity", { enumerable: true, get: function () { return SaveEntity_1.SaveEntity; } });
 __exportStar(require("./parser/satisfactory/objects/ue/MD5Hash"), exports);
 __exportStar(require("./parser/satisfactory/objects/values/GUID"), exports);
-var ObjectReference_1 = require("./parser/satisfactory/objects/values/ObjectReference");
-Object.defineProperty(exports, "ObjectReference", { enumerable: true, get: function () { return ObjectReference_1.ObjectReference; } });
+__exportStar(require("./parser/satisfactory/objects/values/ObjectReference"), exports);
+__exportStar(require("./parser/satisfactory/objects/values/SoftObjectReference"), exports);
 var level_class_1 = require("./parser/satisfactory/save/level.class");
 Object.defineProperty(exports, "Level", { enumerable: true, get: function () { return level_class_1.Level; } });
 var satisfactory_save_1 = require("./parser/satisfactory/save/satisfactory-save");
 Object.defineProperty(exports, "SatisfactorySave", { enumerable: true, get: function () { return satisfactory_save_1.SatisfactorySave; } });
 __exportStar(require("./parser/satisfactory/save/save.types"), exports);
+__exportStar(require("./parser/satisfactory/structs/util.types"), exports);
 var byte_reader_class_1 = require("./parser/byte/byte-reader.class");
 Object.defineProperty(exports, "ByteReader", { enumerable: true, get: function () { return byte_reader_class_1.ByteReader; } });
 var byte_writer_class_1 = require("./parser/byte/byte-writer.class");
@@ -47,7 +67,6 @@ var save_reader_1 = require("./parser/satisfactory/save/save-reader");
 Object.defineProperty(exports, "SaveReader", { enumerable: true, get: function () { return save_reader_1.SaveReader; } });
 var save_writer_1 = require("./parser/satisfactory/save/save-writer");
 Object.defineProperty(exports, "SaveWriter", { enumerable: true, get: function () { return save_writer_1.SaveWriter; } });
-__exportStar(require("./parser/satisfactory/structs/util.types"), exports);
 var save_stream_json_stringifier_1 = require("./parser/stream/reworked/save-stream-json-stringifier");
 Object.defineProperty(exports, "SaveStreamJsonStringifier", { enumerable: true, get: function () { return save_stream_json_stringifier_1.SaveStreamJsonStringifier; } });
 var save_stream_writer_class_1 = require("./parser/stream/reworked/save-stream-writer.class");

package/build/parser/satisfactory/edit/edit-constants.d.ts

@@ -1667,6 +1667,10 @@ export declare const EDIT: {
                 readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk5/Build_ConveyorBeltMk5.Build_ConveyorBeltMk5_C";
                 readonly CLASS_NAME: "Build_ConveyorBeltMk5_C";
             };
+            readonly BELT_MK6: {
+                readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk6/Build_ConveyorBeltMk6.Build_ConveyorBeltMk6_C";
+                readonly CLASS_NAME: "Build_ConveyorBeltMk6_C";
+            };
             readonly LIFT_MK1: {
                 readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk1/Build_ConveyorLiftMk1.Build_ConveyorLiftMk1_C";
                 readonly CLASS_NAME: "Build_ConveyorLiftMk1_C";
@@ -1687,6 +1691,10 @@ export declare const EDIT: {
                 readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk5/Build_ConveyorLiftMk5.Build_ConveyorLiftMk5_C";
                 readonly CLASS_NAME: "Build_ConveyorLiftMk5_C";
             };
+            readonly LIFT_MK6: {
+                readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk6/Build_ConveyorLiftMk6.Build_ConveyorLiftMk6_C";
+                readonly CLASS_NAME: "Build_ConveyorLiftMk6_C";
+            };
         };
         readonly PIPELINE: {
             readonly PIPELINE_MK1: {
@@ -1767,6 +1775,10 @@ export declare const EDIT: {
                 readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/StorageContainerMk2/Build_StorageContainerMk2.Build_StorageContainerMk2_C";
                 readonly CLASS_NAME: "Build_StorageContainerMk2_C";
             };
+            readonly CENTRAL_STORAGE: {
+                readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/CentralStorage/Build_CentralStorage.Build_CentralStorage_C";
+                readonly CLASS_NAME: "Build_CentralStorage_C";
+            };
             readonly FLUID_BUFFER_MK_1: {
                 readonly TYPE_PATH: "/Game/FactoryGame/Buildable/Factory/StorageTank/Build_PipeStorageTank.Build_PipeStorageTank_C";
                 readonly CLASS_NAME: "Build_PipeStorageTank_C";
@@ -1885,6 +1897,15 @@ export declare const EDIT: {
             };
         };
         readonly SUBSYSTEMS_AND_MANAGERS: {
+            readonly WORLD_SETTINGS: {
+                readonly TYPE_PATH: "/Script/FactoryGame.FGWorldSettings";
+            };
+            readonly LIGHTWEIGHT_BUILDABLE_SUBSYSTEM: {
+                readonly TYPE_PATH: "/Script/FactoryGame.FGLightweightBuildableSubsystem";
+            };
+            readonly BUILDABLE_SUBSYSTEM: {
+                readonly TYPE_PATH: "/Game/FactoryGame/-Shared/Blueprint/BP_BuildableSubsystem.BP_BuildableSubsystem_C";
+            };
             readonly FOLIAGE_REMOVAL_SUBSYSTEM: {
                 readonly TYPE_PATH: "/Script/FactoryGame.FGFoliageRemovalSubsystem";
             };

package/build/parser/satisfactory/edit/edit-constants.js

@@ -1751,6 +1751,10 @@ exports.EDIT = {
                 TYPE_PATH: '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk5/Build_ConveyorBeltMk5.Build_ConveyorBeltMk5_C',
                 CLASS_NAME: 'Build_ConveyorBeltMk5_C'
             },
+            BELT_MK6: {
+                TYPE_PATH: '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk6/Build_ConveyorBeltMk6.Build_ConveyorBeltMk6_C',
+                CLASS_NAME: 'Build_ConveyorBeltMk6_C'
+            },
             LIFT_MK1: {
                 TYPE_PATH: '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk1/Build_ConveyorLiftMk1.Build_ConveyorLiftMk1_C',
                 CLASS_NAME: 'Build_ConveyorLiftMk1_C'
@@ -1771,6 +1775,10 @@ exports.EDIT = {
                 TYPE_PATH: '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk5/Build_ConveyorLiftMk5.Build_ConveyorLiftMk5_C',
                 CLASS_NAME: 'Build_ConveyorLiftMk5_C'
             },
+            LIFT_MK6: {
+                TYPE_PATH: '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk6/Build_ConveyorLiftMk6.Build_ConveyorLiftMk6_C',
+                CLASS_NAME: 'Build_ConveyorLiftMk6_C'
+            },
         },
         PIPELINE: {
             PIPELINE_MK1: {
@@ -1851,6 +1859,10 @@ exports.EDIT = {
                 TYPE_PATH: TYPE_PATH_CONTAINER_MK2,
                 CLASS_NAME: CLASS_NAME_CONTAINER_MK2
             },
+            CENTRAL_STORAGE: {
+                TYPE_PATH: '/Game/FactoryGame/Buildable/Factory/CentralStorage/Build_CentralStorage.Build_CentralStorage_C',
+                CLASS_NAME: 'Build_CentralStorage_C'
+            },
             FLUID_BUFFER_MK_1: {
                 TYPE_PATH: TYPE_PATH_FLUID_BUFFER_MK1,
                 CLASS_NAME: CLASS_NAME_FLUID_BUFFER_MK1,
@@ -1969,6 +1981,15 @@ exports.EDIT = {
             }
         },
         SUBSYSTEMS_AND_MANAGERS: {
+            WORLD_SETTINGS: {
+                TYPE_PATH: '/Script/FactoryGame.FGWorldSettings',
+            },
+            LIGHTWEIGHT_BUILDABLE_SUBSYSTEM: {
+                TYPE_PATH: '/Script/FactoryGame.FGLightweightBuildableSubsystem'
+            },
+            BUILDABLE_SUBSYSTEM: {
+                TYPE_PATH: '/Game/FactoryGame/-Shared/Blueprint/BP_BuildableSubsystem.BP_BuildableSubsystem_C'
+            },
             FOLIAGE_REMOVAL_SUBSYSTEM: {
                 TYPE_PATH: '/Script/FactoryGame.FGFoliageRemovalSubsystem'
             },

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

@@ -1,42 +1,9 @@
 import { BinaryReadable } from "../../byte/binary-readable.interface";
 import { ByteWriter } from '../../byte/byte-writer.class';
 import { SaveWriter } from "../save/save-writer";
-import { Transform, vec3 } from '../structs/util.types';
-import { AbstractBaseProperty } from "./Property";
+import { AbstractBaseProperty } from "./property/generic/BasicProperty";
+import { SpecialAnyProperty } from './property/special/SpecialAnyProperty';
 import { SaveObject } from "./SaveObject";
-import { ObjectReference } from "./values/ObjectReference";
-export type SpecialAnyProperty = {} | PowerLineSpecialProperty | PlayerSpecialProperty;
-export type PowerLineSpecialProperty = {
-    num: number;
-    source: ObjectReference;
-    target: ObjectReference;
-    sourceTranslation?: vec3;
-    targetTranslation?: vec3;
-};
-export type PlayerSpecialProperty = {
-    flag: number;
-    eosData?: string;
-    steamPlayerData?: string;
-};
-export type ItemSpecialProperty = {
-    length: number;
-    name: string;
-    position: number;
-    pathName: string;
-};
-export type ConveyorSpecialProperty = {
-    items: ItemSpecialProperty[];
-};
-export type BuildableSubsystemSpecialProperty = {
-    buildables: {
-        typePath: string;
-        instances: {
-            transform: Transform;
-            swatchSlotTypePath: string;
-            recipeTypePath: string;
-        }[];
-    }[];
-};
 export declare class DataFields {
     constructor();
     static ParseProperties(obj: SaveObject, length: number, reader: BinaryReadable, buildVersion: number, typePath: string): void;

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

@@ -2,7 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataFields = void 0;
 const util_types_1 = require("../structs/util.types");
-const Property_1 = require("./Property");
+const ArrayProperty_1 = require("./property/generic/ArrayProperty");
+const BoolProperty_1 = require("./property/generic/BoolProperty");
+const ByteProperty_1 = require("./property/generic/ByteProperty");
+const DoubleProperty_1 = require("./property/generic/DoubleProperty");
+const EnumProperty_1 = require("./property/generic/EnumProperty");
+const FloatProperty_1 = require("./property/generic/FloatProperty");
+const Int32Property_1 = require("./property/generic/Int32Property");
+const Int64Property_1 = require("./property/generic/Int64Property");
+const Int8Property_1 = require("./property/generic/Int8Property");
+const MapProperty_1 = require("./property/generic/MapProperty");
+const ObjectProperty_1 = require("./property/generic/ObjectProperty");
+const SetProperty_1 = require("./property/generic/SetProperty");
+const StrProperty_1 = require("./property/generic/StrProperty");
+const StructProperty_1 = require("./property/generic/StructProperty");
+const TextProperty_1 = require("./property/generic/TextProperty");
+const Uint32Property_1 = require("./property/generic/Uint32Property");
+const Uint64Property_1 = require("./property/generic/Uint64Property");
+const Uint8Property_1 = require("./property/generic/Uint8Property");
 class DataFields {
     constructor() {
     }
@@ -49,18 +66,23 @@ class DataFields {
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk3/Build_ConveyorBeltMk3.Build_ConveyorBeltMk3_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk4/Build_ConveyorBeltMk4.Build_ConveyorBeltMk4_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk5/Build_ConveyorBeltMk5.Build_ConveyorBeltMk5_C':
+            case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk6/Build_ConveyorBeltMk6.Build_ConveyorBeltMk6_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk1/Build_ConveyorLiftMk1.Build_ConveyorLiftMk1_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk2/Build_ConveyorLiftMk2.Build_ConveyorLiftMk2_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk3/Build_ConveyorLiftMk3.Build_ConveyorLiftMk3_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk4/Build_ConveyorLiftMk4.Build_ConveyorLiftMk4_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk5/Build_ConveyorLiftMk5.Build_ConveyorLiftMk5_C':
-                property = {};
+            case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk6/Build_ConveyorLiftMk6.Build_ConveyorLiftMk6_C':
+                const count = reader.readInt32();
+                property = {
+                    items: []
+                };
                 break;
             case '/Game/FactoryGame/Buildable/Factory/PowerLine/Build_PowerLine.Build_PowerLine_C':
             case '/Game/FactoryGame/Events/Christmas/Buildings/PowerLineLights/Build_XmassLightsLine.Build_XmassLightsLine_C':
                 property = {
-                    source: Property_1.ObjectProperty.ReadValue(reader),
-                    target: Property_1.ObjectProperty.ReadValue(reader)
+                    source: ObjectProperty_1.ObjectProperty.ReadValue(reader),
+                    target: ObjectProperty_1.ObjectProperty.ReadValue(reader)
                 };
                 if (remainingLen - (reader.getBufferPosition() - start) >= 24) {
                     property.sourceTranslation = util_types_1.vec3.ParseF(reader);
@@ -94,13 +116,20 @@ class DataFields {
                             const transform = util_types_1.Transform.Parse(reader);
                             reader.readInt32();
                             const swatchSlotTypePath = reader.readString();
-                            reader.readBytes(69);
-                            const recipeTypePath = reader.readString();
+                            const zeroes = util_types_1.vec4.Parse(reader);
+                            const oneZeroOne = util_types_1.vec3.Parse(reader);
+                            const unknownUseNumbers = [zeroes, oneZeroOne];
                             reader.readInt32();
+                            const paintFinishPath = reader.readString();
                             reader.readInt32();
+                            reader.readBytes(1);
+                            const recipeTypePath = reader.readString();
+                            reader.readInt64();
                             instances.push({
                                 transform,
+                                unknownUseNumbers,
                                 swatchSlotTypePath,
+                                paintFinishPath,
                                 recipeTypePath,
                             });
                         }
@@ -126,76 +155,79 @@ class DataFields {
         let overhead = 0;
         switch (propertyType) {
             case 'BoolProperty':
-                currentProperty = Property_1.BoolProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.BoolProperty.CalcOverhead(currentProperty);
+                currentProperty = BoolProperty_1.BoolProperty.Parse(reader, propertyType, index);
+                overhead = BoolProperty_1.BoolProperty.CalcOverhead(currentProperty);
                 break;
             case 'ByteProperty':
-                currentProperty = Property_1.ByteProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.ByteProperty.CalcOverhead(currentProperty);
+                currentProperty = ByteProperty_1.ByteProperty.Parse(reader, propertyType, index);
+                overhead = ByteProperty_1.ByteProperty.CalcOverhead(currentProperty);
                 break;
             case 'Int8Property':
-                currentProperty = Property_1.Int8Property.Parse(reader, propertyType, index);
-                overhead = Property_1.Int8Property.CalcOverhead(currentProperty);
+                currentProperty = Int8Property_1.Int8Property.Parse(reader, propertyType, index);
+                overhead = Int8Property_1.Int8Property.CalcOverhead(currentProperty);
                 break;
             case 'UInt8Property':
-                currentProperty = Property_1.Uint8Property.Parse(reader, propertyType, index);
-                overhead = Property_1.Uint8Property.CalcOverhead(currentProperty);
+                currentProperty = Uint8Property_1.Uint8Property.Parse(reader, propertyType, index);
+                overhead = Uint8Property_1.Uint8Property.CalcOverhead(currentProperty);
                 break;
             case 'IntProperty':
             case 'Int32Property':
-                currentProperty = Property_1.Int32Property.Parse(reader, propertyType, index);
-                overhead = Property_1.Int32Property.CalcOverhead(currentProperty);
+                currentProperty = Int32Property_1.Int32Property.Parse(reader, propertyType, index);
+                overhead = Int32Property_1.Int32Property.CalcOverhead(currentProperty);
                 break;
             case 'UInt32Property':
-                currentProperty = Property_1.Uint32Property.Parse(reader, propertyType, index);
-                overhead = Property_1.Uint32Property.CalcOverhead(currentProperty);
+                currentProperty = Uint32Property_1.Uint32Property.Parse(reader, propertyType, index);
+                overhead = Uint32Property_1.Uint32Property.CalcOverhead(currentProperty);
                 break;
             case 'Int64Property':
-                currentProperty = Property_1.Int64Property.Parse(reader, propertyType, index);
-                overhead = Property_1.Int64Property.CalcOverhead(currentProperty);
+                currentProperty = Int64Property_1.Int64Property.Parse(reader, propertyType, index);
+                overhead = Int64Property_1.Int64Property.CalcOverhead(currentProperty);
+                break;
+            case 'UInt64Property':
+                currentProperty = Uint64Property_1.UInt64Property.Parse(reader, propertyType, index);
                 break;
             case 'SingleProperty':
             case 'FloatProperty':
-                currentProperty = Property_1.FloatProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.FloatProperty.CalcOverhead(currentProperty);
+                currentProperty = FloatProperty_1.FloatProperty.Parse(reader, propertyType, index);
+                overhead = FloatProperty_1.FloatProperty.CalcOverhead(currentProperty);
                 break;
             case 'DoubleProperty':
-                currentProperty = Property_1.DoubleProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.DoubleProperty.CalcOverhead(currentProperty);
+                currentProperty = DoubleProperty_1.DoubleProperty.Parse(reader, propertyType, index);
+                overhead = DoubleProperty_1.DoubleProperty.CalcOverhead(currentProperty);
                 break;
             case 'StrProperty':
             case 'NameProperty':
-                currentProperty = Property_1.StrProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.StrProperty.CalcOverhead(currentProperty);
+                currentProperty = StrProperty_1.StrProperty.Parse(reader, propertyType, index);
+                overhead = StrProperty_1.StrProperty.CalcOverhead(currentProperty);
                 break;
             case 'ObjectProperty':
             case 'InterfaceProperty':
-                currentProperty = Property_1.ObjectProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.ObjectProperty.CalcOverhead(currentProperty);
+                currentProperty = ObjectProperty_1.ObjectProperty.Parse(reader, propertyType, index);
+                overhead = ObjectProperty_1.ObjectProperty.CalcOverhead(currentProperty);
                 break;
             case 'EnumProperty':
-                currentProperty = Property_1.EnumProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.EnumProperty.CalcOverhead(currentProperty);
+                currentProperty = EnumProperty_1.EnumProperty.Parse(reader, propertyType, index);
+                overhead = EnumProperty_1.EnumProperty.CalcOverhead(currentProperty);
                 break;
             case 'StructProperty':
-                currentProperty = Property_1.StructProperty.Parse(reader, propertyType, index, binarySize);
-                overhead = Property_1.StructProperty.CalcOverhead(currentProperty);
+                currentProperty = StructProperty_1.StructProperty.Parse(reader, propertyType, index, binarySize);
+                overhead = StructProperty_1.StructProperty.CalcOverhead(currentProperty);
                 break;
             case 'ArrayProperty':
-                currentProperty = Property_1.ArrayProperty.Parse(reader, propertyType, index, propertyName);
-                overhead = Property_1.ArrayProperty.CalcOverhead(currentProperty);
+                currentProperty = ArrayProperty_1.ArrayProperty.Parse(reader, propertyType, index, propertyName);
+                overhead = ArrayProperty_1.ArrayProperty.CalcOverhead(currentProperty);
                 break;
             case 'MapProperty':
-                currentProperty = Property_1.MapProperty.Parse(reader, propertyName, buildVersion, binarySize);
-                overhead = Property_1.MapProperty.CalcOverhead(currentProperty);
+                currentProperty = MapProperty_1.MapProperty.Parse(reader, propertyName, buildVersion, binarySize);
+                overhead = MapProperty_1.MapProperty.CalcOverhead(currentProperty);
                 break;
             case 'TextProperty':
-                currentProperty = Property_1.TextProperty.Parse(reader, propertyType, index);
-                overhead = Property_1.TextProperty.CalcOverhead(currentProperty);
+                currentProperty = TextProperty_1.TextProperty.Parse(reader, propertyType, index);
+                overhead = TextProperty_1.TextProperty.CalcOverhead(currentProperty);
                 break;
             case 'SetProperty':
-                currentProperty = Property_1.SetProperty.Parse(reader, propertyType, index, propertyName);
-                overhead = Property_1.SetProperty.CalcOverhead(currentProperty);
+                currentProperty = SetProperty_1.SetProperty.Parse(reader, propertyType, index, propertyName);
+                overhead = SetProperty_1.SetProperty.CalcOverhead(currentProperty);
                 break;
             default:
                 throw new Error(`Unimplemented type ${propertyType}`);
@@ -230,11 +262,12 @@ class DataFields {
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk3/Build_ConveyorLiftMk3.Build_ConveyorLiftMk3_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk4/Build_ConveyorLiftMk4.Build_ConveyorLiftMk4_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk5/Build_ConveyorLiftMk5.Build_ConveyorLiftMk5_C':
+                writer.writeInt32(property.items.length);
                 break;
             case '/Game/FactoryGame/Buildable/Factory/PowerLine/Build_PowerLine.Build_PowerLine_C':
             case '/Game/FactoryGame/Events/Christmas/Buildings/PowerLineLights/Build_XmassLightsLine.Build_XmassLightsLine_C':
-                Property_1.ObjectProperty.SerializeValue(writer, property.source);
-                Property_1.ObjectProperty.SerializeValue(writer, property.target);
+                ObjectProperty_1.ObjectProperty.SerializeValue(writer, property.source);
+                ObjectProperty_1.ObjectProperty.SerializeValue(writer, property.target);
                 break;
             case '/Game/FactoryGame/Character/Player/BP_PlayerState.BP_PlayerState_C':
                 writer.writeByte(property.flag);
@@ -260,10 +293,14 @@ class DataFields {
                             util_types_1.Transform.Serialize(writer, instance.transform);
                             writer.writeInt32(0);
                             writer.writeString(instance.swatchSlotTypePath);
-                            writer.writeBytesArray(new Array(69).fill(0));
-                            writer.writeString(instance.recipeTypePath);
+                            util_types_1.vec4.Serialize(writer, instance.unknownUseNumbers[0]);
+                            util_types_1.vec3.Serialize(writer, instance.unknownUseNumbers[1]);
                             writer.writeInt32(0);
+                            writer.writeString(instance.paintFinishPath);
                             writer.writeInt32(0);
+                            writer.writeByte(0);
+                            writer.writeString(instance.recipeTypePath);
+                            writer.writeInt64(0n);
                         }
                     }
                 }
@@ -279,80 +316,84 @@ class DataFields {
         let overhead = 0;
         switch (property.ueType) {
             case 'BoolProperty':
-                overhead = Property_1.BoolProperty.CalcOverhead(property);
-                Property_1.BoolProperty.Serialize(writer, property);
+                overhead = BoolProperty_1.BoolProperty.CalcOverhead(property);
+                BoolProperty_1.BoolProperty.Serialize(writer, property);
                 break;
             case 'ByteProperty':
-                overhead = Property_1.ByteProperty.CalcOverhead(property);
-                Property_1.ByteProperty.Serialize(writer, property);
+                overhead = ByteProperty_1.ByteProperty.CalcOverhead(property);
+                ByteProperty_1.ByteProperty.Serialize(writer, property);
                 break;
             case 'Int8Property':
-                overhead = Property_1.Int8Property.CalcOverhead(property);
-                Property_1.Int8Property.Serialize(writer, property);
+                overhead = Int8Property_1.Int8Property.CalcOverhead(property);
+                Int8Property_1.Int8Property.Serialize(writer, property);
                 break;
             case 'UInt8Property':
-                overhead = Property_1.Uint8Property.CalcOverhead(property);
-                Property_1.Uint8Property.Serialize(writer, property);
+                overhead = Uint8Property_1.Uint8Property.CalcOverhead(property);
+                Uint8Property_1.Uint8Property.Serialize(writer, property);
                 break;
             case 'IntProperty':
             case 'Int32Property':
-                overhead = Property_1.Int32Property.CalcOverhead(property);
-                Property_1.Int32Property.Serialize(writer, property);
+                overhead = Int32Property_1.Int32Property.CalcOverhead(property);
+                Int32Property_1.Int32Property.Serialize(writer, property);
                 break;
             case 'UInt32Property':
-                overhead = Property_1.Uint32Property.CalcOverhead(property);
-                Property_1.Uint32Property.Serialize(writer, property);
+                overhead = Uint32Property_1.Uint32Property.CalcOverhead(property);
+                Uint32Property_1.Uint32Property.Serialize(writer, property);
                 break;
             case 'Int64Property':
-                overhead = Property_1.Int64Property.CalcOverhead(property);
-                Property_1.Int64Property.Serialize(writer, property);
+                overhead = Int64Property_1.Int64Property.CalcOverhead(property);
+                Int64Property_1.Int64Property.Serialize(writer, property);
+                break;
+            case 'UInt64PRoperty':
+                overhead = Uint64Property_1.UInt64Property.CalcOverhead(property);
+                Uint64Property_1.UInt64Property.Serialize(writer, property);
                 break;
             case 'SingleProperty':
             case 'FloatProperty':
-                overhead = Property_1.FloatProperty.CalcOverhead(property);
-                Property_1.FloatProperty.Serialize(writer, property);
+                overhead = FloatProperty_1.FloatProperty.CalcOverhead(property);
+                FloatProperty_1.FloatProperty.Serialize(writer, property);
                 break;
             case 'DoubleProperty':
-                overhead = Property_1.DoubleProperty.CalcOverhead(property);
-                Property_1.DoubleProperty.Serialize(writer, property);
+                overhead = DoubleProperty_1.DoubleProperty.CalcOverhead(property);
+                DoubleProperty_1.DoubleProperty.Serialize(writer, property);
                 break;
             case 'StrProperty':
             case 'NameProperty':
-                overhead = Property_1.StrProperty.CalcOverhead(property);
-                Property_1.StrProperty.Serialize(writer, property);
+                overhead = StrProperty_1.StrProperty.CalcOverhead(property);
+                StrProperty_1.StrProperty.Serialize(writer, property);
                 break;
             case 'ObjectProperty':
             case 'InterfaceProperty':
-                overhead = Property_1.ObjectProperty.CalcOverhead(property);
-                Property_1.ObjectProperty.Serialize(writer, property);
+                overhead = ObjectProperty_1.ObjectProperty.CalcOverhead(property);
+                ObjectProperty_1.ObjectProperty.Serialize(writer, property);
                 break;
             case 'EnumProperty':
-                overhead = Property_1.EnumProperty.CalcOverhead(property);
-                Property_1.EnumProperty.Serialize(writer, property);
+                overhead = EnumProperty_1.EnumProperty.CalcOverhead(property);
+                EnumProperty_1.EnumProperty.Serialize(writer, property);
                 break;
             case 'ByteProperty':
-                overhead = Property_1.ByteProperty.CalcOverhead(property);
-                Property_1.ByteProperty.Serialize(writer, property);
+                overhead = ByteProperty_1.ByteProperty.CalcOverhead(property);
+                ByteProperty_1.ByteProperty.Serialize(writer, property);
                 break;
             case 'StructProperty':
-                overhead = Property_1.StructProperty.CalcOverhead(property);
-                Property_1.StructProperty.Serialize(writer, property);
+                overhead = StructProperty_1.StructProperty.CalcOverhead(property);
+                StructProperty_1.StructProperty.Serialize(writer, property);
                 break;
             case 'ArrayProperty':
-                overhead = Property_1.ArrayProperty.CalcOverhead(property);
-                Property_1.ArrayProperty.Serialize(writer, property, propertyName);
+                overhead = ArrayProperty_1.ArrayProperty.CalcOverhead(property);
+                ArrayProperty_1.ArrayProperty.Serialize(writer, property, propertyName);
                 break;
             case 'MapProperty':
-                overhead = Property_1.MapProperty.CalcOverhead(property);
-                Property_1.MapProperty.Serialize(writer, property);
+                overhead = MapProperty_1.MapProperty.CalcOverhead(property);
+                MapProperty_1.MapProperty.Serialize(writer, property);
                 break;
             case 'TextProperty':
-                overhead = Property_1.TextProperty.CalcOverhead(property);
-                Property_1.TextProperty.Serialize(writer, property);
+                overhead = TextProperty_1.TextProperty.CalcOverhead(property);
+                TextProperty_1.TextProperty.Serialize(writer, property);
                 break;
             case 'SetProperty':
-                overhead = Property_1.SetProperty.CalcOverhead(property);
-                Property_1.SetProperty.Serialize(writer, property);
+                overhead = SetProperty_1.SetProperty.CalcOverhead(property);
+                SetProperty_1.SetProperty.Serialize(writer, property);
                 break;
             default:
                 throw new Error(`Unimplemented type ${property.type}`);

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

@@ -1,7 +1,7 @@
 import { BinaryReadable } from "../../byte/binary-readable.interface";
 import { ByteWriter } from "../../byte/byte-writer.class";
-import { SpecialAnyProperty } from "./DataFields";
-import { PropertiesMap } from "./Property";
+import { PropertiesMap } from "./property/generic/BasicProperty";
+import { SpecialAnyProperty } from './property/special/SpecialAnyProperty';
 export interface SaveObjectHeader {
     typePath: string;
     rootObject: string;