From 07763ce642eb166043ab1acc34cbee91a80976f7 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:55:34 -0800 Subject: [PATCH] Use patcher beta --- .github/workflows/build.yml | 2 -- .gitmodules | 3 --- build.gradle.kts | 4 ++-- build_paperweight.sh | 5 ----- paperweight | 1 - 5 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 .gitmodules delete mode 100755 build_paperweight.sh delete mode 160000 paperweight diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15767bd99..4434243b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,6 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Configure Git User Details run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions" - - name: build paperweight - run: ./build_paperweight.sh - name: Apply Patches run: ./gradlew applyAllPatches --stacktrace - name: Build diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 5fd5230fd..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "paperweight"] - path = paperweight - url = https://github.com/PaperMC/paperweight.git diff --git a/build.gradle.kts b/build.gradle.kts index 9f4a89988..b718eaa50 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,12 +3,12 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { java // TODO java launcher tasks - id("io.papermc.paperweight.patcher") version "2.0.0-SNAPSHOT" + id("io.papermc.paperweight.patcher") version "2.0.0-beta.8" } paperweight { upstreams.paper { - ref = "1dc6ad1df07e018ee68d95464022285f27fff916" + ref = "54debf494f467a71c561cf8765c4f21725c99dd8" patchFile { path = "paper-server/build.gradle.kts" diff --git a/build_paperweight.sh b/build_paperweight.sh deleted file mode 100755 index 7a77305f1..000000000 --- a/build_paperweight.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eou pipefail -git submodule update --init --recursive -cd paperweight -./gradlew pTML diff --git a/paperweight b/paperweight deleted file mode 160000 index e8ebbf244..000000000 --- a/paperweight +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e8ebbf2449eb294705d370d9485b26091c21f91b