From d09ecf17fb8259d7bd51137f9c40dc64066a11ee Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 16 Nov 2021 20:27:38 +0100
Subject: [PATCH 1/2] one less java

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 src/main/resources/fabric.mod.json       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5338d37..e750102e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 9155e3b1..e5329f06 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -34,6 +34,6 @@
   "depends": {
     "minecraft": "1.17.x",
     "fabricloader": ">=0.11.3",
-    "java": ">=17"
+    "java": ">=16"
   }
 }

From 63aa9ab9022e9b4320845bf868c8e69ea3d5feff Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 16 Nov 2021 20:41:20 +0100
Subject: [PATCH 2/2] one more java again

---
 .github/workflows/build-on-pr.yml     |  6 +++---
 .github/workflows/devbuild.yml        |  6 +++---
 .github/workflows/publish-release.yml | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 084e24f7..c6186f76 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: 16
+        distribution: 'temurin'
+        java-version: 17
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml
index 0853e93e..ec4294e5 100644
--- a/.github/workflows/devbuild.yml
+++ b/.github/workflows/devbuild.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: 16
+        distribution: 'temurin'
+        java-version: 17
     - name: Cache Gradle packages
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 16676ba1..ec80c324 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -65,11 +65,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ steps.getbranchinfo.outputs.branchname }}
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -140,11 +140,11 @@ jobs:
     steps:
       - name: Checkout Carpet sources
         uses: actions/checkout@v2
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with: