mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-27 10:49:06 +00:00
1530ca1264
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@914fb08 Fix Entity#updateFluidHeightAndDoFluidPushing inconsistency with Vanilla PaperMC/Paper@e9fa3a7 Use correct queue when blocking on futures PaperMC/Paper@0ff899d Prevent world mutation on copper golem spawn cancel (#13152) PaperMC/Paper@bae47d3 Update to 1.21.10 (#13127) PaperMC/Paper@8339bb3 Update DataConverter constants for 1.21.10 PaperMC/Paper@3982efa Sync Moonrise PaperMC/Paper@fa57d4b Remove Vanilla packet processing at start of tick PaperMC/Paper@fba780d Rebuild patches
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
--- a/paper-api/build.gradle.kts
|
|
+++ b/paper-api/build.gradle.kts
|
|
@@ -67,6 +_,7 @@
|
|
api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
|
|
implementation("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
implementation("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
|
+ compileOnly("org.spongepowered:configurate-yaml:4.2.0")
|
|
|
|
// Annotations - Slowly migrate to jspecify
|
|
val annotations = "org.jetbrains:annotations:$annotationsVersion"
|
|
@@ -89,7 +_,7 @@
|
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
|
}
|
|
|
|
-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
|
|
+val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
|
|
idea {
|
|
module {
|
|
generatedSourceDirs.add(generatedDir.toFile())
|
|
@@ -99,6 +_,18 @@
|
|
main {
|
|
java {
|
|
srcDir(generatedDir)
|
|
+ srcDir(file("../paper-api/src/main/java"))
|
|
+ }
|
|
+ resources {
|
|
+ srcDir(file("../paper-api/src/main/resources"))
|
|
+ }
|
|
+ }
|
|
+ test {
|
|
+ java {
|
|
+ srcDir(file("../paper-api/src/test/java"))
|
|
+ }
|
|
+ resources {
|
|
+ srcDir(file("../paper-api/src/test/resources"))
|
|
}
|
|
}
|
|
}
|
|
@@ -165,7 +_,7 @@
|
|
|
|
tasks.withType<Javadoc>().configureEach {
|
|
val options = options as StandardJavadocDocletOptions
|
|
- options.overview = "src/main/javadoc/overview.html"
|
|
+ options.overview = "../paper-api/src/main/javadoc/overview.html"
|
|
options.use()
|
|
options.isDocFilesSubDirs = true
|
|
options.links(
|
|
@@ -198,11 +_,11 @@
|
|
}
|
|
|
|
// workaround for https://github.com/gradle/gradle/issues/4046
|
|
- inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset")
|
|
+ inputs.dir("../paper-api/src/main/javadoc").withPropertyName("javadoc-sourceset")
|
|
val fsOps = services.fileSystemOperations
|
|
doLast {
|
|
fsOps.copy {
|
|
- from("src/main/javadoc") {
|
|
+ from("../paper-api/src/main/javadoc") {
|
|
include("**/doc-files/**")
|
|
}
|
|
into("build/docs/javadoc")
|