Skip to content

Commit 4dd0844

Browse files
SnaveSutitSnaveSutit
authored
🔀 Merge #394: 🔖 v1.7.0
2 parents 0c28448 + 5e65b98 commit 4dd0844

File tree

81 files changed

+9651
-2798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+9651
-2798
lines changed

‎.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"npm.exclude": ["**/node_modules"],
2828
"errorLens.excludePatterns": ["**/node_modules/**/*"],
29-
"eslint.validate": ["javascript", "javascriptreact", "svelte"],
29+
"eslint.validate": ["javascript", "typescript", "svelte"],
3030
"eslint.useFlatConfig": true,
3131
"eslint.problems.shortenToSingleLine": true
3232
}

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</h1>
55
</div>
66
<div align="center">
7-
<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">
7+
<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">
88
<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">
99
<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>
1010
<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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"title": "Animated Java",
55
"icon": "icon.svg",
66
"description": "A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.",
7-
"version": "1.6.4",
8-
"display_version": "v1.6.4",
7+
"version": "1.7.0",
98
"min_blockbench_version": "4.12.0",
109
"variant": "desktop",
1110
"tags": [
@@ -103,6 +102,7 @@
103102
"prettier": "^2.5.1",
104103
"svelte": "^3.55.1",
105104
"svelte-awesome-color-picker": "^3.0.0-beta.7",
105+
"svelte-multiselect": "^11.0.0-rc.1",
106106
"svelte-preprocess": "^5.0.1",
107107
"svelte-preprocess-esbuild": "^3.0.1",
108108
"typescript": "^4.5.5",

‎src/blockbenchTypeMods.d.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import { blueprintSettingErrors, defaultValues } from './blueprintSettings'
88
import { openExportProgressDialog } from './interface/dialog/exportProgress'
99
import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
1010
import { TextDisplay } from './outliner/textDisplay'
11+
import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
12+
import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
1113
import datapackCompiler from './systems/datapackCompiler'
12-
import resourcepackCompiler from './systems/resourcepackCompiler'
1314
import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
15+
import resourcepackCompiler from './systems/resourcepackCompiler'
16+
import { EasingKey } from './util/easing'
1417
import { isDataPackPath, isResourcePackPath } from './util/minecraftUtil'
1518
import { Valuable } from './util/stores'
1619
import { type Variant } from './variants'
17-
import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
18-
import { VanillaBlockDisplay } from './outliner/vanillaBlockDisplay'
19-
import { EasingKey } from './util/easing'
2020

2121
declare module 'three' {
2222
interface Object3D {

‎src/blueprintFormat.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { BillboardMode, BoneConfig, LocatorConfig } from './nodeConfigs'
66
import { process } from './systems/modelDataFixerUpper'
77
import { events } from './util/events'
88
import { injectSvelteCompomponent } from './util/injectSvelteComponent'
9-
import { toSafeFuntionName } from './util/minecraftUtil'
9+
import { sanitizePathName } from './util/minecraftUtil'
1010
import { addProjectToRecentProjects } from './util/misc'
1111
import { Valuable } from './util/stores'
1212
import { translate } from './util/translation'
@@ -44,6 +44,7 @@ export interface IBlueprintBoneConfigJSON {
4444
export interface IBlueprintLocatorConfigJSON {
4545
use_entity?: LocatorConfig['useEntity']
4646
entity_type?: LocatorConfig['entityType']
47+
sync_passenger_rotation?: LocatorConfig['syncPassengerRotation']
4748
summon_commands?: LocatorConfig['_summonCommands']
4849
ticking_commands?: LocatorConfig['tickingCommands']
4950
}
@@ -164,7 +165,7 @@ export function convertToBlueprint() {
164165
}
165166
for (const animation of Blockbench.Animation.all) {
166167
animation.createUniqueName(Blockbench.Animation.all.filter(a => a !== animation))
167-
animation.name = toSafeFuntionName(animation.name)
168+
animation.name = sanitizePathName(animation.name)
168169
}
169170
for (const cube of Cube.all) {
170171
cube.setUVMode(false)
@@ -340,7 +341,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
340341
parseGroups(model.outliner)
341342

342343
for (const group of Group.all) {
343-
group.name = toSafeFuntionName(group.name)
344+
group.name = sanitizePathName(group.name)
344345
}
345346
}
346347

‎src/blueprintSettings.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type MinecraftVersion } from './systems/datapackCompiler/mcbFiles'
1+
import { MinecraftVersion } from './systems/global'
22
import { Valuable } from './util/stores'
33

44
export type ExportMode = 'raw' | 'zip' | 'none'
@@ -12,7 +12,7 @@ export const defaultValues = {
1212
enable_plugin_mode: false,
1313
resource_pack_export_mode: 'raw' as ExportMode,
1414
data_pack_export_mode: 'raw' as ExportMode,
15-
target_minecraft_version: '1.21.2' as MinecraftVersion,
15+
target_minecraft_versions: ['1.21.4'] as MinecraftVersion[],
1616
// Resource Pack Settings
1717
display_item: 'minecraft:white_dye',
1818
custom_model_data_offset: 0,
@@ -22,6 +22,7 @@ export const defaultValues = {
2222
enable_advanced_data_pack_settings: false,
2323
data_pack: '',
2424
summon_commands: '',
25+
remove_commands: '',
2526
ticking_commands: '',
2627
interpolation_duration: 1,
2728
teleportation_duration: 1,

‎src/components/about.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<img src={AnimatedJavaIcon} />
1111
<div>
1212
<h1>Animated Java</h1>
13-
<h3>{PACKAGE.display_version}</h3>
13+
<h3>v{PACKAGE.version}</h3>
1414
</div>
1515
</div>
1616

0 commit comments

Comments
 (0)