From 7266563ca95f0855b5cae5c2483b08f9ef4d1e5b Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sun, 19 May 2024 13:53:22 -0700
Subject: [PATCH] Back to Java 17 for now

---
 .github/workflows/maven.yml | 6 +++---
 Changelog.txt               | 3 ---
 pom.xml                     | 8 ++++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9641dde68..ddd132071 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,13 +31,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    # 2. Setup Java 21 JDK (Adopt)
-    - name: Java 21 setup
+    # 2. Setup Java 17 JDK (Adopt)
+    - name: Java 17 setup
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
         java-package: jdk
-        java-version: '21'
+        java-version: '17'
 
     # 3. Setup local Maven package cache to speed up building
     - name: Cache Maven packages
diff --git a/Changelog.txt b/Changelog.txt
index f3b117d01..103344b54 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,4 @@
 Version 2.2.013
-    mcMMO now requires Java 21 (see notes)
     Modified the RNG for dropping non-ore blocks from Blast Mining to yield about 50% of what was destroyed
     (API) Deprecated com.gmail.nossr50.mcMMO.getPlaceStore
     (API) Added com.gmail.nossr50.mcMMO.getUserBlockTracker
@@ -9,8 +8,6 @@ Version 2.2.013
     (Codebase) Cleaned up and organized unit tests relating to UserBlockTracker
 
     NOTES:
-    mcMMO is now compiled for Java 21, Java 21 will be requires to run mcMMO.
-    This should not pose an issue as there are Java 21 server JARs for the versions of MC that mcMMO currently supports.
     Not planning to delete the deprecated methods in UserBlockTracker anytime soon, as nothing has really changed other than the names
 
 Version 2.2.012
diff --git a/pom.xml b/pom.xml
index 851f41b8a..c0de518e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
-        <java.version>21</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>17</java.version>
     </properties>
 
     <issueManagement>
@@ -103,7 +103,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>21</release>
+                    <release>17</release>
                     <compilerArgs>
                         <arg>-parameters</arg> <!-- used for ACF syntax stuff -->
                     </compilerArgs>