From b19eb28a37b02d95aa8adebe1ef9514e7fdd6904 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 13 Dec 2022 14:27:38 -0700 Subject: [PATCH] Update --- .github/workflows/build.yml | 26 ++++++++++++------------- build.gradle.kts | 8 ++++---- gradle.properties | 6 +++--- patches/server/0001-Build-changes.patch | 18 ++++++++--------- settings.gradle.kts | 2 +- 5 files changed, 29 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21a8d63..7a596c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,10 @@ name: Patch and Build -on: [ push, pull_request ] + +on: + push: + branches: [ "**" ] + pull_request: + jobs: build: # Only run on PRs if the source branch is on someone else's repo @@ -7,26 +12,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Git Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - - name: Cache Gradle - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 - name: Set up JDK - uses: actions/setup-java@v2.3.0 + uses: actions/setup-java@v3 with: distribution: 'temurin' 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 - run: ./gradlew applyPatches --stacktrace + run: ./gradlew applyPatches - name: Build - run: ./gradlew build --stacktrace + run: ./gradlew build diff --git a/build.gradle.kts b/build.gradle.kts index afde92b..ba3ffd2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,10 +2,10 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.6" + id("io.papermc.paperweight.patcher") version "1.4.0" } -val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" +val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" repositories { mavenCentral() @@ -15,8 +15,8 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.2:fat") - decompiler("net.minecraftforge:forgeflower:1.5.498.29") + remapper("net.fabricmc:tiny-remapper:0.8.6:fat") + decompiler("net.minecraftforge:forgeflower:2.0.605.1") paperclip("io.papermc:paperclip:3.0.2") } diff --git a/gradle.properties b/gradle.properties index 94e9bd2..829d5ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=com.example.paperfork -version=1.18.2-R0.1-SNAPSHOT +version=1.19.3-R0.1-SNAPSHOT -mcVersion=1.18.2 -paperRef=c449f6a1f712b81b50e250a2e258ef3e37fd6b9b +mcVersion=1.19.3 +paperRef=adb8e499dbc6050abf4a690d369cf506bc3ac318 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 0fa61ad..18163fc 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 dd8f449dddbe0838835ae8f8d5033aa422db403d..49f130227abc0c13a2b2e2c250c62e435ed15704 100644 +index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..497db79710a93e18c245ba8ac5853dd5ac6012b5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -9,8 +9,12 @@ plugins { +@@ -7,8 +7,12 @@ plugins { } dependencies { @@ -16,14 +16,14 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..49f130227abc0c13a2b2e2c250c62e43 - implementation(project(":paper-mojangapi")) + // ForkTest start + implementation(project(":forktest-api")) -+ implementation("io.papermc.paper:paper-mojangapi:1.18.2-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } + // ForkTest end // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -59,7 +63,7 @@ tasks.jar { +@@ -61,7 +65,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -32,7 +32,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..49f130227abc0c13a2b2e2c250c62e43 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -147,7 +151,7 @@ fun TaskContainer.registerRunTask( +@@ -133,7 +137,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -42,10 +42,10 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..49f130227abc0c13a2b2e2c250c62e43 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 c8d56947305c981a3268ce4ae3e975db350ceff2..467d8411a6894492d5188e27aa9b852d6cdb61d3 100644 +index 710ca7d3a5659953f64bc6dccdd93b43300961cc..57e0aa0341b359442e562ef4e213b1c785841788 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop