From 53dbd2bc9c82d8597192adb58fa94a7eae506429 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 16 Nov 2021 21:27:00 -0800 Subject: [PATCH] Update upstream & paperweight to 1.2.0 --- .github/workflows/build.yml | 2 +- build.gradle.kts | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- patches/server/0001-Build-changes.patch | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45f806e..21a8d63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-java@v2.3.0 with: distribution: 'temurin' - java-version: '16' + java-version: '17' - name: Configure Git User Details run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions" - name: Apply Patches diff --git a/build.gradle.kts b/build.gradle.kts index 851c280..ac921e5 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.1.14" + id("io.papermc.paperweight.patcher") version "1.2.0" } repositories { diff --git a/gradle.properties b/gradle.properties index 19b471c..df41bc0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.example.paperfork version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 -paperRef=485d15ff8f6e0171fccaecfd4d237289b9d2b263 +paperRef=f3830bc214c0ef7e7a84712ce48c353946b1094f org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-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 914d650..f5631b6 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index d78267e02a705ffa9083815da0df042d3a184837..317e01839efed7631a46f6ee51e3dc44f56d69f1 100644 +index e067c69fea1dec79ef8e97cad1c74020b6a3a235..1e697c30a9e9db2739ce1386bd1e8aad127cba77 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -25,8 +25,8 @@ repositories { +@@ -22,8 +22,8 @@ repositories { } dependencies { @@ -19,7 +19,7 @@ index d78267e02a705ffa9083815da0df042d3a184837..317e01839efed7631a46f6ee51e3dc44 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -77,7 +77,7 @@ tasks.jar { +@@ -74,7 +74,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,7 +28,7 @@ index d78267e02a705ffa9083815da0df042d3a184837..317e01839efed7631a46f6ee51e3dc44 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -203,7 +203,7 @@ tasks.test { +@@ -201,7 +201,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -38,10 +38,10 @@ index d78267e02a705ffa9083815da0df042d3a184837..317e01839efed7631a46f6ee51e3dc44 workingDir = rootProject.layout.projectDirectory.dir( providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run") diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7636b0ae9031e06fd8b4a0c359a45a17e6e075de..8e953a0d275e7a0e8ddacc0baef4acff8272bb90 100644 +index 5a4172faaf960d48939d6a485719041987df9242..57c67adb8e12e41fa06198c40e4f50c0df048c02 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1726,7 +1726,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop