[skip ci] Set duplicatesStrategy to INCLUDE to ensure Log4j2PluginsCacheFileTransformer works correctly (#382)

Author: uRyanxD

patches/server/0003-Setup-Gradle-project.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Setup Gradle project
 
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..4ecbf789542fc32ac9816febb62afcd69cd77cff
+index 0000000000000000000000000000000000000000..2754c5ad659820b1416c222fcabe03756145422d
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,132 @@
 +plugins {
 +    id("pandaspigot.conventions")
 +    id("com.gradleup.shadow") version "9.3.1"
@@ -63,20 +63,22 @@ index 0000000000000000000000000000000000000000..4ecbf789542fc32ac9816febb62afcd6
 +
 +tasks {
 +    shadowJar {
-+        mergeServiceFiles()
 +        archiveClassifier.set("unmapped")
 +
-+        val cbLibsPkg = "org.bukkit.craftbukkit.libs"
-+
-+        relocate("joptsimple", "$cbLibsPkg.joptsimple")
-+        relocate("jline", "$cbLibsPkg.jline")
-+        relocate("org.ibex", "$cbLibsPkg.org.ibex")
-+        relocate("org.gjt", "$cbLibsPkg.org.gjt")
-+
 +        relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v${minecraftVersion}") {
 +            exclude("org.bukkit.craftbukkit.Main*") // don't relocate main class
 +        }
++
++        arrayOf(
++            "joptsimple",
++            "jline",
++            "org.ibex",
++            "org.gjt",
++        ).forEach { relocate(it, "org.bukkit.craftbukkit.libs.$it") }
++
 +        relocate("net.minecraft.server", "net.minecraft.server.v${minecraftVersion}")
++
++        mergeServiceFiles()
 +    }
 +
 +    named("build") {
@@ -107,6 +109,7 @@ index 0000000000000000000000000000000000000000..4ecbf789542fc32ac9816febb62afcd6
 +                "Git-Branch" to gitBranch,
 +                "Git-Commit" to gitHash,
 +            )
++            attributes("Name" to "org/bukkit/", "Sealed" to "true")
 +        }
 +    }
 +

patches/server/0005-Update-to-Netty-4.1.x.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Update to Netty 4.1.x
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fa35e6cdc4b3926cc9476830a841e91571117311..cc6d4cb8976256b8129fb00f52dee50a00a34404 100644
+index 3723769acc78fe26284145a0fcb36515022c618a..a7e26e9852d5b067c73cc1b9a773d6586aae32d0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ dependencies {
@@ -25,14 +25,14 @@ index fa35e6cdc4b3926cc9476830a841e91571117311..cc6d4cb8976256b8129fb00f52dee50a
      implementation("net.sf.jopt-simple:jopt-simple:3.2")
      implementation("jline:jline:2.12.1")
 
-@@ -53,6 +52,7 @@ tasks {
-     shadowJar {
+@@ -67,6 +66,7 @@ tasks {
+         relocate("net.minecraft.server", "net.minecraft.server.v${minecraftVersion}")
+ 
          mergeServiceFiles()
-         archiveClassifier.set("unmapped")
 +        append("META-INF/io.netty.versions.properties")
+     }
 
-         val cbLibsPkg = "org.bukkit.craftbukkit.libs"
- 
+     named("build") {
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 index e2eb305468ff76026dc9b24d59394cfc94501273..b48eeb63ad61b18a630f2feb4fd6203e5e3e6c80 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java

patches/server/0014-PandaSpigot-Configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PandaSpigot Configuration
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cc6d4cb8976256b8129fb00f52dee50a00a34404..2d7fb97266bbb84f63816937ad66faac8f0d9051 100644
+index a7e26e9852d5b067c73cc1b9a773d6586aae32d0..30a686c0e39c4411490578273e2ba2df5e83971d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,12 @@ repositories {
@@ -21,20 +21,21 @@ index cc6d4cb8976256b8129fb00f52dee50a00a34404..2d7fb97266bbb84f63816937ad66faac
      // Minecraft libraries:
      implementation("io.netty:netty-all:4.1.130.Final") // PandaSpigot - Update Netty to 4.1.x
      implementation("com.mojang:authlib:1.5.21")
-@@ -53,6 +59,13 @@ tasks {
-         mergeServiceFiles()
+@@ -52,6 +58,14 @@ tasks {
+     shadowJar {
          archiveClassifier.set("unmapped")
-         append("META-INF/io.netty.versions.properties")
+ 
 +        // PandaSpigot start - Configuration
 +        arrayOf(
 +            "com.amihaiemil.eoyaml",
 +            "org.spongepowered.configurate",
 +            "io.leangen.geantyref",
 +        ).forEach { relocate(it, "com.hpfxd.pandaspigot.libs.$it") }
 +        // PandaSpigot end
- 
-         val cbLibsPkg = "org.bukkit.craftbukkit.libs"
- 
++
+         relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v${minecraftVersion}") {
+             exclude("org.bukkit.craftbukkit.Main*") // don't relocate main class
+         }
 diff --git a/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java b/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..f021fd0c7622a788b809ecbf896162912ab4b0d0

patches/server/0039-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -22,7 +22,7 @@ This patch contains heavy inspiration from:
 https://github.com/PaperMC/Paper/blob/master/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2d7fb97266bbb84f63816937ad66faac8f0d9051..c00a948f3e9bc92f7086261c236c831d6b147653 100644
+index 8aabc66e6b45174d78db36af355804fc8fd3db48..7b16c9ea097206ecc296a9fec921a9e0dfee89f4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -21,8 +21,10 @@ dependencies {
@@ -55,22 +55,31 @@ index 2d7fb97266bbb84f63816937ad66faac8f0d9051..c00a948f3e9bc92f7086261c236c831d
      testImplementation("junit:junit:4.11")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
  }
-@@ -59,6 +65,7 @@ tasks {
-         mergeServiceFiles()
+@@ -58,6 +64,8 @@ tasks {
+     shadowJar {
          archiveClassifier.set("unmapped")
-         append("META-INF/io.netty.versions.properties")
-+        transform(com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer()) // PandaSpigot - Use TerminalConsoleAppender
+ 
++        duplicatesStrategy = DuplicatesStrategy.INCLUDE // Required for Log4j2PluginsCacheFileTransformer to function properly
++
          // PandaSpigot start - Configuration
          arrayOf(
              "com.amihaiemil.eoyaml",
-@@ -70,7 +77,6 @@ tasks {
-         val cbLibsPkg = "org.bukkit.craftbukkit.libs"
+@@ -72,7 +80,6 @@ tasks {
 
-         relocate("joptsimple", "$cbLibsPkg.joptsimple")
--        relocate("jline", "$cbLibsPkg.jline")
-         relocate("org.ibex", "$cbLibsPkg.org.ibex")
-         relocate("org.gjt", "$cbLibsPkg.org.gjt")
+         arrayOf(
+             "joptsimple",
+-            "jline",
+             "org.ibex",
+             "org.gjt",
+         ).forEach { relocate(it, "org.bukkit.craftbukkit.libs.$it") }
+@@ -81,6 +88,7 @@ tasks {
+ 
+         mergeServiceFiles()
+         append("META-INF/io.netty.versions.properties")
++        transform<com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer>() // PandaSpigot - Use TerminalConsoleAppender
+     }
 
+     named("build") {
 diff --git a/src/main/java/com/hpfxd/pandaspigot/console/PandaConsole.java b/src/main/java/com/hpfxd/pandaspigot/console/PandaConsole.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..25a515b681bbbb70946f2ec73647a6f184f81b3c

patches/server/0112-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch

@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 698b0a08f85056d36c131515a0825aeca52755c3..83dcd2285e088f8620831e20893c44a122779daf 100644
+index e3f1b191e44585b28a556f11d0a1024412ada964..db5e7e22b4856412e9db0787ba6edd88192006c1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,6 +25,7 @@ dependencies {

patches/server/0113-Adventure-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Adventure API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 83dcd2285e088f8620831e20893c44a122779daf..8c8aa2274fd97c9d3a2f24700f58e045e984f75d 100644
+index db5e7e22b4856412e9db0787ba6edd88192006c1..6d4fa7beafda08917d66655955da42fea16b286f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -4,6 +4,7 @@ plugins {