From f3da4f66bbd28bb27d24cd22c36c0d4c929e3ed6 Mon Sep 17 00:00:00 2001 From: Marc Baloup Date: Tue, 30 Nov 2021 20:09:47 +0100 Subject: [PATCH] Java 17 and MC 1.18 --- Bungee/.classpath | 2 +- Bungee/.settings/org.eclipse.jdt.core.prefs | 6 +++--- CLI/.classpath | 2 +- CLI/.settings/org.eclipse.jdt.core.prefs | 6 +++--- Core/.classpath | 2 +- Core/.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../java/fr/pandacube/lib/core/util/MinecraftVersion.java | 4 +++- Paper/.classpath | 2 +- Paper/.settings/org.eclipse.jdt.core.prefs | 6 +++--- pom.xml | 4 ++-- 10 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Bungee/.classpath b/Bungee/.classpath index d4e0e69..5e577b9 100644 --- a/Bungee/.classpath +++ b/Bungee/.classpath @@ -13,7 +13,7 @@ - + diff --git a/Bungee/.settings/org.eclipse.jdt.core.prefs b/Bungee/.settings/org.eclipse.jdt.core.prefs index 1b835cb..cf2cd45 100644 --- a/Bungee/.settings/org.eclipse.jdt.core.prefs +++ b/Bungee/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=16 -org.eclipse.jdt.core.compiler.compliance=16 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=16 +org.eclipse.jdt.core.compiler.source=17 diff --git a/CLI/.classpath b/CLI/.classpath index d4e0e69..5e577b9 100644 --- a/CLI/.classpath +++ b/CLI/.classpath @@ -13,7 +13,7 @@ - + diff --git a/CLI/.settings/org.eclipse.jdt.core.prefs b/CLI/.settings/org.eclipse.jdt.core.prefs index 1b835cb..cf2cd45 100644 --- a/CLI/.settings/org.eclipse.jdt.core.prefs +++ b/CLI/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=16 -org.eclipse.jdt.core.compiler.compliance=16 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=16 +org.eclipse.jdt.core.compiler.source=17 diff --git a/Core/.classpath b/Core/.classpath index d4e0e69..5e577b9 100644 --- a/Core/.classpath +++ b/Core/.classpath @@ -13,7 +13,7 @@ - + diff --git a/Core/.settings/org.eclipse.jdt.core.prefs b/Core/.settings/org.eclipse.jdt.core.prefs index 42ac2a1..af7ce86 100644 --- a/Core/.settings/org.eclipse.jdt.core.prefs +++ b/Core/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=16 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=16 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=16 +org.eclipse.jdt.core.compiler.source=17 diff --git a/Core/src/main/java/fr/pandacube/lib/core/util/MinecraftVersion.java b/Core/src/main/java/fr/pandacube/lib/core/util/MinecraftVersion.java index 7665c2c..b0b843c 100644 --- a/Core/src/main/java/fr/pandacube/lib/core/util/MinecraftVersion.java +++ b/Core/src/main/java/fr/pandacube/lib/core/util/MinecraftVersion.java @@ -51,7 +51,9 @@ public enum MinecraftVersion { v1_16_4_to_1_16_5(754, "1.16.4", "1.16.5"), v1_17(755, "1.17"), - v1_17_1(756, "1.17.1"); + v1_17_1(756, "1.17.1"), + + v1_18(757, "1.18"); // IMPORTANT: don't forget to update the versionMergeDisplay value when adding a new version; private static Map, List> versionMergeDisplay; diff --git a/Paper/.classpath b/Paper/.classpath index a4f28fd..ab334ee 100644 --- a/Paper/.classpath +++ b/Paper/.classpath @@ -6,7 +6,7 @@ - + diff --git a/Paper/.settings/org.eclipse.jdt.core.prefs b/Paper/.settings/org.eclipse.jdt.core.prefs index 1b835cb..cf2cd45 100644 --- a/Paper/.settings/org.eclipse.jdt.core.prefs +++ b/Paper/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=16 -org.eclipse.jdt.core.compiler.compliance=16 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=16 +org.eclipse.jdt.core.compiler.source=17 diff --git a/pom.xml b/pom.xml index 30c8a3c..db3153e 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,8 @@ unknown - 16 - 16 + 17 + 17 UTF-8 1.18-R0.1-SNAPSHOT