Skip to content

Commit a507bd2

Browse files
SnaveSutitSnaveSutit
authored
🔀 Merge #467: 🔖 v1.8.1
2 parents c6197dc + 2255fbc commit a507bd2

File tree

18 files changed

+1278
-251
lines changed

18 files changed

+1278
-251
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"title": "Animated Java",
55
"icon": "icon.svg",
66
"description": "Effortlessly craft complex animations for Minecraft: Java Edition",
7-
"version": "1.8.0",
7+
"version": "1.8.1",
88
"min_blockbench_version": "4.12.0",
99
"max_blockbench_version": "4.12.6",
1010
"variant": "desktop",

‎src/assets/vanillaAssetOverrides/minecraft/models/block/chest.json‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"parent": "block/block",
23
"textures": {
34
"0": "entity/chest/normal"
45
},
@@ -8,38 +9,38 @@
89
"to": [15, 14, 15],
910
"rotation": { "angle": 0, "axis": "y", "origin": [8, 11.5, 8] },
1011
"faces": {
11-
"north": { "uv": [10.5, 3.5, 14, 4.75], "rotation": 180, "texture": "#0" },
12-
"east": { "uv": [0, 3.5, 3.5, 4.75], "rotation": 180, "texture": "#0" },
13-
"south": { "uv": [3.5, 3.5, 7, 4.75], "rotation": 180, "texture": "#0" },
14-
"west": { "uv": [7, 3.5, 10.5, 4.75], "rotation": 180, "texture": "#0" },
15-
"up": { "uv": [7, 0, 10.5, 3.5], "texture": "#0" },
16-
"down": { "uv": [3.5, 0, 7, 3.5], "texture": "#0" }
12+
"north": { "uv": [7, 3.5, 3.5, 4.75], "rotation": 180, "texture": "#0" },
13+
"east": { "uv": [3.5, 3.5, 0, 4.75], "rotation": 180, "texture": "#0" },
14+
"south": { "uv": [14, 3.5, 10.5, 4.75], "rotation": 180, "texture": "#0" },
15+
"west": { "uv": [10.5, 3.5, 7, 4.75], "rotation": 180, "texture": "#0" },
16+
"up": { "uv": [7, 3.5, 10.5, 0], "texture": "#0" },
17+
"down": { "uv": [3.5, 3.5, 7, 0], "texture": "#0" }
1718
}
1819
},
1920
{
20-
"from": [7, 8, 0],
21-
"to": [9, 12, 1],
22-
"rotation": { "angle": 0, "axis": "y", "origin": [8, 10, 0.5] },
21+
"from": [7, 8, 15],
22+
"to": [9, 12, 16],
23+
"rotation": { "angle": 0, "axis": "y", "origin": [8, 10, 15.5] },
2324
"faces": {
24-
"north": { "uv": [0.5, 1.25, 1, 0.25], "texture": "#0" },
25-
"east": { "uv": [0.25, 1.25, 0.5, 0.25], "texture": "#0" },
26-
"south": { "uv": [0.5, 1.25, 1, 0.25], "texture": "#0" },
27-
"west": { "uv": [1, 1.25, 1.25, 0.25], "texture": "#0" },
28-
"up": { "uv": [0.5, 0, 1, 0.25], "texture": "#0" },
29-
"down": { "uv": [0.5, 0, 1, 0.25], "texture": "#0" }
25+
"north": { "uv": [1, 1.25, 0.5, 0.25], "texture": "#0" },
26+
"east": { "uv": [0.5, 1.25, 0.25, 0.25], "texture": "#0" },
27+
"south": { "uv": [1, 1.25, 0.5, 0.25], "texture": "#0" },
28+
"west": { "uv": [1.25, 1.25, 1, 0.25], "texture": "#0" },
29+
"up": { "uv": [0.5, 0.25, 1, 0], "texture": "#0" },
30+
"down": { "uv": [0.5, 0.25, 1, 0], "texture": "#0" }
3031
}
3132
},
3233
{
3334
"from": [1, 0, 1],
3435
"to": [15, 10, 15],
3536
"rotation": { "angle": 0, "axis": "y", "origin": [8, 5, 8] },
3637
"faces": {
37-
"north": { "uv": [10.5, 8.25, 14, 10.75], "rotation": 180, "texture": "#0" },
38-
"east": { "uv": [7, 8.25, 10.5, 10.75], "rotation": 180, "texture": "#0" },
39-
"south": { "uv": [3.5, 8.25, 7, 10.75], "rotation": 180, "texture": "#0" },
40-
"west": { "uv": [0, 8.25, 3.5, 10.75], "rotation": 180, "texture": "#0" },
41-
"up": { "uv": [7, 4.75, 10.5, 8.25], "texture": "#0" },
42-
"down": { "uv": [3.5, 4.75, 7, 8.25], "rotation": 180, "texture": "#0" }
38+
"north": { "uv": [7, 8.25, 3.5, 10.75], "rotation": 180, "texture": "#0" },
39+
"east": { "uv": [10.5, 8.25, 7, 10.75], "rotation": 180, "texture": "#0" },
40+
"south": { "uv": [14, 8.25, 10.5, 10.75], "rotation": 180, "texture": "#0" },
41+
"west": { "uv": [3.5, 8.25, 0, 10.75], "rotation": 180, "texture": "#0" },
42+
"up": { "uv": [7, 8.25, 10.5, 4.75], "texture": "#0" },
43+
"down": { "uv": [3.5, 8.25, 7, 4.75], "rotation": 180, "texture": "#0" }
4344
}
4445
}
4546
]

‎src/assets/vanillaAssetOverrides/minecraft/models/item/template_chest.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"parent": "block/block",
3+
"textures": {
4+
"0": "entity/chest/normal"
5+
},
6+
"elements": [
7+
{
8+
"from": [1, 9, 1],
9+
"to": [15, 14, 15],
10+
"rotation": { "angle": 0, "axis": "y", "origin": [8, 11.5, 8] },
11+
"faces": {
12+
"north": { "uv": [10.5, 3.5, 14, 4.75], "rotation": 180, "texture": "#0" },
13+
"east": { "uv": [0, 3.5, 3.5, 4.75], "rotation": 180, "texture": "#0" },
14+
"south": { "uv": [3.5, 3.5, 7, 4.75], "rotation": 180, "texture": "#0" },
15+
"west": { "uv": [7, 3.5, 10.5, 4.75], "rotation": 180, "texture": "#0" },
16+
"up": { "uv": [7, 0, 10.5, 3.5], "texture": "#0" },
17+
"down": { "uv": [3.5, 0, 7, 3.5], "texture": "#0" }
18+
}
19+
},
20+
{
21+
"from": [7, 8, 0],
22+
"to": [9, 12, 1],
23+
"rotation": { "angle": 0, "axis": "y", "origin": [8, 10, 0.5] },
24+
"faces": {
25+
"north": { "uv": [0.5, 1.25, 1, 0.25], "texture": "#0" },
26+
"east": { "uv": [0.25, 1.25, 0.5, 0.25], "texture": "#0" },
27+
"south": { "uv": [0.5, 1.25, 1, 0.25], "texture": "#0" },
28+
"west": { "uv": [1, 1.25, 1.25, 0.25], "texture": "#0" },
29+
"up": { "uv": [0.5, 0, 1, 0.25], "texture": "#0" },
30+
"down": { "uv": [0.5, 0, 1, 0.25], "texture": "#0" }
31+
}
32+
},
33+
{
34+
"from": [1, 0, 1],
35+
"to": [15, 10, 15],
36+
"rotation": { "angle": 0, "axis": "y", "origin": [8, 5, 8] },
37+
"faces": {
38+
"north": { "uv": [10.5, 8.25, 14, 10.75], "rotation": 180, "texture": "#0" },
39+
"east": { "uv": [7, 8.25, 10.5, 10.75], "rotation": 180, "texture": "#0" },
40+
"south": { "uv": [3.5, 8.25, 7, 10.75], "rotation": 180, "texture": "#0" },
41+
"west": { "uv": [0, 8.25, 3.5, 10.75], "rotation": 180, "texture": "#0" },
42+
"up": { "uv": [7, 4.75, 10.5, 8.25], "texture": "#0" },
43+
"down": { "uv": [3.5, 4.75, 7, 8.25], "rotation": 180, "texture": "#0" }
44+
}
45+
}
46+
]
47+
}

‎src/components/vanillaItemDisplayElementPanel.svelte‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
let item = selected.item
1212
let error = selected.error
1313
14+
ITEM_DISPLAY_ITEM_DISPLAY_SELECT.set(selected.itemDisplay)
15+
1416
$: {
1517
$error = ''
1618
if (selected.item !== item) {

‎src/interface/panel/vanillaItemDisplayElement.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ ITEM_DISPLAY_ITEM_DISPLAY_SELECT.set = function (
100100
if (VanillaItemDisplay.selected.length > 1) {
101101
for (const display of VanillaItemDisplay.selected) {
102102
display.itemDisplay = value
103+
void display.updateItem()
103104
}
104105
} else {
105106
selected.itemDisplay = value
107+
void selected.updateItem()
106108
}
107109
Project!.saved = false
108110
Undo.finishEdit(`Change Item Display Node's Item Display Mode to ${value}`, {

0 commit comments

Comments
 (0)