🐛 Fix version resolution for resource pack only workspaces

packages/java-edition/src/dependency/mcmeta.ts

@@ -13,6 +13,7 @@ export function resolveConfiguredVersion(
 	inputVersion: string,
 	versions: McmetaVersions,
 	packMcmeta: PackMcmeta | undefined,
+	packType: 'assets' | 'data' | undefined,
 ): VersionInfo {
 	function findReleaseTarget(version: McmetaVersion): string {
 		if (version.release_target) {
@@ -55,18 +56,30 @@ export function resolveConfiguredVersion(
 		const packFormat = packMcmeta?.pack.pack_format
 		if (packFormat && latestRelease) {
 			// If the pack format is larger than the latest release, use the latest snapshot
-			if (packFormat > latestRelease.data_pack_version) {
+			if (
+				packFormat > (packType === 'assets'
+					? latestRelease.resource_pack_version
+					: latestRelease.data_pack_version)
+			) {
 				return toVersionInfo(versions[0], 'auto')
 			}
 			// Look for versions from recent to oldest, picking the most recent release that matches
 			let oldestRelease = undefined
 			for (const version of versions) {
 				if (version.type === 'release') {
 					// If we already passed the pack format, use the oldest release so far
-					if (packFormat > version.data_pack_version) {
+					if (
+						packFormat > (packType === 'assets'
+							? version.resource_pack_version
+							: version.data_pack_version)
+					) {
 						return toVersionInfo(oldestRelease, 'auto')
 					}
-					if (packFormat === version.data_pack_version) {
+					if (
+						packFormat === (packType === 'assets'
+							? version.resource_pack_version
+							: version.data_pack_version)
+					) {
 						return toVersionInfo(version, 'auto')
 					}
 					oldestRelease = version

packages/java-edition/src/index.ts

@@ -62,6 +62,7 @@ export const initialize: core.ProjectInitializer = async (ctx) => {
 						config.env.gameVersion,
 						versions,
 						packMcmeta,
+						type,
 					)
 					packs.push({ type, packRoot, packMcmeta, versionInfo })
 				}
@@ -83,21 +84,22 @@ export const initialize: core.ProjectInitializer = async (ctx) => {
 	const packs = await findPackMcmetas(versions)
 
 	function selectVersionInfo(packs: PackInfo[], versions: McmetaVersions) {
-		// Select the first valid data pack.mcmeta
+		// Select the first valid pack.mcmeta, prioritizing data packs
 		const pack = packs.find(p => p.packMcmeta !== undefined && p.type === 'data')
+			?? packs.find(p => p.packMcmeta !== undefined && p.type === 'assets')
 		const version = pack === undefined
-			? resolveConfiguredVersion(config.env.gameVersion, versions, undefined)
+			? resolveConfiguredVersion(config.env.gameVersion, versions, undefined, undefined)
 			: pack.versionInfo
 		const packMessage = pack === undefined
 			? 'Failed finding a valid pack.mcmeta'
 			: `Found a valid pack.mcmeta ${pack.packRoot}/pack.mcmeta`
 		const reasonMessage = pack && version.reason === 'auto'
-			? `using pack format ${pack.packMcmeta?.pack.pack_format} to select`
+			? `using ${pack.type} pack format ${pack.packMcmeta?.pack.pack_format} to select`
 			: version.reason === 'config'
 			? `but using config override "${config.env.gameVersion}" to select`
 			: version.reason === 'fallback'
 			? 'using fallback'
-			: 'loading' // should never occur
+			: 'impossible' // should never occur
 		const versionMessage = `version ${version.release}${
 			version.id === version.release ? '' : ` (${version.id})`
 		}`

packages/java-edition/test/dependency/mcmeta.spec.ts

@@ -56,6 +56,7 @@ describe('mcmeta', () => {
 					version,
 					Fixtures.Versions,
 					packMcmeta,
+					undefined,
 				)
 				snapshot(actual)
 			})