mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-26 18:29:07 +00:00
5ed9d4b83c
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6e598f8 Fix incorrect createPath overload arguments, fixes #12043 (#12794) PaperMC/Paper@f7d5a0a [ci skip] Add remote build cache configuration through Gradle properties (#12797) PaperMC/Paper@b4466ec Dialog API (#12671) PaperMC/Paper@a939945 Fixup sendAllDataToRemote calls PaperMC/Paper@cb47e01 Remove more dead code, fix pre-existing desync when cancelling and closing container PaperMC/Paper@4076453 Specify the class loader when loading services (#12829) PaperMC/Paper@1bf6364 Update Mache for horse decompile fix PaperMC/Paper@76fb506 Add vanilla error message to precondition for DialogBaseImpl (#12831) PaperMC/Paper@fcfc6c3 Expose HexColor argument type (#12833) PaperMC/Paper@4000fcc Fix typo in PluginBootstrap javadocs (#12821) PaperMC/Paper@25d358c [ci skip] javadoc: Fix grammatical error for getState (#12817) PaperMC/Paper@ba7c982 Add missing Range annotations to dialog types PaperMC/Paper@533d93c Don't consume anchor charge if loc changes (#12835) PaperMC/Paper@d9b5003 Dried Ghast events and Happy Ghast spawn reason (#12788) PaperMC/Paper@bda8406 [ci skip] fix typo in AttributeInstance (#12843) PaperMC/Paper@94d60e1 Copy thrown pearls list for removal (#12840) PaperMC/Paper@21fb542 Do not write fall_distance tag unless it already existed before PaperMC/Paper@04f9519 Fix spawners converted from 1.21.4 not running finalisation logic PaperMC/Paper@22d80a3 [ci skip] Update Gradle wrapper and Fill plugin (#12846) PaperMC/Paper@a6e0c08 Add getRotation to Location (#12799) PaperMC/Paper@e792779 Allow AreaEffectCloud#setColor to reset color for null (#12760)
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
--- a/paper-api/build.gradle.kts
|
|
+++ b/paper-api/build.gradle.kts
|
|
@@ -90,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())
|
|
@@ -100,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"))
|
|
}
|
|
}
|
|
}
|
|
@@ -166,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(
|
|
@@ -199,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")
|