Java 21 is required for 1.21.

dscalzi · Apr 7, 2024 · 17a44be · 17a44be
1 parent 8366447
commit 17a44be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/lib/common/distribution/DistributionFactory.ts b/lib/common/distribution/DistributionFactory.ts
@@ -122,13 +122,28 @@ export class HeliosServer {
     }
 
     private defaultUndefinedJavaOptions(props: JavaVersionProps): Required<JavaVersionProps> {
+        const [defaultRange, defaultSuggestion] = this.defaultJavaVersion()
         return {
-            supported: props.distribution ?? mcVersionAtLeast('1.17', this.rawServer.minecraftVersion) ? '>=17.x' : '8.x',
-            distribution: props.distribution ?? process.platform === Platform.DARWIN ? JdkDistribution.CORRETTO : JdkDistribution.TEMURIN,
-            suggestedMajor: props.suggestedMajor ?? mcVersionAtLeast('1.17', this.rawServer.minecraftVersion) ? 17 : 8,
+            supported: props.distribution ?? defaultRange,
+            distribution: props.distribution ?? this.defaultJavaPlatform(),
+            suggestedMajor: props.suggestedMajor ?? defaultSuggestion,
         }
     }
 
+    private defaultJavaVersion(): [string, number] {
+        if(mcVersionAtLeast('1.21', this.rawServer.minecraftVersion)) {
+            return ['>=21.x', 21]
+        } else if(mcVersionAtLeast('1.17', this.rawServer.minecraftVersion)) {
+            return ['>=17.x', 17]
+        } else {
+            return ['8.x', 8]
+        }
+    }
+
+    private defaultJavaPlatform(): JdkDistribution {
+        return process.platform === Platform.DARWIN ? JdkDistribution.CORRETTO : JdkDistribution.TEMURIN
+    }
+
 }
 
 export class HeliosModule {

diff --git a/lib/microsoft/rest/MicrosoftResponse.ts b/lib/microsoft/rest/MicrosoftResponse.ts
@@ -1,4 +1,4 @@
-import { DisplayableError, RestResponse } from '../../common/rest/RestResponse'
+import { RestResponse } from '../../common/rest/RestResponse'
 
 /**
  * Various error codes from any point of the Microsoft authentication process.

diff --git a/lib/mojang/rest/MojangResponse.ts b/lib/mojang/rest/MojangResponse.ts
@@ -1,4 +1,4 @@
-import { DisplayableError, RestResponse } from '../../common/rest/RestResponse'
+import { RestResponse } from '../../common/rest/RestResponse'
 
 /**
  * @see https://wiki.vg/Authentication#Errors