From ec7b0836aeae226d5fb3edcf808642cdd85b229d Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 21 Jul 2024 08:28:28 +0800 Subject: [PATCH] Bump dependencies --- patches/api/0006-Bump-Dependencies.patch | 25 +++++++++++-------- patches/server/0015-Bump-Dependencies.patch | 16 ++++++------ .../0048-Linear-region-file-format.patch | 4 +-- .../0068-Cache-player-profileResult.patch | 4 +-- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/patches/api/0006-Bump-Dependencies.patch b/patches/api/0006-Bump-Dependencies.patch index 148c640aa..7ced40513 100644 --- a/patches/api/0006-Bump-Dependencies.patch +++ b/patches/api/0006-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e911b6596 100644 +index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..ff58ae095588694b572c02754745810c92eadd8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,10 @@ java { @@ -21,7 +21,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e val apiAndDocs: Configuration by configurations.creating { attributes { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) -@@ -29,8 +31,8 @@ configurations.api { +@@ -29,20 +31,20 @@ configurations.api { dependencies { api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api // api dependencies are listed transitively to API consumers @@ -32,7 +32,12 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e // Paper start - adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") { exclude("com.google.guava", "guava") -@@ -42,7 +44,7 @@ dependencies { + } + // Paper - adventure + api("org.yaml:snakeyaml:2.2") +- api("org.joml:joml:1.10.5") ++ api("org.joml:joml:1.10.7") // Leaf - Bump Dependencies + // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } @@ -46,7 +51,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") - api("io.sentry:sentry:5.4.0") // Pufferfish -+ api("io.sentry:sentry:7.10.0") // Pufferfish // Leaf - Bump Dependencies ++ api("io.sentry:sentry:7.12.0") // Pufferfish // Leaf - Bump Dependencies implementation("org.ow2.asm:asm:9.7") implementation("org.ow2.asm:asm-commons:9.7") @@ -55,10 +60,10 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e - api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") -+ api("org.apache.maven:maven-resolver-provider:3.9.7") // Paper - make API dependency for Paper Plugins + // Leaf start - Bump Dependencies -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.20") -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20") ++ api("org.apache.maven:maven-resolver-provider:3.9.8") // Paper - make API dependency for Paper Plugins ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.21") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.21") + // Leaf end - Bump Dependencies val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... @@ -67,7 +72,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e // Paper start - add checker - val checkerQual = "org.checkerframework:checker-qual:3.33.0" -+ val checkerQual = "org.checkerframework:checker-qual:3.44.0" // Leaf - Bump Dependencies ++ val checkerQual = "org.checkerframework:checker-qual:3.45.0" // Leaf - Bump Dependencies compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end @@ -75,7 +80,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e - testImplementation("org.apache.commons:commons-lang3:3.12.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + // Leaf start - Bump Dependencies -+ testImplementation("org.apache.commons:commons-lang3:3.14.0") ++ testImplementation("org.apache.commons:commons-lang3:3.15.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") + // Leaf end - Bump Dependencies testImplementation("org.hamcrest:hamcrest:2.2") @@ -107,7 +112,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..4bd00bcd2d20e62a36c48c26f444646e + "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0", // Leaf - Bump Dependencies // Paper end - "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper -+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.19", // Paper // Leaf - Bump Dependencies ++ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.21", // Paper // Leaf - Bump Dependencies ) options.tags("apiNote:a:API Note:") diff --git a/patches/server/0015-Bump-Dependencies.patch b/patches/server/0015-Bump-Dependencies.patch index 693ee55fc..f831b5de9 100644 --- a/patches/server/0015-Bump-Dependencies.patch +++ b/patches/server/0015-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e92a670eac 100644 +index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..9f63ee937e8bbbefe789d497d990161c44ac0d8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { @@ -13,7 +13,7 @@ index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e9 // Paper start - implementation("org.jline:jline-terminal-jansi:3.21.0") -+ implementation("org.jline:jline-terminal-jansi:3.26.1") // Leaf - Bump Dependencies ++ implementation("org.jline:jline-terminal-jansi:3.26.3") // Leaf - Bump Dependencies implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file /* @@ -29,7 +29,7 @@ index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e9 runtimeOnly(log4jPlugins.output) alsoShade(log4jPlugins.output) - implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol -+ implementation("io.netty:netty-codec-haproxy:4.1.111.Final") // Paper - Add support for proxy protocol ++ implementation("io.netty:netty-codec-haproxy:4.1.112.Final") // Paper - Add support for proxy protocol // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion + implementation("org.apache.logging.log4j:log4j-iostreams:2.23.1") // Paper - remove exclusion @@ -52,9 +52,9 @@ index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e9 - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + // Leaf start - Bump Dependencies -+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.7") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.20") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.8") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.21") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.21") + // Leaf end // Purpur start @@ -65,7 +65,7 @@ index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e9 - testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") -+ testImplementation("io.github.classgraph:classgraph:4.8.173") // Paper - mob goal test // Leaf - Bump Dependencies ++ testImplementation("io.github.classgraph:classgraph:4.8.174") // Paper - mob goal test // Leaf - Bump Dependencies + testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") // Leaf - Bump Dependencies testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.11.0") @@ -78,7 +78,7 @@ index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e9 implementation("me.lucko:spark-paper:1.10.84-20240720.204128-1") // Paper end - spark + -+ implementation("io.netty:netty-all:4.1.111.Final") // Leaf - Bump Dependencies ++ implementation("io.netty:netty-all:4.1.112.Final") // Leaf - Bump Dependencies } paperweight { diff --git a/patches/server/0048-Linear-region-file-format.patch b/patches/server/0048-Linear-region-file-format.patch index 579c8c52f..0c7025c23 100644 --- a/patches/server/0048-Linear-region-file-format.patch +++ b/patches/server/0048-Linear-region-file-format.patch @@ -12,7 +12,7 @@ This format saves about 50% of disk space. Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools diff --git a/build.gradle.kts b/build.gradle.kts -index f8345586b3e72cb222adf5ae8986f3e92a670eac..9f8d3e2b4a5e479c51a2381cfcaffc6fd9de0a50 100644 +index 9f63ee937e8bbbefe789d497d990161c44ac0d8b..eae49bdd56b3f4ffdc59789be8f150d47c42eb54 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,11 @@ dependencies { @@ -25,7 +25,7 @@ index f8345586b3e72cb222adf5ae8986f3e92a670eac..9f8d3e2b4a5e479c51a2381cfcaffc6f + // LinearPaper end + // Paper start - implementation("org.jline:jline-terminal-jansi:3.26.1") // Leaf - Bump Dependencies + implementation("org.jline:jline-terminal-jansi:3.26.3") // Leaf - Bump Dependencies implementation("net.minecrell:terminalconsoleappender:1.3.0") diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java index 73df26b27146bbad2106d57b22dd3c792ed3dd1d..d2f209dd61f4412478a4b8fbe3489787d30bf74b 100644 diff --git a/patches/server/0068-Cache-player-profileResult.patch b/patches/server/0068-Cache-player-profileResult.patch index 8285015bd..d340c2016 100644 --- a/patches/server/0068-Cache-player-profileResult.patch +++ b/patches/server/0068-Cache-player-profileResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache player profileResult diff --git a/build.gradle.kts b/build.gradle.kts -index 8ca21359f9be43d59417448554a9aaebd5140094..6b72333bd753fcbc7fc244bedddbb31a2d20f594 100644 +index eae49bdd56b3f4ffdc59789be8f150d47c42eb54..93367a64ead53f51e00158ba84fbe5e79d04c132 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,10 @@ dependencies { @@ -17,7 +17,7 @@ index 8ca21359f9be43d59417448554a9aaebd5140094..6b72333bd753fcbc7fc244bedddbb31a + // Leaf end - Libraries + // Paper start - implementation("org.jline:jline-terminal-jansi:3.26.1") // Leaf - Bump Dependencies + implementation("org.jline:jline-terminal-jansi:3.26.3") // Leaf - Bump Dependencies implementation("net.minecrell:terminalconsoleappender:1.3.0") diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java index cccf95f68b40b5fc1ac533e9d0d7d2c1c6334df8..a6a1fe9ba187549d13fe1821bf4b8fc37fbe0a0a 100644