Bedrock attachable fixes

Author: JannisX11

js/formats/bedrock/bedrock.js

@@ -821,9 +821,13 @@ window.calculateVisibleBox = calculateVisibleBox;
 
 		codec.dispatchEvent('parse', {model: data.object});
 
-		Project.geometry_name = geometry_name;
-		Project.texture_width = 16;
-		Project.texture_height = 16;
+		if (!args.import_to_current_project) {
+			Project.model_identifier = geometry_name;
+			Project.texture_width = 16;
+			Project.texture_height = 16;
+		} else if (args.collection) {
+			args.collection.model_identifier = geometry_name;
+		}
 
 		if (typeof description.visible_bounds_width == 'number' && typeof description.visible_bounds_height == 'number') {
 			Project.visible_box[0] = Math.max(Project.visible_box[0], description.visible_bounds_width || 0);

js/formats/bedrock/bedrock_multi_file.ts

@@ -248,7 +248,8 @@ BARS.defineActions(function() {
 					name: project_parsed.name || 'Attachable',
 					scope: 2,
 					export_codec: 'bedrock',
-					export_path: attachable_path
+					export_path: attachable_path,
+					model_identifier: project_parsed.model_identifier,
 				}).add();
 				for (let animation of Animation.all) {
 					animation.setScopeFromAnimators();
@@ -288,7 +289,7 @@ BARS.defineActions(function() {
 						export_codec: 'bedrock',
 						export_path: file.path,
 					}).add();
-					Codecs.bedrock.load(json, file, {import_to_current_project: true});
+					Codecs.bedrock.load(json, file, {import_to_current_project: true, collection});
 					let content = finder.find();
 					let scope = finder.findEmptyScope();
 					content.nodes.forEach(node => node.scope = scope);

js/outliner/collections.ts

@@ -27,6 +27,7 @@ export interface CollectionOptions {
 	name?: string
 	export_codec?: string
 	export_path?: string
+	model_identifier?: string
 	visibility?: boolean
 	scope?: number
 }
@@ -381,6 +382,7 @@ export class Collection {
 
 					this.extend(form_data);
 					this.children.replace(vue_data.content.map(node => node.uuid));
+					this.saved = false;
 
 					Blockbench.dispatchEvent('edit_collection_properties', {collection: this})
 

js/outliner/types/group.js

@@ -651,7 +651,13 @@ new NodePreviewController(Group, {
 
 				if (target_group) {
 					bone.position.set(group.origin[0], group.origin[1], group.origin[2])
-					if (group.parent == Outliner.ROOT) bone.position.y -= 24;
+					if (group.parent instanceof Group) {
+						bone.position.x -= group.parent.origin[0];
+						bone.position.y -= group.parent.origin[1];
+						bone.position.z -= group.parent.origin[2];
+					} else {
+						bone.position.y -= 24;
+					}
 					target_group.mesh.add(bone);
 					bone.updateMatrixWorld();
 				}