From 9a5ced656db03fc9d9099666361894382c408900 Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin" <git_commits@alexgoodwin.dev>
Date: Sat, 31 Dec 2022 16:45:17 -0800
Subject: [PATCH] 1.16.5 removal part 3: update Java target to Java 16

---
 dist/pom.xml                                         |  6 +++---
 plugin/pom.xml                                       |  6 +++---
 .../main/java/com/denizenscript/denizen/Denizen.java | 12 ++++++------
 pom.xml                                              |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index e4e68a8581..66172c57f6 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -75,7 +75,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -168,8 +168,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index a7f2e68308..a3fd82684c 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -99,7 +99,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -143,8 +143,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
index 0fcbd68fdc..d3fff0baa0 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -134,13 +134,10 @@ public void onEnable() {
         DebugInternals.alternateTrimLogic = FormattedTextHelper::bukkitSafeDebugTrimming;
         String javaVersion = System.getProperty("java.version");
         Debug.log("Running on java version: " + javaVersion);
-        if (javaVersion.startsWith("8") || javaVersion.startsWith("1.8")) {
-            Debug.log("Running on fully supported Java 8. Updating to Java 17+ is recommended.");
-        }
-        else if (javaVersion.startsWith("9") || javaVersion.startsWith("1.9") || javaVersion.startsWith("10") || javaVersion.startsWith("1.10")
-                || javaVersion.startsWith("11")
+        if (javaVersion.startsWith("8") || javaVersion.startsWith("1.8") || javaVersion.startsWith("9") || javaVersion.startsWith("1.9")
+                || javaVersion.startsWith("10") || javaVersion.startsWith("1.10") || javaVersion.startsWith("11")
                 || javaVersion.startsWith("12") || javaVersion.startsWith("13") || javaVersion.startsWith("14") || javaVersion.startsWith("15")) {
-            getLogger().warning("Running unreliable Java version. Old Minecraft is built for Java 8, modern Minecraft is built for Java 17. Other Java versions are not guaranteed to function properly.");
+            Debug.log("Running on outdated Java version somehow. Denizen requires Java 16+ or newer to function.");
         }
         else if (javaVersion.startsWith("16")) {
             Debug.log("Running on fully supported Java 16.");
@@ -148,6 +145,9 @@ else if (javaVersion.startsWith("16")) {
         else if (javaVersion.startsWith("17")) {
             Debug.log("Running on fully supported Java 17.");
         }
+        else if (javaVersion.startsWith("18") || javaVersion.startsWith("19")) {
+            getLogger().warning("Running unreliable future Java version. modern Minecraft versions are built for Java 17. Other Java versions are not guaranteed to function properly.");
+        }
         else {
             Debug.log("Running on unrecognized (future?) Java version. May or may not work.");
         }
diff --git a/pom.xml b/pom.xml
index a3fff29a6f..05730b5d15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,8 +74,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
         </plugins>