pulling FGBuildableRailroadTrack into common types

- re: #5
satisfactory-dev · Nov 7, 2024 · 7af910e · 7af910e
1 parent 884c46d
commit 7af910e
Show file tree

Hide file tree

Showing 12 changed files with 188 additions and 180 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -59,6 +59,7 @@
 	"common_type__common_base__FGBuildablePipelinePump__valve__type": "classes/CoreUObject/FGBuildablePipelinePump",
 	"common_type__common_base__FGBuildablePipeReservoir__type": "classes/CoreUObject/FGBuildablePipeReservoir",
 	"common_type__common_base__FGBuildablePoleLightweight__type": "classes/CoreUObject/FGBuildablePoleLightweight",
+	"common_type__common_base__FGBuildableRailroadTrack__type": "classes/CoreUObject/FGBuildableRailroadTrack",
 	"common_type__common_base__FGBuildableTradingPost__type": "classes/CoreUObject/FGBuildableTradingPost",
 	"common_type__common_base__FGBuildableWall__base__type": "classes/CoreUObject/FGBuildableWall",
 	"common_type__common_base__FGBuildableWall__base__rectangle__type": "classes/CoreUObject/FGBuildableWall",

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadTrack.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadTrack.ts
@@ -1,39 +1,15 @@
-import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
-
 import {FGBuildable__base__type} from './FGBuildable';
 
-import {
-	decimal_string__type,
-	boolean__type,
-	integer_string__signed__type,
-	integer_string__type,
-} from '../../../common/common/scalar';
+import {common_base__FGBuildableRailroadTrack__type} from '../../../common/classes/CoreUObject/FGBuildableRailroadTrack';
+
+import {NativeClass__type} from '../../../common/common/unassigned';
 
-import {
-	empty_object__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+export type FGBuildableRailroadTrack__type =
+	FGBuildableRailroadTrack__merged__type;
 
-export type FGBuildableRailroadTrack__type = FGBuildable__base__type & {
-	ClassName?: 'Build_RailroadTrack_C';
-	mMeshLength: decimal_string__type;
-	mConnections: [
-		UnrealEngineString<
-			'/Script/FactoryGame.FGRailroadTrackConnectionComponent',
-			StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>
-		>,
-		...UnrealEngineString<
-			'/Script/FactoryGame.FGRailroadTrackConnectionComponent',
-			StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>
-		>[],
-	];
-	mIsOwnedByPlatform: boolean__type;
-	mTrackGraphID: integer_string__signed__type;
-	mOverlappingTracks: '';
-	mVehicles: empty_object__type;
-	mSignalBlockID: integer_string__type;
-	mBlockVisualizationColorDataStartIndex: integer_string__type;
-};
+export type FGBuildableRailroadTrack__merged__type =
+	common_base__FGBuildableRailroadTrack__type &
+		FGBuildable__base__type;
 
 export type FGBuildableRailroadTrack__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/common/classes/CoreUObject/FGBuildableRailroadTrack.ts b/generated-types/common/classes/CoreUObject/FGBuildableRailroadTrack.ts
@@ -0,0 +1,34 @@
+import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
+
+import {
+	decimal_string__type,
+	boolean__type,
+	integer_string__signed__type,
+	integer_string__type,
+} from '../../common/scalar';
+
+import {empty_object__type} from '../../common/unassigned';
+
+import {common_base__FGBuildable__base__type} from './FGBuildable';
+
+export type common_base__FGBuildableRailroadTrack__type =
+	common_base__FGBuildable__base__type & {
+		ClassName?: 'Build_RailroadTrack_C';
+		mMeshLength: decimal_string__type;
+		mConnections: [
+			UnrealEngineString<
+				'/Script/FactoryGame.FGRailroadTrackConnectionComponent',
+				StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>
+			>,
+			...UnrealEngineString<
+				'/Script/FactoryGame.FGRailroadTrackConnectionComponent',
+				StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>
+			>[],
+		];
+		mIsOwnedByPlatform: boolean__type;
+		mTrackGraphID: integer_string__signed__type;
+		mOverlappingTracks: '';
+		mVehicles: empty_object__type;
+		mSignalBlockID: integer_string__type;
+		mBlockVisualizationColorDataStartIndex: integer_string__type;
+	};
diff --git a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts
@@ -33,6 +33,7 @@ import {
 	faux_30__type,
 	faux_31__type,
 	faux_32__type,
+	faux_33__type,
 	NativeClass__type,
 } from '../../common/unassigned';
 
@@ -79,6 +80,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_30__type
 			| faux_31__type
 			| faux_32__type
+			| faux_33__type
 		),
 		...(
 			| faux_1__type
@@ -117,6 +119,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_30__type
 			| faux_31__type
 			| faux_32__type
+			| faux_33__type
 		)[],
 	];
 };
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -97,6 +97,8 @@ import {
 	common_base__FGBuildableDoor__automated__type,
 } from '../classes/CoreUObject/FGBuildableDoor';
 
+import {common_base__FGBuildableRailroadTrack__type} from '../classes/CoreUObject/FGBuildableRailroadTrack';
+
 export type class__type = class__no_description__type & {
 	mDescription: string;
 };
@@ -310,6 +312,11 @@ export type faux_32__type = class__type & {
 	door_autoamted?: common_base__FGBuildableDoor__automated__type;
 };
 
+export type faux_33__type = class__type & {
+	faux?: 'FGBuildableRailroadTrack';
+	ref?: common_base__FGBuildableRailroadTrack__type;
+};
+
 export type faux_4__type = class__type & {
 	faux_texture: Texture2D__type;
 };

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadTrack.ts b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadTrack.ts
@@ -1,48 +1,31 @@
-import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
-
 import {FGBuildable__base__type} from './FGBuildable';
 
 import {
 	integer_string__type,
 	integer_string__signed__type,
 	decimal_string__type,
-	boolean__type,
 } from '../../../common/common/scalar';
 
-import {
-	empty_object__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+import {common_base__FGBuildableRailroadTrack__type} from '../../../common/classes/CoreUObject/FGBuildableRailroadTrack';
 
-export type FGBuildableRailroadTrack__type = FGBuildable__base__type & {
-	ClassName?: 'Build_RailroadTrack_C';
-	mMeshLength: decimal_string__type;
-	mConnections: [
-		UnrealEngineString<
-			'/Script/FactoryGame.FGRailroadTrackConnectionComponent',
-			StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>
-		>,
-		...UnrealEngineString<
-			'/Script/FactoryGame.FGRailroadTrackConnectionComponent',
-			StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>
-		>[],
-	];
-	mIsOwnedByPlatform: boolean__type;
-	mTrackGraphID: integer_string__signed__type;
-	mOverlappingTracks: '';
-	mVehicles: empty_object__type;
-	mSignalBlockID: integer_string__type;
-	mBlockVisualizationMeshLength: decimal_string__type;
-	mBlockVisualizationNumPrimitiveDataFloats: integer_string__type;
-	mBlockVisualizationNumPerInstancePrimitiveDataCountOffset: integer_string__type;
-	mBlockVisualizationSplineDataSettings: {
-		StartTangentPrimitiveDataStartIndex: integer_string__type;
-		EndPositionPrimitiveDataStartIndex: integer_string__type;
-		EndTangentPrimitiveDataStartIndex: integer_string__type;
-		InstanceScaleIndex: integer_string__signed__type;
+import {NativeClass__type} from '../../../common/common/unassigned';
+
+export type FGBuildableRailroadTrack__type =
+	FGBuildableRailroadTrack__merged__type & {
+		mBlockVisualizationMeshLength: decimal_string__type;
+		mBlockVisualizationNumPrimitiveDataFloats: integer_string__type;
+		mBlockVisualizationNumPerInstancePrimitiveDataCountOffset: integer_string__type;
+		mBlockVisualizationSplineDataSettings: {
+			StartTangentPrimitiveDataStartIndex: integer_string__type;
+			EndPositionPrimitiveDataStartIndex: integer_string__type;
+			EndTangentPrimitiveDataStartIndex: integer_string__type;
+			InstanceScaleIndex: integer_string__signed__type;
+		};
 	};
-	mBlockVisualizationColorDataStartIndex: integer_string__type;
-};
+
+export type FGBuildableRailroadTrack__merged__type =
+	common_base__FGBuildableRailroadTrack__type &
+		FGBuildable__base__type;
 
 export type FGBuildableRailroadTrack__NativeClass =
 	NativeClass__type & {

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -900,65 +900,20 @@
 				}
 			}
 		},
-		"FGBuildableRailroadTrack": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base",
-			"unevaluatedProperties": false,
-			"required": [
-				"mMeshLength",
-				"mConnections",
-				"mIsOwnedByPlatform",
-				"mTrackGraphID",
-				"mOverlappingTracks",
-				"mVehicles",
-				"mSignalBlockID",
-				"mBlockVisualizationColorDataStartIndex"
-			],
-			"properties": {
-				"ClassName": {
-					"type": "string",
-					"const": "Build_RailroadTrack_C"
-				},
-				"mMeshLength": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mConnections": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"minItems": 1,
-						"items": {
-							"type": "string",
-							"minLength": 1,
-							"UnrealEngineString": {
-								"left": "/Script/FactoryGame.FGRailroadTrackConnectionComponent",
-								"right": {
-									"starts_with": "/Game/FactoryGame/Buildable/Factory/Train/Track/"
-								}
-							}
-						}
-					}
-				},
-				"mIsOwnedByPlatform": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
-				"mTrackGraphID": {
-					"$ref": "common.schema.json#/$defs/integer-string--signed"
-				},
-				"mOverlappingTracks": {
-					"type": "string",
-					"const": ""
-				},
-				"mVehicles": {
-					"$ref": "common.schema.json#/$defs/empty-object"
-				},
-				"mSignalBlockID": {
-					"$ref": "common.schema.json#/$defs/integer-string"
+		"FGBuildableRailroadTrack--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableRailroadTrack"
 				},
-				"mBlockVisualizationColorDataStartIndex": {
-					"$ref": "common.schema.json#/$defs/integer-string"
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				}
-			}
+			]
+		},
+		"FGBuildableRailroadTrack": {
+			"type": "object",
+			"$ref": "#/$defs/FGBuildableRailroadTrack--merged",
+			"unevaluatedProperties": false
 		},
 		"FGBuildable--occupied--merged": {
 			"allOf": [

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -2125,6 +2125,65 @@
 				}
 			}
 		},
+		"common-base--FGBuildableRailroadTrack": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--base",
+			"required": [
+				"mMeshLength",
+				"mConnections",
+				"mIsOwnedByPlatform",
+				"mTrackGraphID",
+				"mOverlappingTracks",
+				"mVehicles",
+				"mSignalBlockID",
+				"mBlockVisualizationColorDataStartIndex"
+			],
+			"properties": {
+				"ClassName": {
+					"type": "string",
+					"const": "Build_RailroadTrack_C"
+				},
+				"mMeshLength": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mConnections": {
+					"type": "string",
+					"minLength": 1,
+					"typed_string": {
+						"minItems": 1,
+						"items": {
+							"type": "string",
+							"minLength": 1,
+							"UnrealEngineString": {
+								"left": "/Script/FactoryGame.FGRailroadTrackConnectionComponent",
+								"right": {
+									"starts_with": "/Game/FactoryGame/Buildable/Factory/Train/Track/"
+								}
+							}
+						}
+					}
+				},
+				"mIsOwnedByPlatform": {
+					"$ref": "common.schema.json#/$defs/boolean"
+				},
+				"mTrackGraphID": {
+					"$ref": "common.schema.json#/$defs/integer-string--signed"
+				},
+				"mOverlappingTracks": {
+					"type": "string",
+					"const": ""
+				},
+				"mVehicles": {
+					"$ref": "common.schema.json#/$defs/empty-object"
+				},
+				"mSignalBlockID": {
+					"$ref": "common.schema.json#/$defs/integer-string"
+				},
+				"mBlockVisualizationColorDataStartIndex": {
+					"$ref": "common.schema.json#/$defs/integer-string"
+				}
+			}
+		},
 		"common-base--FGBuildableTradingPost": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base",
@@ -3009,6 +3068,20 @@
 					"$ref": "#/$defs/common-base--FGBuildableDoor--automated"
 				}
 			}
+		},
+		"faux-33": {
+			"type": "object",
+			"$ref": "#/$defs/class",
+			"required": ["base"],
+			"properties": {
+				"faux": {
+					"type": "string",
+					"const": "FGBuildableRailroadTrack"
+				},
+				"ref": {
+					"$ref": "#/$defs/common-base--FGBuildableRailroadTrack"
+				}
+			}
 		}
 	},
 	"items": false,
@@ -3205,6 +3278,11 @@
 								"type": "object",
 								"$ref": "#/$defs/faux-32",
 								"unevaluatedProperties": false
+							},
+							{
+								"type": "object",
+								"$ref": "#/$defs/faux-33",
+								"unevaluatedProperties": false
 							}
 						]
 					}