diff --git a/common-imports.json b/common-imports.json index afce06b..6050f54 100644 --- 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 index 42b4ff9..478862c 100644 --- 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 index 4fd6b4b..411ff3f 100644 --- 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 new file mode 100644 index 0000000..59bac79 --- /dev/null +++ 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 index d229bb0..1c85b5a 100644 --- 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 index c6e6999..e187ed3 100644 --- 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 index 165743e..d87f276 100644 --- 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 new file mode 100644 index 0000000..0db1bea --- /dev/null +++ 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 new file mode 100644 index 0000000..7be01d7 --- /dev/null +++ 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 new file mode 100644 index 0000000..224a3d3 --- /dev/null +++ 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 index 7428e67..e75e8d0 100644 --- 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 index b096359..61bd411 100644 --- 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 index d9d2b25..bbea994 100644 --- 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 index d229bb0..1c85b5a 100644 --- 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 index c6e6999..e187ed3 100644 --- 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 & { diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index 7ed488b..bdb81bd 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -5009,84 +5009,79 @@ } } }, - "FGBuildableAttachmentMerger": { + "FGBuildableAttachmentMergerSplitter--with-inventory-size": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "unevaluatedProperties": false, - "required": ["mCurrentInputIndex", "mInventorySize"], + "required": ["mInventorySize"], "properties": { - "mCurrentInputIndex": { - "$ref": "common.schema.json#/$defs/integer-string--signed" - }, "mInventorySize": { "$ref": "common.schema.json#/$defs/integer-string" } } }, - "FGBuildable--splitter--base": { - "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "required": ["mCurrentOutputIndex", "mInventorySize"], - "properties": { - "mCurrentOutputIndex": { - "$ref": "common.schema.json#/$defs/integer-string--signed" + "FGBuildableAttachmentMerger--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableAttachmentMerger" }, - "mInventorySize": { - "$ref": "common.schema.json#/$defs/integer-string" + { + "$ref": "#/$defs/FGBuildable--base" + }, + { + "$ref": "#/$defs/FGBuildableAttachmentMergerSplitter--with-inventory-size" } - } + ] }, - "FGBuildableAttachmentSplitter": { + "FGBuildableAttachmentMerger": { "type": "object", - "$ref": "#/$defs/FGBuildable--splitter--base", + "$ref": "#/$defs/FGBuildableAttachmentMerger--merged", "unevaluatedProperties": false }, - "FGBuildableSplitterSmart": { - "type": "object", - "$ref": "#/$defs/FGBuildable--splitter--base", - "unevaluatedProperties": false, - "required": [ - "OnSortRulesChangedDelegate", - "mMaxNumSortRules", - "mLastItem", - "mItemToLastOutputMap", - "mLastOutputIndex", - "mCurrentInventoryIndex", - "mDistributionTable" - ], - "properties": { - "OnSortRulesChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mMaxNumSortRules": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mLastItem": { - "type": "string", - "minLength": 1, - "typed_string": { - "required": ["ItemState"], - "properties": { - "ItemState": { - "$ref": "common.schema.json#/$defs/empty-object" - } - } - } + "FGBuildable--splitter--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--splitter--base" }, - "mItemToLastOutputMap": { - "$ref": "common.schema.json#/$defs/empty-object" + { + "$ref": "#/$defs/FGBuildable--base" }, - "mLastOutputIndex": { - "$ref": "common.schema.json#/$defs/integer-string" + { + "$ref": "#/$defs/FGBuildableAttachmentMergerSplitter--with-inventory-size" + } + ] + }, + "FGBuildable--splitter--base": { + "type": "object", + "$ref": "#/$defs/FGBuildable--splitter--base--merged" + }, + "FGBuildableAttachmentSplitter--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableAttachmentSplitter" }, - "mCurrentInventoryIndex": { - "$ref": "common.schema.json#/$defs/integer-string" + { + "$ref": "#/$defs/FGBuildable--splitter--base" + } + ] + }, + "FGBuildableAttachmentSplitter": { + "type": "object", + "$ref": "#/$defs/FGBuildableAttachmentSplitter--merged", + "unevaluatedProperties": false + }, + "FGBuildableSplitterSmart--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableSplitterSmart" }, - "mDistributionTable": { - "type": "string", - "const": "" + { + "$ref": "#/$defs/FGBuildable--splitter--base" } - } + ] + }, + "FGBuildableSplitterSmart": { + "type": "object", + "$ref": "#/$defs/FGBuildableSplitterSmart--merged", + "unevaluatedProperties": false }, "FGBuildableFoundation--base": { "type": "object", diff --git a/schema/common.schema.json b/schema/common.schema.json index 95ac8b2..7a6eb4b 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -5014,6 +5014,76 @@ } } }, + "common-base--FGBuildableAttachmentMerger": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--base", + "required": ["mCurrentInputIndex"], + "properties": { + "mCurrentInputIndex": { + "$ref": "common.schema.json#/$defs/integer-string--signed" + } + } + }, + "common-base--FGBuildable--splitter--base": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--base", + "required": ["mCurrentOutputIndex"], + "properties": { + "mCurrentOutputIndex": { + "$ref": "common.schema.json#/$defs/integer-string--signed" + } + } + }, + "common-base--FGBuildableAttachmentSplitter": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--splitter--base" + }, + "common-base--FGBuildableSplitterSmart": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--splitter--base", + "required": [ + "OnSortRulesChangedDelegate", + "mMaxNumSortRules", + "mLastItem", + "mItemToLastOutputMap", + "mLastOutputIndex", + "mCurrentInventoryIndex", + "mDistributionTable" + ], + "properties": { + "OnSortRulesChangedDelegate": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mMaxNumSortRules": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mLastItem": { + "type": "string", + "minLength": 1, + "typed_string": { + "required": ["ItemState"], + "properties": { + "ItemState": { + "$ref": "common.schema.json#/$defs/empty-object" + } + } + } + }, + "mItemToLastOutputMap": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mLastOutputIndex": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mCurrentInventoryIndex": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mDistributionTable": { + "type": "string", + "const": "" + } + } + }, "faux-1": { "type": "object", "$ref": "#/$defs/class", @@ -5457,6 +5527,18 @@ }, "FGBuildableJumppad": { "$ref": "#/$defs/common-base--FGBuildableJumppad" + }, + "FGBuildableAttachmentMerger": { + "$ref": "#/$defs/common-base--FGBuildableAttachmentMerger" + }, + "FGBuildable_splitter_base": { + "$ref": "#/$defs/common-base--FGBuildable--splitter--base" + }, + "FGBuildableAttachmentSplitter": { + "$ref": "#/$defs/common-base--FGBuildableAttachmentSplitter" + }, + "FGBuildableSplitterSmart": { + "$ref": "#/$defs/common-base--FGBuildableSplitterSmart" } } }, diff --git a/schema/update8.schema.json b/schema/update8.schema.json index bdbe784..2da9a24 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -2526,78 +2526,64 @@ "$ref": "#/$defs/FGBuildableMAM--merged", "unevaluatedProperties": false }, + "FGBuildableAttachmentMerger--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableAttachmentMerger" + }, + { + "$ref": "#/$defs/FGBuildable--base" + } + ] + }, "FGBuildableAttachmentMerger": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "unevaluatedProperties": false, - "required": ["mCurrentInputIndex"], - "properties": { - "mCurrentInputIndex": { - "$ref": "common.schema.json#/$defs/integer-string--signed" + "$ref": "#/$defs/FGBuildableAttachmentMerger--merged", + "unevaluatedProperties": false + }, + "FGBuildable--splitter--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--splitter--base" + }, + { + "$ref": "#/$defs/FGBuildable--base" } - } + ] }, "FGBuildable--splitter--base": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "required": ["mCurrentOutputIndex"], - "properties": { - "mCurrentOutputIndex": { - "$ref": "common.schema.json#/$defs/integer-string--signed" + "$ref": "#/$defs/FGBuildable--splitter--base--merged" + }, + "FGBuildableAttachmentSplitter--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableAttachmentSplitter" + }, + { + "$ref": "#/$defs/FGBuildable--splitter--base" } - } + ] }, "FGBuildableAttachmentSplitter": { "type": "object", - "$ref": "#/$defs/FGBuildable--splitter--base", + "$ref": "#/$defs/FGBuildableAttachmentSplitter--merged", "unevaluatedProperties": false }, - "FGBuildableSplitterSmart": { - "type": "object", - "$ref": "#/$defs/FGBuildable--splitter--base", - "unevaluatedProperties": false, - "required": [ - "OnSortRulesChangedDelegate", - "mMaxNumSortRules", - "mLastItem", - "mItemToLastOutputMap", - "mLastOutputIndex", - "mCurrentInventoryIndex", - "mDistributionTable" - ], - "properties": { - "OnSortRulesChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mMaxNumSortRules": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mLastItem": { - "type": "string", - "minLength": 1, - "typed_string": { - "required": ["ItemState"], - "properties": { - "ItemState": { - "$ref": "common.schema.json#/$defs/empty-object" - } - } - } - }, - "mItemToLastOutputMap": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mLastOutputIndex": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mCurrentInventoryIndex": { - "$ref": "common.schema.json#/$defs/integer-string" + "FGBuildableSplitterSmart--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableSplitterSmart" }, - "mDistributionTable": { - "type": "string", - "const": "" + { + "$ref": "#/$defs/FGBuildable--splitter--base" } - } + ] + }, + "FGBuildableSplitterSmart": { + "type": "object", + "$ref": "#/$defs/FGBuildableSplitterSmart--merged", + "unevaluatedProperties": false }, "FGBuildableFoundation--base": { "type": "object", diff --git a/types-progress--common.md b/types-progress--common.md index d2e4433..6c66410 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (278 of 278) +100.00% Complete (283 of 283) ## Basic Types @@ -68,7 +68,10 @@ - [x] common-base--FGBuildable--pipeline-flow-accessory (common type) - [x] common-base--FGBuildable--pole--base--no-static (common type) - [x] common-base--FGBuildable--pole--base--with-static (common type) +- [x] common-base--FGBuildable--splitter--base (common type) - [x] common-base--FGBuildable--tiered +- [x] common-base--FGBuildableAttachmentMerger +- [x] common-base--FGBuildableAttachmentSplitter - [x] common-base--FGBuildableBlueprintDesigner - [x] common-base--FGBuildableConveyorBelt - [x] common-base--FGBuildableConveyorBelt--base (common type) @@ -123,6 +126,7 @@ - [x] common-base--FGBuildableResourceExtractor--oil-extractor - [x] common-base--FGBuildableResourceSink - [x] common-base--FGBuildableResourceSinkShop +- [x] common-base--FGBuildableSplitterSmart - [x] common-base--FGBuildableStorage - [x] common-base--FGBuildableTradingPost - [x] common-base--FGBuildableTrainPlatform--base (common type) diff --git a/types-progress--update8.md b/types-progress--update8.md index 2f152de..1dcadbd 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (435 of 435) +100.00% Complete (443 of 443) ## Basic Types @@ -50,7 +50,10 @@ - [x] common-base--FGBuildable--pipeline-flow-accessory (common type) - [x] common-base--FGBuildable--pole--base--no-static (common type) - [x] common-base--FGBuildable--pole--base--with-static (common type) +- [x] common-base--FGBuildable--splitter--base (common type) - [x] common-base--FGBuildable--tiered (common type) +- [x] common-base--FGBuildableAttachmentMerger (common type) +- [x] common-base--FGBuildableAttachmentSplitter (common type) - [x] common-base--FGBuildableBlueprintDesigner (common type) - [x] common-base--FGBuildableConveyorBelt (common type) - [x] common-base--FGBuildableConveyorBelt--base (common type) @@ -105,6 +108,7 @@ - [x] common-base--FGBuildableResourceExtractor--oil-extractor (common type) - [x] common-base--FGBuildableResourceSink (common type) - [x] common-base--FGBuildableResourceSinkShop (common type) +- [x] common-base--FGBuildableSplitterSmart (common type) - [x] common-base--FGBuildableStorage (common type) - [x] common-base--FGBuildableTradingPost (common type) - [x] common-base--FGBuildableTrainPlatform--base (common type) @@ -255,9 +259,18 @@ - [x] FGBuildable--pole--base--with-static--merged - [x] FGBuildable--power-switch--base - [x] FGBuildable--splitter--base +- [x] FGBuildable--splitter--base--merged - [x] FGBuildable--tiered - [x] FGBuildable--tiered--merged +## FGBuildableAttachmentMerger + +- [x] FGBuildableAttachmentMerger--merged + +## FGBuildableAttachmentSplitter + +- [x] FGBuildableAttachmentSplitter--merged + ## FGBuildableBlueprintDesigner - [x] FGBuildableBlueprintDesigner--merged @@ -438,6 +451,10 @@ - [x] FGBuildableResourceSinkShop--merged +## FGBuildableSplitterSmart + +- [x] FGBuildableSplitterSmart--merged + ## FGBuildableStorage - [x] FGBuildableStorage--merged diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index 2c6ebb6..252f97c 100644 --- a/types-progress--version_1_0_0_4.md +++ b/types-progress--version_1_0_0_4.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (469 of 469) +100.00% Complete (478 of 478) ## Basic Types @@ -56,7 +56,10 @@ - [x] common-base--FGBuildable--pipeline-flow-accessory (common type) - [x] common-base--FGBuildable--pole--base--no-static (common type) - [x] common-base--FGBuildable--pole--base--with-static (common type) +- [x] common-base--FGBuildable--splitter--base (common type) - [x] common-base--FGBuildable--tiered (common type) +- [x] common-base--FGBuildableAttachmentMerger (common type) +- [x] common-base--FGBuildableAttachmentSplitter (common type) - [x] common-base--FGBuildableBlueprintDesigner (common type) - [x] common-base--FGBuildableConveyorBelt (common type) - [x] common-base--FGBuildableConveyorBelt--base (common type) @@ -111,6 +114,7 @@ - [x] common-base--FGBuildableResourceExtractor--oil-extractor (common type) - [x] common-base--FGBuildableResourceSink (common type) - [x] common-base--FGBuildableResourceSinkShop (common type) +- [x] common-base--FGBuildableSplitterSmart (common type) - [x] common-base--FGBuildableStorage (common type) - [x] common-base--FGBuildableTradingPost (common type) - [x] common-base--FGBuildableTrainPlatform--base (common type) @@ -261,9 +265,22 @@ - [x] FGBuildable--pole--base--with-static--merged - [x] FGBuildable--power-switch--base - [x] FGBuildable--splitter--base +- [x] FGBuildable--splitter--base--merged - [x] FGBuildable--tiered - [x] FGBuildable--tiered--merged +## FGBuildableAttachmentMerger + +- [x] FGBuildableAttachmentMerger--merged + +## FGBuildableAttachmentMergerSplitter + +- [x] FGBuildableAttachmentMergerSplitter--with-inventory-size + +## FGBuildableAttachmentSplitter + +- [x] FGBuildableAttachmentSplitter--merged + ## FGBuildableBlueprintDesigner - [x] FGBuildableBlueprintDesigner--base @@ -460,6 +477,10 @@ - [x] FGBuildableSpaceElevator--mSpaceElevatorState +## FGBuildableSplitterSmart + +- [x] FGBuildableSplitterSmart--merged + ## FGBuildableStorage - [x] FGBuildableStorage--merged