From 9a677d46a1efd348768d85a7d75d437d501b3f79 Mon Sep 17 00:00:00 2001
From: PiggyPiglet <noreply@piggypiglet.me>
Date: Mon, 19 Jan 2026 16:36:34 +0800
Subject: [PATCH] Potential gradle publish fix

---
 build.gradle.kts                         | 30 ++++++++++++++++--------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 77912fd..4c892a0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -83,21 +83,17 @@ tasks {
         from(paper.output)
     }
 
-    val sourcesJar by registering(Jar::class) {
+    val combinedSourcesJar by registering(Jar::class) {
         archiveClassifier.set("sources")
         from(sourceSets.main.get().allSource)
         from(paper.allSource)
     }
 
-    withType<JavaCompile> {
-        options.encoding = "UTF-8"
-        options.release = 8
-    }
-
-    val javadocJar = withType<Javadoc> {
+    val combinedJavadoc by registering(Javadoc::class) {
         isFailOnError = false
 
         source = sourceSets.main.get().allJava + paper.allJava
+        classpath = sourceSets.main.get().compileClasspath + paper.compileClasspath
 
         with(options as StandardJavadocDocletOptions) {
             addStringOption("Xdoclint:none", "-quiet")
@@ -106,6 +102,17 @@ tasks {
         }
     }
 
+    val combinedJavadocJar by registering(Jar::class) {
+        archiveClassifier.set("javadoc")
+        dependsOn(combinedJavadoc)
+        from(combinedJavadoc.get().destinationDir)
+    }
+
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release = 8
+    }
+
     withType<ShadowJar> {
         configurations = listOf(project.configurations.runtimeClasspath.get())
 
@@ -145,9 +152,12 @@ tasks {
                     builtBy(plainJar)
                 }
 
-                artifacts {
-                    archives(sourcesJar)
-                    archives(javadocJar)
+                artifact(combinedSourcesJar) {
+                    builtBy(combinedSourcesJar)
+                }
+
+                artifact(combinedJavadocJar) {
+                    builtBy(combinedJavadocJar)
                 }
             }
         }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2617362..aa28adb 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists