🚧 Improved version handling

Author: SnaveSutit

src/systems/datapackCompiler/index.ts

@@ -794,6 +794,7 @@ export default async function compileDataPack(options: {
 		})
 	)
 
+	type Formats = number | number[] | { min_inclusive: number; max_inclusive: number }
 	interface IPackMeta {
 		pack?: {
 			pack_format?: number
@@ -802,7 +803,7 @@ export default async function compileDataPack(options: {
 		overlays?: {
 			entries?: Array<{
 				directory?: string
-				formats?: number | number[] | { min_inclusive: number; max_inclusive: number }
+				formats?: Formats
 			}>
 		}
 	}
@@ -823,14 +824,46 @@ export default async function compileDataPack(options: {
 	packMeta.pack.description ??= `Animated Java Data Pack for ${aj.target_minecraft_version}`
 	packMeta.overlays ??= {}
 	packMeta.overlays.entries ??= []
+	let formats: Formats
+	switch (aj.target_minecraft_version) {
+		case '1.20.5': {
+			formats = {
+				min_inclusive: getDataPackFormat('1.20.5'),
+				max_inclusive: getDataPackFormat('1.21.0') - 1,
+			}
+			break
+		}
+		case '1.21.0': {
+			formats = {
+				min_inclusive: getDataPackFormat('1.21.0'),
+				max_inclusive: getDataPackFormat('1.21.2') - 1,
+			}
+			break
+		}
+		case '1.21.2': {
+			formats = {
+				min_inclusive: getDataPackFormat('1.21.2'),
+				max_inclusive: getDataPackFormat('1.21.4') - 1,
+			}
+			break
+		}
+		case '1.21.4': {
+			formats = getDataPackFormat('1.21.4')
+			break
+		}
+		default: {
+			formats = getDataPackFormat(aj.target_minecraft_version)
+			break
+		}
+	}
 	const overlay = packMeta.overlays.entries.find(e => e.directory === 'animated_java')
 	if (!overlay) {
 		packMeta.overlays.entries.push({
 			directory: 'animated_java',
-			formats: getDataPackFormat(aj.target_minecraft_version),
+			formats,
 		})
 	} else {
-		overlay.formats = getDataPackFormat(aj.target_minecraft_version)
+		overlay.formats = formats
 	}
 
 	exportedFiles.set(PathModule.join(dataPackFolder, 'pack.mcmeta'), autoStringify(packMeta))

src/systems/resourcepackCompiler/1.21.4.ts

@@ -286,5 +286,9 @@ function createMultiVariantItemDefinition(
 		} as (typeof itemDefinition.model.cases)[0])
 	}
 
+	if (itemDefinition.model.cases.length === 0) {
+		return createSingleVariantItemDefinition(model)
+	}
+
 	return itemDefinition
 }

src/util/minecraftUtil.ts

@@ -228,6 +228,8 @@ export function getDataPackFormat(version: MinecraftVersion): number {
 			return 48
 		case '1.21.2':
 			return 57
+		case '1.21.4':
+			return 61
 		default:
 			return Infinity
 	}

test_blueprints/armor_stand.ajblueprint

@@ -14,17 +14,17 @@
 		"enable_plugin_mode": false,
 		"resource_pack_export_mode": "raw",
 		"data_pack_export_mode": "raw",
-		"target_minecraft_version": "1.20.4",
+		"target_minecraft_version": "1.21.4",
 		"display_item": "minecraft:white_dye",
 		"custom_model_data_offset": 0,
 		"enable_advanced_resource_pack_settings": false,
 		"enable_advanced_resource_pack_folders": false,
-		"resource_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\.modrinth\\profiles\\AJ Tests 1.20.4\\resourcepacks\\resourcepack",
+		"resource_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\.modrinth\\profiles\\Animated Java Dev\\resourcepacks\\resourcepack",
 		"display_item_path": "",
 		"model_folder": "",
 		"texture_folder": "",
 		"enable_advanced_data_pack_settings": false,
-		"data_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\.modrinth\\profiles\\AJ Tests 1.20.4\\saves\\AJ Tests 1_21_4\\datapacks\\datapack",
+		"data_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\.modrinth\\profiles\\Animated Java Dev\\saves\\Animated Java Dev\\datapacks\\datapack",
 		"summon_commands": "",
 		"ticking_commands": "",
 		"interpolation_duration": 1,
@@ -1502,7 +1502,7 @@
 		"default": {
 			"name": "default",
 			"display_name": "Default",
-			"uuid": "b3c20335-1d42-762c-f9a7-2d7abaec2ece",
+			"uuid": "d08528a6-bb3d-0203-485d-1727f5ff2ff7",
 			"texture_map": {},
 			"excluded_nodes": [],
 			"is_default": true