Complete patches

patches/server/0003-Build-system-changes.patch

@@ -5,74 +5,95 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f083d422678f5fd21825439944af888fbdc9bf3c..e30b51ed329f0c66a2329da45996ef0fc0db8ffb 100644
+index 5b8a28969451b12c4fc66976afd052ffa5805932..340dd814ad710f48c642be280d0bddbbcd5b9aab 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,6 +19,7 @@ dependencies {
+@@ -19,21 +19,43 @@ dependencies {
          exclude("io.papermc.paper", "paper-api")
      }
      // Purpur end
-+    /* // Plazma - Use libs.versions.toml
++    // Plazma start - Use libs.versions.toml
      // Paper start
++    /*
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -46,9 +47,32 @@ dependencies {
-     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
-     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-     // Paper start - Use Velocity cipher
--    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
-+    // Plazma start - Use libs.versions.toml
+     implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
+     implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
 +     */
+     /*
+           Required to add the missing Log4j2Plugins.dat file from log4j-core
+           which has been removed by Mojang. Without it, log4j has to classload
+           all its classes to check if they are plugins.
+           Scanning takes about 1-2 seconds so adding this speeds up the server start.
+      */
+-    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
+-    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
+-    runtimeOnly(log4jPlugins.output)
++    //implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
++    //log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
++    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
++
++    implementation(common.log4j.core)
++    implementation(common.log4j.iostreams)
 +    implementation(common.snakeyaml)
 +    implementation(common.bundles.asm)
 +    implementation(common.commons.lang2)
 +    implementation(common.adventure.serializer.ansi)
-+    implementation(common.log4j.core)
-+    implementation(common.log4j.iostreams)
-+    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
-+    runtimeOnly(log4jPlugins.output)
-+    alsoShade(log4jPlugins.output)
-+
 +    implementation(server.ansi)
 +    implementation(server.bundles.implementation)
-+    implementation(server.velocity) {
-+    // Plazma end
-         isTransitive = false
-     }
++
+     alsoShade(log4jPlugins.output)
 +
 +    runtimeOnly(common.bundles.maven)
 +    runtimeOnly(common.maven.provider)
 +    runtimeOnly(server.bundles.runtime)
++    runtimeOnly(log4jPlugins.output)
 +
 +    testImplementation(common.bundles.test)
 +    testImplementation(server.classgraph)
-+    /* // Plazma - Use libs.versions.toml
++    /*
+     implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
+     // Paper end
+     implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
+@@ -44,31 +66,37 @@ dependencies {
+     runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
+     runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
+     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
++     */
+     // Paper start - Use Velocity cipher
+-    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
++    implementation(server.velocity) {
+         isTransitive = false
+     }
      // Paper end
  
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-@@ -57,19 +81,22 @@ dependencies {
++    /*
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
      // Pufferfish start
      implementation("org.yaml:snakeyaml:1.32")
 -    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
-+     */ // Plazma - Use libs.versions.toml
-+    implementation(server.simpleyaml) { // Plazma - Use libs.versions.toml
++     */
++    implementation(server.simpleyaml) {
          exclude(group="org.yaml", module="snakeyaml")
      }
      // Pufferfish end
  
 -    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
 -    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
-+    //implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur // Plazma - Use libs.versions.toml
-+    //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur // Plazma - Use libs.versions.toml
++    //implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
++    //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
      implementation("dev.omega24:upnp4j:1.0") // Purpur
  
-+    /* // Plazma - Use libs.versions.toml
++    /*
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.5.0")
-+     */ // Plazma - Use libs.versions.toml
++     */
++    // Plazma end
  }
  
- val craftbukkitPackageVersion = "1_20_R2" // Paper
+ val craftbukkitPackageVersion = "1_20_R3" // Paper