pull decimal-string types into common types

- re: #4
satisfactory-dev · Oct 12, 2024 · dae2241 · dae2241
1 parent a49434d
commit dae2241
Show file tree

Hide file tree

Showing 158 changed files with 1,152 additions and 1,050 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -4,6 +4,8 @@
 	"common_type__class__no_description_or_display_name__type": "common/unassigned",
 	"common_type__NativeClass__type": "common/unassigned",
 	"common_type__UnrealEngineString__array__type": "common/unassigned",
+	"common_type__decimal_string__type": "common/scalar",
+	"common_type__decimal_string__signed__type": "common/scalar",
 	"common_type__UnrealEngineString": "utils/validators",
 	"common_type__StringStartsWith": "utils/validators",
 	"common_type__StringPassedRegExp": "utils/validators"

diff --git a/data-progress--common.md b/data-progress--common.md
@@ -1,7 +1,9 @@
 # Data Progress
 
-0.00% Complete (0 of 2)
+0.00% Complete (0 of 4)
 
 ## /Script/CoreUObject.Class'/Script/FactoryGame.FGFauxEntry'
 
 -   [ ] faux
+-   [ ] faux
+-   [ ] faux
diff --git a/data/common/faux.json b/data/common/faux.json
diff --git a/generated-types/1.0/classes/CoreUObject/FGAmmoTypeInstantHit.ts b/generated-types/1.0/classes/CoreUObject/FGAmmoTypeInstantHit.ts
@@ -1,9 +1,11 @@
-import {boolean__type, decimal_string__type} from '../../common/scalar';
+import {boolean__type} from '../../common/scalar';
 
 import {xyz__type} from '../../common/unassigned';
 
 import {FGAmmoTypeProjectile__base__type} from './FGAmmoTypeProjectile';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGAmmoTypeInstantHit__base__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGAmmoTypeProjectile.ts b/generated-types/1.0/classes/CoreUObject/FGAmmoTypeProjectile.ts
@@ -1,9 +1,4 @@
-import {
-	boolean__type,
-	decimal_string__type,
-	decimal_string__signed__type,
-	integer_string__type,
-} from '../../common/scalar';
+import {boolean__type, integer_string__type} from '../../common/scalar';
 
 import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
 
@@ -19,6 +14,11 @@ import {
 
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
 
+import {
+	decimal_string__type,
+	decimal_string__signed__type,
+} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGAmmoTypeProjectile__type = FGAmmoTypeProjectile__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGAmmoTypeSpreadshot.ts b/generated-types/1.0/classes/CoreUObject/FGAmmoTypeSpreadshot.ts
@@ -1,7 +1,9 @@
-import {integer_string__type, decimal_string__type} from '../../common/scalar';
+import {integer_string__type} from '../../common/scalar';
 
 import {FGAmmoTypeProjectile__base__type} from './FGAmmoTypeProjectile';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGAmmoTypeSpreadshot__type = FGAmmoTypeProjectile__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildable.ts b/generated-types/1.0/classes/CoreUObject/FGBuildable.ts
@@ -1,7 +1,5 @@
 import {
-	decimal_string__signed__type,
 	boolean__type,
-	decimal_string__type,
 	integer_string__type,
 	integer_string__signed__type,
 } from '../../common/scalar';
@@ -15,6 +13,11 @@ import {
 
 import {StringPassedRegExp} from '../../utils/validators';
 
+import {
+	decimal_string__signed__type,
+	decimal_string__type,
+} from '../../../common/common/scalar';
+
 import {
 	UnrealEngineString__array__type,
 	class__type,

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableBeamLightweight.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableBeamLightweight.ts
@@ -1,7 +1,7 @@
-import {decimal_string__type} from '../../common/scalar';
-
 import {FGBuildable__base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableBeamLightweight__type = FGBuildable__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableBlueprintDesigner.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableBlueprintDesigner.ts
@@ -9,12 +9,13 @@ import {
 
 import {
 	integer_string__signed__type,
-	decimal_string__type,
 	boolean__type,
 } from '../../common/scalar';
 
 import {FGBuildable__base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableBlueprintDesigner__base__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorBelt.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorBelt.ts
@@ -1,13 +1,14 @@
 import {
 	integer_string__signed__type,
-	decimal_string__type,
 	integer_string__type,
 } from '../../common/scalar';
 
 import {empty_object__type} from '../../common/unassigned';
 
 import {FGBuildable__base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableConveyorBelt__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorLift.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorLift.ts
@@ -1,4 +1,4 @@
-import {decimal_string__type, boolean__type} from '../../common/scalar';
+import {boolean__type} from '../../common/scalar';
 
 import {
 	transformation__type,
@@ -7,6 +7,8 @@ import {
 
 import {FGBuildableConveyorBelt__base__type} from './FGBuildableConveyorBelt';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableConveyorLift__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableCornerWall.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableCornerWall.ts
@@ -1,7 +1,9 @@
-import {decimal_string__type, boolean__type} from '../../common/scalar';
+import {boolean__type} from '../../common/scalar';
 
 import {FGBuildableWall__base__type} from './FGBuildableWall';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableCornerWall__type = FGBuildableWall__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableDockingStation.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableDockingStation.ts
@@ -1,13 +1,11 @@
 import {empty_object__type, xy__type} from '../../common/unassigned';
 
-import {
-	decimal_string__type,
-	integer_string__type,
-	boolean__type,
-} from '../../common/scalar';
+import {integer_string__type, boolean__type} from '../../common/scalar';
 
 import {FGBuildable__docking_station_base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableDockingStation__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableDoor.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableDoor.ts
@@ -1,11 +1,9 @@
-import {
-	boolean__type,
-	decimal_string__type,
-	integer_string__type,
-} from '../../common/scalar';
+import {boolean__type, integer_string__type} from '../../common/scalar';
 
 import {FGBuildableWall__base__rectangle__type} from './FGBuildableWall';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableDoor__type = FGBuildableDoor__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableDroneStation.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableDroneStation.ts
@@ -1,14 +1,15 @@
 import {
 	boolean__type,
 	boolean_extended__type,
-	decimal_string__type,
 	integer_string__type,
 } from '../../common/scalar';
 
 import {xyz__type} from '../../common/unassigned';
 
 import {FGBuildable__docking_station_base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableDroneStation__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFactory.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFactory.ts
@@ -1,6 +1,6 @@
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
-import {decimal_string__type} from '../../common/scalar';
+import {decimal_string__type} from '../../../common/common/scalar';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFactorySimpleProducer.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFactorySimpleProducer.ts
@@ -1,9 +1,9 @@
-import {decimal_string__type} from '../../common/scalar';
-
 import {mEventType__type} from '../../common/unassigned';
 
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableFactorySimpleProducer__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFoundation.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFoundation.ts
@@ -1,4 +1,4 @@
-import {decimal_string__type, boolean__type} from '../../common/scalar';
+import {boolean__type} from '../../common/scalar';
 
 import {
 	empty_object__type,
@@ -7,6 +7,8 @@ import {
 
 import {FGBuildable__base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 export type FGBuildableFoundation__type = FGBuildableFoundation__base__type;
 
 export type FGBuildableFoundation__base__type = FGBuildable__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingActivator.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingActivator.ts
@@ -1,13 +1,11 @@
 import {None__type, empty_object__type} from '../../common/unassigned';
 
-import {
-	decimal_string__type,
-	boolean__type,
-	integer_string__type,
-} from '../../common/scalar';
+import {boolean__type, integer_string__type} from '../../common/scalar';
 
 import {FGBuildable__extractor_base__shared__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {
 	UnrealEngineString__array__type,
 	NativeClass__type,

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableGenerator.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableGenerator.ts
@@ -1,7 +1,7 @@
-import {decimal_string__type} from '../../common/scalar';
-
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 export type FGBuildableGenerator__base__type =
 	FGBuildable__consumes_power_base__type & {
 		mPowerProduction: decimal_string__type;

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableGeneratorFuel.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableGeneratorFuel.ts
@@ -1,11 +1,9 @@
-import {
-	integer_string__type,
-	boolean__type,
-	decimal_string__type,
-} from '../../common/scalar';
+import {integer_string__type, boolean__type} from '../../common/scalar';
 
 import {FGBuildableGenerator__base__type} from './FGBuildableGenerator';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableGeneratorFuel__base__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableGeneratorGeoThermal.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableGeneratorGeoThermal.ts
@@ -1,7 +1,9 @@
-import {boolean__type, decimal_string__type} from '../../common/scalar';
+import {boolean__type} from '../../common/scalar';
 
 import {FGBuildableGenerator__base__type} from './FGBuildableGenerator';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableGeneratorGeoThermal__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableGeneratorNuclear.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableGeneratorNuclear.ts
@@ -1,7 +1,9 @@
-import {integer_string__type, decimal_string__type} from '../../common/scalar';
+import {integer_string__type} from '../../common/scalar';
 
 import {FGBuildableGeneratorFuel__base__type} from './FGBuildableGeneratorFuel';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableGeneratorNuclear__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableJumppad.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableJumppad.ts
@@ -1,8 +1,6 @@
 import {
 	integer_string__type,
 	integer_string__signed__type,
-	decimal_string__type,
-	decimal_string__signed__type,
 	boolean__type,
 } from '../../common/scalar';
 
@@ -14,6 +12,11 @@ import {
 
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
+import {
+	decimal_string__type,
+	decimal_string__signed__type,
+} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableJumppad__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableLadder.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableLadder.ts
@@ -1,7 +1,9 @@
-import {decimal_string__type, integer_string__type} from '../../common/scalar';
+import {integer_string__type} from '../../common/scalar';
 
 import {FGBuildable__base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableLadder__type = FGBuildable__base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableLightSource.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableLightSource.ts
@@ -4,10 +4,12 @@ import {
 	mLightControlData__type,
 } from '../../common/unassigned';
 
-import {boolean__type, decimal_string__type} from '../../common/scalar';
+import {boolean__type} from '../../common/scalar';
 
 import {FGBuildable__base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableLightSource__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableMAM.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableMAM.ts
@@ -1,7 +1,7 @@
-import {decimal_string__type} from '../../common/scalar';
-
 import {FGBuildable__occupied__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableMAM__type = FGBuildable__occupied__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableManufacturer.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableManufacturer.ts
@@ -1,6 +1,5 @@
 import {
 	integer_string__type,
-	decimal_string__type,
 	boolean__type,
 	boolean_extended__type,
 } from '../../common/scalar';
@@ -12,6 +11,8 @@ import {
 
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableManufacturer__type =

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableManufacturerVariablePower.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableManufacturerVariablePower.ts
@@ -1,9 +1,11 @@
-import {decimal_string__type, boolean__type} from '../../common/scalar';
-
 import {empty_object__type, xyz_array__type} from '../../common/unassigned';
 
+import {boolean__type} from '../../common/scalar';
+
 import {FGBuildableManufacturer__base__type} from './FGBuildableManufacturer';
 
+import {decimal_string__type} from '../../../common/common/scalar';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGBuildableManufacturerVariablePower__base__type =