✨ Enchantment Glint Preview

Author: SnaveSutit

src/dialogs/displayEntityConfig/displayEntityConfig.svelte

@@ -2,6 +2,7 @@
 	import { onDestroy } from 'svelte'
 	import { DisplayEntityConfig } from '../../../nodeConfigs'
 	import { TextDisplay } from '../../../outliner/textDisplay'
+	import { VanillaBlockDisplay } from '../../../outliner/vanillaBlockDisplay'
 	import BoxSelect from '../../../svelteComponents/sidebarDialogItems/boxSelect.svelte'
 	import Checkbox from '../../../svelteComponents/sidebarDialogItems/checkbox.svelte'
 	import CodeEdit from '../../../svelteComponents/sidebarDialogItems/codeEdit.svelte'
@@ -80,6 +81,7 @@
 
 	onDestroy(() => {
 		saveConfig()
+		Canvas.updateAll()
 	})
 </script>
 
@@ -160,11 +162,13 @@
 	{/if}
 
 	{#if !(displayEntity instanceof TextDisplay)}
-		<Checkbox
-			label={localize('dialog.display_entity.enchanted.title')}
-			description={localize('dialog.display_entity.enchanted.description')}
-			bind:value={enchanted}
-		/>
+		{#if !(displayEntity instanceof VanillaBlockDisplay)}
+			<Checkbox
+				label={localize('dialog.display_entity.enchanted.title')}
+				description={localize('dialog.display_entity.enchanted.description')}
+				bind:value={enchanted}
+			/>
+		{/if}
 
 		<Checkbox
 			label={localize('dialog.display_entity.glowing.title')}

src/dialogs/displayEntityConfig/pages/perVariant.svelte

@@ -346,7 +346,10 @@ export const BLUEPRINT_FORMAT = registerDeletableHandlerPatch({
 						fixCubeRotation(cube)
 					}
 
-					Canvas.updateAll()
+					requestAnimationFrame(() => {
+						Variant.selectDefault()
+						Canvas.updateAll()
+					})
 				})
 			},
 

src/formats/blueprint/index.ts

@@ -23,6 +23,8 @@ import './systems/minecraft/blockstateManager'
 import './systems/minecraft/fontManager'
 import './systems/minecraft/registryManager'
 import './systems/minecraft/versionManager'
+// Shaders
+import 'import_folder_recursive:./shaders'
 // Misc imports
 import { openChangelogDialog } from './dialogs/changelog/changelog'
 import { openExportProgressDialog } from './dialogs/exportProgress/exportProgress'
@@ -31,11 +33,15 @@ import { BLUEPRINT_FORMAT } from './formats/blueprint'
 import { BLUEPRINT_CODEC } from './formats/blueprint/codec'
 import { exportAll } from './interface/animatedJavaBarItem'
 import { TextDisplay } from './outliner/textDisplay'
-import { VanillaBlockDisplay, debugBlockState } from './outliner/vanillaBlockDisplay'
+import { debugBlockState, VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
 import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
 import { checkForIncompatabilities } from './popups/incompatability/incompatability'
 import { openInstallPopup } from './popups/installed/installed'
 import './prism/mcfunctionPrism'
+import {
+	applyEnchantmentGlintToMesh,
+	removeEnchantmentGlintFromMesh,
+} from './shaders/enchantmentGlint'
 import { cleanupExportedFiles } from './systems/cleaner'
 import TELLRAW from './systems/datapackCompiler/tellraw'
 import { exportProject } from './systems/exporter'
@@ -112,6 +118,8 @@ const AnimatedJavaApi = {
 	},
 	TELLRAW,
 	getBlockState,
+	applyEnchantmentGlintToMesh,
+	removeEnchantmentGlintFromMesh,
 }
 window.AnimatedJava = AnimatedJavaApi
 

src/index.ts

@@ -1,7 +1,20 @@
-import { overrideAccessors, registerPatch } from 'blockbench-patch-manager'
-import { activeProjectIsBlueprintFormat, projectTargetVersionIsAtLeast } from '../formats/blueprint'
+import {
+	overrideAccessors,
+	registerPatch,
+	registerPropertyOverridePatch,
+} from 'blockbench-patch-manager'
+import {
+	activeProjectIsBlueprintFormat,
+	projectTargetVersionIsAtLeast,
+	type IBlueprintDisplayEntityConfigJSON,
+} from '../formats/blueprint'
+import {
+	applyEnchantmentGlintToMesh,
+	removeEnchantmentGlintFromMesh,
+} from '../shaders/enchantmentGlint'
 import { isCubeValid } from '../systems/util'
 import { localize as translate } from '../util/lang'
+import { Variant } from '../variants'
 
 declare global {
 	// @ts-expect-error - Broken BB types
@@ -109,3 +122,35 @@ registerPatch({
 		Cube.prototype.init = originalInit
 	},
 })
+
+registerPropertyOverridePatch({
+	id: `animated_java:override-function/cube/preview_controller/updateGeometry`,
+	target: Cube.preview_controller,
+	key: 'updateGeometry',
+
+	condition: () => activeProjectIsBlueprintFormat(),
+
+	get: original => {
+		return function (this: NodePreviewController, instance: Cube) {
+			original.apply(this, [instance])
+
+			if (activeProjectIsBlueprintFormat()) {
+				const parent = instance.parent
+				let config: IBlueprintDisplayEntityConfigJSON
+				if (parent instanceof Group) {
+					if (!Variant.selected || Variant.selected.isDefault) {
+						config = parent.configs.default
+					} else {
+						config = parent.configs.variants[Variant.selected.uuid]
+					}
+
+					removeEnchantmentGlintFromMesh(instance.mesh)
+
+					if (config?.enchanted) {
+						applyEnchantmentGlintToMesh(instance.mesh)
+					}
+				}
+			}
+		}
+	},
+})