mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
107 lines
5.8 KiB
Diff
107 lines
5.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Fri, 28 Oct 2022 17:48:45 -0400
|
|
Subject: [PATCH] Bump Dependencies
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index d356988d21896ac06b5cc2e54785813b7d30233c..fa745abebf14fee0ca56cadc98822be62b647edf 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -22,7 +22,7 @@ dependencies {
|
|
}
|
|
// Gale end - project setup
|
|
// Paper start
|
|
- implementation("org.jline:jline-terminal-jansi:3.21.0")
|
|
+ implementation("org.jline:jline-terminal-jansi:3.23.0") // Leaf - Bump Dependencies
|
|
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
|
implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
|
|
implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
|
|
@@ -32,31 +32,35 @@ dependencies {
|
|
all its classes to check if they are plugins.
|
|
Scanning takes about 1-2 seconds so adding this speeds up the server start.
|
|
*/
|
|
- implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
|
|
- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
|
|
+ // Leaf start - Bump Dependencies
|
|
+ implementation("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - implementation
|
|
+ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins
|
|
runtimeOnly(log4jPlugins.output)
|
|
alsoShade(log4jPlugins.output)
|
|
- implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
|
|
+ implementation("io.netty:netty-codec-haproxy:4.1.99.Final") // Paper - Add support for proxy protocol
|
|
// Paper end
|
|
- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
|
|
- implementation("org.ow2.asm:asm:9.5")
|
|
- implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
|
|
- testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
|
|
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.20.0") // Paper - remove exclusion
|
|
+ implementation("org.ow2.asm:asm:9.6")
|
|
+ implementation("org.ow2.asm:asm-commons:9.6") // Paper - ASM event executor generation
|
|
+ testImplementation("org.mockito:mockito-core:5.6.0") // Paper - switch to mockito
|
|
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
|
|
implementation("commons-lang:commons-lang:2.6")
|
|
- implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
|
|
- runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
|
|
+ implementation("net.fabricmc:mapping-io:0.5.0-beta.1") // Paper - needed to read mappings for stacktrace deobfuscation
|
|
+ runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0")
|
|
runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
|
|
- runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
|
|
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Leaf - Bump Dependencies - Waiting Log4j support disruptor 4.0.0
|
|
+ // Leaf end
|
|
// Paper start - Use Velocity cipher
|
|
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
|
|
+ implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") { // Leaf - Bump Dependencies
|
|
isTransitive = false
|
|
}
|
|
// Paper end
|
|
|
|
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
|
|
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
|
|
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
|
|
+ // Leaf start - Bump Dependencies
|
|
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.5")
|
|
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.16")
|
|
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.16")
|
|
+ // Leaf end
|
|
|
|
// Pufferfish start
|
|
implementation("org.yaml:snakeyaml:2.2")
|
|
@@ -69,11 +73,13 @@ dependencies {
|
|
implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
|
|
implementation("dev.omega24:upnp4j:1.0") // Purpur
|
|
|
|
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
|
+ // Leaf start - Bump Dependencies
|
|
+ testImplementation("io.github.classgraph:classgraph:4.8.162") // Paper - mob goal test
|
|
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
|
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
|
|
|
- implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
|
|
+ implementation("io.netty:netty-all:4.1.99.Final"); // Paper - Bump netty
|
|
+ // Leaf end
|
|
}
|
|
|
|
val craftbukkitPackageVersion = "1_20_R2" // Paper
|
|
@@ -265,3 +271,7 @@ sourceSets {
|
|
}
|
|
}
|
|
// Gale end - package license into jar
|
|
+
|
|
+repositories {
|
|
+ mavenCentral()
|
|
+}
|
|
diff --git a/src/main/java/io/papermc/paper/util/ObfHelper.java b/src/main/java/io/papermc/paper/util/ObfHelper.java
|
|
index b8b17d046f836c8652ab094db00ab1af84971b2c..e856d7ce39e388f8bf45d394fd2fb586e3370c27 100644
|
|
--- a/src/main/java/io/papermc/paper/util/ObfHelper.java
|
|
+++ b/src/main/java/io/papermc/paper/util/ObfHelper.java
|
|
@@ -93,7 +93,7 @@ public enum ObfHelper {
|
|
return null;
|
|
}
|
|
final MemoryMappingTree tree = new MemoryMappingTree();
|
|
- MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2, tree);
|
|
+ MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2_FILE, tree); // Leaf - Use mapping-io 0.5.0-beta.1
|
|
final Set<ClassMapping> classes = new HashSet<>();
|
|
|
|
final StringPool pool = new StringPool();
|