Miscellaneous fixes

.github/workflows/pr-build.yml

@@ -9,7 +9,8 @@ jobs:
 
     strategy:
       matrix:
-        java: [15]
+        java: [16]
+      fail-fast: true
 
     steps:
     - uses: actions/checkout@v2
@@ -18,19 +19,25 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
+        distribution: 'adopt'
 
-    - uses: actions/cache@v2
+    - name: Cache gradle
+      uses: actions/cache@v2
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-maven-
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/jdks
+          ~/.gradle/native
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-parchment-2-${{ hashFiles('**/*.gradle*', 'gradle/**', 'gradle.properties') }}
+        restore-keys: ${{ runner.os }}-parchment-2
 
     - name: Patch Parchment
       run: |
-        git config --global user.email "you@example.com"
-        git config --global user.name "Your Name"
-        git submodule update --init --recursive
-        ./parchment ghjar
+        git config --global user.email "no-reply@github.com"
+        git config --global user.name "GitHub Actions"
+        ./gradlew applyPatches
+        ./gradlew reobfJar
 
     - uses: actions/upload-artifact@v2
       with: