Merge branch 'patch' into next

Author: JannisX11

CONTRIBUTING.md

@@ -17,10 +17,11 @@ If you want to contribute Blockbench translations, you can visit [blockbench.net
 
 ## Source code contributions
 
-Blockbench, the program itself, is mostly just coded by me. But sometimes, code contributions can be helpful!
+Blockbench, the program itself, is mostly just coded by me. But third party contributions are welcome!
 
-If you want to contribute to the Blockbench code, please contact me (@Jannis) on [Discord](https://discord.gg/sGkj78W) (e.g. in #bb-feedback) *before* to discuss whether a change is necessary in the base program and how it can be approached.
-Some changes make sense in Blockbench itself, while others could work better as a plugin.
+Bug fixes can be submitted via pull request.
+
+If you want to add a feature or change functionality, I recommend opening a discussion on Discord before to talk about if and where it fits in. You can do so in the channel [#bb-feedback](https://discord.gg/kZBmCwvBFw). Some features may be out of scope and work better as plugins, or I might have additional tips on how to approach it. The timing of features being integrated also depends on the release cycle, new features should go through beta testing before being shipped.
 
 Minor fixes should be targeting the `patch` branch, new features and fixes that require additional testing should generally target the `next` branch.
 

assets/player_skin.png

@@ -31,11 +31,13 @@
 		background-color: var(--color-back);
 		height: 18px;
 		margin-top: 12px;
+		border-radius: 10px;
 	}
 	.progress_bar_inner {
 		background-color: var(--color-accent);
 		height: 100%;
 		width: calc(100% * var(--progress));
+		border-radius: inherit;
 	}
 	.accent_color {
 		color: var(--color-accent);
@@ -693,7 +695,10 @@
 	}
 	.tool.side_menu_tool i.icon.action_more_options {
 		display: inline-block;
-		width: 19px;
+		width: 20px;
+		height: 100%;
+		margin-top: 0;
+		padding-top: 4px;
 		color: var(--color-text);
 		margin-left: 0;
 	}
@@ -708,6 +713,7 @@
 		text-align: center;
 		width: 100%;
 		margin-top: 0px;
+		padding-top: 0px;
 	}
 
 /*(Context-)Menu*/

css/general.css

@@ -1120,6 +1120,7 @@
 	}
 	.texture_layer > label {
 		flex-grow: 1;
+		overflow: hidden;
 	}
 	.texture_layer i.toggle_disabled {
 		color: var(--color-subtle_text);
@@ -1773,7 +1774,7 @@
 	}
 	#timeline_vue.graph_editor .channel_head {
 		flex-wrap: wrap;
-		justify-content: flex-end;
+		justify-content: flex-start;
 	}
 	.drag_hover[order]::before {
 		z-index: 7;

css/panels.css

@@ -81,9 +81,9 @@ export const Animator = {
 		Timeline.pause()
 		Animator.open = false;
 
-		scene.remove(WinterskyScene.space);
-		scene.remove(Animator.motion_trail);
-		scene.remove(Animator.onion_skin_object);
+		Canvas.scene.remove(WinterskyScene.space);
+		Canvas.scene.remove(Animator.motion_trail);
+		Canvas.scene.remove(Animator.onion_skin_object);
 		Animator.resetParticles(true);
 
 		three_grid.position.z = three_grid.position.x;
@@ -113,7 +113,7 @@ export const Animator = {
 			}
 		}
 		Blockbench.dispatchEvent('display_default_pose', {reduced_updates});
-		if (!reduced_updates) scene.updateMatrixWorld()
+		if (!reduced_updates) Canvas.scene.updateMatrixWorld()
 	},
 	resetParticles(optimized) {
 		for (var path in Animator.particle_effects) {

js/animations/animation_mode.js

@@ -237,6 +237,9 @@ new ValidatorCheck('molang_syntax', {
 			if (clear_string.match(/^[+*/.,?=&<>|]/)) {
 				issues.push('Expression starts with an invalid character')
 			}
+			if (clear_string.endsWith(';') && !clear_string.includes('return ')) {
+				issues.push('Complex expression with no return value. Remove the semicolon or add a return statement')
+			}
 			if (
 				(clear_string.match(/[\w.]\s+[\w.]/) &&
 					!keywords.find((k) => clear_string.includes(k))) ||

js/animations/molang.js

@@ -118,7 +118,12 @@ export const AutoBackup = {
 
 				// Confirm selection
 				if (confirm_selection && projects.length > 1) {
-					let form: Record<string, FormElementOptions | '_'> = {};
+					let form: Record<string, FormElementOptions | '_'> = {
+						info: {
+							text: '⚠ Recovering models is only a backup. Please remember to always save your work to your device.',
+							type: 'info'
+						}
+					};
 					let keys: UUID[] = [];
 
 					projects.sort((a, b) => (b.date??0) - (a.date??0));
@@ -154,7 +159,7 @@ export const AutoBackup = {
 					}
 
 					projects = await new Promise<ProjectSave[]>((resolve, reject) => {
-						new Dialog({
+						let dialog = new Dialog({
 							id: 'recover_backup',
 							title: 'message.recover_backup.title',
 							form,
@@ -170,6 +175,10 @@ export const AutoBackup = {
 								resolve(to_open);
 							}
 						}).show();
+						let content = dialog.object.querySelector('.dialog_content') as HTMLElement;
+						if (content) {
+							content.style.maxHeight = (window.innerHeight - 150) + 'px';
+						}
 					})
 				}
 

js/auto_backup.ts

@@ -92,7 +92,7 @@ export function initializeDesktopApp() {
 //Load Model
 export function loadOpenWithBlockbenchFile() {
 	function load(path: string) {
-		if (!path || path.length < 7 || !path.match(/\w\.\w+$/)) return;
+		if (!path || path.length < 7 || path.startsWith('--') || !path.match(/.\.\w+$/)) return;
 		var extension = pathToExtension(path);
 		if (extension == 'png') {
 			Blockbench.read([path], {readtype: 'image'}, (files) => {

js/desktop.ts

@@ -1301,6 +1301,11 @@ var codec = new Codec('bedrock', {
 			texture_width:  Project.texture_width || 16,
 			texture_height: Project.texture_height || 16,
 		}
+
+		if (options.collection) {
+
+		}
+
 		var bones = []
 
 		var groups = getAllGroups();

js/formats/bedrock/bedrock.js

@@ -189,7 +189,32 @@ BARS.defineActions(function() {
 						size: bb.size()
 					}
 				});
-				if (type == 'selection_box') box_data.length = 1;
+				if (type == 'selection_box') {
+					let { origin, size } = box_data[0];
+					let minX = origin[0];
+					let minY = origin[1];
+					let minZ = origin[2];
+					let maxX = origin[0] + size[0];
+					let maxY = origin[1] + size[1];
+					let maxZ = origin[2] + size[2];
+					for (let i = 1; i < box_data.length; i++) {
+						const { origin, size } = box_data[i];
+						minX = Math.min(minX, origin[0]);
+						minY = Math.min(minY, origin[1]);
+						minZ = Math.min(minZ, origin[2]);
+						maxX = Math.max(maxX, origin[0] + size[0]);
+						maxY = Math.max(maxY, origin[1] + size[1]);
+						maxZ = Math.max(maxZ, origin[2] + size[2]);
+					}
+					box_data = [{
+						origin: [minX, minY, minZ],
+						size: [
+							maxX - minX,
+							maxY - minY,
+							maxZ - minZ
+						]
+					}]
+				};
 				let data = box_data as any;
 				if (box_data.length == 1 && box_data[0].origin.equals([-8, 0, -8]) && box_data[0].size.equals([16, 16, 16])) {
 					data = true;