Skip to content

Commit 6503525

Browse files
committed
Fix #135 and #136
1 parent a4f6b2a commit 6503525

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

exporters/datapackExporter/datapackExporter.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ export function loadExporter() {
284284
} ${getExportVersionId()}`,
285285
// load function tag
286286
`scoreboard players reset * ${scoreboard.rigLoaded}`,
287-
`execute as @e[type=${entityTypes.ajRoot},tag=${tags.rootEntity}] run function #${NAMESPACE}:on_load`,
287+
`execute as @e[type=${entityTypes.ajRoot},tag=${tags.rootEntity}] run function ${AJ_NAMESPACE}:on_load`,
288288
])
289289
.chainNewFile('on_load.mcfunction', [
290290
`scoreboard players set @s ${scoreboard.rigLoaded} 1`,
@@ -577,13 +577,15 @@ export function loadExporter() {
577577
}
578578

579579
if (!singleEntityRig) {
580-
namespaceFolder.chainNewFile('stop_all_animations.mcfunction', [
581-
`execute if entity @s[tag=${tags.rootEntity}] run function ${AJ_NAMESPACE}:animations/stop_all_animations_as_root`,
582-
`execute if entity @s[tag=!${tags.rootEntity}] run tellraw @a ${API.formatStr(
583-
errorMustBeRunAsRoot.toString(),
584-
[`${NAMESPACE}:animations/stop_all_animations`]
585-
)}`,
586-
])
580+
namespaceFolder
581+
.accessFolder('functions/animations')
582+
.chainNewFile('stop_all_animations.mcfunction', [
583+
`execute if entity @s[tag=${tags.rootEntity}] run function ${AJ_NAMESPACE}:animations/stop_all_animations_as_root`,
584+
`execute if entity @s[tag=!${tags.rootEntity}] run tellraw @a ${API.formatStr(
585+
errorMustBeRunAsRoot.toString(),
586+
[`${NAMESPACE}:animations/stop_all_animations`]
587+
)}`,
588+
])
587589

588590
animatedJavaFolder
589591
.newFolder('functions/animations')
@@ -1024,7 +1026,6 @@ export function loadExporter() {
10241026
}
10251027
}
10261028
datapack.newFile('animated_java.mcmeta', content)
1027-
console.log(EXPORT_FOLDER)
10281029
await Promise.all(
10291030
datapack.children.map(async child => await child.writeToDisk(EXPORT_FOLDER, progress))
10301031
)

0 commit comments

Comments
 (0)