Skip to content

Commit 09c03b1

Browse files
SnaveSutitSnaveSutit
committed
🚧 Squashed v1.1.0
commit 2e4f4b5 Author: SnaveSutit <snavesutit@gmail.com> Date: Mon Jul 15 16:48:12 2024 -0400 v1.1.0 commit 7e48c40 Author: SnaveSutit <snavesutit@gmail.com> Date: Mon Jul 15 16:47:59 2024 -0400 🚧 Hide easing options if non-linear interpolation commit 61502a1 Author: SnaveSutit <snavesutit@gmail.com> Date: Mon Jul 15 15:48:38 2024 -0400 🚧 Uninstall message (tells you to restart BB) commit c82c457 Author: SnaveSutit <snavesutit@gmail.com> Date: Mon Jul 15 15:42:13 2024 -0400 🚧 Welcome page commit df55e43 Author: SnaveSutit <snavesutit@gmail.com> Date: Mon Jul 15 13:44:41 2024 -0400 🚧 Improve some types, and fix some dialog issues commit 958e209 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 15:12:10 2024 -0400 Fix #216 changing the ease now defaults the args commit 2cb4ef4 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 13:59:14 2024 -0400 🛠️ Fix incorrect block model rotations with `facing` commit 6c084db Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:57:53 2024 -0400 🚧 Update text blueprint commit 0d3a6db Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:38:03 2024 -0400 🛠️ Fix #214 @LeCarbonator minor localization key additions commit 236b2c0 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:34:40 2024 -0400 🛠️ Fix #220 commit b41a72b Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:33:58 2024 -0400 🛠️ Fix Default anim snapping effecting all formats commit a14d1a9 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:31:05 2024 -0400 🛠️ Fix #215 commit c9cdb13 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:21:53 2024 -0400 🛠️ Fix #218 Block displays should not respect the `facing` state. commit bde8fe3 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:20:34 2024 -0400 🛠️ Fix untranslated error messages. @LeCarbonator this time there are actually new translation keys 😅 commit f19ec3e Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:02:51 2024 -0400 🛠️ Fix #219 commit 7af48b1 Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:02:43 2024 -0400 🛠️ Fix invalid NBT in outdated rig warning commit f7bf8dc Author: SnaveSutit <snavesutit@gmail.com> Date: Sun Jul 14 12:02:21 2024 -0400 🛠️ Fix invalid animation names commit b020e4e Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 21:53:09 2024 -0400 🛠️ Fix #212 commit ea6f853 Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 21:39:47 2024 -0400 🛠️ Fix per-rig objectives being put in global commit 6f22c25 Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 21:07:28 2024 -0400 🚧 Missing language translation fix - Fix the `translation` function returning the translation key when a language that isn't supported is selected. It now returns the English translation if no language is found. commit 4c37978 Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 20:16:20 2024 -0400 🚧 Fix #211 commit c0df525 Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 19:43:51 2024 -0400 🚧 Update incorrect translation keys commit fd716a5 Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 10:05:29 2024 -0400 🧼 Clean up some unused code in keyframeEasings UI commit e518b9b Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Jul 12 10:04:58 2024 -0400 🛠️ Fix missing easing mode translation string @LeCarbonator Translations will need to be updated commit df45be5 Author: SnaveSutit <snavesutit@gmail.com> Date: Thu Jul 11 17:41:30 2024 -0400 🛠️ Maybe fix weird save path issues commit fabd543 Author: SnaveSutit <snavesutit@gmail.com> Date: Thu Jul 11 17:41:03 2024 -0400 🚧 Update build scripts commit f33a389 Author: SnaveSutit <snavesutit@gmail.com> Date: Thu Jul 11 17:40:35 2024 -0400 🧼 Clean up dependencies commit aa68c8f Author: SnaveSutit <snavesutit@gmail.com> Date: Thu Jul 11 10:28:31 2024 -0400 🚧 Fix about.md links
1 parent 03357b2 commit 09c03b1

Some content is hidden

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

56 files changed

+1910
-2338
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Things you'll need installed before you can setup the development environment
6363
```ts
6464
/// <reference types="blockbench-types"/>
6565
```
66-
4. Run `yarn build:dev` to start the development environment, which will watch for changes and recompile the plugin.
66+
4. Run `yarn dev` to start the development environment, which will watch for changes and recompile the plugin.
6767
5. Open Blockbench, then go to `File > Plugins > Load Plugin From File` and select the `animated_java.js` file from your local repo (`dist/pluginPackage/animated-java.js`).
6868
6. That's it! You're ready to start developing.
6969

‎TODO.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
- [ ] Look into adding a color picker for tintable vanilla items.
8282
- [ ] Add Variants to the UndoSystem (Blocked by vanilla Blockbench not supporting custom undo actions).
8383
- [ ] Remove `easingArgs` and `easingMode` from saved keyframes if `easingType` is `linear`.
84+
- [ ] Add an option to generate a `damage_flash` variant for mob-type entities.
8485

8586
# Data Pack Compiler
8687

‎package.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"type": "module",
33
"name": "animated_java",
44
"title": "Animated Java",
5-
"version": "1.0.0",
6-
"display_version": "1.0.0",
5+
"version": "1.1.0",
6+
"display_version": "1.1.0",
77
"min_blockbench_version": "4.10.0",
88
"author": {
99
"name": "Titus Evans (SnaveSutit)",
@@ -63,14 +63,13 @@
6363
"private": true,
6464
"scripts": {
6565
"build:scripts": "esbuild --bundle --platform=node --outfile=dist/build.cjs --packages=external ./tools/esbuild.ts",
66-
"build:dev": "yarn build:scripts && node ./dist/build.cjs --mode=dev",
67-
"build:prod": "yarn build:scripts && node ./dist/build.cjs",
66+
"dev": "yarn build:scripts && node ./dist/build.cjs --mode=dev",
67+
"prod": "yarn build:scripts && node ./dist/build.cjs",
6868
"format": "prettier --write ."
6969
},
7070
"devDependencies": {
7171
"@novacbn/svelte-codejar": "^0.1.2",
7272
"@types/eslint": "^8.21.1",
73-
"@types/fs-extra": "^11.0.1",
7473
"@types/js-yaml": "^4.0.5",
7574
"@types/node": "^17.0.21",
7675
"@typescript-eslint/eslint-plugin": "^5.54.0",
@@ -83,14 +82,12 @@
8382
"esbuild-plugin-svelte": "^0.1.1",
8483
"eslint": "^8.35.0",
8584
"firebase": "^9.19.0",
86-
"fs-extra": "^11.1.0",
8785
"js-yaml": "^4.1.0",
8886
"prettier": "^2.5.1",
8987
"svelte": "^3.55.1",
9088
"svelte-awesome-color-picker": "^3.0.0-beta.7",
9189
"svelte-preprocess": "^5.0.1",
9290
"svelte-preprocess-esbuild": "^3.0.1",
93-
"ts-json-schema-generator": "^2.3.0",
9491
"typescript": "^4.5.5"
9592
},
9693
"dependencies": {

‎src/blueprintFormat.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { BillboardMode, BoneConfig, LocatorConfig } from './nodeConfigs'
33
import ProjectTitleSvelte from './components/projectTitle.svelte'
44
import { PACKAGE } from './constants'
55
import { events } from './util/events'
6-
import { injectSvelteCompomponent } from './util/injectSvelte'
6+
import { injectSvelteCompomponent } from './util/injectSvelteComponent'
77
import { toSafeFuntionName } from './util/minecraftUtil'
88
import { addProjectToRecentProjects } from './util/misc'
99
import { Valuable } from './util/stores'
@@ -147,6 +147,7 @@ export interface IBlueprintFormatJSON {
147147
export function convertToBlueprint() {
148148
// Convert the current project to a Blueprint
149149
// NOTE - Nothing needs to be done here yet. The default functionality is sufficient.
150+
Project!.save_path = ''
150151
}
151152

152153
export function getDefaultProjectSettings(): ModelProject['animated_java'] {
@@ -222,7 +223,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
222223

223224
Project.loadingPromises = []
224225

225-
Project.save_path = model.meta.save_location || path
226+
Project.save_path = path
226227

227228
if (model.meta.box_uv !== undefined) {
228229
Project.box_uv = model.meta.box_uv
@@ -526,8 +527,8 @@ export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
526527
created() {
527528
void injectSvelteCompomponent({
528529
elementSelector: () => $('#format_page_animated_java_blueprint_mount')[0],
529-
svelteComponent: FormatPageSvelte,
530-
svelteComponentProperties: { format: BLUEPRINT_FORMAT },
530+
component: FormatPageSvelte,
531+
props: {},
531532
})
532533
},
533534
template: `<div id="format_page_animated_java_blueprint_mount" style="display: flex; flex-direction: column; flex-grow: 1;"></div>`,
@@ -584,8 +585,8 @@ export const BLUEPRINT_FORMAT = new Blockbench.ModelFormat({
584585
}
585586
},
586587
prepend: true,
587-
svelteComponent: ProjectTitleSvelte,
588-
svelteComponentProperties: { pluginMode: thisProject.pluginMode },
588+
component: ProjectTitleSvelte,
589+
props: { pluginMode: thisProject.pluginMode },
589590
})
590591

591592
if (Variant.all.length === 0) new Variant('Default', true)

‎src/components/blueprintSettingsDialog.svelte‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import FileSelect from './dialogItems/fileSelect.svelte'
1313
import FolderSelect from './dialogItems/folderSelect.svelte'
1414
import CodeInput from './dialogItems/codeInput.svelte'
15+
import Select from './dialogItems/select.svelte'
16+
import { DIALOG_ID } from '../interface/animationPropertiesDialog'
1517
1618
import HeartIcon from '../assets/heart.png'
1719
import KoFiImage from '../assets/kofi_s_tag_white.webp'
@@ -27,8 +29,6 @@
2729
</script>
2830

2931
<script lang="ts">
30-
import Select from './dialogItems/select.svelte'
31-
3232
export let blueprintName: Valuable<string>
3333
export let textureSizeX: Valuable<number>
3434
export let textureSizeY: Valuable<number>
@@ -356,6 +356,8 @@
356356
}
357357
</script>
358358

359+
<div style="--aj-dialog-id: '{DIALOG_ID}';" />
360+
359361
<div>
360362
<LineInput
361363
label={translate('dialog.blueprint_settings.blueprint_name.title')}
@@ -744,7 +746,7 @@
744746
}
745747
}
746748
747-
:global(.dialog_wrapper .dialog_content) {
749+
:global(dialog#animated_java\:blueprintSettingsDialog .dialog_wrapper .dialog_content) {
748750
overflow-y: auto !important;
749751
}
750752
div {

‎src/components/icon.svelte‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
<script lang="ts" context="module">
2-
import { onDestroy } from 'svelte'
32
import AnimatedJavaIcon from '../assets/animated_java_icon.svg'
43
</script>
54

6-
<script lang="ts">
7-
let selected = false
8-
9-
const parent = document.querySelector('[format=animated_java_blueprint]')!
10-
const interval = setInterval(() => {
11-
selected = parent.classList.contains('selected')
12-
}, 16)
13-
14-
onDestroy(() => {
15-
clearInterval(interval)
16-
})
17-
</script>
18-
19-
<span class="icon_wrapper f_left">
5+
<span class="icon_wrapper f_left" id="animated_java:icon">
206
<img src={AnimatedJavaIcon} alt="" />
217
</span>
228

‎src/components/installedPopup.svelte‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<script lang="ts" context="module">
2+
import AnimatedJavaIcon from '../assets/animated_java_icon.svg'
3+
</script>
4+
5+
<div class="content-container">
6+
<div class="header-container">
7+
<!-- svelte-ignore a11y-missing-attribute -->
8+
<img src={AnimatedJavaIcon} />
9+
<div>
10+
<h1>Welcome to Animated Java!</h1>
11+
<h3>
12+
A Blockbench plugin that makes complex animation a breeze in Minecraft: Java
13+
Edition.
14+
</h3>
15+
</div>
16+
</div>
17+
<div class="another-container">
18+
<h2>Not Sure Where to Start?</h2>
19+
<p>
20+
Check out our <a href="https://animated-java.dev/docs/getting-started"
21+
>getting started</a
22+
> page to learn how to use Animated Java.
23+
</p>
24+
<p>
25+
You can open our docs at any time via the Animated Java menu at the top of the screen.
26+
</p>
27+
<h2>Need more help?</h2>
28+
<p>
29+
Feel free to join our <a href="https://animated-java.dev/discord">Discord server</a> to ask
30+
questions via our support channel.
31+
</p>
32+
</div>
33+
</div>
34+
35+
<style>
36+
.another-container {
37+
display: flex;
38+
align-items: flex-start;
39+
flex-direction: column;
40+
padding: 0 10%;
41+
}
42+
43+
.content-container {
44+
display: flex;
45+
flex-direction: column;
46+
align-items: center;
47+
}
48+
49+
p {
50+
text-align: left;
51+
}
52+
53+
h2 {
54+
text-align: center;
55+
margin-top: 2rem;
56+
/* color: var(--color-subtle_text); */
57+
font-weight: 500;
58+
border-bottom: 1px solid var(--color-accent);
59+
margin-bottom: 1rem;
60+
}
61+
62+
.header-container {
63+
display: flex;
64+
align-items: center;
65+
margin-top: 1rem;
66+
justify-content: center;
67+
}
68+
.header-container div {
69+
display: flex;
70+
flex-direction: column;
71+
justify-content: center;
72+
margin-left: 2rem;
73+
}
74+
.header-container img {
75+
width: 128px;
76+
border-radius: 16px;
77+
box-shadow: 4px 4px 8px -4px black;
78+
}
79+
.header-container h1 {
80+
margin: 0px;
81+
border-bottom: 1px solid var(--color-accent);
82+
margin-bottom: 4px;
83+
}
84+
.header-container h3 {
85+
margin: 0px;
86+
color: var(--color-subtle_text);
87+
font-size: medium;
88+
max-width: 23rem;
89+
}
90+
</style>

0 commit comments

Comments
 (0)