diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..ccebba77 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c..fc10b601 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..79a61d42 100644 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/patches/api/0002-Bump-Dependencies.patch b/patches/api/0002-Bump-Dependencies.patch index f865dc9f..1f3428c3 100644 --- a/patches/api/0002-Bump-Dependencies.patch +++ b/patches/api/0002-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..97a482d26bab77fc027f78665bbbedcbb15bae39 100644 +index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..1f2ece9e66235f372881963038f958dcf87aa351 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,14 +24,14 @@ configurations.api { @@ -14,31 +14,31 @@ index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..97a482d26bab77fc027f78665bbbedcb api("com.google.guava:guava:31.1-jre") - api("com.google.code.gson:gson:2.10") - api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper -+ api("com.google.code.gson:gson:2.10.1") -+ api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper ++ api("com.google.code.gson:gson:2.10.1") // Leaf - Bump Dependencies ++ api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper // Leaf - Bump Dependencies api("org.yaml:snakeyaml:1.33") // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } - api("it.unimi.dsi:fastutil:8.5.6") -+ api("it.unimi.dsi:fastutil:8.5.11") ++ api("it.unimi.dsi:fastutil:8.5.11") // Leaf - Bump Dependencies apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) apiAndDocs("net.kyori:adventure-api") apiAndDocs("net.kyori:adventure-text-minimessage") -@@ -39,19 +39,19 @@ dependencies { +@@ -39,33 +39,33 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") - api("org.apache.logging.log4j:log4j-api:2.17.1") - api("org.slf4j:slf4j-api:1.8.0-beta4") -+ api("org.apache.logging.log4j:log4j-api:2.19.0") -+ api("org.slf4j:slf4j-api:1.8.0-beta4") // Leaf TODO - Bump later, need to fix breaking compatibility ++ api("org.apache.logging.log4j:log4j-api:2.20.0") // Leaf - Bump Dependencies ++ api("org.slf4j:slf4j-api:2.0.6") // Leaf - Bump Dependencies - implementation("org.ow2.asm:asm:9.2") - implementation("org.ow2.asm:asm-commons:9.2") -+ implementation("org.ow2.asm:asm:9.4") -+ implementation("org.ow2.asm:asm-commons:9.4") ++ implementation("org.ow2.asm:asm:9.4") // Leaf - Bump Dependencies ++ implementation("org.ow2.asm:asm-commons:9.4") // Leaf - Bump Dependencies // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") @@ -48,36 +48,46 @@ index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..97a482d26bab77fc027f78665bbbedcb + compileOnly("org.apache.maven:maven-resolver-provider:3.8.7") // Leaf TODO - Bump to 4.0.0 later, need to fix breaking compatibility + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility -+ compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper ++ compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper // Leaf - Bump Dependencies - val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations... -+ val annotations = "org.jetbrains:annotations:24.0.0" // Paper - we don't want Java 5 annotations... ++ val annotations = "org.jetbrains:annotations:24.0.0" // Paper - we don't want Java 5 annotations... // Leaf - Bump Dependencies compileOnly(annotations) testCompileOnly(annotations) -@@ -64,8 +64,8 @@ dependencies { + // Paper start - add checker +- val checkerQual = "org.checkerframework:checker-qual:3.21.0" ++ val checkerQual = "org.checkerframework:checker-qual:3.31.0" // Leaf - Bump Dependencies + compileOnlyApi(checkerQual) + testCompileOnly(checkerQual) + // Paper end +- testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito ++ testImplementation("org.mockito:mockito-core:5.1.1") // Paper - add mockito // Leaf - Bump Dependencies testImplementation("org.apache.commons:commons-lang3:3.12.0") testImplementation("junit:junit:4.13.2") - testImplementation("org.hamcrest:hamcrest-library:1.3") - testImplementation("org.ow2.asm:asm-tree:9.3") -+ testImplementation("org.hamcrest:hamcrest-library:2.2") -+ testImplementation("org.ow2.asm:asm-tree:9.4") ++ testImplementation("org.hamcrest:hamcrest-library:2.2") // Leaf - Bump Dependencies ++ testImplementation("org.ow2.asm:asm-tree:9.4") // Leaf - Bump Dependencies } configure { -@@ -111,9 +111,9 @@ tasks.withType { +@@ -111,11 +111,11 @@ tasks.withType { options.use() options.isDocFilesSubDirs = true options.links( - "https://guava.dev/releases/31.0.1-jre/api/docs/", -+ "https://guava.dev/releases/31.1-jre/api/docs/", ++ "https://guava.dev/releases/31.1-jre/api/docs/", // Leaf - Bump Dependencies "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", - "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.jetbrains/annotations/24.0.0/", // Paper - we don't want Java 5 annotations // Paper start - //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat +- //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat ++ //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat // Leaf - Bump Dependencies "https://jd.adventure.kyori.net/api/$adventureVersion/", + "https://jd.adventure.kyori.net/text-minimessage/$adventureVersion/", + "https://jd.adventure.kyori.net/text-serializer-gson/$adventureVersion/", @@ -153,6 +153,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks. jarToScan.set(tasks.jar.flatMap { it.archiveFile }) classpath.from(configurations.compileClasspath) diff --git a/patches/api/0010-Pufferfish-Sentry.patch b/patches/api/0010-Pufferfish-Sentry.patch index 022f439d..efb92c6a 100644 --- a/patches/api/0010-Pufferfish-Sentry.patch +++ b/patches/api/0010-Pufferfish-Sentry.patch @@ -7,17 +7,17 @@ Original license: GPL v3 Original project: https://github.com/pufferfish-gg/Pufferfish diff --git a/build.gradle.kts b/build.gradle.kts -index 97a482d26bab77fc027f78665bbbedcbb15bae39..9dadc97e6e7c3e9669d08b976ed3c5a901718144 100644 +index 1f2ece9e66235f372881963038f958dcf87aa351..aed8456760061f08256730073d3bbd8a837b2672 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,7 @@ dependencies { apiAndDocs("net.kyori:adventure-text-logger-slf4j") - api("org.apache.logging.log4j:log4j-api:2.19.0") - api("org.slf4j:slf4j-api:1.8.0-beta4") // Leaf TODO - Bump later, need to fix breaking compatibility -+ api("io.sentry:sentry:6.13.1") // Pufferfish + api("org.apache.logging.log4j:log4j-api:2.20.0") // Leaf - Bump Dependencies + api("org.slf4j:slf4j-api:2.0.6") // Leaf - Bump Dependencies ++ api("io.sentry:sentry:6.14.0") // Pufferfish - implementation("org.ow2.asm:asm:9.4") - implementation("org.ow2.asm:asm-commons:9.4") + implementation("org.ow2.asm:asm:9.4") // Leaf - Bump Dependencies + implementation("org.ow2.asm:asm-commons:9.4") // Leaf - Bump Dependencies diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java new file mode 100644 index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8eb08fb68a diff --git a/patches/server/0003-Bump-Dependencies.patch b/patches/server/0003-Bump-Dependencies.patch index 5cc2c983..5a7f39da 100644 --- a/patches/server/0003-Bump-Dependencies.patch +++ b/patches/server/0003-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index b19fa7a84f97abb995143de14302658bf22b2904..d463f9e7613bffa692df966c8d1b6f1d0b63f661 100644 +index c745122af630d0f79bed7f0c03baa66eeb2e5da0..6ffb4052614f7b1a8fa3630d1d543d22d7981541 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { @@ -13,40 +13,44 @@ index b19fa7a84f97abb995143de14302658bf22b2904..d463f9e7613bffa692df966c8d1b6f1d implementation("io.projectreactor.tools:blockhound:1.0.7.RELEASE") // Gale - base thread pool - watch for blocking base threads // Paper start - implementation("org.jline:jline-terminal-jansi:3.21.0") -+ implementation("org.jline:jline-terminal-jansi:3.22.0") ++ implementation("org.jline:jline-terminal-jansi:3.22.0") // Leaf - Bump Dependencies implementation("net.minecrell:terminalconsoleappender:1.3.0") /* Required to add the missing Log4j2Plugins.dat file from log4j-core -@@ -25,29 +25,29 @@ dependencies { +@@ -25,29 +25,31 @@ 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.14.1") // Paper - implementation - annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins -+ implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation -+ annotationProcessor("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins - implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol +- implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol ++ // Leaf start - Bump Dependencies ++ implementation("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - implementation ++ annotationProcessor("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins // Leaf - Bump Dependencies ++ implementation("io.netty:netty-codec-haproxy:4.1.89.Final") // Paper - Add support for proxy protocol // Leaf - Bump Dependencies // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion +- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion - implementation("org.ow2.asm:asm:9.3") - implementation("org.ow2.asm:asm-commons:9.3") // 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.4") + implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation ++ // Leaf end + testImplementation("org.mockito:mockito-core:5.1.1") // Paper - switch to mockito implementation("org.spongepowered:configurate-yaml:4.1.2") // 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 // Paper start - Use Velocity cipher - implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") { -+ implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") { ++ implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") { // Leaf - Bump Dependencies isTransitive = false } // Paper end - runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") - runtimeOnly("mysql:mysql-connector-java:8.0.29") -+ runtimeOnly("org.xerial:sqlite-jdbc:3.40.1.0") -+ runtimeOnly("mysql:mysql-connector-java:8.0.32") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.41.0.0") // Leaf - Bump Dependencies ++ runtimeOnly("mysql:mysql-connector-java:8.0.32") // Leaf - Bump Dependencies runtimeOnly("com.lmax:disruptor:3.4.4") // Paper - runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") @@ -58,19 +62,22 @@ index b19fa7a84f97abb995143de14302658bf22b2904..d463f9e7613bffa692df966c8d1b6f1d // Pufferfish start implementation("org.yaml:snakeyaml:1.33") -@@ -56,9 +56,9 @@ dependencies { +@@ -56,11 +58,11 @@ dependencies { } // Pufferfish end - testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test -+ testImplementation("io.github.classgraph:classgraph:4.8.154") // Paper - mob goal test ++ testImplementation("io.github.classgraph:classgraph:4.8.154") // Paper - mob goal test // Leaf - Bump Dependencies testImplementation("junit:junit:4.13.2") - testImplementation("org.hamcrest:hamcrest-library:1.3") -+ testImplementation("org.hamcrest:hamcrest-library:2.2") ++ testImplementation("org.hamcrest:hamcrest-library:2.2") // Leaf - Bump Dependencies - implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty +- implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty ++ implementation("io.netty:netty-all:4.1.89.Final"); // Paper - Bump netty // Leaf - Bump Dependencies } -@@ -228,3 +228,6 @@ tasks.registerRunTask("runDev") { + + val craftbukkitPackageVersion = "1_19_R2" // Paper +@@ -228,3 +230,6 @@ tasks.registerRunTask("runDev") { description = "Spin up a non-relocated Mojang-mapped test server" classpath(sourceSets.main.map { it.runtimeClasspath }) }