From 8643d69635efc01a42a8e79c6b947bad77ff257b Mon Sep 17 00:00:00 2001
From: DoggySazHi <doggysazhi@gmail.com>
Date: Tue, 4 Jun 2024 10:48:48 -0700
Subject: [PATCH 1/2] Removed NMS, removed cube, updated to 1.20.6

---
 .github/workflows/build-and-publish.yml | 4 ++--
 build.gradle                            | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 670fa21..4f8144e 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -19,10 +19,10 @@ 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 }}
diff --git a/build.gradle b/build.gradle
index 4d0d3ee..4543909 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'maven-publish'
-    id 'io.papermc.paperweight.userdev' version '1.7.1'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
@@ -32,7 +31,7 @@ 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 {
@@ -40,7 +39,7 @@ shadowJar {
     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

From 32de29f20a3312eb4dd422f9e1f40b7c9f2d6d94 Mon Sep 17 00:00:00 2001
From: DoggySazHi <doggysazhi@gmail.com>
Date: Sun, 16 Jun 2024 17:34:31 -0700
Subject: [PATCH 2/2] Version bump Gradle and Shadow

---
 .github/workflows/build-and-publish.yml  | 4 ++--
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 4f8144e..c6f67a6 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -28,7 +28,7 @@ jobs:
         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:
diff --git a/build.gradle b/build.gradle
index 4543909..7e5842c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 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 'com.diffplug.spotless' version '6.25.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d..2617362 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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