diff --git a/build.gradle.kts b/build.gradle.kts index 3fdbe4d2e..f6df2f3d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,8 @@ plugins { java `maven-publish` - // Nothing special about this, just keep it up to date - id("com.github.johnrengelman.shadow") version "8.1.1" apply false - // In general, keep this version in sync with upstream. Sometimes a newer version than upstream might work, but an older version is extremely likely to break. - id("io.papermc.paperweight.patcher") version "1.5.11" + id("io.papermc.paperweight.patcher") version "1.7.1" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" @@ -21,8 +18,8 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.10:fat") // Must be kept in sync with upstream - decompiler("net.minecraftforge:forgeflower:2.0.627.2") // Must be kept in sync with upstream + remapper("net.fabricmc:tiny-remapper:0.10.2:fat") // Must be kept in sync with upstream + decompiler("org.vineflower:vineflower:1.10.1") // Must be kept in sync with upstream paperclip("io.papermc:paperclip:3.0.3") // You probably want this to be kept in sync with upstream } @@ -32,7 +29,7 @@ allprojects { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } } @@ -40,7 +37,7 @@ allprojects { subprojects { tasks.withType { options.encoding = Charsets.UTF_8.name() - options.release = 17 + options.release = 21 } tasks.withType { options.encoding = Charsets.UTF_8.name() @@ -105,7 +102,6 @@ paperweight { tasks.generateDevelopmentBundle { apiCoordinates = "com.example.paperfork:forktest-api" - mojangApiCoordinates = "io.papermc.paper:paper-mojangapi" libraryRepositories = listOf( "https://repo.maven.apache.org/maven2/", paperMavenPublicUrl, diff --git a/gradle.properties b/gradle.properties index e54dd9769..9cd5bb394 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=com.example.paperfork -version=1.20.4-R0.1-SNAPSHOT +version=1.20.6-R0.1-SNAPSHOT -mcVersion=1.20.4 +mcVersion=1.20.6 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917..e6441136f 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 1af9e0930..b82aa23a4 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f1..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index c801e6052..b105d748b 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,25 +5,19 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 58da26ad2f128ba0b66f86820f60853f4be352f0..c23e342dcb54d51bd4460a89cb315856b73b63b3 100644 +index 87bb3fd9b97506f61734ae7f2e6860610ba794e7..7e2017f8fceeadc39f82c1559f3b78bf43e055d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { +@@ -12,7 +12,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { val alsoShade: Configuration by configurations.creating dependencies { - implementation(project(":paper-api")) -- implementation(project(":paper-mojangapi")) -+ // ForkTest start -+ implementation(project(":forktest-api")) -+ implementation("io.papermc.paper:paper-mojangapi:1.20.2-R0.1-SNAPSHOT") { -+ exclude("io.papermc.paper", "paper-api") -+ } -+ // ForkTest end ++ implementation(project(":forktest-api")) // ForkTest - update api reference // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -70,7 +74,7 @@ tasks.jar { +@@ -78,7 +78,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -32,7 +26,7 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..c23e342dcb54d51bd4460a89cb315856 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -154,7 +158,7 @@ fun TaskContainer.registerRunTask( +@@ -137,7 +137,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -42,23 +36,23 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..c23e342dcb54d51bd4460a89cb315856 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..eb6b51d5799c677e00ec132078c9305fbc6cccb6 100644 +index 39303bb4e336732db0ab19dee0c1f8b609bbb134..55d308d092b2c7c0d02e46f0cb255aec59d28049 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1866,7 +1866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! +- return "Paper"; // Paper + return "ForkTest"; // ForkTest - ForkTest > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 142d2c48239d4ebe3896218536656d116cd24d7c..2005d2b42e390e0bf6928285b393ea47d0c6e333 100644 +index da1aed63af837b193900bb85393611edbd56c363..6acf6e1acbcc21444d015bdd49901d078736498b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper +@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { diff --git a/work/Paper b/work/Paper index 07b956e3a..3fc93581b 160000 --- a/work/Paper +++ b/work/Paper @@ -1 +1 @@ -Subproject commit 07b956e3a30d9cd192111829b59bdf4372f128b1 +Subproject commit 3fc93581bb876e8149b2ca423375a98f5ca12d27