Skip to content

Commit d285985

Browse files
SnaveSutitSnaveSutit
committed
🚧 Squashed v1.5.0, v1.5.1, and v1.5.2.
commit bcbb6f8 Author: SnaveSutit <snavesutit@gmail.com> Date: Sat Nov 2 17:33:16 2024 -0400 🛠️ Fix broken asset download on first startup. commit 9a3b525 Author: SnaveSutit <snavesutit@gmail.com> Date: Fri Nov 1 15:08:57 2024 -0400 ✨ Improved tellraw messages commit d8dbdbd Author: SnaveSutit <snavesutit@gmail.com> Date: Wed Oct 30 17:53:35 2024 -0400 Fix production build script issues. commit 2dce027 Author: SnaveSutit <snavesutit@gmail.com> Date: Tue Oct 29 11:10:47 2024 -0400 🛠️ Static Export Locator / Camera Fixes - Fixed use entity locators and cameras not summoning properly in static mode commit 66986b7 Author: SnaveSutit <snavesutit@gmail.com> Date: Wed Oct 23 09:58:02 2024 -0400 🚧 v1.5.1 commit 357bfa2 Author: SnaveSutit <snavesutit@gmail.com> Date: Wed Oct 23 09:57:52 2024 -0400 🛠️ Fix broken passengers from summon tp command
1 parent 7d95287 commit d285985

File tree

12 files changed

+855
-77
lines changed

12 files changed

+855
-77
lines changed

‎package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@
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.5.1",
8-
"display_version": "1.5.1",
7+
"version": "1.5.2",
8+
"display_version": "1.5.2",
99
"min_blockbench_version": "4.11.1",
10+
"variant": "desktop",
11+
"tags": [
12+
"Minecraft: Java Edition",
13+
"Animation",
14+
"Display Entities"
15+
],
1016
"author": {
1117
"name": "Titus Evans (SnaveSutit)",
1218
"email": "snavesutit@gmail.com",
@@ -76,6 +82,7 @@
7682
},
7783
"devDependencies": {
7884
"@novacbn/svelte-codejar": "^0.1.2",
85+
"@types/download": "^8.0.5",
7986
"@types/eslint": "^8.21.1",
8087
"@types/js-yaml": "^4.0.5",
8188
"@types/node": "^17.0.21",
@@ -99,7 +106,7 @@
99106
},
100107
"dependencies": {
101108
"deepslate": "^0.19.2",
102-
"easydl": "^1.2.0",
109+
"download": "^8.0.0",
103110
"fflate": "^0.8.2",
104111
"generic-stream": "^1.2.6",
105112
"marked": "^4.3.0",

‎src/systems/datapackCompiler/1.20.4/animation.mcb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dir global {
4545
dir errors {
4646
function function_not_executed_as_root_entity {
4747
#ARGS: {export_namespace: string, function_path: string}
48-
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)', TAGS.PROJECT_ROOT('$(export_namespace)'))%>
48+
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
4949
}
5050
}
5151
}
@@ -144,7 +144,7 @@ dir <%export_namespace%> {
144144
execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1
145145
execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1
146146
block outdated_tellraw { with storage aj:temp
147-
$tellraw @a <%TELLRAW.RIG_OUTDATED(export_namespace)%>
147+
$tellraw @a <%TELLRAW.RIG_OUTDATED()%>
148148
}
149149
data modify entity @s data.rigHash set value '<%rigHash%>'
150150
execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: <%0xff0000%>}

‎src/systems/datapackCompiler/1.20.4/static.mcb

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dir global {
3838
dir errors {
3939
function function_not_executed_as_root_entity {
4040
#ARGS: {export_namespace: string, function_path: string}
41-
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)', TAGS.PROJECT_ROOT('$(export_namespace)'))%>
41+
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
4242
}
4343
}
4444
}
@@ -122,7 +122,7 @@ dir <%export_namespace%> {
122122
execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1
123123
execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1
124124
block outdated_tellraw { with storage aj:temp
125-
$tellraw @a <%TELLRAW.RIG_OUTDATED(export_namespace)%>
125+
$tellraw @a <%TELLRAW.RIG_OUTDATED()%>
126126
}
127127
data modify entity @s data.rigHash set value '<%rigHash%>'
128128
execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: <%0xff0000%>}
@@ -229,6 +229,12 @@ dir <%export_namespace%> {
229229
tag @s remove <%TAGS.NEW()%>
230230

231231
function *global/internal/gu/convert_uuid_array_to_string with entity @s
232+
tp @s \
233+
^<%roundTo(locator.default_transform.pos[0], 10)%> \
234+
^<%roundTo(locator.default_transform.pos[1], 10)%> \
235+
^<%roundTo(locator.default_transform.pos[2], 10)%> \
236+
~<%roundTo(locator.default_transform.head_rot[1], 10)%> \
237+
~<%roundTo(locator.default_transform.head_rot[0], 10)%>
232238
<%%
233239
if (locator.config.summon_commands) {
234240
emit.mcb(locator.config.summon_commands)
@@ -245,6 +251,12 @@ dir <%export_namespace%> {
245251
tag @s remove <%TAGS.NEW()%>
246252

247253
function *global/internal/gu/convert_uuid_array_to_string with entity @s
254+
tp @s \
255+
^<%roundTo(camera.default_transform.pos[0], 10)%> \
256+
^<%roundTo(camera.default_transform.pos[1], 10)%> \
257+
^<%roundTo(camera.default_transform.pos[2], 10)%> \
258+
~<%roundTo(camera.default_transform.head_rot[1], 10)%> \
259+
~<%roundTo(camera.default_transform.head_rot[0], 10)%>
248260
}
249261
data modify entity @s data.cameras.<%camera.name%>.uuid set from storage aj:uuid main.out
250262
}

‎src/systems/datapackCompiler/1.20.5/animation.mcb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dir global {
4545
dir errors {
4646
function function_not_executed_as_root_entity {
4747
#ARGS: {export_namespace: string, function_path: string}
48-
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)', TAGS.PROJECT_ROOT('$(export_namespace)'))%>
48+
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
4949
}
5050
}
5151
}
@@ -144,7 +144,7 @@ dir <%export_namespace%> {
144144
execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1
145145
execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1
146146
block outdated_tellraw { with storage aj:temp
147-
$tellraw @a <%TELLRAW.RIG_OUTDATED(export_namespace)%>
147+
$tellraw @a <%TELLRAW.RIG_OUTDATED()%>
148148
}
149149
data modify entity @s data.rigHash set value '<%rigHash%>'
150150
execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: <%0xff0000%>}

‎src/systems/datapackCompiler/1.20.5/static.mcb

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dir global {
3838
dir errors {
3939
function function_not_executed_as_root_entity {
4040
#ARGS: {export_namespace: string, function_path: string}
41-
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)', TAGS.PROJECT_ROOT('$(export_namespace)'))%>
41+
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
4242
}
4343
}
4444
}
@@ -122,7 +122,7 @@ dir <%export_namespace%> {
122122
execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1
123123
execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1
124124
block outdated_tellraw { with storage aj:temp
125-
$tellraw @a <%TELLRAW.RIG_OUTDATED(export_namespace)%>
125+
$tellraw @a <%TELLRAW.RIG_OUTDATED()%>
126126
}
127127
data modify entity @s data.rigHash set value '<%rigHash%>'
128128
execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: <%0xff0000%>}
@@ -229,6 +229,12 @@ dir <%export_namespace%> {
229229
tag @s remove <%TAGS.NEW()%>
230230

231231
function *global/internal/gu/convert_uuid_array_to_string with entity @s
232+
tp @s \
233+
^<%roundTo(locator.default_transform.pos[0], 10)%> \
234+
^<%roundTo(locator.default_transform.pos[1], 10)%> \
235+
^<%roundTo(locator.default_transform.pos[2], 10)%> \
236+
~<%roundTo(locator.default_transform.head_rot[1], 10)%> \
237+
~<%roundTo(locator.default_transform.head_rot[0], 10)%>
232238
<%%
233239
if (locator.config.summon_commands) {
234240
emit.mcb(locator.config.summon_commands)
@@ -245,6 +251,12 @@ dir <%export_namespace%> {
245251
tag @s remove <%TAGS.NEW()%>
246252

247253
function *global/internal/gu/convert_uuid_array_to_string with entity @s
254+
tp @s \
255+
^<%roundTo(camera.default_transform.pos[0], 10)%> \
256+
^<%roundTo(camera.default_transform.pos[1], 10)%> \
257+
^<%roundTo(camera.default_transform.pos[2], 10)%> \
258+
~<%roundTo(camera.default_transform.head_rot[1], 10)%> \
259+
~<%roundTo(camera.default_transform.head_rot[0], 10)%>
248260
}
249261
data modify entity @s data.cameras.<%camera.name%>.uuid set from storage aj:uuid main.out
250262
}

‎src/systems/datapackCompiler/1.21.2/animation.mcb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dir global {
4545
dir errors {
4646
function function_not_executed_as_root_entity {
4747
#ARGS: {export_namespace: string, function_path: string}
48-
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)', TAGS.PROJECT_ROOT('$(export_namespace)'))%>
48+
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
4949
}
5050
}
5151
}
@@ -144,7 +144,7 @@ dir <%export_namespace%> {
144144
execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1
145145
execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1
146146
block outdated_tellraw { with storage aj:temp
147-
$tellraw @a <%TELLRAW.RIG_OUTDATED(export_namespace)%>
147+
$tellraw @a <%TELLRAW.RIG_OUTDATED()%>
148148
}
149149
data modify entity @s data.rigHash set value '<%rigHash%>'
150150
execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: <%0xff0000%>}

‎src/systems/datapackCompiler/1.21.2/static.mcb

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dir global {
3838
dir errors {
3939
function function_not_executed_as_root_entity {
4040
#ARGS: {export_namespace: string, function_path: string}
41-
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)', TAGS.PROJECT_ROOT('$(export_namespace)'))%>
41+
$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
4242
}
4343
}
4444
}
@@ -122,7 +122,7 @@ dir <%export_namespace%> {
122122
execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1
123123
execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1
124124
block outdated_tellraw { with storage aj:temp
125-
$tellraw @a <%TELLRAW.RIG_OUTDATED(export_namespace)%>
125+
$tellraw @a <%TELLRAW.RIG_OUTDATED()%>
126126
}
127127
data modify entity @s data.rigHash set value '<%rigHash%>'
128128
execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: <%0xff0000%>}
@@ -174,7 +174,7 @@ dir <%export_namespace%> {
174174
}
175175
}
176176
# Rotation Logic
177-
execute at @s on passengers run tp @s ~ ~ ~ ~ ~
177+
execute at @s on passengers run rotate @s ~ ~
178178
IF (root_ticking_commands) {
179179
<%%
180180
emit.mcb(root_ticking_commands)
@@ -224,11 +224,17 @@ dir <%export_namespace%> {
224224

225225
REPEAT (Object.values(rig.nodes).filter(v => v.type === 'locator')) as locator {
226226
IF (locator.config && locator.config.use_entity) {
227-
summon <%locator.config.entity_type%> ~ ~ ~ {Tags:['<%TAGS.NEW()%>', '<%TAGS.GLOBAL_LOCATOR()%>', '<%TAGS.PROJECT_LOCATOR(export_namespace)%>', '<%TAGS.LOCAL_LOCATOR(export_namespace, locator.name)%>']}
227+
summon <%locator.config.entity_type%> ^<%locator.default_transform.pos[0]%> ^<%locator.default_transform.pos[1]%> ^<%locator.default_transform.pos[2]%> {Tags:['<%TAGS.NEW()%>', '<%TAGS.GLOBAL_LOCATOR()%>', '<%TAGS.PROJECT_LOCATOR(export_namespace)%>', '<%TAGS.LOCAL_LOCATOR(export_namespace, locator.name)%>']}
228228
execute as @e[type=<%locator.config.entity_type%>,tag=<%TAGS.NEW()%>,tag=<%TAGS.GLOBAL_LOCATOR()%>,limit=1,distance=..0.01] run {
229229
tag @s remove <%TAGS.NEW()%>
230230

231231
function *global/internal/gu/convert_uuid_array_to_string with entity @s
232+
tp @s \
233+
^<%roundTo(locator.default_transform.pos[0], 10)%> \
234+
^<%roundTo(locator.default_transform.pos[1], 10)%> \
235+
^<%roundTo(locator.default_transform.pos[2], 10)%> \
236+
~<%roundTo(locator.default_transform.head_rot[1], 10)%> \
237+
~<%roundTo(locator.default_transform.head_rot[0], 10)%>
232238
<%%
233239
if (locator.config.summon_commands) {
234240
emit.mcb(locator.config.summon_commands)
@@ -245,6 +251,12 @@ dir <%export_namespace%> {
245251
tag @s remove <%TAGS.NEW()%>
246252

247253
function *global/internal/gu/convert_uuid_array_to_string with entity @s
254+
tp @s \
255+
^<%roundTo(camera.default_transform.pos[0], 10)%> \
256+
^<%roundTo(camera.default_transform.pos[1], 10)%> \
257+
^<%roundTo(camera.default_transform.pos[2], 10)%> \
258+
~<%roundTo(camera.default_transform.head_rot[1], 10)%> \
259+
~<%roundTo(camera.default_transform.head_rot[0], 10)%>
248260
}
249261
data modify entity @s data.cameras.<%camera.name%>.uuid set from storage aj:uuid main.out
250262
}
@@ -286,7 +298,7 @@ dir <%export_namespace%> {
286298
function *<%export_namespace%>/set_default_pose
287299

288300
tp @s ~ ~ ~ ~ ~
289-
execute at @s on passengers run tp @s ~ ~ ~ ~ ~
301+
execute at @s on passengers run rotate @s ~ ~
290302
data modify entity @s teleport_duration set value <%teleportation_duration%>
291303
execute on passengers run data modify entity @s teleport_duration set value <%teleportation_duration%>
292304
# Custom Summon Commands

0 commit comments

Comments
 (0)