🎨 Rename GenericDisplayConfig -> CommonDisplayConfig

Author: SnaveSutit

src/blockbench-additions/model-formats/ajblueprint/dfu.ts

@@ -1,4 +1,4 @@
-import { GenericDisplayConfig } from '@aj/systems/node-configs'
+import { CommonDisplayConfig } from '@aj/systems/node-configs'
 import TransparentTexture from '@assets/transparent.png'
 import { NbtCompound, NbtList, NbtString, NbtTag } from 'deepslate/lib/nbt'
 import { type IBlueprintFormatJSON, getDefaultProjectSettings } from '.'
@@ -280,7 +280,7 @@ function updateModelTo1_0pre1(model: any) {
 		if (typeof node === 'string') return
 		bones.push(node.uuid as string)
 		node.configs = {
-			default: new GenericDisplayConfig().toJSON(),
+			default: new CommonDisplayConfig().toJSON(),
 			variants: {},
 		}
 		node.children.forEach((child: any) => {

src/blockbench-additions/model-formats/ajblueprint/versions/v1.6.4.ts

@@ -1,14 +1,14 @@
 import type { PACKAGE } from '@aj/constants'
 import type {
 	CameraConfig,
-	GenericDisplayConfig,
+	CommonDisplayConfig,
 	LocatorConfig,
 	Serialized,
 	TextDisplayConfig,
 } from '@aj/systems/node-configs'
 
 namespace v1_6_4 {
-	export type IBlueprintBoneConfigJSON = Serialized<GenericDisplayConfig>
+	export type IBlueprintBoneConfigJSON = Serialized<CommonDisplayConfig>
 	export type IBlueprintLocatorConfigJSON = Serialized<LocatorConfig>
 	export type IBlueprintCameraConfigJSON = Serialized<CameraConfig>
 	export type IBlueprintTextDisplayConfigJSON = Serialized<TextDisplayConfig>

src/blockbench-additions/outliner-elements/blockDisplay.ts

@@ -2,12 +2,16 @@ import { getBlockModel } from '@aj/systems/minecraft-temp/blockModelManager'
 import { type BlockStateValue, getBlockState } from '@aj/systems/minecraft-temp/blockstateManager'
 import { MINECRAFT_REGISTRY } from '@aj/systems/minecraft-temp/registryManager'
 import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
-import { GenericDisplayConfig, type Serialized } from '@aj/systems/node-configs'
+import { BlockDisplayConfig, CommonDisplayConfig, type Serialized } from '@aj/systems/node-configs'
 import EVENTS from '@events'
 import { PACKAGE } from '../../constants'
 import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/block-display-config'
 import { parseBlock } from '../../util/minecraftUtil'
-import { createAction, createBlockbenchMod } from '../../util/moddingTools'
+import {
+	createAction,
+	createBlockbenchMod,
+	fixClassPropertyInheritance,
+} from '../../util/moddingTools'
 import { Valuable } from '../../util/stores'
 import { translate } from '../../util/translation'
 import { isCurrentFormat } from '../model-formats/ajblueprint'
@@ -49,7 +53,8 @@ export class BlockDisplay extends ResizableOutlinerElement {
 
 	// Properties
 	private __block = new Valuable('minecraft:stone')
-	public config: Serialized<GenericDisplayConfig>
+	public config: Serialized<BlockDisplayConfig>
+	public commonConfig: Serialized<CommonDisplayConfig>
 
 	public error = new Valuable('')
 
@@ -79,6 +84,7 @@ export class BlockDisplay extends ResizableOutlinerElement {
 
 		this.block ??= 'minecraft:stone'
 		this.config ??= {}
+		this.commonConfig ??= {}
 
 		this.sanitizeName()
 
@@ -195,7 +201,7 @@ export class BlockDisplay extends ResizableOutlinerElement {
 new Property(BlockDisplay, 'string', 'block', { default: 'minecraft:stone' })
 new Property(BlockDisplay, 'object', 'config', {
 	get default() {
-		return new GenericDisplayConfig().toJSON()
+		return new CommonDisplayConfig().toJSON()
 	},
 })
 OutlinerElement.registerType(BlockDisplay, BlockDisplay.type)

src/blockbench-additions/outliner-elements/itemDisplay.ts

@@ -1,11 +1,15 @@
 import { getItemModel } from '@aj/systems/minecraft-temp/itemModelManager'
 import { MINECRAFT_REGISTRY } from '@aj/systems/minecraft-temp/registryManager'
 import { getCurrentVersion } from '@aj/systems/minecraft-temp/versionManager'
-import { GenericDisplayConfig, type Serialized } from '@aj/systems/node-configs'
+import { CommonDisplayConfig, ItemDisplayConfig, type Serialized } from '@aj/systems/node-configs'
 import EVENTS from '@events'
 import { PACKAGE } from '../../constants'
 import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../../ui/dialogs/item-display-config'
-import { createAction, createBlockbenchMod } from '../../util/moddingTools'
+import {
+	createAction,
+	createBlockbenchMod,
+	fixClassPropertyInheritance,
+} from '../../util/moddingTools'
 import { Valuable } from '../../util/stores'
 import { translate } from '../../util/translation'
 import { isCurrentFormat } from '../model-formats/ajblueprint'
@@ -35,7 +39,8 @@ export class ItemDisplay extends ResizableOutlinerElement {
 	// Properties
 	private __item = new Valuable('minecraft:diamond')
 	private __itemDisplay = new Valuable('none')
-	public config: Serialized<GenericDisplayConfig>
+	public config: Serialized<ItemDisplayConfig>
+	public commonConfig: Serialized<CommonDisplayConfig>
 
 	public error = new Valuable('')
 
@@ -70,6 +75,7 @@ export class ItemDisplay extends ResizableOutlinerElement {
 		this.scale ??= [1, 1, 1]
 		this.visibility ??= true
 		this.config ??= {}
+		this.commonConfig ??= {}
 
 		this.sanitizeName()
 
@@ -193,7 +199,7 @@ new Property(ItemDisplay, 'string', 'item', { default: 'minecraft:diamond' })
 new Property(ItemDisplay, 'string', 'item_display', { default: 'none' })
 new Property(ItemDisplay, 'object', 'config', {
 	get default() {
-		return new GenericDisplayConfig().toJSON()
+		return new CommonDisplayConfig().toJSON()
 	},
 })
 OutlinerElement.registerType(ItemDisplay, ItemDisplay.type)