From ad960f72e1b54973be3ddcef29e3688c9dcd72c9 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Thu, 2 Dec 2021 00:00:38 -0800 Subject: [PATCH] Update upstream --- build.gradle.kts | 12 +++++----- gradle.properties | 6 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- patches/server/0001-Build-changes.patch | 30 ++++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ac921e5..90c4d7f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.0" apply false - id("io.papermc.paperweight.patcher") version "1.2.0" + id("io.papermc.paperweight.patcher") version "1.3.1" } repositories { @@ -15,9 +15,9 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.6.0:fat") - decompiler("net.minecraftforge:forgeflower:1.5.498.12") - paperclip("io.papermc:paperclip:2.0.1") + remapper("net.fabricmc:tiny-remapper:0.7.0:fat") + decompiler("net.minecraftforge:forgeflower:1.5.498.22") + paperclip("io.papermc:paperclip:3.0.2") } allprojects { @@ -26,7 +26,7 @@ allprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(16)) + languageVersion.set(JavaLanguageVersion.of(17)) } } } @@ -34,7 +34,7 @@ allprojects { subprojects { tasks.withType { options.encoding = Charsets.UTF_8.name() - options.release.set(16) + options.release.set(17) } tasks.withType { options.encoding = Charsets.UTF_8.name() diff --git a/gradle.properties b/gradle.properties index df41bc0..6d99bda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=com.example.paperfork -version=1.17.1-R0.1-SNAPSHOT +version=1.18-R0.1-SNAPSHOT -mcVersion=1.17.1 -paperRef=f3830bc214c0ef7e7a84712ce48c353946b1094f +mcVersion=1.18 +paperRef=956124f86a93515cf67ee850e96cfd7bc58e27e8 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..84d1f85 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index f5631b6..a165114 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,21 +5,21 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1e697c30a9e9db2739ce1386bd1e8aad127cba77 100644 +index cd74406039704e5a880f00b9b60bb7b1dedc5398..f11c3e2eb81181075c51c624e00c466de50d3a18 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -22,8 +22,8 @@ repositories { +@@ -18,8 +18,8 @@ repositories { } dependencies { -- implementation(project(":Paper-API")) -- implementation(project(":Paper-MojangAPI")) +- implementation(project(":paper-api")) +- implementation(project(":paper-mojangapi")) + implementation(project(":ForkTest-API")) // ForkTest -+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // ForkTest ++ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // ForkTest // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -74,7 +74,7 @@ tasks.jar { +@@ -67,7 +67,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,20 +28,20 @@ index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1e697c30a9e9db2739ce1386bd1e8aad "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -201,7 +201,7 @@ tasks.test { - fun TaskContainer.registerRunTask( - name: String, block: JavaExec.() -> Unit +@@ -158,7 +158,7 @@ fun TaskContainer.registerRunTask( + name: String, + block: JavaExec.() -> Unit ): TaskProvider = register(name) { - group = "paper" + group = "paperweight" + mainClass.set("org.bukkit.craftbukkit.Main") standardInput = System.`in` - workingDir = rootProject.layout.projectDirectory.dir( - providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") + 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 5a4172faaf960d48939d6a485719041987df9242..57c67adb8e12e41fa06198c40e4f50c0df048c02 100644 +index 893badbe321fa974cb82f5f11ab590bb3827f8b8..4aba540f4bc8014548cc10818472431dfa6b2ede 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1729,7 +1729,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop