Skip to content

Commit 4729256

Browse files
committed
Update to 26.1.2
1 parent 3ef0ba6 commit 4729256

19 files changed

Lines changed: 5126 additions & 4889 deletions

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.papermc.paperweight.tasks.RebuildGitPatches
44

55
plugins {
66
java // TODO java launcher tasks
7-
id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
7+
id("io.papermc.paperweight.patcher") version "2.0.0-beta.21"
88
}
99

1010
paperweight {
@@ -39,7 +39,7 @@ subprojects {
3939

4040
extensions.configure<JavaPluginExtension> {
4141
toolchain {
42-
languageVersion = JavaLanguageVersion.of(21)
42+
languageVersion = JavaLanguageVersion.of(25)
4343
}
4444
}
4545

@@ -58,7 +58,7 @@ subprojects {
5858
}
5959
tasks.withType<JavaCompile>().configureEach {
6060
options.encoding = Charsets.UTF_8.name()
61-
options.release = 21
61+
options.release = 25
6262
options.isFork = true
6363
}
6464
tasks.withType<Javadoc>().configureEach {

folia-api/build.gradle.kts.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--- a/paper-api/build.gradle.kts
22
+++ b/paper-api/build.gradle.kts
33
@@ -91,7 +_,7 @@
4-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
4+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
55
}
66

77
-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
@@ -37,7 +37,7 @@
3737
options.use()
3838
options.isDocFilesSubDirs = true
3939
options.links(
40-
@@ -216,11 +_,11 @@
40+
@@ -217,11 +_,11 @@
4141
}
4242

4343
// workaround for https://github.com/gradle/gradle/issues/4046

folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add TPS From Region
55

66

77
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
8-
index 14d81c7b138ebf999d5812d26fbf869209c100f3..b9d34c0b80a5d0c26f43e4959c3a8256a854585a 100644
8+
index 77473d9de8283a557ca061b0429dee9312de7d6b..bfebdc317c71d16db742416db590505c66529673 100644
99
--- a/src/main/java/org/bukkit/Bukkit.java
1010
+++ b/src/main/java/org/bukkit/Bukkit.java
1111
@@ -2987,6 +2987,42 @@ public final class Bukkit {
@@ -52,10 +52,10 @@ index 14d81c7b138ebf999d5812d26fbf869209c100f3..b9d34c0b80a5d0c26f43e4959c3a8256
5252
/**
5353
* @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
5454
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
55-
index 0ec885b97d655c03371840d739b47063494ed36f..1dc5d8c96786950fc98cada5bad981c0c716b154 100644
55+
index dd8ad5976eb413f049245a4f37bd94b3e41829de..23901bb9e01a90dc5f12e458b7188d51e91022b4 100644
5656
--- a/src/main/java/org/bukkit/Server.java
5757
+++ b/src/main/java/org/bukkit/Server.java
58-
@@ -2761,4 +2761,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
58+
@@ -2780,4 +2780,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
5959
*/
6060
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
6161
// Paper end - API to check if the server is sleeping

folia-server/build.gradle.kts.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
+ activeFork = fork
2020
+
2121
+
22-
spigot {
23-
enabled = true
24-
buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
25-
@@ -104,7 +_,19 @@
22+
updatingMinecraft {
23+
// oldPaperCommit = "7e80cef5198561d0db53406127e5b8bc7af51577"
24+
}
25+
@@ -86,7 +_,19 @@
2626
}
2727
}
2828

@@ -43,16 +43,16 @@
4343
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
4444
extendsFrom(configurations.compileClasspath.get())
4545
}
46-
@@ -127,7 +_,7 @@
46+
@@ -109,7 +_,7 @@
4747
}
4848

4949
dependencies {
5050
- implementation(project(":paper-api"))
5151
+ implementation(project(":folia-api"))
52-
implementation("ca.spottedleaf:concurrentutil:0.0.8")
52+
implementation("ca.spottedleaf:concurrentutil:0.0.10")
5353
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
5454
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
55-
@@ -198,14 +_,14 @@
55+
@@ -171,14 +_,14 @@
5656
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
5757
attributes(
5858
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -71,7 +71,7 @@
7171
"Build-Number" to (build ?: ""),
7272
"Build-Time" to buildTime.toString(),
7373
"Git-Branch" to gitBranch,
74-
@@ -357,7 +_,7 @@
74+
@@ -316,7 +_,7 @@
7575
}
7676

7777
fill {

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 3550 additions & 3276 deletions
Large diffs are not rendered by default.

folia-server/minecraft-patches/features/0002-Max-pending-logins.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Max pending logins
66
Should help the floodgates on launch
77

88
diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
9-
index 605fbd9f16e6b969b3976dd1a905387ac0037c8a..69f694995848173c2f3137aa8e9706be6fd3a9ae 100644
9+
index 823a610458c48ada2bf2412d64dc0e998d649870..ed905df09f24363044509e1e3d838fb25a69a002 100644
1010
--- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
1111
+++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
1212
@@ -100,7 +100,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -19,7 +19,7 @@ index 605fbd9f16e6b969b3976dd1a905387ac0037c8a..69f694995848173c2f3137aa8e9706be
1919

2020
if (this.state == ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT
2121
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
22-
index e0654190600925b912703e026cc716864f0741fd..63af5268e2fade40478e270116a888c06d736900 100644
22+
index 086dc3aa695d5a6798e42ec8841e8b233e5f9962..96856e17b510deaa570c8ee891a43bc6c9854749 100644
2323
--- a/net/minecraft/server/players/PlayerList.java
2424
+++ b/net/minecraft/server/players/PlayerList.java
2525
@@ -150,6 +150,17 @@ public abstract class PlayerList {

folia-server/minecraft-patches/features/0003-Add-chunk-system-throughput-counters-to-tps.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index 96ccb8f657d755b2e58a8dd0cda00ca0df4886b2..fd48134ab73d3096bc86402b4eb393c8
5858
chunk = wrappedFull.getWrapped();
5959
} else {
6060
diff --git a/io/papermc/paper/threadedregions/commands/CommandServerHealth.java b/io/papermc/paper/threadedregions/commands/CommandServerHealth.java
61-
index 2bb43161f4864c37d8c50854c6608dd02acf1fc7..2c3a3c9dd48b096d12bbff344750a1eae1f0549e 100644
61+
index a80983c10fe39db500512b88442b9b3c30d03b12..7826c50b7c7c59e148905337ddc0dc8085f3f7c1 100644
6262
--- a/io/papermc/paper/threadedregions/commands/CommandServerHealth.java
6363
+++ b/io/papermc/paper/threadedregions/commands/CommandServerHealth.java
6464
@@ -169,6 +169,9 @@ public final class CommandServerHealth extends Command {

0 commit comments

Comments
 (0)