Merge branch 'blockbench-4.12.0' into next

SnaveSutit · SnaveSutit · commit 7aac7a219706 · 2025-01-15T22:19:50.000-05:00
diff --git a/src/blockbenchTypeMods.d.ts b/src/blockbenchTypeMods.d.ts
@@ -98,7 +98,6 @@ declare global {
 			isDataPackPath: typeof isDataPackPath
 			blueprintSettingErrors: typeof blueprintSettingErrors
 			openUnexpectedErrorDialog: typeof openUnexpectedErrorDialog
-			TRANSPARENT_TEXTURE: Texture
 			BLUEPRINT_FORMAT: typeof BLUEPRINT_FORMAT
 			BLUEPRINT_CODEC: typeof BLUEPRINT_CODEC
 			TextDisplay: typeof TextDisplay
diff --git a/src/blueprintFormat.ts b/src/blueprintFormat.ts
@@ -7,7 +7,7 @@ import { injectSvelteCompomponent } from './util/injectSvelteComponent'
 import { toSafeFuntionName } from './util/minecraftUtil'
 import { addProjectToRecentProjects } from './util/misc'
 import { Valuable } from './util/stores'
-import { TRANSPARENT_TEXTURE, TRANSPARENT_TEXTURE_MATERIAL, Variant } from './variants'
+import { Variant } from './variants'
 import FormatPageSvelte from './components/formatPage.svelte'
 import { translate } from './util/translation'
 import { process } from './systems/modelDataFixerUpper'
@@ -572,9 +572,6 @@ export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
 		events.UNLOAD.subscribe(() => clearInterval(updateBoundingBoxIntervalId), true)
 		events.UNINSTALL.subscribe(() => clearInterval(updateBoundingBoxIntervalId), true)
 
-		thisProject.materials[TRANSPARENT_TEXTURE.uuid] = TRANSPARENT_TEXTURE_MATERIAL
-		TRANSPARENT_TEXTURE.updateMaterial()
-
 		Project.loadingPromises ??= []
 		Project.loadingPromises.push(
 			new Promise<void>(resolve => {
@@ -664,7 +661,7 @@ export function saveBlueprint() {
 export function updateRotationLock() {
 	if (!isCurrentFormat()) return
 	BLUEPRINT_FORMAT.rotation_limit = !(
-		!!Group.selected ||
+		!!Group.first_selected ||
 		!!AnimatedJava.API.TextDisplay.selected.length ||
 		!!AnimatedJava.API.VanillaItemDisplay.selected.length ||
 		!!AnimatedJava.API.VanillaBlockDisplay.selected.length ||
diff --git a/src/components/variantConfigDialog.svelte b/src/components/variantConfigDialog.svelte
@@ -1,7 +1,7 @@
 <script lang="ts" context="module">
 	import { type Valuable } from '../util/stores'
 	import { translate } from '../util/translation'
-	import { TRANSPARENT_TEXTURE, TextureMap, Variant } from '../variants'
+	import { TextureMap, Variant } from '../variants'
 	import Checkbox from './dialogItems/checkbox.svelte'
 	import LineInput from './dialogItems/lineInput.svelte'
 	import MissingTexture from '../assets/missing_texture.png'
@@ -19,7 +19,7 @@
 	export let generateNameFromDisplayName: Valuable<boolean>
 	export let excludedNodes: Valuable<Array<CollectionItem>>
 
-	const availableTextures = [...Texture.all, TRANSPARENT_TEXTURE]
+	const availableTextures = [...Texture.all]
 	const primaryTextures = [...Texture.all]
 	const secondaryTextures = availableTextures
 
diff --git a/src/index.ts b/src/index.ts
@@ -20,7 +20,7 @@ import './systems/minecraft/blockstateManager'
 import './systems/minecraft/assetManager'
 import './systems/minecraft/fontManager'
 // Misc imports
-import { TRANSPARENT_TEXTURE, Variant } from './variants'
+import { Variant } from './variants'
 import './systems/minecraft/registryManager'
 import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
 import resourcepackCompiler from './systems/resourcepackCompiler'
@@ -59,7 +59,6 @@ globalThis.AnimatedJava = {
 		isDataPackPath,
 		blueprintSettingErrors,
 		openUnexpectedErrorDialog,
-		TRANSPARENT_TEXTURE,
 		BLUEPRINT_FORMAT,
 		BLUEPRINT_CODEC,
 		TextDisplay,
diff --git a/src/interface/dialog/boneConfig.ts b/src/interface/dialog/boneConfig.ts
@@ -174,6 +174,7 @@ export const BONE_CONFIG_ACTION = createAction(`${PACKAGE.name}:bone_config`, {
 	name: translate('action.open_bone_config.name'),
 	condition: () => Format === BLUEPRINT_FORMAT,
 	click: () => {
-		openBoneConfigDialog(Group.selected)
+		if (!Group.first_selected) return
+		openBoneConfigDialog(Group.first_selected)
 	},
 })
diff --git a/src/outliner/textDisplay.ts b/src/outliner/textDisplay.ts
@@ -212,8 +212,8 @@ export class TextDisplay extends ResizableOutlinerElement {
 	}
 
 	select() {
-		if (Group.selected) {
-			Group.selected.unselect()
+		if (Group.first_selected) {
+			Group.first_selected.unselect()
 		}
 
 		if (!Pressing.ctrl && !Pressing.shift) {
@@ -548,7 +548,7 @@ export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_text_display`,
 		}
 
 		selected.forEachReverse(el => el.unselect())
-		Group.selected && Group.selected.unselect()
+		Group.first_selected && Group.first_selected.unselect()
 		textDisplay.select()
 
 		Undo.finishEdit('Create Text Display', {
diff --git a/src/outliner/vanillaBlockDisplay.ts b/src/outliner/vanillaBlockDisplay.ts
@@ -143,8 +143,8 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 	}
 
 	select() {
-		if (Group.selected) {
-			Group.selected.unselect()
+		if (Group.first_selected) {
+			Group.first_selected.unselect()
 		}
 		if (!Pressing.ctrl && !Pressing.shift) {
 			if (Cube.selected.length) {
@@ -426,7 +426,7 @@ export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_vanilla_block_
 		}
 
 		selected.forEachReverse(el => el.unselect())
-		Group.selected && Group.selected.unselect()
+		Group.first_selected && Group.first_selected.unselect()
 		vanillaBlockDisplay.select()
 
 		Undo.finishEdit('Create Vanilla Block Display', {
diff --git a/src/outliner/vanillaItemDisplay.ts b/src/outliner/vanillaItemDisplay.ts
@@ -151,8 +151,8 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
 	}
 
 	select() {
-		if (Group.selected) {
-			Group.selected.unselect()
+		if (Group.first_selected) {
+			Group.first_selected.unselect()
 		}
 		if (!Pressing.ctrl && !Pressing.shift) {
 			if (Cube.selected.length) {
@@ -425,7 +425,7 @@ export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_vanilla_item_d
 		}
 
 		selected.forEachReverse(el => el.unselect())
-		Group.selected && Group.selected.unselect()
+		Group.first_selected && Group.first_selected.unselect()
 		vanillaItemDisplay.select()
 
 		Undo.finishEdit('Create Vanilla Item Display', {
diff --git a/src/systems/resourcepackCompiler/1.20.4.ts b/src/systems/resourcepackCompiler/1.20.4.ts
@@ -1,6 +1,5 @@
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
 import { isResourcePackPath, toSafeFuntionName } from '../../util/minecraftUtil'
-import { TRANSPARENT_TEXTURE } from '../../variants'
 import { IntentionalExportError } from '../exporter'
 import { ITextureAtlas } from '../minecraft/textureAtlas'
 import { IRenderedNodes, IRenderedRig } from '../rigRenderer'
@@ -242,16 +241,6 @@ export default async function compileResourcePack(options: {
 	}
 	exportedFiles.set(blockAtlasPath, autoStringify(blockAtlas))
 
-	// Transparent texture
-	const transparentTexturePath = PathModule.join(
-		resourcePackFolder,
-		'assets/animated_java/textures/blueprint/transparent.png'
-	)
-	exportedFiles.set(
-		transparentTexturePath,
-		nativeImage.createFromDataURL(TRANSPARENT_TEXTURE.source).toPNG()
-	)
-
 	// Variant Models
 	for (const variant of Object.values(rig.variants)) {
 		for (const [boneUuid, variantModel] of Object.entries(variant.models)) {
diff --git a/src/systems/resourcepackCompiler/1.21.2.ts b/src/systems/resourcepackCompiler/1.21.2.ts
@@ -1,6 +1,5 @@
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
 import { isResourcePackPath, toSafeFuntionName } from '../../util/minecraftUtil'
-import { TRANSPARENT_TEXTURE } from '../../variants'
 import { IntentionalExportError } from '../exporter'
 import { type ITextureAtlas } from '../minecraft/textureAtlas'
 import { IRenderedNodes, IRenderedRig } from '../rigRenderer'
@@ -109,16 +108,6 @@ export default async function compileResourcePack(options: {
 			)
 	}
 
-	// Transparent texture
-	const transparentTexturePath = PathModule.join(
-		resourcePackFolder,
-		'assets/animated_java/textures/blueprint/transparent.png'
-	)
-	exportedFiles.set(
-		transparentTexturePath,
-		nativeImage.createFromDataURL(TRANSPARENT_TEXTURE.source).toPNG()
-	)
-
 	// Variant Models
 	for (const variant of Object.values(rig.variants)) {
 		for (const [boneUuid, variantModel] of Object.entries(variant.models)) {
diff --git a/src/systems/resourcepackCompiler/1.21.4.ts b/src/systems/resourcepackCompiler/1.21.4.ts
@@ -1,6 +1,6 @@
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
 import { isResourcePackPath, toSafeFuntionName } from '../../util/minecraftUtil'
-import { TRANSPARENT_TEXTURE, Variant } from '../../variants'
+import { Variant } from '../../variants'
 import { IntentionalExportError } from '../exporter'
 import { IItemDefinition } from '../minecraft/itemDefinitions'
 import { type ITextureAtlas } from '../minecraft/textureAtlas'
@@ -108,16 +108,6 @@ export default async function compileResourcePack(options: {
 			)
 	}
 
-	// Transparent texture
-	const transparentTexturePath = PathModule.join(
-		resourcePackFolder,
-		'assets/animated_java/textures/blueprint/transparent.png'
-	)
-	exportedFiles.set(
-		transparentTexturePath,
-		nativeImage.createFromDataURL(TRANSPARENT_TEXTURE.source).toPNG()
-	)
-
 	// Item Model Definitions
 	const defaultVariant = Variant.getDefault()
 
diff --git a/src/systems/rigRenderer.ts b/src/systems/rigRenderer.ts
@@ -12,7 +12,7 @@ import {
 	parseResourcePackPath,
 	toSafeFuntionName,
 } from '../util/minecraftUtil'
-import { TRANSPARENT_TEXTURE, TRANSPARENT_TEXTURE_RESOURCE_LOCATION, Variant } from '../variants'
+import { Variant } from '../variants'
 import {
 	correctSceneAngle,
 	getFrame,
@@ -240,8 +240,7 @@ function renderCube(cube: Cube, rig: IRenderedRig, model: IRenderedModel) {
 
 	element.faces = {}
 	for (const [face, data] of Object.entries(cube.faces)) {
-		if (!data) continue
-		if (!data.texture || data.getTexture()?.uuid === TRANSPARENT_TEXTURE.uuid) continue
+		if (!data?.texture) continue
 		const renderedFace = {} as IRenderedFace
 		if (data.enabled) {
 			renderedFace.uv = data.uv
@@ -570,20 +569,11 @@ function renderVariantModels(variant: Variant, rig: IRenderedRig) {
 		for (const [fromUUID, toUUID] of variant.textureMap.map.entries()) {
 			const fromTexture = Texture.all.find(t => t.uuid === fromUUID)
 			if (!fromTexture) throw new Error(`From texture not found: ${fromUUID}`)
-			if (toUUID === TRANSPARENT_TEXTURE.uuid) {
-				textures[fromTexture.id] = TRANSPARENT_TEXTURE_RESOURCE_LOCATION
-				rig.textures[TRANSPARENT_TEXTURE.id] = TRANSPARENT_TEXTURE
-				unreplacedTextures.delete(fromTexture.id)
-			} else {
-				const toTexture = Texture.all.find(t => t.uuid === toUUID)
-				if (!toTexture) throw new Error(`To texture not found: ${toUUID}`)
-				textures[fromTexture.id] = getTextureResourceLocation(
-					toTexture,
-					rig
-				).resourceLocation
-				rig.textures[toTexture.id] = toTexture
-				isOnlyTransparent = false
-			}
+			const toTexture = Texture.all.find(t => t.uuid === toUUID)
+			if (!toTexture) throw new Error(`To texture not found: ${toUUID}`)
+			textures[fromTexture.id] = getTextureResourceLocation(toTexture, rig).resourceLocation
+			rig.textures[toTexture.id] = toTexture
+			isOnlyTransparent = false
 		}
 
 		// Don't export models without any texture changes
diff --git a/src/variants.ts b/src/variants.ts
@@ -1,23 +1,7 @@
 import { IBlueprintVariantJSON } from './blueprintFormat'
-import { PACKAGE } from './constants'
 import { events } from './util/events'
-import TransparentTexture from './assets/transparent.png'
 import { toSafeFuntionName } from './util/minecraftUtil'
 
-const OLD_PROJECT = Project
-// @ts-ignore
-Project = { materials: {} }
-export const TRANSPARENT_TEXTURE = new Texture(
-	{
-		id: `${PACKAGE.name}:transparent_texture`,
-		name: 'Transparent',
-	},
-	'797174ae-5c58-4a83-a630-eefd51007c80'
-).fromDataURL(TransparentTexture)
-export const TRANSPARENT_TEXTURE_MATERIAL = Project!.materials[TRANSPARENT_TEXTURE.uuid]
-export const TRANSPARENT_TEXTURE_RESOURCE_LOCATION = 'animated_java:blueprint/transparent'
-Project = OLD_PROJECT
-
 export class TextureMap {
 	map: Map<string, string>
 
@@ -46,7 +30,6 @@ export class TextureMap {
 	 */
 	public getMappedTexture(texture: Texture | string): Texture | undefined {
 		const uuid = this.map.get(texture instanceof Texture ? texture.uuid : texture)
-		if (uuid === TRANSPARENT_TEXTURE.uuid) return TRANSPARENT_TEXTURE
 		return Texture.all.find(t => t.uuid === uuid)
 	}
 
@@ -74,7 +57,6 @@ export class TextureMap {
 
 	public verifyTextures() {
 		for (const [key, value] of this.map) {
-			if (value === TRANSPARENT_TEXTURE.uuid) continue
 			if (!Texture.all.some(t => t.uuid === value)) {
 				this.map.delete(key)
 			}

Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ export class TextDisplay extends ResizableOutlinerElement {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`select() {`
`215`		`- if (Group.selected) {`
`216`		`- Group.selected.unselect()`
	`215`	`+ if (Group.first_selected) {`
	`216`	`+ Group.first_selected.unselect()`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`if (!Pressing.ctrl && !Pressing.shift) {`
@@ -548,7 +548,7 @@ export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_text_display`,
`548`	`548`	`}`
`549`	`549`
`550`	`550`	`selected.forEachReverse(el => el.unselect())`
`551`		`- Group.selected && Group.selected.unselect()`
	`551`	`+ Group.first_selected && Group.first_selected.unselect()`
`552`	`552`	`textDisplay.select()`
`553`	`553`
`554`	`554`	`Undo.finishEdit('Create Text Display', {`
Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,8 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`select() {`
`146`		`- if (Group.selected) {`
`147`		`- Group.selected.unselect()`
	`146`	`+ if (Group.first_selected) {`
	`147`	`+ Group.first_selected.unselect()`
`148`	`148`	`}`
`149`	`149`	`if (!Pressing.ctrl && !Pressing.shift) {`
`150`	`150`	`if (Cube.selected.length) {`
@@ -426,7 +426,7 @@ export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_vanilla_block_
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`selected.forEachReverse(el => el.unselect())`
`429`		`- Group.selected && Group.selected.unselect()`
	`429`	`+ Group.first_selected && Group.first_selected.unselect()`
`430`	`430`	`vanillaBlockDisplay.select()`
`431`	`431`
`432`	`432`	`Undo.finishEdit('Create Vanilla Block Display', {`
Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`select() {`
`154`		`- if (Group.selected) {`
`155`		`- Group.selected.unselect()`
	`154`	`+ if (Group.first_selected) {`
	`155`	`+ Group.first_selected.unselect()`
`156`	`156`	`}`
`157`	`157`	`if (!Pressing.ctrl && !Pressing.shift) {`
`158`	`158`	`if (Cube.selected.length) {`
@@ -425,7 +425,7 @@ export const CREATE_ACTION = createAction(`${PACKAGE.name}:create_vanilla_item_d
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`selected.forEachReverse(el => el.unselect())`
`428`		`- Group.selected && Group.selected.unselect()`
	`428`	`+ Group.first_selected && Group.first_selected.unselect()`
`429`	`429`	`vanillaItemDisplay.select()`
`430`	`430`
`431`	`431`	`Undo.finishEdit('Create Vanilla Item Display', {`