From 7c0ce2505c0e37ce10126e56423cf52b24b71b31 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Sun, 13 Jun 2021 10:24:53 -0500
Subject: [PATCH] Use JDK 16 on the 1.17 module while using JDK 8 on everything
 else

---
 .github/workflows/maven.yml                         |  4 ++--
 Core/pom.xml                                        |  6 ++++--
 NMS/NMS-v1_17_R1/pom.xml                            |  7 +++++++
 .../songoda/core/nms/v1_17_R1/anvil/AnvilView.java  |  1 -
 pom.xml                                             | 13 +++++++++++--
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 570730f9..47afe2d8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,9 +16,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/Core/pom.xml b/Core/pom.xml
index 26554c8d..74812da4 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -23,8 +23,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+
+                    <release>${java.release}</release>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml
index 63b7ea50..b679cf04 100644
--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@@ -7,6 +7,13 @@
         <relativePath>../../</relativePath>
     </parent>
 
+    <properties>
+        <java.version>1.16</java.version>
+        <java.release>16</java.release>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <artifactId>SongodaCore-NMS-v1_17_R1</artifactId>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/NMS/NMS-v1_17_R1/src/com/songoda/core/nms/v1_17_R1/anvil/AnvilView.java b/NMS/NMS-v1_17_R1/src/com/songoda/core/nms/v1_17_R1/anvil/AnvilView.java
index 97137e3d..3ef792d7 100644
--- a/NMS/NMS-v1_17_R1/src/com/songoda/core/nms/v1_17_R1/anvil/AnvilView.java
+++ b/NMS/NMS-v1_17_R1/src/com/songoda/core/nms/v1_17_R1/anvil/AnvilView.java
@@ -2,7 +2,6 @@ package com.songoda.core.nms.v1_17_R1.anvil;
 
 import com.songoda.core.nms.anvil.CustomAnvil;
 import com.songoda.core.nms.anvil.methods.AnvilTextChange;
-import jdk.internal.misc.Unsafe;
 import net.minecraft.core.BlockPosition;
 import net.minecraft.network.chat.ChatMessage;
 import net.minecraft.network.protocol.game.PacketPlayOutOpenWindow;
diff --git a/pom.xml b/pom.xml
index d88ae073..6213a149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,13 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
+    <properties>
+        <java.version>1.8</java.version>
+        <java.release>8</java.release>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <modules>
         <module>Core</module>
         <module>Compatibility</module>
@@ -38,8 +45,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+
+                    <release>${java.release}</release>
                 </configuration>
             </plugin>
         </plugins>