pulling FGCustomizationRecipe--FGRecipe into common types

- re: #4
satisfactory-dev · Oct 23, 2024 · 651167e · 651167e
1 parent f6da73a
commit 651167e
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 157 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -14,6 +14,7 @@
 	"common_type__common_base__FGBuildingDescriptor__ClassName__type": "common/unassigned",
 	"common_type__common_base__FGBuildingDescriptor__mForm__type": "common/unassigned",
 	"common_type__common_base__FGBuildingDescriptor__mSubCategories__type": "common/unassigned",
+	"common_type__common_base__FGCustomizationRecipe__FGRecipe__type": "common/unassigned",
 	"common_type__common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type": "common/unassigned",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__mSubCategories__type": "common/unassigned",
 	"common_type__empty_object__type": "common/unassigned",

diff --git a/generated-types/1.0/classes/CoreUObject/FGCustomizationRecipe.ts b/generated-types/1.0/classes/CoreUObject/FGCustomizationRecipe.ts
@@ -1,23 +1,10 @@
-import {StringPassedRegExp} from '../../utils/validators';
-
-import {decimal_string__type} from '../../../common/common/scalar';
-
 import {
-	mEventType__optional_csv__type,
-	ItemClass__type,
-	class__no_description__type,
+	common_base__FGCustomizationRecipe__FGRecipe__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 
 export type FGCustomizationRecipe__FGRecipe__type =
-	class__no_description__type & {
-		FullName: StringPassedRegExp<'^BlueprintGeneratedClass /Game/FactoryGame/(?:-?[A-Z][A-Za-z0-9_]+/)*(Recipe_[A-Za-z0-9_]+)\\.\\1_C$'>;
-		mDisplayName: Exclude<string, ''>;
-		mIngredients: '' | ItemClass__type;
-		mProduct: '' | ItemClass__type;
-		mManufacturingMenuPriority: decimal_string__type;
-		mManufactoringDuration: decimal_string__type;
-		mManualManufacturingMultiplier: decimal_string__type;
+	common_base__FGCustomizationRecipe__FGRecipe__type & {
 		mProducedIn:
 			| ''
 			| [
@@ -60,9 +47,6 @@ export type FGCustomizationRecipe__FGRecipe__type =
 						| '/Game/FactoryGame/Buildable/Factory/QuantumEncoder/Build_QuantumEncoder.Build_QuantumEncoder_C'
 					)[],
 			];
-		mRelevantEvents: mEventType__optional_csv__type;
-		mVariablePowerConsumptionConstant: decimal_string__type;
-		mVariablePowerConsumptionFactor: decimal_string__type;
 	};
 
 export type FGCustomizationRecipe__NativeClass =

diff --git a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts
@@ -12,6 +12,7 @@ import {
 	faux_10__type,
 	faux_11__type,
 	faux_12__type,
+	common_base__FGCustomizationRecipe__FGRecipe__type,
 	NativeClass__type,
 } from '../../common/unassigned';
 
@@ -31,6 +32,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_10__type
 			| faux_11__type
 			| faux_12__type
+			| common_base__FGCustomizationRecipe__FGRecipe__type
 		),
 		...(
 			| faux_1__type
@@ -46,6 +48,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_10__type
 			| faux_11__type
 			| faux_12__type
+			| common_base__FGCustomizationRecipe__FGRecipe__type
 		)[],
 	];
 };
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -1,4 +1,8 @@
-import {UnrealEngineString, StringStartsWith} from '../utils/validators';
+import {
+	UnrealEngineString,
+	StringStartsWith,
+	StringPassedRegExp,
+} from '../utils/validators';
 
 import {
 	boolean__type,
@@ -129,6 +133,20 @@ export type common_base__FGBuildingDescriptor__mSubCategories__type = [
 	>[],
 ];
 
+export type common_base__FGCustomizationRecipe__FGRecipe__type =
+	class__no_description__type & {
+		FullName: StringPassedRegExp<'^BlueprintGeneratedClass /Game/FactoryGame/(?:-?[A-Z][A-Za-z0-9_]+/)*(Recipe_[A-Za-z0-9_]+)\\.\\1_C$'>;
+		mDisplayName: Exclude<string, ''>;
+		mIngredients: '' | ItemClass__type;
+		mProduct: '' | ItemClass__type;
+		mManufacturingMenuPriority: decimal_string__type;
+		mManufactoringDuration: decimal_string__type;
+		mManualManufacturingMultiplier: decimal_string__type;
+		mRelevantEvents: mEventType__optional_csv__type;
+		mVariablePowerConsumptionConstant: decimal_string__type;
+		mVariablePowerConsumptionFactor: decimal_string__type;
+	};
+
 export type common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type =
 	class__type & {
 		mAbbreviatedDisplayName: string;

diff --git a/generated-types/update8/classes/CoreUObject/FGCustomizationRecipe.ts b/generated-types/update8/classes/CoreUObject/FGCustomizationRecipe.ts
@@ -1,23 +1,10 @@
-import {StringPassedRegExp} from '../../utils/validators';
-
-import {decimal_string__type} from '../../../common/common/scalar';
-
 import {
-	mEventType__optional_csv__type,
-	ItemClass__type,
-	class__no_description__type,
+	common_base__FGCustomizationRecipe__FGRecipe__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 
 export type FGCustomizationRecipe__FGRecipe__type =
-	class__no_description__type & {
-		FullName: StringPassedRegExp<'^BlueprintGeneratedClass /Game/FactoryGame/(?:-?[A-Z][A-Za-z0-9_]+/)*(Recipe_[A-Za-z0-9_]+)\\.\\1_C$'>;
-		mDisplayName: Exclude<string, ''>;
-		mIngredients: '' | ItemClass__type;
-		mProduct: '' | ItemClass__type;
-		mManufacturingMenuPriority: decimal_string__type;
-		mManufactoringDuration: decimal_string__type;
-		mManualManufacturingMultiplier: decimal_string__type;
+	common_base__FGCustomizationRecipe__FGRecipe__type & {
 		mProducedIn:
 			| ''
 			| [
@@ -56,9 +43,6 @@ export type FGCustomizationRecipe__FGRecipe__type =
 						| '/Script/FactoryGame.FGBuildableAutomatedWorkBench'
 					)[],
 			];
-		mRelevantEvents: mEventType__optional_csv__type;
-		mVariablePowerConsumptionConstant: decimal_string__type;
-		mVariablePowerConsumptionFactor: decimal_string__type;
 	};
 
 export type FGCustomizationRecipe__NativeClass =

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -574,55 +574,8 @@
 		},
 		"FGCustomizationRecipe--FGRecipe": {
 			"type": "object",
-			"$ref": "common.schema.json#/$defs/class--no-description",
-			"required": [
-				"FullName",
-				"mDisplayName",
-				"mIngredients",
-				"mProduct",
-				"mManufacturingMenuPriority",
-				"mManufactoringDuration",
-				"mManualManufacturingMultiplier",
-				"mProducedIn",
-				"mRelevantEvents",
-				"mVariablePowerConsumptionConstant",
-				"mVariablePowerConsumptionFactor"
-			],
+			"$ref": "common.schema.json#/$defs/common-base--FGCustomizationRecipe--FGRecipe",
 			"properties": {
-				"FullName": {
-					"type": "string",
-					"pattern": "^BlueprintGeneratedClass /Game/FactoryGame/(?:-?[A-Z][A-Za-z0-9_]+/)*(Recipe_[A-Za-z0-9_]+)\\.\\1_C$"
-				},
-				"mDisplayName": {
-					"type": "string",
-					"minLength": 1
-				},
-				"mIngredients": {
-					"oneOf": [
-						{
-							"type": "string",
-							"const": ""
-						},
-						{
-							"$ref": "common.schema.json#/$defs/ItemClass"
-						}
-					]
-				},
-				"mProduct": {
-					"oneOf": [
-						{"type": "string", "const": ""},
-						{"$ref": "common.schema.json#/$defs/ItemClass"}
-					]
-				},
-				"mManufacturingMenuPriority": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mManufactoringDuration": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mManualManufacturingMultiplier": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"mProducedIn": {
 					"oneOf": [
 						{"type": "string", "const": ""},
@@ -656,15 +609,6 @@
 							}
 						}
 					]
-				},
-				"mRelevantEvents": {
-					"$ref": "common.schema.json#/$defs/mEventType--optional-csv"
-				},
-				"mVariablePowerConsumptionConstant": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mVariablePowerConsumptionFactor": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
 				}
 			}
 		},

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -771,6 +771,68 @@
 				}
 			]
 		},
+		"common-base--FGCustomizationRecipe--FGRecipe": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/class--no-description",
+			"required": [
+				"FullName",
+				"mDisplayName",
+				"mIngredients",
+				"mProduct",
+				"mManufacturingMenuPriority",
+				"mManufactoringDuration",
+				"mManualManufacturingMultiplier",
+				"mProducedIn",
+				"mRelevantEvents",
+				"mVariablePowerConsumptionConstant",
+				"mVariablePowerConsumptionFactor"
+			],
+			"properties": {
+				"FullName": {
+					"type": "string",
+					"pattern": "^BlueprintGeneratedClass /Game/FactoryGame/(?:-?[A-Z][A-Za-z0-9_]+/)*(Recipe_[A-Za-z0-9_]+)\\.\\1_C$"
+				},
+				"mDisplayName": {
+					"type": "string",
+					"minLength": 1
+				},
+				"mIngredients": {
+					"oneOf": [
+						{
+							"type": "string",
+							"const": ""
+						},
+						{
+							"$ref": "common.schema.json#/$defs/ItemClass"
+						}
+					]
+				},
+				"mProduct": {
+					"oneOf": [
+						{"type": "string", "const": ""},
+						{"$ref": "common.schema.json#/$defs/ItemClass"}
+					]
+				},
+				"mManufacturingMenuPriority": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mManufactoringDuration": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mManualManufacturingMultiplier": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mRelevantEvents": {
+					"$ref": "common.schema.json#/$defs/mEventType--optional-csv"
+				},
+				"mVariablePowerConsumptionConstant": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mVariablePowerConsumptionFactor": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				}
+			}
+		},
 		"faux-1": {
 			"type": "object",
 			"$ref": "#/$defs/class",
@@ -1057,6 +1119,11 @@
 								"type": "object",
 								"$ref": "#/$defs/faux-12",
 								"unevaluatedProperties": false
+							},
+							{
+								"type": "object",
+								"$ref": "#/$defs/common-base--FGCustomizationRecipe--FGRecipe",
+								"unevaluatedProperties": false
 							}
 						]
 					}

diff --git a/schema/update8.schema.json b/schema/update8.schema.json
@@ -447,55 +447,8 @@
 		},
 		"FGCustomizationRecipe--FGRecipe": {
 			"type": "object",
-			"$ref": "common.schema.json#/$defs/class--no-description",
-			"required": [
-				"FullName",
-				"mDisplayName",
-				"mIngredients",
-				"mProduct",
-				"mManufacturingMenuPriority",
-				"mManufactoringDuration",
-				"mManualManufacturingMultiplier",
-				"mProducedIn",
-				"mRelevantEvents",
-				"mVariablePowerConsumptionConstant",
-				"mVariablePowerConsumptionFactor"
-			],
+			"$ref": "common.schema.json#/$defs/common-base--FGCustomizationRecipe--FGRecipe",
 			"properties": {
-				"FullName": {
-					"type": "string",
-					"pattern": "^BlueprintGeneratedClass /Game/FactoryGame/(?:-?[A-Z][A-Za-z0-9_]+/)*(Recipe_[A-Za-z0-9_]+)\\.\\1_C$"
-				},
-				"mDisplayName": {
-					"type": "string",
-					"minLength": 1
-				},
-				"mIngredients": {
-					"oneOf": [
-						{
-							"type": "string",
-							"const": ""
-						},
-						{
-							"$ref": "common.schema.json#/$defs/ItemClass"
-						}
-					]
-				},
-				"mProduct": {
-					"oneOf": [
-						{"type": "string", "const": ""},
-						{"$ref": "common.schema.json#/$defs/ItemClass"}
-					]
-				},
-				"mManufacturingMenuPriority": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mManufactoringDuration": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mManualManufacturingMultiplier": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"mProducedIn": {
 					"oneOf": [
 						{"type": "string", "const": ""},
@@ -527,15 +480,6 @@
 							}
 						}
 					]
-				},
-				"mRelevantEvents": {
-					"$ref": "common.schema.json#/$defs/mEventType--optional-csv"
-				},
-				"mVariablePowerConsumptionConstant": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mVariablePowerConsumptionFactor": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
 				}
 			}
 		},

diff --git a/types-progress--common.md b/types-progress--common.md
@@ -1,13 +1,13 @@
 # Types Progress
 
-100.00% Complete (55 of 55)
+100.00% Complete (59 of 59)
 
 ## Basic Types
 
 -   [x] boolean (common type)
 -   [x] boolean-extended
 -   [x] class (common type)
--   [x] class--no-description
+-   [x] class--no-description (common type)
 -   [x] class--no-description-or-display-name
 -   [x] color (common type)
 -   [x] color-decimal
@@ -41,18 +41,19 @@
 -   [x] common-base--FGBuildingDescriptor--ClassName
 -   [x] common-base--FGBuildingDescriptor--mForm
 -   [x] common-base--FGBuildingDescriptor--mSubCategories
+-   [x] common-base--FGCustomizationRecipe--FGRecipe
 -   [x] common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories
 
 ## ItemClass
 
--   [x] ItemClass
+-   [x] ItemClass (common type)
 -   [x] ItemClass--amount-required
 
 ## mEventType
 
 -   [x] mEventType
--   [x] mEventType--optional-csv
+-   [x] mEventType--optional-csv (common type)
 
 ## UnrealEngineString