Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
0aa3cc7228 Suppress deprecation registration warnings for brigadier events (#6297)
81a7559b41 Correct handling of invalid maps (#6302)

Tuinity Changes:
5620c57206 Use Velocity compression and cipher natives (#351)
3be4fc5809 [CI-SKIP] Redirect to CI when clicking CI badge in README (#344)
This commit is contained in:
William Blake Galbreath
2021-07-31 22:50:13 -05:00
parent a2340e3381
commit ef304d16da
12 changed files with 381 additions and 49 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index b7e5bdcfe04ab7d8d8d453a787849963640262a5..cdae64a1f8a4096865fbaa246a0715f909cf5043 100644
index 66f5e6edc2bac290664c534df213058eaeab3b4e..0f87b2104253705608e402e28b8b262ae2181206 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,8 +34,8 @@ repositories {
@@ -35,8 +35,8 @@ repositories {
}
dependencies {
@@ -19,15 +19,15 @@ index b7e5bdcfe04ab7d8d8d453a787849963640262a5..cdae64a1f8a4096865fbaa246a0715f9
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -66,6 +66,7 @@ dependencies {
@@ -67,6 +67,7 @@ dependencies {
implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
implementation("io.netty:netty-all:4.1.65.Final") // Paper
+ implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
@@ -86,7 +87,7 @@ tasks.jar {
implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Tuinity
@@ -88,7 +89,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",