From 58d8432cf2015cdbfed77762518b55f04b8b5264 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Thu, 24 Dec 2020 17:01:18 +0100
Subject: [PATCH] Update Java to version 15.0.1

---
 client/src/assembly/linux-jre.xml           | 2 +-
 client/src/assembly/macos-jre.xml           | 2 +-
 client/src/assembly/win64-jre.xml           | 2 +-
 common/.settings/org.eclipse.jdt.core.prefs | 1 +
 server/.classpath                           | 7 +------
 server/.settings/org.eclipse.jdt.core.prefs | 9 +++++----
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/client/src/assembly/linux-jre.xml b/client/src/assembly/linux-jre.xml
index 9213b404..76c02c36 100644
--- a/client/src/assembly/linux-jre.xml
+++ b/client/src/assembly/linux-jre.xml
@@ -36,7 +36,7 @@
 	</files>
 	<fileSets>
 		<fileSet>
-			<directory>jre/jdk-12_linux</directory>
+			<directory>jre/jdk_linux</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/client/src/assembly/macos-jre.xml b/client/src/assembly/macos-jre.xml
index 9a38bed1..ceafd313 100644
--- a/client/src/assembly/macos-jre.xml
+++ b/client/src/assembly/macos-jre.xml
@@ -36,7 +36,7 @@
 	</files>
 	<fileSets>
 		<fileSet>
-			<directory>jre/jdk-12_macos</directory>
+			<directory>jre/jdk_macos</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/client/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml
index 003cd3b9..01f7aa92 100644
--- a/client/src/assembly/win64-jre.xml
+++ b/client/src/assembly/win64-jre.xml
@@ -39,7 +39,7 @@
 	</files>
 	<fileSets>
 		<fileSet>
-			<directory>jre/jdk-12_win64</directory>
+			<directory>jre/jdk_windows</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/common/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs
index db24ee78..8b5c4dca 100644
--- a/common/.settings/org.eclipse.jdt.core.prefs
+++ b/common/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
 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=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
diff --git a/server/.classpath b/server/.classpath
index e5f2586d..32579c38 100644
--- a/server/.classpath
+++ b/server/.classpath
@@ -23,11 +23,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14">
-		<attributes>
-			<attribute name="module" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/.settings/org.eclipse.jdt.core.prefs b/server/.settings/org.eclipse.jdt.core.prefs
index 86fcef95..3a0745fd 100644
--- a/server/.settings/org.eclipse.jdt.core.prefs
+++ b/server/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=14
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=14
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -11,5 +12,5 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 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=enabled
-org.eclipse.jdt.core.compiler.source=14
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8