mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add support for Java 20

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2023-02-23 07:19:41 +11:00
parent eb0a08e7f1
commit c9f381c842
2 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
paper-server/pom.xml
View file

@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>9.3</version> <version>9.4</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Mojang depends --> <!-- Mojang depends -->
@ -360,19 +360,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version> <version>3.4.1</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.3</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.3</version>
</dependency>
</dependencies>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

4
paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
View file

@ -155,8 +155,8 @@ public class Main {
System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'."); System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'.");
return; return;
} }
if (javaVersion > 63.0) { if (javaVersion > 64.0) {
System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 19 is supported."); System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 20 is supported.");
return; return;
} }