Merge branch 'experimental'

Author: SnaveSutit

exporters/datapackExporter/exporter/gen/function_tags.ts

@@ -15,16 +15,17 @@ export function generateTags(folders: IFolders) {
 			{ replace: false, values: [`${G.INTERNAL_PATH}/load`] },
 			tagMerger
 		)
-		.chainNewFile(
-			'tick.json',
-			{ replace: false, values: [`${G.INTERNAL_PATH}/tick`] },
-			tagMerger
-		)
+		.chainNewFile('tick.json', { replace: false, values: [`animated_java:tick`] }, tagMerger)
 
-	const animatedJavafunctionTagFolder = folders.animatedJava.tags.newFolder(
-		`functions/${G.PROJECT_NAME}`
+	const animatedJavaFunctionTagFolder = folders.animatedJava.tags.newFolder(`functions`)
+	animatedJavaFunctionTagFolder.newFile(
+		'rig_tick.json',
+		{ replace: false, values: [`${G.INTERNAL_PATH}/tick`] },
+		tagMerger
 	)
-	animatedJavafunctionTagFolder
+
+	const projectFunctionTagFolder = animatedJavaFunctionTagFolder.newFolder(`${G.PROJECT_NAME}`)
+	projectFunctionTagFolder
 		.newFolder('on_load')
 		.chainNewFile('as_root.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_rig_entities.json', { replace: false, values: [] }, tagMerger)
@@ -33,7 +34,7 @@ export function generateTags(folders: IFolders) {
 		.chainNewFile('as_locator_entities.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_camera_origins.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_camera_entities.json', { replace: false, values: [] }, tagMerger)
-	animatedJavafunctionTagFolder
+	projectFunctionTagFolder
 		.newFolder('on_tick')
 		.chainNewFile('as_root.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_rig_entities.json', { replace: false, values: [] }, tagMerger)
@@ -42,7 +43,7 @@ export function generateTags(folders: IFolders) {
 		.chainNewFile('as_locator_entities.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_camera_origins.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_camera_entities.json', { replace: false, values: [] }, tagMerger)
-	animatedJavafunctionTagFolder
+	projectFunctionTagFolder
 		.newFolder('on_summon')
 		.chainNewFile('as_root.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_rig_entities.json', { replace: false, values: [] }, tagMerger)
@@ -51,7 +52,7 @@ export function generateTags(folders: IFolders) {
 		.chainNewFile('as_locator_entities.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_camera_origins.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_camera_entities.json', { replace: false, values: [] }, tagMerger)
-	animatedJavafunctionTagFolder
+	projectFunctionTagFolder
 		.newFolder('on_remove')
 		.chainNewFile('as_root.json', { replace: false, values: [] }, tagMerger)
 		.chainNewFile('as_rig_entities.json', { replace: false, values: [] }, tagMerger)

exporters/datapackExporter/exporter/gen/functions.ts

@@ -450,10 +450,14 @@ export function generateFunctions(folders: IFolders) {
 	// SECTION - Tick functions
 	// ------------------------
 
+	folders.animatedJava.functions.newFile('tick.mcfunction', [
+		`execute as @e[type=minecraft:item_display,tag=${G.TAGS.globalRigRoot}] run function #animated_java:rig_tick`,
+	])
+
 	folders.project.internalFunctions
 		// ANCHOR - function G.INTERNAL_FUNCTIONS/tick
 		.chainNewFile('tick.mcfunction', [
-			`execute as @e[type=minecraft:item_display,tag=${G.TAGS.rootEntity}] run function ${G.INTERNAL_PATH}/tick_as_root`,
+			`execute if entity @s[tag=${G.TAGS.rootEntity}] run function ${G.INTERNAL_PATH}/tick_as_root`,
 		])
 		// ANCHOR - function G.INTERNAL_FUNCTIONS/tick_as_root
 		.chainNewFile('tick_as_root.mcfunction', [
@@ -498,7 +502,7 @@ export function generateFunctions(folders: IFolders) {
 				: `execute at @s on passengers run function ${G.INTERNAL_PATH}/summon/as_rig_entities`,
 			...G.VARIANTS.map(
 				v =>
-					`execute if score #variant ${G.SCOREBOARD.i} = $aj.${G.PROJECT_NAME}.variant.${v.name} ${G.SCOREBOARD.id} run function ${G.INTERNAL_PATH}/apply_variant/${v.name}_as_root`
+					`execute if score #variant ${G.SCOREBOARD.i} = $aj.${G.PROJECT_NAME}.variant.${v.name} ${G.SCOREBOARD.id} run function ${G.INTERNAL_PATH}/apply_variant/${v.name}/as_root`
 			),
 			`execute if score #animation ${G.SCOREBOARD.i} matches 0.. run scoreboard players operation @s ${G.SCOREBOARD.animTime} = #frame ${G.SCOREBOARD.i}`,
 			...G.exportData.renderedAnimations
@@ -726,7 +730,7 @@ export function generateFunctions(folders: IFolders) {
 			// ANCHOR - function G.INTERNAL_PATH:animations/pause_all_as_root
 			.chainNewFile('pause_all_as_root.mcfunction', [
 				...G.exportData.renderedAnimations.map(
-					a => `function ${G.INTERNAL_PATH}/animations/${a.name}/pause`
+					a => `function ${G.INTERNAL_PATH}/animations/${a.name}/pause_as_root`
 				),
 			])
 	}

package.json

@@ -2,7 +2,7 @@
 	"type": "module",
 	"name": "animated_java",
 	"title": "Animated Java",
-	"version": "0.4.2",
+	"version": "0.4.3",
 	"min_blockbench_version": "4.6.5",
 	"author": {
 		"name": "Titus Evans (SnaveSutit)",