🔀 Merge #394: 🔖 v1.7.0

Author: SnaveSutit

.vscode/settings.json

@@ -26,7 +26,7 @@
 	},
 	"npm.exclude": ["**/node_modules"],
 	"errorLens.excludePatterns": ["**/node_modules/**/*"],
-	"eslint.validate": ["javascript", "javascriptreact", "svelte"],
+	"eslint.validate": ["javascript", "typescript", "svelte"],
 	"eslint.useFlatConfig": true,
 	"eslint.problems.shortenToSingleLine": true
 }

README.md

@@ -4,7 +4,7 @@
 	</h1>
 </div>
 <div align="center">
-	<img alt="Dynamic JSON Badge" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2FAnimated-Java%2Fanimated-java%2Frefs%2Fheads%2Fmain%2Fpackage.json&query=display_version&style=flat-square&label=%20&color=%2300000000&link=https%3A%2F%2Fbuilds.animated-java.dev%2Flatest">
+	<img alt="Dynamic JSON Badge" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2FAnimated-Java%2Fanimated-java%2Frefs%2Fheads%2Fmain%2Fpackage.json&query=version&style=flat-square&label=%20&color=%2300000000&link=https%3A%2F%2Fbuilds.animated-java.dev%2Flatest&prefix=v">
 	<img alt="Total Downloads" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fblckbn.ch%2Fapi%2Fstats%2Fplugins%3Fweeks%3D1000&query=animated_java&style=flat-square&logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAA6BJREFUeF7tnFFSGzEMhuXkBB0gkLf0JuQmcBLgJMlNmp6keQtkyHCCxJ3NNJ0MTXclW7Js5ucVWfJ%2B38oQYxMIX64Egmt1FCcIcH4JIAACnAk4l0cHQIAzAefy6AAIcCbgXB4dAAHOBJzLowMgwJmAc3l0AAQ4E3Aujw6AABmB1%2B0u9o24m1w19VI1NdkOPATIXlj1aAhQRypLCAEyXurREKCOVJYQAmS81KMhQB2pLCEEyHipR0OAOlJZQgiQ8VKPhgB1pLKEECDjpR4NAepIZQkhQMZLPRoC1JHKEkKAjJd6NASoI5UlhAAZL%2FVoCFBHKksIATJe6tEQoI5UlhACZLxY0W%2Fb3eKwH71Mp9%2FWQwM0BGw2HzMa7%2B%2Bnk%2BvlUD3r77ufinjdvv8gCvdEtI770XxIQq6ADn4Y7xddzUC0vJ1cPVpD7svvKuAM%2FmmOgxJyBJzDPxX0luAmoFt2ItHDhbejV0KqgEvwT7VjpJfp7dWzRye4COiBP9gJKQL64HtLKC6AAb9XglQAB76nhOICNm%2B75xDoidnu%2FyxHEgES%2BN18IsXH0r8ZFRfQPWiOBK6AFuB3LFwE5EjgCGgFvquAVAlhfPjVt3zF%2Fej76fd8zjLnseycz8utA06TkC5HRDTrBxtXfz7YDfL3hu%2FeAYkSBsFyAmqAX42AhOWIw%2Fi%2FMbXAr0pAKQk1wa9OgLWE2uBXKcBKQo3wqxWgLaFW%2BFUL0JJQM%2FzqBeRKqB1%2BEwJSJbQAvxkBUgmtwG9KAFdCS%2FBVBHB2J7M%2Btn4a3Ld3ZAHf%2BvmyN%2BOsJ3hJ3iUJFvC72tbP16SAz8uRFXwIGFi7uk6gENeWf0ZEB2j%2BAEnIBQEJ0DSHQIAmzYRcEJAATXMIBGjSTMgFAQnQNIdAgCbNhFwQkABNc0gLArqDUgNndTSR1JUr9%2F%2BUKmxF%2FL3hUheZArPRuNyRLUB4sq0AlnIlNC525As43rnqP69ZDknZSjEc5tObm1VO1WwBx53J7ftDoLDImUhrY7V2YFUEdPAEN19aY31hvnF1N7meazyImoBjJ8huv2jMv3gOjXX%2FfNKqAo4SNh%2Bz0fjwFCnOuMfEi1OUFVwTxXWM4ScdRsuhe8yy1I43ZKQT%2Farx6h3wVUFZPRcEWJFl5oUAJiirMAiwIsvMCwFMUFZhEGBFlpkXApigrMIgwIosMy8EMEFZhUGAFVlmXghggrIKgwArssy8EMAEZRUGAVZkmXkhgAnKKuw3fJAlf%2F2mKG8AAAAASUVORK5CYII%3D&label=%20&color=%2300aced00">
 	<a href="https://discord.com/invite/jFgY4PXZfp"><img alt="Discord" src="https://img.shields.io/discord/785339959518953482?style=flat-square&logo=discord&label=%20&color=%2300aced00"></a>
 	<img alt="Static Badge" src="https://img.shields.io/badge/Ko--Fi?style=flat-square&logo=kofi&label=Support%20Us!&labelColor=%2300aced00&color=%2300aced00&link=https%3A%2F%2Fko-fi.com%2Fsnavesutit">

package.json

@@ -4,8 +4,7 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.",
-	"version": "1.6.4",
-	"display_version": "v1.6.4",
+	"version": "1.7.0",
 	"min_blockbench_version": "4.12.0",
 	"variant": "desktop",
 	"tags": [
@@ -103,6 +102,7 @@
 		"prettier": "^2.5.1",
 		"svelte": "^3.55.1",
 		"svelte-awesome-color-picker": "^3.0.0-beta.7",
+		"svelte-multiselect": "^11.0.0-rc.1",
 		"svelte-preprocess": "^5.0.1",
 		"svelte-preprocess-esbuild": "^3.0.1",
 		"typescript": "^4.5.5",

src/blockbenchTypeMods.d.ts

@@ -8,15 +8,15 @@ import { blueprintSettingErrors, defaultValues } from './blueprintSettings'
 import { openExportProgressDialog } from './interface/dialog/exportProgress'
 import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
 import { TextDisplay } from './outliner/textDisplay'
+import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
+import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
 import datapackCompiler from './systems/datapackCompiler'
-import resourcepackCompiler from './systems/resourcepackCompiler'
 import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
+import resourcepackCompiler from './systems/resourcepackCompiler'
+import { EasingKey } from './util/easing'
 import { isDataPackPath, isResourcePackPath } from './util/minecraftUtil'
 import { Valuable } from './util/stores'
 import { type Variant } from './variants'
-import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
-import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
-import { EasingKey } from './util/easing'
 
 declare module 'three' {
 	interface Object3D {

src/blueprintFormat.ts

@@ -6,7 +6,7 @@ import { BillboardMode, BoneConfig, LocatorConfig } from './nodeConfigs'
 import { process } from './systems/modelDataFixerUpper'
 import { events } from './util/events'
 import { injectSvelteCompomponent } from './util/injectSvelteComponent'
-import { toSafeFuntionName } from './util/minecraftUtil'
+import { sanitizePathName } from './util/minecraftUtil'
 import { addProjectToRecentProjects } from './util/misc'
 import { Valuable } from './util/stores'
 import { translate } from './util/translation'
@@ -44,6 +44,7 @@ export interface IBlueprintBoneConfigJSON {
 export interface IBlueprintLocatorConfigJSON {
 	use_entity?: LocatorConfig['useEntity']
 	entity_type?: LocatorConfig['entityType']
+	sync_passenger_rotation?: LocatorConfig['syncPassengerRotation']
 	summon_commands?: LocatorConfig['_summonCommands']
 	ticking_commands?: LocatorConfig['tickingCommands']
 }
@@ -164,7 +165,7 @@ export function convertToBlueprint() {
 	}
 	for (const animation of Blockbench.Animation.all) {
 		animation.createUniqueName(Blockbench.Animation.all.filter(a => a !== animation))
-		animation.name = toSafeFuntionName(animation.name)
+		animation.name = sanitizePathName(animation.name)
 	}
 	for (const cube of Cube.all) {
 		cube.setUVMode(false)
@@ -340,7 +341,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
 			parseGroups(model.outliner)
 
 			for (const group of Group.all) {
-				group.name = toSafeFuntionName(group.name)
+				group.name = sanitizePathName(group.name)
 			}
 		}
 

src/blueprintSettings.ts

@@ -1,4 +1,4 @@
-import { type MinecraftVersion } from './systems/datapackCompiler/mcbFiles'
+import { MinecraftVersion } from './systems/global'
 import { Valuable } from './util/stores'
 
 export type ExportMode = 'raw' | 'zip' | 'none'
@@ -12,7 +12,7 @@ export const defaultValues = {
 	enable_plugin_mode: false,
 	resource_pack_export_mode: 'raw' as ExportMode,
 	data_pack_export_mode: 'raw' as ExportMode,
-	target_minecraft_version: '1.21.2' as MinecraftVersion,
+	target_minecraft_versions: ['1.21.4'] as MinecraftVersion[],
 	// Resource Pack Settings
 	display_item: 'minecraft:white_dye',
 	custom_model_data_offset: 0,
@@ -22,6 +22,7 @@ export const defaultValues = {
 	enable_advanced_data_pack_settings: false,
 	data_pack: '',
 	summon_commands: '',
+	remove_commands: '',
 	ticking_commands: '',
 	interpolation_duration: 1,
 	teleportation_duration: 1,

src/components/about.svelte

@@ -10,7 +10,7 @@
 		<img src={AnimatedJavaIcon} />
 		<div>
 			<h1>Animated Java</h1>
-			<h3>{PACKAGE.display_version}</h3>
+			<h3>v{PACKAGE.version}</h3>
 		</div>
 	</div>