✨ Split brightnessOverride into skyBrightness and blockBrightness

Author: SnaveSutit

schemas/blueprint-project.schema.json

@@ -517,7 +517,8 @@
 				"glow_color",
 				"shadow_radius",
 				"shadow_strength",
-				"brightness_override",
+				"sky_brightness",
+				"block_brightness",
 				"enchanted",
 				"invisible",
 				"nbt"
@@ -556,6 +557,18 @@
 					"maximum": 15,
 					"default": 0
 				},
+				"sky_brightness": {
+					"type": "number",
+					"minimum": 0,
+					"maximum": 15,
+					"default": 0
+				},
+				"block_brightness": {
+					"type": "number",
+					"minimum": 0,
+					"maximum": 15,
+					"default": 0
+				},
 				"enchanted": {
 					"type": "boolean",
 					"default": false

schemas/plugin-blueprint.schema.json

@@ -450,8 +450,20 @@
 					"default": "fixed"
 				},
 				"custom_brightness": {
-					"type": "number",
-					"default": 0
+					"type": "object",
+					"required": ["sky", "block"],
+					"properties": {
+						"sky": {
+							"type": "number",
+							"minimum": 0,
+							"maximum": 15
+						},
+						"block": {
+							"type": "number",
+							"minimum": 0,
+							"maximum": 15
+						}
+					}
 				},
 				"custom_name": {
 					"$ref": "#/definitions/optional_adventure_component",

src/dialogs/displayEntityConfig/displayEntityConfig.svelte

@@ -33,7 +33,8 @@
 
 	let billboard = observable<string>(DEFAULT_CONFIG.billboard)
 	let overrideBrightness = observable<boolean>(DEFAULT_CONFIG.overrideBrightness)
-	let brightnessOverride = observable<number>(DEFAULT_CONFIG.brightnessOverride)
+	let skyBrightness = observable<number>(DEFAULT_CONFIG.skyBrightness)
+	let blockBrightness = observable<number>(DEFAULT_CONFIG.blockBrightness)
 	let enchanted = observable<boolean>(DEFAULT_CONFIG.enchanted)
 	let glowing = observable<boolean>(DEFAULT_CONFIG.glowing)
 	let overrideGlowColor = observable<boolean>(DEFAULT_CONFIG.overrideGlowColor)
@@ -58,7 +59,8 @@
 		$onApplyFunction = config.onApplyFunction
 		$billboard = config.billboard
 		$overrideBrightness = config.overrideBrightness
-		$brightnessOverride = config.brightnessOverride
+		$skyBrightness = config.skyBrightness
+		$blockBrightness = config.blockBrightness
 		$enchanted = config.enchanted
 		$glowing = config.glowing
 		$overrideGlowColor = config.overrideGlowColor
@@ -95,7 +97,8 @@
 		config.onApplyFunction = $onApplyFunction
 		config.billboard = $billboard as BillboardMode
 		config.overrideBrightness = $overrideBrightness
-		config.brightnessOverride = $brightnessOverride
+		config.skyBrightness = $skyBrightness
+		config.blockBrightness = $blockBrightness
 		config.enchanted = $enchanted
 		config.glowing = $glowing
 		config.overrideGlowColor = $overrideGlowColor
@@ -172,10 +175,20 @@
 
 	{#if $overrideBrightness}
 		<NumberSlider
-			label={translate('dialog.display_entity.brightness_override.title')}
-			tooltip={translate('dialog.display_entity.brightness_override.description')}
-			bind:value={brightnessOverride}
-			defaultValue={DisplayEntityConfig.prototype.brightnessOverride}
+			label={translate('dialog.display_entity.sky_brightness.title')}
+			tooltip={translate('dialog.display_entity.sky_brightness.description')}
+			bind:value={skyBrightness}
+			defaultValue={DisplayEntityConfig.prototype.skyBrightness}
+			min={0}
+			max={15}
+			valueStep={1}
+		/>
+
+		<NumberSlider
+			label={translate('dialog.display_entity.block_brightness.title')}
+			tooltip={translate('dialog.display_entity.block_brightness.description')}
+			bind:value={blockBrightness}
+			defaultValue={DisplayEntityConfig.prototype.blockBrightness}
 			min={0}
 			max={15}
 			valueStep={1}

src/formats/blueprint/dfu.ts

@@ -16,6 +16,7 @@ import v1_0_0_pre7 from './versions/1.0.0-pre7'
 import v1_0_0_pre8 from './versions/1.0.0-pre8'
 import v1_10_0_beta_1 from './versions/1.10.0-beta.1'
 import v1_10_0_beta_4 from './versions/1.10.0-beta.4'
+import v1_10_0_beta_7 from './versions/1.10.0-beta.7'
 import v1_4_0 from './versions/1.4.0'
 import v1_6_3 from './versions/1.6.3'
 import v1_6_5 from './versions/1.6.5'
@@ -99,6 +100,8 @@ export function upgradeAnimatedJavaBlueprint(model: any): IBlueprintFormatJSON {
 				model = v1_10_0_beta_1(model)
 			case VersionUtil.compare(model.meta.format_version, '<', '1.10.0-beta.4'):
 				model = v1_10_0_beta_4(model)
+			case VersionUtil.compare(model.meta.format_version, '<', '1.10.0-beta.7'):
+				model = v1_10_0_beta_7(model)
 		}
 
 		// Remove unknown blueprint settings

src/formats/blueprint/index.ts

@@ -45,7 +45,9 @@ export interface IBlueprintDisplayEntityConfigJSON {
 	on_apply_function?: DisplayEntityConfig['__onApplyFunction']
 	billboard?: DisplayEntityConfig['billboard']
 	override_brightness?: DisplayEntityConfig['overrideBrightness']
-	brightness_override?: DisplayEntityConfig['brightnessOverride']
+	sky_brightness?: DisplayEntityConfig['skyBrightness']
+	block_brightness?: DisplayEntityConfig['blockBrightness']
+	brightness_override?: number
 	enchanted?: DisplayEntityConfig['enchanted']
 	glowing?: DisplayEntityConfig['glowing']
 	override_glow_color?: DisplayEntityConfig['overrideGlowColor']

src/formats/blueprint/versions/1.10.0-beta.1.ts

@@ -6,25 +6,16 @@ export default function upgrade(model: any): IBlueprintFormatJSON {
 
 	// Invert rotation xy and position x for Blockbench 5.0
 	for (const animation of fixed.animations ?? []) {
-		for (const [uuid, animator] of Object.entries<Record<string, any>>(
-			animation.animators ?? {}
-		)) {
-			console.log('Processing animator', uuid, JSON.parse(JSON.stringify(animator)))
+		for (const animator of Object.values<Record<string, any>>(animation.animators ?? {})) {
 			for (const keyframe of animator.keyframes ?? []) {
-				console.log('Processing keyframe', JSON.parse(JSON.stringify(keyframe)))
 				if (keyframe.channel === 'rotation') {
 					for (const datapoint of keyframe.data_points ?? []) {
-						console.log('Processing datapoint', JSON.parse(JSON.stringify(datapoint)))
 						datapoint.x = invertMolang(datapoint.x)
 						datapoint.y = invertMolang(datapoint.y)
 					}
 				}
 				if (keyframe.channel === 'position') {
 					for (const datapoint of keyframe.data_points ?? []) {
-						console.log(
-							'Processing position datapoint',
-							JSON.parse(JSON.stringify(datapoint))
-						)
 						datapoint.x = invertMolang(datapoint.x)
 					}
 				}

src/formats/blueprint/versions/1.10.0-beta.7.ts

@@ -0,0 +1,30 @@
+import type { IBlueprintFormatJSON } from '..'
+
+export default function upgrade(model: any): IBlueprintFormatJSON {
+	console.log('Processing model format 1.10.0-beta.7', JSON.parse(JSON.stringify(model)))
+	const fixed: IBlueprintFormatJSON = JSON.parse(JSON.stringify(model))
+
+	// Split brightness override into separate sky and block brightness values.
+	for (const group of fixed.groups ?? []) {
+		if (group.configs?.default) upgradeConfig(group.configs.default)
+		for (const config of Object.values(group.configs.variants ?? {}) as any) {
+			upgradeConfig(config)
+		}
+	}
+	for (const element of fixed.elements ?? []) {
+		if (element.configs?.default) upgradeConfig(element.configs.default)
+		for (const config of Object.values(element.configs.variants ?? {}) as any) {
+			upgradeConfig(config)
+		}
+	}
+
+	return fixed
+}
+
+function upgradeConfig(config: any) {
+	if (config?.brightness_override !== undefined) {
+		config.sky_brightness ??= config.brightness_override
+		config.block_brightness ??= config.brightness_override
+		delete config.brightness_override
+	}
+}

src/lang/en.yml

@@ -466,6 +466,12 @@ animated_java:
       brightness_override:
         title: Brightness
         description: The brightness of the node. This should be a value between 0 and 15.
+      sky_brightness:
+        title: Sky Brightness
+        description: The sky light brightness of the node. This should be a value between 0 and 15.
+      block_brightness:
+        title: Block Brightness
+        description: The block light brightness of the node. This should be a value between 0 and 15.
       use_custom_brightness:
         title: Use Custom Brightness
         description: Whether or not to enable the custom brightness override for the node.
@@ -632,6 +638,12 @@ animated_java:
       brightness_override:
         title: Brightness
         description: The brightness of the text display. This should be a value between 0 and 15.
+      sky_brightness:
+        title: Sky Brightness
+        description: The sky light brightness of the text display. This should be a value between 0 and 15.
+      block_brightness:
+        title: Block Brightness
+        description: The block light brightness of the text display. This should be a value between 0 and 15.
       use_custom_brightness:
         title: Use Custom Brightness
         description: Whether or not to enable the custom brightness override for the bone.

src/nodeConfigs.ts

@@ -13,7 +13,8 @@ export class DisplayEntityConfig {
 	private __onApplyFunction?: string
 	private __billboard?: BillboardMode
 	private __overrideBrightness?: boolean
-	private __brightnessOverride?: number
+	private __skyBrightness?: number
+	private __blockBrightness?: number
 	private __enchanted?: boolean
 	private __glowing?: boolean
 	private __overrideGlowColor?: boolean
@@ -27,7 +28,8 @@ export class DisplayEntityConfig {
 			on_apply_function: '',
 			billboard: 'fixed',
 			override_brightness: false,
-			brightness_override: 0,
+			sky_brightness: 0,
+			block_brightness: 0,
 			enchanted: false,
 			glowing: false,
 			override_glow_color: false,
@@ -64,13 +66,22 @@ export class DisplayEntityConfig {
 		this.__overrideBrightness = value
 	}
 
-	get brightnessOverride(): NonNullable<DisplayEntityConfig['__brightnessOverride']> {
-		if (this.__brightnessOverride !== undefined) return this.__brightnessOverride
+	get skyBrightness(): NonNullable<DisplayEntityConfig['__skyBrightness']> {
+		if (this.__skyBrightness !== undefined) return this.__skyBrightness
 		const defaultConfig = DisplayEntityConfig.getDefault()
-		return defaultConfig.brightnessOverride
+		return defaultConfig.skyBrightness
 	}
-	set brightnessOverride(value: DisplayEntityConfig['__brightnessOverride']) {
-		this.__brightnessOverride = value
+	set skyBrightness(value: DisplayEntityConfig['__skyBrightness']) {
+		this.__skyBrightness = value
+	}
+
+	get blockBrightness(): NonNullable<DisplayEntityConfig['__blockBrightness']> {
+		if (this.__blockBrightness !== undefined) return this.__blockBrightness
+		const defaultConfig = DisplayEntityConfig.getDefault()
+		return defaultConfig.blockBrightness
+	}
+	set blockBrightness(value: DisplayEntityConfig['__blockBrightness']) {
+		this.__blockBrightness = value
 	}
 
 	get enchanted(): NonNullable<DisplayEntityConfig['__enchanted']> {
@@ -141,7 +152,8 @@ export class DisplayEntityConfig {
 			this.__onApplyFunction === other.__onApplyFunction &&
 			this.__billboard === other.__billboard &&
 			this.__overrideBrightness === other.__overrideBrightness &&
-			this.__brightnessOverride === other.__brightnessOverride &&
+			this.__skyBrightness === other.__skyBrightness &&
+			this.__blockBrightness === other.__blockBrightness &&
 			this.__enchanted === other.__enchanted &&
 			this.__glowing === other.__glowing &&
 			this.__overrideGlowColor === other.__overrideGlowColor &&
@@ -161,7 +173,8 @@ export class DisplayEntityConfig {
 			on_apply_function: this.__onApplyFunction,
 			billboard: this.__billboard,
 			override_brightness: this.__overrideBrightness,
-			brightness_override: this.__brightnessOverride,
+			sky_brightness: this.__skyBrightness,
+			block_brightness: this.__blockBrightness,
 			enchanted: this.__enchanted,
 			glowing: this.__glowing,
 			override_glow_color: this.__overrideGlowColor,
@@ -177,8 +190,8 @@ export class DisplayEntityConfig {
 		if (other.__billboard !== undefined) this.billboard = other.billboard
 		if (other.__overrideBrightness !== undefined)
 			this.overrideBrightness = other.overrideBrightness
-		if (other.__brightnessOverride !== undefined)
-			this.brightnessOverride = other.brightnessOverride
+		if (other.__skyBrightness !== undefined) this.skyBrightness = other.skyBrightness
+		if (other.__blockBrightness !== undefined) this.blockBrightness = other.blockBrightness
 		if (other.__enchanted !== undefined) this.enchanted = other.enchanted
 		if (other.__glowing !== undefined) this.glowing = other.glowing
 		if (other.__overrideGlowColor !== undefined)
@@ -195,8 +208,12 @@ export class DisplayEntityConfig {
 		if (json.billboard !== undefined) config.__billboard = json.billboard
 		if (json.override_brightness !== undefined)
 			config.__overrideBrightness = json.override_brightness
-		if (json.brightness_override !== undefined)
-			config.__brightnessOverride = json.brightness_override
+		if (json.sky_brightness !== undefined) config.__skyBrightness = json.sky_brightness
+		if (json.block_brightness !== undefined) config.__blockBrightness = json.block_brightness
+		if (json.brightness_override !== undefined) {
+			config.__skyBrightness ??= json.brightness_override
+			config.__blockBrightness ??= json.brightness_override
+		}
 		if (json.enchanted !== undefined) config.__enchanted = json.enchanted
 		if (json.glowing !== undefined) config.__glowing = json.glowing
 		if (json.override_glow_color !== undefined)
@@ -217,8 +234,8 @@ export class DisplayEntityConfig {
 			compound.set(
 				'brightness',
 				new NbtCompound()
-					.set('block', new NbtFloat(this.brightnessOverride))
-					.set('sky', new NbtFloat(this.brightnessOverride))
+					.set('block', new NbtInt(this.blockBrightness))
+					.set('sky', new NbtInt(this.skyBrightness))
 			)
 		}
 

src/outliner/interaction.ts

@@ -241,7 +241,6 @@ export const PREVIEW_CONTROLLER: NodePreviewController = new NodePreviewControll
 	updateTransform(el: Interaction) {
 		ResizableOutlinerElement.prototype.preview_controller.updateTransform(el)
 		if (el.mesh.parent) {
-			console.log('Updating interaction transform with parent')
 			Reusable.euler1.setFromQuaternion(
 				el.mesh.parent.getWorldQuaternion(Reusable.quat1),
 				'ZYX'