Start cleaning up plugin remapping patches
This commit is contained in:
parent
0b1b1fe067
commit
e2552eea24
1033 changed files with 57 additions and 143 deletions
|
@ -25,11 +25,11 @@ Other changes:
|
|||
Co-Authored-By: Emilia Kond <emilia@rymiel.space>
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index c0a078302223202db37d2ed9ecf20716ed7706a5..7fb99f67edf961bb31e3f77049d2d3eb7bb148bc 100644
|
||||
index 94fcbfae0678391d38ee8e6e54576d9fb294585e..3dc1e82536e1e84287499825ab191c4e92bc37d7 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -6,9 +6,30 @@ plugins {
|
||||
id("com.github.johnrengelman.shadow")
|
||||
@@ -5,9 +5,30 @@ plugins {
|
||||
`maven-publish`
|
||||
}
|
||||
|
||||
+val log4jPlugins = sourceSets.create("log4jPlugins")
|
||||
|
@ -60,15 +60,26 @@ index c0a078302223202db37d2ed9ecf20716ed7706a5..7fb99f67edf961bb31e3f77049d2d3eb
|
|||
implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
|
||||
implementation("org.ow2.asm:asm-commons:9.7")
|
||||
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
|
||||
@@ -67,7 +88,7 @@ publishing {
|
||||
@@ -75,6 +96,19 @@ tasks.check {
|
||||
dependsOn(scanJar)
|
||||
}
|
||||
// Paper end
|
||||
+// Paper start - use TCA for console improvements
|
||||
+tasks.serverJar {
|
||||
+ from(alsoShade.elements.map {
|
||||
+ it.map { f ->
|
||||
+ if (f.asFile.isFile) {
|
||||
+ zipTree(f.asFile)
|
||||
+ } else {
|
||||
+ f.asFile
|
||||
+ }
|
||||
+ }
|
||||
+ })
|
||||
+}
|
||||
+// Paper end - use TCA for console improvements
|
||||
|
||||
tasks.shadowJar {
|
||||
- configurations = listOf(project.configurations.vanillaServer.get())
|
||||
+ configurations = listOf(project.configurations.vanillaServer.get(), alsoShade) // Paper
|
||||
}
|
||||
|
||||
// Paper start
|
||||
tasks.test {
|
||||
exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
|
||||
diff --git a/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java b/src/log4jPlugins/java/io/papermc/paper/console/StripANSIConverter.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..91547f6e6fe90006713beb2818da634304bdd236
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue