3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-23 23:00:08 +01:00

Fix bad diff in build gradle file

Dieser Commit ist enthalten in:
Nassim Jahnke 2024-04-28 00:43:17 +02:00
Ursprung 06cae13223
Commit dd571d89f2
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
8 geänderte Dateien mit 19 neuen und 21 gelöschten Zeilen

Datei anzeigen

@ -5,15 +5,13 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
diff --git a/build.gradle.kts b/build.gradle.kts
index 53b5724c16a54cb7ca0c3095724cd2a9271c98b9..90983bcc4ec752b6266afb70b5d9b939a1812815 100644
index 53b5724c16a54cb7ca0c3095724cd2a9271c98b9..1f6df49819af1c698806c1cf0d35269505881de2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,8 +32,7 @@ dependencies {
implementation("org.ow2.asm:asm-commons:9.7")
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
@@ -34,6 +34,7 @@ dependencies {
implementation("commons-lang:commons-lang:2.6")
- runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
- runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")

Datei anzeigen

@ -6,10 +6,10 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
index 90983bcc4ec752b6266afb70b5d9b939a1812815..f4198f997d82ccf761137cda8c1827e202686c75 100644
index 1f6df49819af1c698806c1cf0d35269505881de2..0c2b0a06b4a4226e4cd2c3846ab8c9b4eb5d913e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
@@ -45,6 +45,7 @@ dependencies {
testImplementation("org.mockito:mockito-core:5.11.0")
testImplementation("org.ow2.asm:asm-tree:9.7")
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest

Datei anzeigen

@ -6,10 +6,10 @@ Subject: [PATCH] Plugin remapping
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
diff --git a/build.gradle.kts b/build.gradle.kts
index f4198f997d82ccf761137cda8c1827e202686c75..600b442986fa5ca9dd12f900caa284b854cc30ca 100644
index 0c2b0a06b4a4226e4cd2c3846ab8c9b4eb5d913e..e1588bbfdcfe601de2435b0b8f9bba3a2855411d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,6 +44,7 @@ dependencies {
@@ -46,6 +46,7 @@ dependencies {
testImplementation("org.ow2.asm:asm-tree:9.7")
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
@ -17,7 +17,7 @@ index f4198f997d82ccf761137cda8c1827e202686c75..600b442986fa5ca9dd12f900caa284b8
}
paperweight {
@@ -158,20 +159,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM
@@ -160,20 +161,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM
runtime.filterNot { it.asFile.absolutePath == vanilla }
}

Datei anzeigen

@ -6,10 +6,10 @@ Subject: [PATCH] Remap reflection calls in plugins using internals
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
diff --git a/build.gradle.kts b/build.gradle.kts
index 600b442986fa5ca9dd12f900caa284b854cc30ca..caf738482232039e6e28376daa37b2a3a7465c69 100644
index e1588bbfdcfe601de2435b0b8f9bba3a2855411d..b6af3dc3f1a247c6c2ee5c040786ef21f71425ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,6 +45,12 @@ dependencies {
@@ -47,6 +47,12 @@ dependencies {
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins

Datei anzeigen

@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
- Allows manipulating the CommandNode to add more children/metadata for the client
diff --git a/build.gradle.kts b/build.gradle.kts
index caf738482232039e6e28376daa37b2a3a7465c69..8e667150eb288c4e2cbc8e9d97de040f38abdfb1 100644
index b6af3dc3f1a247c6c2ee5c040786ef21f71425ee..dac5aa09674a8220154403e126c275481f76ed92 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,6 +13,7 @@ val alsoShade: Configuration by configurations.creating

Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts
index 8e667150eb288c4e2cbc8e9d97de040f38abdfb1..e4caad0371110c90b7c65cd6dccc53d549c98aca 100644
index dac5aa09674a8220154403e126c275481f76ed92..869de96d874ba52823b4b5f19398d38d46172a5b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
@@ -41,6 +41,7 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")

Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
diff --git a/build.gradle.kts b/build.gradle.kts
index e4caad0371110c90b7c65cd6dccc53d549c98aca..97d7857828007f5f164c76a33a68d7d2f4250dce 100644
index 869de96d874ba52823b4b5f19398d38d46172a5b..db349c954f95bb8a26e3570983d99ab197d74c4d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {

Datei anzeigen

@ -5,12 +5,12 @@ Subject: [PATCH] Use Velocity compression and cipher natives
diff --git a/build.gradle.kts b/build.gradle.kts
index 97d7857828007f5f164c76a33a68d7d2f4250dce..2143aa04db50ec04448af338170d67369a5ca023 100644
index db349c954f95bb8a26e3570983d99ab197d74c4d..898bd00a37455d6e7b5e4f52b17c127bd71f2563 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,6 +35,11 @@ dependencies {
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
implementation("commons-lang:commons-lang:2.6")
@@ -37,6 +37,11 @@ dependencies {
runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
+ // Paper start - Use Velocity cipher
+ implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {