From c5f50af156415552197a464f6c7852ea8aa5d08c Mon Sep 17 00:00:00 2001 From: tksimeji Date: Wed, 11 Feb 2026 15:22:00 +0900 Subject: [PATCH 1/4] build: update the paperweight-patcher plugin to version 2.0.0-beta.19 --- build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f32ea579cc..1af0dac50a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { - id("io.papermc.paperweight.patcher") version "2.0.0-beta.18" + id("io.papermc.paperweight.patcher") version "2.0.0-beta.19" } paperweight { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da476..37f78a6af8 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-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 933d7fc576020229ac1a45b9c99ddcfc01f40581 Mon Sep 17 00:00:00 2001 From: tksimeji Date: Wed, 11 Feb 2026 17:16:03 +0900 Subject: [PATCH 2/4] build: patch build.gradle.kts for fork-api and fork-server to match paper 1.21.11 --- .editorconfig | 3 +++ fork-api/build.gradle.kts.patch | 8 +++--- fork-server/build.gradle.kts.patch | 40 ++++++++++++++++-------------- gradle.properties | 6 ++--- 4 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..3652786e4c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +# Prevent Intellij IDEA from removing contextually spaced lines +[{fork-api,fork-server}/**/*.patch] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/fork-api/build.gradle.kts.patch b/fork-api/build.gradle.kts.patch index 2b27b97fa4..f4f5d5d935 100644 --- a/fork-api/build.gradle.kts.patch +++ b/fork-api/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/paper-api/build.gradle.kts +++ b/paper-api/build.gradle.kts -@@ -90,7 +_,7 @@ +@@ -91,7 +_,7 @@ testRuntimeOnly("org.junit.platform:junit-platform-launcher") } @@ -9,7 +9,7 @@ idea { module { generatedSourceDirs.add(generatedDir.toFile()) -@@ -100,6 +_,18 @@ +@@ -101,6 +_,18 @@ main { java { srcDir(generatedDir) @@ -28,7 +28,7 @@ } } } -@@ -166,7 +_,7 @@ +@@ -183,7 +_,7 @@ tasks.withType().configureEach { val options = options as StandardJavadocDocletOptions @@ -37,7 +37,7 @@ options.use() options.isDocFilesSubDirs = true options.links( -@@ -199,11 +_,11 @@ +@@ -216,11 +_,11 @@ } // workaround for https://github.com/gradle/gradle/issues/4046 diff --git a/fork-server/build.gradle.kts.patch b/fork-server/build.gradle.kts.patch index e21501db67..d5461c645b 100644 --- a/fork-server/build.gradle.kts.patch +++ b/fork-server/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts -@@ -26,6 +_,17 @@ +@@ -22,6 +_,17 @@ minecraftVersion = providers.gradleProperty("mcVersion") gitFilePatches = false @@ -17,39 +17,26 @@ + spigot { enabled = true - buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44" -@@ -107,7 +_,20 @@ + buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9" +@@ -104,7 +_,9 @@ } } -val log4jPlugins = sourceSets.create("log4jPlugins") -+sourceSets { -+ main { -+ java { srcDir("../paper-server/src/main/java") } -+ resources { srcDir("../paper-server/src/main/resources") } -+ } -+ test { -+ java { srcDir("../paper-server/src/test/java") } -+ resources { srcDir("../paper-server/src/test/resources") } -+ } -+} -+ +val log4jPlugins = sourceSets.create("log4jPlugins") { + java { srcDir("../paper-server/src/log4jPlugins/java") } +} configurations.named(log4jPlugins.compileClasspathConfigurationName) { extendsFrom(configurations.compileClasspath.get()) } -@@ -129,7 +_,7 @@ - } - +@@ -129,5 +_,5 @@ dependencies { - implementation(project(":paper-api")) + implementation(project(":fork-api")) - implementation("ca.spottedleaf:concurrentutil:0.0.3") + implementation("ca.spottedleaf:concurrentutil:0.0.8") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -266,7 +_,7 @@ +@@ -264,16 +_,20 @@ jvmArgumentProviders.add(provider) } @@ -58,3 +45,18 @@ idea { module { generatedSourceDirs.add(generatedDir.toFile()) + } + } + sourceSets { + main { +- java { +- srcDir(generatedDir) +- } ++ java { srcDir("../paper-server/src/main/java") } ++ resources { srcDir("../paper-server/src/main/resources") } ++ } ++ test { ++ java { srcDir("../paper-server/src/test/java") } ++ resources { srcDir("../paper-server/src/test/resources") } + } + } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 41a6ef33eb..3906e9f1b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=fork.test -version=1.21.8-R0.1-SNAPSHOT -mcVersion=1.21.8 -paperRef=103187750e29fd982b84b2bab114fe5af98a82e5 +version=1.21.11-R0.1-SNAPSHOT +mcVersion=1.21.11 +paperRef=6103cc7f608badbd5e4fab95a2161cf398d5074f org.gradle.configuration-cache=true org.gradle.caching=true From c22d45b7c7d66886fe8cce3d26864d3b37fb3e8a Mon Sep 17 00:00:00 2001 From: tksimeji Date: Wed, 11 Feb 2026 17:24:55 +0900 Subject: [PATCH 3/4] build: support changing the path from net.minecraft.BlockUtil to net.minecraft.util.BlockUtil --- .../sources/net/minecraft/{ => util}/BlockUtil.java.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename fork-server/minecraft-patches/sources/net/minecraft/{ => util}/BlockUtil.java.patch (74%) diff --git a/fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch b/fork-server/minecraft-patches/sources/net/minecraft/util/BlockUtil.java.patch similarity index 74% rename from fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch rename to fork-server/minecraft-patches/sources/net/minecraft/util/BlockUtil.java.patch index a2792a088b..5fd85be648 100644 --- a/fork-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch +++ b/fork-server/minecraft-patches/sources/net/minecraft/util/BlockUtil.java.patch @@ -1,10 +1,10 @@ ---- a/net/minecraft/BlockUtil.java -+++ b/net/minecraft/BlockUtil.java +--- a/net/minecraft/util/BlockUtil.java ++++ b/net/minecraft/util/BlockUtil.java @@ -16,6 +_,7 @@ public static BlockUtil.FoundRectangle getLargestRectangleAround( BlockPos centerPos, Direction.Axis axis1, int max1, Direction.Axis axis2, int max2, Predicate posPredicate ) { -+ System.out.println("hello"); ++ System.out.println("This is a test of paperweight-patcher!"); BlockPos.MutableBlockPos mutableBlockPos = centerPos.mutable(); Direction direction = Direction.get(Direction.AxisDirection.NEGATIVE, axis1); Direction opposite = direction.getOpposite(); From 9dfe236fdf8fc1b7a7f2dee416dfb049fb0e5e37 Mon Sep 17 00:00:00 2001 From: tksimeji Date: Wed, 11 Feb 2026 18:50:46 +0900 Subject: [PATCH 4/4] fix: fix issue where runDevServer fails with source sets --- fork-server/build.gradle.kts.patch | 10 +++++----- gradle.properties | 1 + settings.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fork-server/build.gradle.kts.patch b/fork-server/build.gradle.kts.patch index d5461c645b..8833b71dae 100644 --- a/fork-server/build.gradle.kts.patch +++ b/fork-server/build.gradle.kts.patch @@ -36,7 +36,7 @@ implementation("ca.spottedleaf:concurrentutil:0.0.8") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -264,16 +_,20 @@ +@@ -264,16 +_,22 @@ jvmArgumentProviders.add(provider) } @@ -49,10 +49,10 @@ } sourceSets { main { -- java { -- srcDir(generatedDir) -- } -+ java { srcDir("../paper-server/src/main/java") } + java { + srcDir(generatedDir) ++ srcDir("../paper-server/src/main/java") + } + resources { srcDir("../paper-server/src/main/resources") } + } + test { diff --git a/gradle.properties b/gradle.properties index 3906e9f1b8..53ca4a8854 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ group=fork.test version=1.21.11-R0.1-SNAPSHOT mcVersion=1.21.11 +apiVersion=1.21.11 paperRef=6103cc7f608badbd5e4fab95a2161cf398d5074f org.gradle.configuration-cache=true diff --git a/settings.gradle.kts b/settings.gradle.kts index fb5080d9e7..cacf7ed2f1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "fork"