Update Paper

Adapt checkstyle patching and preserve the Folia server logo with a
dedicated folia-logo.png resource.

Author: jpenilla

.gitignore

@@ -12,5 +12,8 @@ build
 /folia-api/build.gradle.kts
 /paper-api
 /paper-api-generator
+/paper-checkstyle
+/.checkstyle
+/folia-checkstyle/build.gradle.kts
 
 .idea/

build.gradle.kts

@@ -22,12 +22,28 @@ paperweight {
             outputFile = file("folia-api/build.gradle.kts")
             patchFile = file("folia-api/build.gradle.kts.patch")
         }
+        patchFile {
+            path = "paper-checkstyle/build.gradle.kts"
+            outputFile = file("folia-checkstyle/build.gradle.kts")
+            patchFile = file("folia-checkstyle/build.gradle.kts.patch")
+        }
         patchDir("paperApi") {
             upstreamPath = "paper-api"
             excludes = setOf("build.gradle.kts")
             patchesDir = file("folia-api/paper-patches")
             outputDir = file("paper-api")
         }
+        patchDir("paperCheckstyle") {
+            upstreamPath = "paper-checkstyle"
+            excludes = setOf("build.gradle.kts")
+            patchesDir = file("folia-checkstyle/paper-patches")
+            outputDir = file("paper-checkstyle")
+        }
+        patchDir("paperCheckstyleConfig") {
+            upstreamPath = ".checkstyle"
+            patchesDir = file("folia-checkstyle/config-patches")
+            outputDir = file(".checkstyle")
+        }
     }
 }
 

folia-api/build.gradle.kts.patch

@@ -1,15 +1,32 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -94,7 +_,7 @@
+@@ -19,7 +_,11 @@
+ 
+ paperCheckstyle {
+     customJavadocTags = projectCustomJavadocTags
+-    directoriesToSkipFile = layout.projectDirectory.file(".checkstyle/ignored_directories.txt")
++    directoriesToSkipFile = layout.projectDirectory.file("../paper-api/.checkstyle/ignored_directories.txt")
++}
++
++tasks.named<io.papermc.paperweight.checkstyle.tasks.MergeCheckstyleConfigs>("mergeCheckstyleConfigs") {
++    overrideConfigFile.set(layout.projectDirectory.file("../paper-api/.checkstyle/checkstyle.xml"))
+ }
+ 
+ val annotationsVersion = "26.0.2"
+@@ -105,10 +_,10 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
+ 
+     // checkstyle
+-    checkstyle(project(":paper-checkstyle"))
++    checkstyle(project(":folia-checkstyle"))
  }
 
 -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())
-@@ -104,6 +_,18 @@
+@@ -118,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -28,7 +45,7 @@
          }
      }
  }
-@@ -186,7 +_,7 @@
+@@ -200,7 +_,7 @@
 
  tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
@@ -37,7 +54,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -213,11 +_,11 @@
+@@ -227,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

folia-checkstyle/build.gradle.kts.patch

@@ -0,0 +1,35 @@
+--- a/paper-checkstyle/build.gradle.kts
++++ b/paper-checkstyle/build.gradle.kts
+@@ -5,6 +_,19 @@
+ 
+ val testData = sourceSets.create("testData")
+ 
++tasks.named<io.papermc.paperweight.checkstyle.tasks.MergeCheckstyleConfigs>("mergeCheckstyleConfigs") {
++    overrideConfigFile.set(layout.projectDirectory.file("../.checkstyle/checkstyle.xml"))
++}
++
++sourceSets {
++    main {
++        java.srcDir(file("../paper-checkstyle/src/main/java"))
++        resources.srcDir(file("../paper-checkstyle/src/main/resources"))
++    }
++    test {
++        java.srcDir(file("../paper-checkstyle/src/test/java"))
++        resources.srcDir(file("../paper-checkstyle/src/test/resources"))
++    }
++}
++testData.java.srcDir(file("../paper-checkstyle/src/testData/java"))
++testData.resources.srcDir(file("../paper-checkstyle/src/testData/resources"))
++
+ dependencies {
+     implementation("com.puppycrawl.tools:checkstyle:13.8.0")
+     implementation("org.jspecify:jspecify:1.0.0")
+@@ -16,7 +_,7 @@
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+     testData.implementationConfigurationName("org.jspecify:jspecify:1.0.0")
+ 
+-    checkstyle(project(":paper-checkstyle"))
++    checkstyle(project(":folia-checkstyle"))
+ }
+ 
+ tasks {

folia-server/build.gradle.kts.patch

@@ -29,7 +29,7 @@
 -val log4jPlugins = sourceSets.create("log4jPlugins")
 +sourceSets {
 +    main {
-+        java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") }
++        java { srcDir("../paper-server/src/main/java") }
 +        resources { srcDir("../paper-server/src/main/resources") }
 +    }
 +    test {
@@ -71,6 +71,15 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
+@@ -246,7 +_,7 @@
+     jvmArgumentProviders.add(provider)
+ }
+ 
+-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
++val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("../paper-server/src/generated/java").asFile.toPath()
+ idea {
+     module {
+         generatedSourceDirs.add(generatedDir.toFile())
 @@ -327,7 +_,7 @@
  }