1.20.5 support (#85)

* 1.20.5 support

* Maybe fix tests

* Actually use Java 21

* Install java in devcontainer

* Fix test

Dockerfile

@@ -14,4 +14,8 @@ RUN gem install jekyll bundler
 ENV DENO_INSTALL="$HOME/.deno"
 ENV DENO_INSTALL_ROOT="$HOME/.deno"
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
-ENV PATH="${PATH}:$HOME/.deno/bin"
+ENV PATH="${PATH}:$HOME/.deno/bin"
+
+ENV JAVA_HOME=/opt/java/openjdk
+COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+ENV PATH="${JAVA_HOME}/bin:${PATH}"

cli/commands/init.ts

@@ -237,6 +237,7 @@ async function promptUser(
     minecraftVersion = await Select.prompt({
       message: "Select the minecraft version",
       options: minecraftVersions.map((v) => v.version),
+      default: minecraftVersions.find((v) => v.stable)?.version,
     });
   }
 
@@ -297,7 +298,7 @@ async function defaultOptions(
   startingName: string,
 ): Promise<generator.Configuration> {
   const minecraftVersions = await generator.getTemplateGameVersions();
-  const minecraftVersion = minecraftVersions[0]!.version;
+  const minecraftVersion = minecraftVersions.find((v) => v.stable)!.version;
 
   return {
     modid: generator.nameToModId(startingName),

cli/test.ts

@@ -2,6 +2,7 @@
 import {
   generateTemplate,
   getTemplateGameVersions,
+  minecraftSupportsSplitSources,
 } from "../scripts/dist/fabric-template-generator.js";
 import { getGeneratorOptions } from "./commands/init.ts";
 import { assert } from "https://deno.land/std@0.221.0/assert/mod.ts";
@@ -36,7 +37,7 @@ for (const { version } of minecraftVersions) {
             projectName: "test",
             packageName: "net.fabricmc.generator.test",
             dataGeneration: false,
-            splitSources: true,
+            splitSources: minecraftSupportsSplitSources(version),
             uniqueModIcon: true,
 
             minecraftVersion: version,

scripts/src/lib/Template.svelte

@@ -21,10 +21,9 @@
     $: modid = nameToModId(projectName);
 
     const versions = Promise.all([getTemplateGameVersions()]).then(([gameVersions]) => {
-        const game = gameVersions;
-        minecraftVersion = game[0].version;
+        minecraftVersion = gameVersions.find((version) => version.stable)!.version;
         return {
-            game,
+            game: gameVersions,
         };
     });
 

scripts/src/lib/template/java.ts

@@ -1,4 +1,4 @@
-import { getMinorMinecraftVersion } from "./minecraft";
+import { getMinorMinecraftVersion, getPathMinecraftVersion } from "./minecraft";
 
 export interface JavaVersion {
 	compatibility: string,
@@ -28,16 +28,36 @@ const JAVA_17 : JavaVersion = {
     kotlinRelease: "17"
 }
 
+const JAVA_21 : JavaVersion = {
+	compatibility: "VERSION_21",
+	mixin: "JAVA_21",
+	release: 21,
+    kotlinRelease: "21"
+}
+
 export function getJavaVersion(minecraftVersion: string): JavaVersion {
 	const minor = getMinorMinecraftVersion(minecraftVersion);
 
 	if (minor <= 16) {
+		// Minecraft 1.16 and below use Java 8
 		return JAVA_8;
 	} else if (minor == 17) {
+		// Minecraft 1.17 uses Java 16
 		return JAVA_16;
+	} else if (minor <= 19) {
+		// Minecraft 1.18 and 1.19 use all Java 17
+		return JAVA_17;
+	} else if (minor == 20) {
+		const patch = getPathMinecraftVersion(minecraftVersion);
+
+		if (patch <= 4) {
+			// Minecraft 1.20.0 -> 1.20.4 use Java 17
+			return JAVA_17;
+		}
 	}
 
-	return JAVA_17;
+	// Minecraft 1.20.5 and above use Java 21
+	return JAVA_21;
 }
 
 const JAVA_PACKAGE_REGEX = /^[a-z][a-z0-9_]*(\.[a-z0-9_]+)+[0-9a-z_]$/;

scripts/src/lib/template/minecraft.ts

@@ -7,7 +7,17 @@ export function minecraftSupportsSplitSources(minecraftVersion: string): boolean
 }
 
 export function getMinorMinecraftVersion(minecraftVersion: string): number {
-	return Number(minecraftVersion.split(".")[1]);
+	return getVersionParts(minecraftVersion)[1];
+}
+
+export function getPathMinecraftVersion(minecraftVersion: string): number {
+	return getVersionParts(minecraftVersion)[2];
+}
+
+function getVersionParts(minecraftVersion: String): number[] {
+	// Remove any snapshot or pre-release suffix
+	const targetVersion = minecraftVersion.split("-")[0];
+	return targetVersion.split(".").map((v) => parseInt(v));
 }
 
 export function sharedModIdChecks(id: string, isId: boolean): string[] | undefined {

scripts/src/lib/template/modjson.ts

@@ -15,6 +15,10 @@ export async function addModJson(writer: TemplateWriter, canvas: CanvasAdaptorFa
     ...(config.splitSources ? await generateClientMixin(writer, config) : [])
   ];
 
+  // Format the minecraft version with any pre3, or rc1, etc. suffixes
+  const index = config.minecraftVersion.indexOf("-");
+  const minecraftVersion = config.minecraftVersion.substring(0, index === -1 ? config.minecraftVersion.length : index + 1);
+
   const fabricModJson : any = {
     "schemaVersion": 1,
     "id": config.modid,
@@ -35,7 +39,7 @@ export async function addModJson(writer: TemplateWriter, canvas: CanvasAdaptorFa
     "mixins": mixins,
     "depends": {
       "fabricloader": ">=" + config.loaderVersion,
-      "minecraft": "~" + config.minecraftVersion,
+      "minecraft": "~" + minecraftVersion,
       "java": ">=" + getJavaVersion(config.minecraftVersion).release
     },
     "suggests": {

scripts/src/lib/template/template.ts

@@ -84,14 +84,21 @@ export async function generateTemplate(options: Options) {
 
 export async function getTemplateGameVersions(): Promise<GameVersion[]> {
 	let versions = await getGameVersions()
-	return versions.filter((v) => v.stable).filter((v) => {
+	return versions.filter((v) => {
 		const version = v.version;
 
 		if (version.startsWith("1.14") && version != "1.14.4") {
 			// Hide pre 1.14.4 MC versions as they require using V1 yarn.
 			return false;
 		}
 
+		if (!v.stable) {
+			// Hide unstable versions, other than the latest -pre or -rc version.
+			const isLatest = versions[0].version == version;
+			const isPre = version.includes("-pre") || version.includes("-rc");
+			return isLatest && isPre;
+		}
+
 		return true;
 	});
 }

scripts/src/lib/template/templates/git/workflow.yml

@@ -12,7 +12,6 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
           21,    # Current Java LTS
         ]
     runs-on: ubuntu-22.04