Remove redundant and unneeded repos, reorder repos (#6867)

This commit is contained in:
Jason 2021-11-03 19:42:18 -07:00 committed by GitHub
parent d9e2817ffd
commit 3e310e096c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 62 additions and 68 deletions

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16fdf26fdd 100644
index a482ad74b9a5d06a982ac2a6d9b6c5dc9f664f46..7a7a6a1a1bdfecb619dd6ba6f6865eb0bb74d0d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,9 @@
@ -34,8 +34,8 @@ index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16
}
dependencies {
@@ -47,6 +57,8 @@ dependencies {
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
@@ -46,6 +56,8 @@ dependencies {
implementation("io.netty:netty-all:4.1.65.Final") // Paper
+ implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
@ -43,7 +43,7 @@ index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -140,6 +152,45 @@ tasks.shadowJar {
@@ -139,6 +151,45 @@ tasks.shadowJar {
transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
}
@ -90,7 +90,7 @@ index 2c39461ce531cfa8fc0aa6928e0de819640b0553..2b16554395db5ec82c8dacc274517c16
exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index f1034cfb63ea37c22e67b5d4a18214774f208de2..a8740f03a7feef40490e9f5be610c2c835114f08 100644
index f4b1eb512defda8523ddaba054bde744a4aaeb32..14416856fde78bccbf53fa60f17c82588a2d11f6 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -433,4 +433,9 @@ public class PaperConfig {