diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 46bb858a..084e24f7 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -3,10 +3,7 @@
 
 name: Pull Request Builds
 
-on:
-  pull_request:
-    paths:
-    - "src/**"
+on: [pull_request]
 
 jobs:
   Build:
@@ -16,8 +13,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
+        distribution: 'adopt'
         java-version: 16
     - name: Cache Gradle packages
       uses: actions/cache@v2
diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml
index cfef27e7..0853e93e 100644
--- a/.github/workflows/devbuild.yml
+++ b/.github/workflows/devbuild.yml
@@ -3,10 +3,7 @@
 
 name: Development Builds
 
-on:
-  push:
-    paths:
-    - "src/**"
+on: [push]
 
 jobs:
   Build:
@@ -16,8 +13,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 16
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
+        distribution: 'adopt'
         java-version: 16
     - name: Cache Gradle packages
       uses: actions/cache@v2
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 526ab335..16676ba1 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -66,8 +66,9 @@ jobs:
         with:
           ref: ${{ steps.getbranchinfo.outputs.branchname }}
       - name: Set up JDK 16
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 16
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -140,8 +141,9 @@ jobs:
       - name: Checkout Carpet sources
         uses: actions/checkout@v2
       - name: Set up JDK 16
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 16
       - name: Cache Gradle packages
         uses: actions/cache@v2
diff --git a/build.gradle b/build.gradle
index 317189c7..83f535d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,10 +55,10 @@ tasks.withType(JavaCompile).configureEach {
 	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
 	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
 	// We'll use that if it's available, but otherwise we'll use the older option.
-	//def targetVersion = 8
-	//if (JavaVersion.current().isJava9Compatible()) {
-	//	 it.options.release = targetVersion
-	//}
+	def targetVersion = 8
+	if (JavaVersion.current().isJava9Compatible()) {
+		 it.options.release = targetVersion
+	}
 
 	// Minecraft 1.17 (21w19a) upwards uses Java 16.
 	//it.options.release = 16