Merge pull request #4 from Gensokyo-Reimagined/doggy-dev/1.20.6

Bump to 1.20.6

.github/workflows/build-and-publish.yml

@@ -19,16 +19,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: JDK 17 setup
+    - name: JDK 21 setup
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         server-id: github
         settings-path: ${{ github.workspace }}
 
     - name: Gradle plz build
-      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: spotlessApply build shadowJar
 
@@ -39,7 +39,7 @@ jobs:
         path: build/libs/*-all.jar
 
     - name: Reposilite hates my posterior
-      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: publish
       env:

build.gradle

@@ -1,8 +1,7 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'io.github.goooler.shadow' version '8.1.2'
     id 'maven-publish'
-    id 'io.papermc.paperweight.userdev' version '1.7.1'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
@@ -32,15 +31,15 @@ dependencies {
     implementation "com.mysql:mysql-connector-j:8.3.0"
     implementation "org.apache.commons:commons-dbcp2:2.11.0"
     implementation "org.apache.commons:commons-pool2:2.12.0" // can't reload plugin without this
-    paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT")
+    compileOnly "io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT"
 }
 
 shadowJar {
     project.configurations.runtimeClasspath.canBeResolved = true
     configurations = [project.configurations.runtimeClasspath]
 }
 
-def targetJavaVersion = 17
+def targetJavaVersion = 21
 java {
     def javaVersion = JavaVersion.toVersion(targetJavaVersion)
     sourceCompatibility = javaVersion
@@ -56,10 +55,6 @@ tasks.withType(JavaCompile).configureEach {
     }
 }
 
-tasks.assemble {
-    dependsOn(reobfJar)
-}
-
 processResources {
     def props = [version: version]
     inputs.properties props

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists