adding splitters & mergers to common types

- re: #5
satisfactory-dev · Nov 17, 2024 · 6c6e0a5 · 6c6e0a5
1 parent e349d31
commit 6c6e0a5
Show file tree

Hide file tree

Showing 21 changed files with 343 additions and 176 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -50,7 +50,10 @@
 	"common_type__common_base__FGBuildable__pipeline_flow_accessory__type": "classes/CoreUObject/FGBuildable",
 	"common_type__common_base__FGBuildable__pole__base__no_static__type": "classes/CoreUObject/FGBuildable",
 	"common_type__common_base__FGBuildable__pole__base__with_static__type": "classes/CoreUObject/FGBuildable",
+	"common_type__common_base__FGBuildable__splitter__base__type": "classes/CoreUObject/FGBuildable",
 	"common_type__common_base__FGBuildable__tiered__type": "classes/CoreUObject/FGBuildable",
+	"common_type__common_base__FGBuildableAttachmentMerger__type": "classes/CoreUObject/FGBuildableAttachmentMerger",
+	"common_type__common_base__FGBuildableAttachmentSplitter__type": "classes/CoreUObject/FGBuildableAttachmentSplitter",
 	"common_type__common_base__FGBuildableBlueprintDesigner__type": "classes/CoreUObject/FGBuildableBlueprintDesigner",
 	"common_type__common_base__FGBuildableConveyorBelt__type": "classes/CoreUObject/FGBuildableConveyorBelt",
 	"common_type__common_base__FGBuildableConveyorBelt__base__type": "classes/CoreUObject/FGBuildableConveyorBelt",
@@ -104,6 +107,7 @@
 	"common_type__common_base__FGBuildableResourceExtractor__oil_extractor__type": "classes/CoreUObject/FGBuildableResourceExtractor",
 	"common_type__common_base__FGBuildableResourceSink__type": "classes/CoreUObject/FGBuildableResourceSink",
 	"common_type__common_base__FGBuildableResourceSinkShop__type": "classes/CoreUObject/FGBuildableResourceSinkShop",
+	"common_type__common_base__FGBuildableSplitterSmart__type": "classes/CoreUObject/FGBuildableSplitterSmart",
 	"common_type__common_base__FGBuildableStorage__type": "classes/CoreUObject/FGBuildableStorage",
 	"common_type__common_base__FGBuildableTradingPost__type": "classes/CoreUObject/FGBuildableTradingPost",
 	"common_type__common_base__FGBuildableTrainPlatform__base__type": "classes/CoreUObject/FGBuildableTrainPlatform",

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildable.ts b/generated-types/1.0/classes/CoreUObject/FGBuildable.ts
@@ -3,11 +3,12 @@ import {
 	FGBuildable__consumes_power_base__version_1__type,
 } from '../../common/unassigned';
 
+import {FGBuildableAttachmentMergerSplitter__with_inventory_size__type} from './FGBuildableAttachmentMergerSplitter';
+
 import {
 	boolean__type,
 	integer_string__type,
 	decimal_string__type,
-	integer_string__signed__type,
 } from '../../../common/common/scalar';
 
 import {
@@ -26,6 +27,7 @@ import {
 	common_base__FGBuildable__pipeline_flow_accessory__type,
 	common_base__FGBuildable__pole__base__no_static__type,
 	common_base__FGBuildable__pole__base__with_static__type,
+	common_base__FGBuildable__splitter__base__type,
 	common_base__FGBuildable__tiered__type,
 } from '../../../common/classes/CoreUObject/FGBuildable';
 
@@ -290,10 +292,13 @@ export type FGBuildable__power_switch__base__type =
 		mBuildingTag: '';
 	};
 
-export type FGBuildable__splitter__base__type = FGBuildable__base__type & {
-	mCurrentOutputIndex: integer_string__signed__type;
-	mInventorySize: integer_string__type;
-};
+export type FGBuildable__splitter__base__type =
+	FGBuildable__splitter__base__merged__type;
+
+export type FGBuildable__splitter__base__merged__type =
+	common_base__FGBuildable__splitter__base__type &
+		FGBuildable__base__type &
+		FGBuildableAttachmentMergerSplitter__with_inventory_size__type;
 
 export type FGBuildable__tiered__type = FGBuildable__tiered__merged__type;
 

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableAttachmentMerger.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableAttachmentMerger.ts
@@ -1,16 +1,18 @@
 import {FGBuildable__base__type} from './FGBuildable';
 
-import {
-	integer_string__signed__type,
-	integer_string__type,
-} from '../../../common/common/scalar';
+import {FGBuildableAttachmentMergerSplitter__with_inventory_size__type} from './FGBuildableAttachmentMergerSplitter';
+
+import {common_base__FGBuildableAttachmentMerger__type} from '../../../common/classes/CoreUObject/FGBuildableAttachmentMerger';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGBuildableAttachmentMerger__type = FGBuildable__base__type & {
-	mCurrentInputIndex: integer_string__signed__type;
-	mInventorySize: integer_string__type;
-};
+export type FGBuildableAttachmentMerger__type =
+	FGBuildableAttachmentMerger__merged__type;
+
+export type FGBuildableAttachmentMerger__merged__type =
+	common_base__FGBuildableAttachmentMerger__type &
+		FGBuildable__base__type &
+		FGBuildableAttachmentMergerSplitter__with_inventory_size__type;
 
 export type FGBuildableAttachmentMerger__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableAttachmentMergerSplitter.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableAttachmentMergerSplitter.ts
@@ -0,0 +1,5 @@
+import {integer_string__type} from '../../../common/common/scalar';
+
+export type FGBuildableAttachmentMergerSplitter__with_inventory_size__type = {
+	mInventorySize: integer_string__type;
+};
diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableAttachmentSplitter.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableAttachmentSplitter.ts
@@ -1,9 +1,15 @@
 import {FGBuildable__splitter__base__type} from './FGBuildable';
 
+import {common_base__FGBuildableAttachmentSplitter__type} from '../../../common/classes/CoreUObject/FGBuildableAttachmentSplitter';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableAttachmentSplitter__type =
-	FGBuildable__splitter__base__type;
+	FGBuildableAttachmentSplitter__merged__type;
+
+export type FGBuildableAttachmentSplitter__merged__type =
+	common_base__FGBuildableAttachmentSplitter__type &
+		FGBuildable__splitter__base__type;
 
 export type FGBuildableAttachmentSplitter__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableSplitterSmart.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableSplitterSmart.ts
@@ -1,24 +1,15 @@
 import {FGBuildable__splitter__base__type} from './FGBuildable';
 
-import {
-	empty_object__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+import {common_base__FGBuildableSplitterSmart__type} from '../../../common/classes/CoreUObject/FGBuildableSplitterSmart';
 
-import {integer_string__type} from '../../../common/common/scalar';
+import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableSplitterSmart__type =
-	FGBuildable__splitter__base__type & {
-		OnSortRulesChangedDelegate: empty_object__type;
-		mMaxNumSortRules: integer_string__type;
-		mLastItem: {
-			ItemState: empty_object__type;
-		};
-		mItemToLastOutputMap: empty_object__type;
-		mLastOutputIndex: integer_string__type;
-		mCurrentInventoryIndex: integer_string__type;
-		mDistributionTable: '';
-	};
+	FGBuildableSplitterSmart__merged__type;
+
+export type FGBuildableSplitterSmart__merged__type =
+	common_base__FGBuildableSplitterSmart__type &
+		FGBuildable__splitter__base__type;
 
 export type FGBuildableSplitterSmart__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/common/classes/CoreUObject/FGBuildable.ts b/generated-types/common/classes/CoreUObject/FGBuildable.ts
@@ -175,6 +175,11 @@ export type common_base__FGBuildable__pole__base__with_static__type =
 		mUseStaticHeight: boolean__type;
 	};
 
+export type common_base__FGBuildable__splitter__base__type =
+	common_base__FGBuildable__base__type & {
+		mCurrentOutputIndex: integer_string__signed__type;
+	};
+
 export type common_base__FGBuildable__tiered__type =
 	common_base__FGBuildable__base__type & {
 		Tier: integer_string__type;

diff --git a/generated-types/common/classes/CoreUObject/FGBuildableAttachmentMerger.ts b/generated-types/common/classes/CoreUObject/FGBuildableAttachmentMerger.ts
@@ -0,0 +1,8 @@
+import {integer_string__signed__type} from '../../common/scalar';
+
+import {common_base__FGBuildable__base__type} from './FGBuildable';
+
+export type common_base__FGBuildableAttachmentMerger__type =
+	common_base__FGBuildable__base__type & {
+		mCurrentInputIndex: integer_string__signed__type;
+	};
diff --git a/generated-types/common/classes/CoreUObject/FGBuildableAttachmentSplitter.ts b/generated-types/common/classes/CoreUObject/FGBuildableAttachmentSplitter.ts
@@ -0,0 +1,4 @@
+import {common_base__FGBuildable__splitter__base__type} from './FGBuildable';
+
+export type common_base__FGBuildableAttachmentSplitter__type =
+	common_base__FGBuildable__splitter__base__type;
diff --git a/generated-types/common/classes/CoreUObject/FGBuildableSplitterSmart.ts b/generated-types/common/classes/CoreUObject/FGBuildableSplitterSmart.ts
@@ -0,0 +1,18 @@
+import {empty_object__type} from '../../common/unassigned';
+
+import {integer_string__type} from '../../common/scalar';
+
+import {common_base__FGBuildable__splitter__base__type} from './FGBuildable';
+
+export type common_base__FGBuildableSplitterSmart__type =
+	common_base__FGBuildable__splitter__base__type & {
+		OnSortRulesChangedDelegate: empty_object__type;
+		mMaxNumSortRules: integer_string__type;
+		mLastItem: {
+			ItemState: empty_object__type;
+		};
+		mItemToLastOutputMap: empty_object__type;
+		mLastOutputIndex: integer_string__type;
+		mCurrentInventoryIndex: integer_string__type;
+		mDistributionTable: '';
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -15,6 +15,7 @@ import {
 	common_base__FGBuildable__tiered__type,
 	common_base__FGBuildable__extractor_base__shared__type,
 	common_base__FGBuildable__extractor_base__type,
+	common_base__FGBuildable__splitter__base__type,
 	common_base__FGBuildable__pipeline_accessory__base__type,
 	common_base__FGBuildable__pipeline_accessory__type,
 	common_base__FGBuildable__pipeline_flow_accessory__type,
@@ -144,6 +145,12 @@ import {common_base__FGBuildableDockingStation__type} from '../classes/CoreUObje
 
 import {common_base__FGBuildableJumppad__type} from '../classes/CoreUObject/FGBuildableJumppad';
 
+import {common_base__FGBuildableAttachmentMerger__type} from '../classes/CoreUObject/FGBuildableAttachmentMerger';
+
+import {common_base__FGBuildableAttachmentSplitter__type} from '../classes/CoreUObject/FGBuildableAttachmentSplitter';
+
+import {common_base__FGBuildableSplitterSmart__type} from '../classes/CoreUObject/FGBuildableSplitterSmart';
+
 import {
 	FGSchematic__mUnlocks_mSchematics__mSchematics__type,
 	common_base__FGSchematic__mUnlocks__type,
@@ -540,6 +547,10 @@ export type faux_11__type = class__type & {
 	FGBuildablePowerStorage?: common_base__FGBuildablePowerStorage__type;
 	FGBuildableDockingStation?: common_base__FGBuildableDockingStation__type;
 	FGBuildableJumppad?: common_base__FGBuildableJumppad__type;
+	FGBuildableAttachmentMerger?: common_base__FGBuildableAttachmentMerger__type;
+	FGBuildable_splitter_base?: common_base__FGBuildable__splitter__base__type;
+	FGBuildableAttachmentSplitter?: common_base__FGBuildableAttachmentSplitter__type;
+	FGBuildableSplitterSmart?: common_base__FGBuildableSplitterSmart__type;
 };
 
 export type faux_12__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildable.ts b/generated-types/update8/classes/CoreUObject/FGBuildable.ts
@@ -4,7 +4,6 @@ import {
 	boolean__type,
 	decimal_string__type,
 	integer_string__type,
-	integer_string__signed__type,
 } from '../../../common/common/scalar';
 
 import {
@@ -23,6 +22,7 @@ import {
 	common_base__FGBuildable__pipeline_flow_accessory__type,
 	common_base__FGBuildable__pole__base__no_static__type,
 	common_base__FGBuildable__pole__base__with_static__type,
+	common_base__FGBuildable__splitter__base__type,
 	common_base__FGBuildable__tiered__type,
 } from '../../../common/classes/CoreUObject/FGBuildable';
 
@@ -219,9 +219,12 @@ export type FGBuildable__power_switch__base__type =
 		mBuildingTag: '';
 	};
 
-export type FGBuildable__splitter__base__type = FGBuildable__base__type & {
-	mCurrentOutputIndex: integer_string__signed__type;
-};
+export type FGBuildable__splitter__base__type =
+	FGBuildable__splitter__base__merged__type;
+
+export type FGBuildable__splitter__base__merged__type =
+	common_base__FGBuildable__splitter__base__type &
+		FGBuildable__base__type;
 
 export type FGBuildable__tiered__type = FGBuildable__tiered__merged__type;
 

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableAttachmentMerger.ts b/generated-types/update8/classes/CoreUObject/FGBuildableAttachmentMerger.ts
@@ -1,12 +1,15 @@
 import {FGBuildable__base__type} from './FGBuildable';
 
-import {integer_string__signed__type} from '../../../common/common/scalar';
+import {common_base__FGBuildableAttachmentMerger__type} from '../../../common/classes/CoreUObject/FGBuildableAttachmentMerger';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGBuildableAttachmentMerger__type = FGBuildable__base__type & {
-	mCurrentInputIndex: integer_string__signed__type;
-};
+export type FGBuildableAttachmentMerger__type =
+	FGBuildableAttachmentMerger__merged__type;
+
+export type FGBuildableAttachmentMerger__merged__type =
+	common_base__FGBuildableAttachmentMerger__type &
+		FGBuildable__base__type;
 
 export type FGBuildableAttachmentMerger__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableAttachmentSplitter.ts b/generated-types/update8/classes/CoreUObject/FGBuildableAttachmentSplitter.ts
@@ -1,9 +1,15 @@
 import {FGBuildable__splitter__base__type} from './FGBuildable';
 
+import {common_base__FGBuildableAttachmentSplitter__type} from '../../../common/classes/CoreUObject/FGBuildableAttachmentSplitter';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableAttachmentSplitter__type =
-	FGBuildable__splitter__base__type;
+	FGBuildableAttachmentSplitter__merged__type;
+
+export type FGBuildableAttachmentSplitter__merged__type =
+	common_base__FGBuildableAttachmentSplitter__type &
+		FGBuildable__splitter__base__type;
 
 export type FGBuildableAttachmentSplitter__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableSplitterSmart.ts b/generated-types/update8/classes/CoreUObject/FGBuildableSplitterSmart.ts
@@ -1,24 +1,15 @@
 import {FGBuildable__splitter__base__type} from './FGBuildable';
 
-import {
-	empty_object__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+import {common_base__FGBuildableSplitterSmart__type} from '../../../common/classes/CoreUObject/FGBuildableSplitterSmart';
 
-import {integer_string__type} from '../../../common/common/scalar';
+import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableSplitterSmart__type =
-	FGBuildable__splitter__base__type & {
-		OnSortRulesChangedDelegate: empty_object__type;
-		mMaxNumSortRules: integer_string__type;
-		mLastItem: {
-			ItemState: empty_object__type;
-		};
-		mItemToLastOutputMap: empty_object__type;
-		mLastOutputIndex: integer_string__type;
-		mCurrentInventoryIndex: integer_string__type;
-		mDistributionTable: '';
-	};
+	FGBuildableSplitterSmart__merged__type;
+
+export type FGBuildableSplitterSmart__merged__type =
+	common_base__FGBuildableSplitterSmart__type &
+		FGBuildable__splitter__base__type;
 
 export type FGBuildableSplitterSmart__NativeClass =
 	NativeClass__type & {