Animated-Java
diff --git a/‎package.json‎
Lines changed: 2 additions & 2 deletions b/‎package.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/components/changelogDialog.svelte‎
Lines changed: 26 additions & 4 deletions b/‎src/components/changelogDialog.svelte‎
Lines changed: 26 additions & 4 deletions
diff --git a/‎src/interface/animatedJavaBarItem.ts‎
Lines changed: 0 additions & 15 deletions b/‎src/interface/animatedJavaBarItem.ts‎
Lines changed: 0 additions & 15 deletions
diff --git a/‎src/lang/en.yml‎
Lines changed: 1 addition & 1 deletion b/‎src/lang/en.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/pluginPackage/changelog.json‎
Lines changed: 19 additions & 0 deletions b/‎src/pluginPackage/changelog.json‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎src/systems/datapackCompiler/1.20.4/animation.mcb‎
Lines changed: 21 additions & 120 deletions b/‎src/systems/datapackCompiler/1.20.4/animation.mcb‎
Lines changed: 21 additions & 120 deletions
@@ -4,8 +4,8 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.",
-	"version": "1.6.0",
-	"display_version": "1.6.0",
+	"version": "1.6.1",
+	"display_version": "1.6.1",
 	"min_blockbench_version": "4.11.1",
 	"variant": "desktop",
 	"tags": [
 
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import changelog from '../pluginPackage/changelog.json'
+	import AnimatedJavaIcon from '../assets/animated_java_icon.svg'
 
 	function formatDateFull(date: string) {
 		// @ts-expect-error
@@ -40,10 +41,13 @@
 </script>
 
 <div class="content plugin_browser_tabbed_page" id="plugin_browser_changelog">
-	{#each Object.values(changelog) as versions}
-		<h3>
-			{versions.title}
-		</h3>
+	{#each Object.values(changelog).reverse() as versions}
+		<div class="title-container">
+			<img src={AnimatedJavaIcon} alt="" />
+			<h3>
+				{versions.title}
+			</h3>
+		</div>
 		<!-- svelte-ignore a11y-label-has-associated-control -->
 		<label class="plugin_changelog_author">{versions.author}</label>
 		<!-- svelte-ignore a11y-label-has-associated-control -->
@@ -83,4 +87,22 @@
 		border-radius: 3px;
 		font-size: 0.8em;
 	}
+	img {
+		border-radius: 4px;
+		width: 24px;
+		height: 24px;
+		margin-left: 0.5px;
+		box-shadow: 1px 1px 1px #000000aa;
+	}
+	.title-container h3 {
+		margin-left: 8px;
+		margin-top: 0;
+	}
+	.title-container {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		margin-top: 8px;
+	}
 </style>
@@ -114,21 +114,6 @@ MenuBar.addAction(
 	MENU_ID + '.animated_java:extract-open'
 )
 
-MenuBar.addAction(
-	createAction(`${PACKAGE.name}:extract`, {
-		icon: 'fa-trash-can',
-		category: 'animated_java',
-		name: translate('action.extract.name'),
-		condition() {
-			return Format === BLUEPRINT_FORMAT
-		},
-		click() {
-			void cleanupExportedFiles()
-		},
-	}),
-	MENU.id
-)
-
 MenuBar.addAction(
 	createAction(`${PACKAGE.name}:export`, {
 		icon: 'insert_drive_file',
 
@@ -33,7 +33,7 @@ animated_java.dialog.about.title: About Animated Java
 animated_java.dialog.about.close_button: Close
 
 ## Changelog
-animated_java.dialog.changelog_dialog.title: Changelog
+animated_java.dialog.changelog_dialog.title: Animated Java Changelog
 
 ## Unexpected Error Dialog
 animated_java.dialog.unexpected_error.title: An Unexpected Error Occurred!
 
@@ -37,5 +37,24 @@
 				]
 			}
 		]
+	},
+	"1.6.1": {
+		"title": "v1.6.1",
+		"author": "Titus Evans (SnaveSutit)",
+		"date": "2025-01-10",
+		"categories": [
+			{
+				"title": "Changes",
+				"list": ["Slightly improved the changelog."]
+			},
+			{
+				"title": "Fixes",
+				"list": [
+					"Fixed overlays breaking custom function tags.",
+					"Fixed [#350](https://github.com/Animated-Java/animated-java/issues/350)",
+					"Fixed [#353](https://github.com/Animated-Java/animated-java/issues/353)"
+				]
+			}
+		]
 	}
 }
@@ -1,128 +1,9 @@
-dir global {
-
-	function on_load minecraft:load {
-		# Initialize Scoreboards
-		scoreboard objectives add <%OBJECTIVES.I()%> dummy
-		scoreboard objectives add <%OBJECTIVES.ID()%> dummy
-		scoreboard objectives add <%OBJECTIVES.IS_RIG_LOADED()%> dummy
-		scoreboard objectives add <%OBJECTIVES.TWEEN_DURATION()%> dummy
-
-		scoreboard players add aj.last_id <%OBJECTIVES.ID()%> 0
-
-		# Initialize Storage
-		data modify storage aj:temp args set value {}
-		IF (show_outdated_warning) {
-			# Initialize Rigs
-			scoreboard players reset * <%OBJECTIVES.IS_RIG_LOADED()%>
-		}
-		function #*global/on_load
-	}
-
-	function on_tick minecraft:tick {
-		execute as @e[type=item_display,tag=<%TAGS.GLOBAL_ROOT()%>] at @s run function #*global/root/on_tick
-	}
-
-	tag functions on_load {
-		*<%export_namespace%>/on_load
-	}
-
-	dir root {
-		# TODO Maybe instead of merging tags, I should just generate it from the .ajmeta data every time a rig is exported?
-		# That way I can also check if the rig's files still exist, and remove tag entries if they don't.
-		# An entry will be added for each exported rig.
-		tag functions on_tick {
-			*<%export_namespace%>/root/on_tick
-		}
-		# An entry will be added for each exported rig.
-		IF (show_outdated_warning) {
-			tag functions on_load {
-				*<%export_namespace%>/root/on_load
-			}
-		}
-	}
-
-	IF (show_function_errors) {
-		dir errors {
-			function function_not_executed_as_root_entity {
-				#ARGS: {export_namespace: string, function_path: string}
-				$tellraw @a <%TELLRAW.FUNCTION_NOT_EXECUTED_AS_ROOT_ERROR('$(function_path)')%>
-			}
-		}
-	}
-
-	dir remove {
-		# Removes all instances of all rigs from the world.
-		function everything {
-			kill @e[tag=<%TAGS.GLOBAL_RIG()%>]
-		}
-	}
-
-	dir internal {
-		# Thanks Gibbsly for this code! https://github.com/gibbsly/gu
-		dir gu {
-			function load minecraft:load {
-				scoreboard players set 256 <%OBJECTIVES.I()%> 256
-				data modify storage aj:uuid main.hex_chars set value \
-					<%JSON.stringify([...Array(0x100).keys()].map(v => {const x = v.toString(16); return x.length > 1 ? x : '0' + x}))%>
-			}
-
-			function convert_uuid_array_to_string {
-				#ARGS: {UUID: [int, int, int, int]}
-
-				data modify storage aj:uuid temp set value {0:0,1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,a:0,b:0,c:0,d:0,e:0,f:0}
-				$data modify storage aj:uuid main.in set value $(UUID)
-
-				execute store result score 0= <%OBJECTIVES.I()%> store result score 1= <%OBJECTIVES.I()%> run data get storage aj:uuid main.in[0]
-				execute store result storage aj:uuid temp.0 int 1 run scoreboard players operation 0= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 2= <%OBJECTIVES.I()%> run scoreboard players operation 1= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.1 int 1 run scoreboard players operation 1= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 3= <%OBJECTIVES.I()%> run scoreboard players operation 2= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.2 int 1 run scoreboard players operation 2= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.3 int 1 run scoreboard players operation 3= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-
-				execute store result score 0= <%OBJECTIVES.I()%> store result score 1= <%OBJECTIVES.I()%> run data get storage aj:uuid main.in[1]
-				execute store result storage aj:uuid temp.4 int 1 run scoreboard players operation 0= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 2= <%OBJECTIVES.I()%> run scoreboard players operation 1= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.5 int 1 run scoreboard players operation 1= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 3= <%OBJECTIVES.I()%> run scoreboard players operation 2= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.6 int 1 run scoreboard players operation 2= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.7 int 1 run scoreboard players operation 3= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-
-				execute store result score 0= <%OBJECTIVES.I()%> store result score 1= <%OBJECTIVES.I()%> run data get storage aj:uuid main.in[2]
-				execute store result storage aj:uuid temp.8 int 1 run scoreboard players operation 0= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 2= <%OBJECTIVES.I()%> run scoreboard players operation 1= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.9 int 1 run scoreboard players operation 1= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 3= <%OBJECTIVES.I()%> run scoreboard players operation 2= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.a int 1 run scoreboard players operation 2= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.b int 1 run scoreboard players operation 3= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-
-				execute store result score 0= <%OBJECTIVES.I()%> store result score 1= <%OBJECTIVES.I()%> run data get storage aj:uuid main.in[3]
-				execute store result storage aj:uuid temp.c int 1 run scoreboard players operation 0= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 2= <%OBJECTIVES.I()%> run scoreboard players operation 1= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.d int 1 run scoreboard players operation 1= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result score 3= <%OBJECTIVES.I()%> run scoreboard players operation 2= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.e int 1 run scoreboard players operation 2= <%OBJECTIVES.I()%> %= 256 <%OBJECTIVES.I()%>
-				execute store result storage aj:uuid temp.f int 1 run scoreboard players operation 3= <%OBJECTIVES.I()%> /= 256 <%OBJECTIVES.I()%>
-
-				block { with storage aj:uuid temp
-					REPEAT (0, 15) as i {
-						$data modify storage aj:uuid temp.<%i.toString(16)%> set from storage aj:uuid main.hex_chars[$(<%i.toString(16)%>)]
-					}
-				}
-
-				block { with storage aj:uuid temp
-					$data modify storage aj:uuid main.out set value "$(3)$(2)$(1)$(0)-$(7)$(6)-$(5)$(4)-$(b)$(a)-$(9)$(8)$(f)$(e)$(d)$(c)"
-				}
-			}
-		}
-	}
-}
 
 dir <%export_namespace%> {
 	function on_load {
 		IF (use_storage_for_animation) {
 			REPEAT (animations) as animation {
-				data remove storage aj.<%export_namespace%>:animations <%animation.storageSafeName%>
+				data remove storage aj.<%export_namespace%>:animations <%animation.safe_name%>
 			}
 			<%animationStorage.join('\n')%>
 		}
@@ -133,6 +14,10 @@ dir <%export_namespace%> {
 		%%>
 	}
 
+	function invalid_version_warning {
+		# This function will contain a tellraw if the datapack is loaded in the wrong version.
+	}
+
 	dir root {
 		IF (show_outdated_warning) {
 			function on_load {
@@ -365,6 +250,11 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
 							execute on passengers run data modify entity @s[type=!marker] start_interpolation set value -1
 						}
 						function apply_frame {
@@ -378,6 +268,17 @@ dir <%export_namespace%> {
 										storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).<%node.type + '_' + node.safe_name%>
 								}
 							}
+							IF (animation.frames.some(v => v.variant)) {
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data modify storage aj:temp variant set from storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run function *<%export_namespace%>/animations/<%animation.safe_name%>/zzz/apply_variant with storage aj:temp variant
+								$execute if data storage aj.<%export_namespace%>:animations <%animation.safe_name%>.$(frame).variant unless entity @s[tag=<%TAGS.TRANSFORMS_ONLY()%>] run data remove storage aj:temp variant
+							}
+						}
+						IF (animation.frames.some(v => v.variant)) {
+							function apply_variant {
+								#ARGS: {name: string, condition: string}
+								$execute $(condition)run function *<%export_namespace%>/variants/$(name)/apply
+							}
 						}
 					} ELSE {
 						function set_frame {
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,24 @@`
`37`	`37`	`]`
`38`	`38`	`}`
`39`	`39`	`]`
	`40`	`+ },`
	`41`	`+ "1.6.1": {`
	`42`	`+ "title": "v1.6.1",`
	`43`	`+ "author": "Titus Evans (SnaveSutit)",`
	`44`	`+ "date": "2025-01-10",`
	`45`	`+ "categories": [`
	`46`	`+ {`
	`47`	`+ "title": "Changes",`
	`48`	`+ "list": ["Slightly improved the changelog."]`
	`49`	`+ },`
	`50`	`+ {`
	`51`	`+ "title": "Fixes",`
	`52`	`+ "list": [`
	`53`	`+ "Fixed overlays breaking custom function tags.",`
	`54`	`+ "Fixed [#350](https://github.com/Animated-Java/animated-java/issues/350)",`
	`55`	`+ "Fixed [#353](https://github.com/Animated-Java/animated-java/issues/353)"`
	`56`	`+ ]`
	`57`	`+ }`
	`58`	`+ ]`
`40`	`59`	`}`
`41`	`60`	`}`