From 443f09d9e7d6e01bf9c30ebbcbd248d7eb46a99f Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Sun, 2 Jun 2024 22:01:33 +0900 Subject: [PATCH] real build fix --- .github/workflows/release.yml | 2 +- .../main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt | 1 + patches/server/0004-Fork-friendly-Rebranding.patch | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56191ba..8465d3c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,9 +4,9 @@ on: push: branches: [ "ver/*", "dev/*", "feat/**/*" ] paths: - - "release.yml" - "*.patch" - "gradle.properties" + - "release.yml" workflow_dispatch: env: diff --git a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt index ac16f4f..cc88a7a 100644 --- a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt +++ b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt @@ -13,6 +13,7 @@ import org.plazmamc.alwaysuptodate.utils.registerTask class AlwaysUpToDate : Plugin { + @Suppress("UNUSED_VARIABLE") override fun apply(target: Project): Unit = with(target) { Git.checkForGit() diff --git a/patches/server/0004-Fork-friendly-Rebranding.patch b/patches/server/0004-Fork-friendly-Rebranding.patch index e764fbe..85d777e 100644 --- a/patches/server/0004-Fork-friendly-Rebranding.patch +++ b/patches/server/0004-Fork-friendly-Rebranding.patch @@ -164,7 +164,7 @@ index 0000000000000000000000000000000000000000..af534fb15be2be3e5b4258c522e0e6c9 + +} diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -index a27797afd0dc262a72dbd7906c6f00641619c7eb..a4af02bddf744b6ab271096d1b526cc4c0ec97eb 100644 +index a27797afd0dc262a72dbd7906c6f00641619c7eb..a337e2c9576fb70a8ee9082e9b69719c804b286e 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java @@ -30,10 +30,6 @@ public record ServerBuildInfoImpl( @@ -186,7 +186,7 @@ index a27797afd0dc262a72dbd7906c6f00641619c7eb..a4af02bddf744b6ab271096d1b526cc4 + .orElse(BRAND_ID), // Purpur // Plazma - Fork-friendly Rebranding getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME) - .orElse(BRAND_PURPUR_NAME), // Purpur -+ .orElse(BRAND_NAME), // Purpur // Plazma - Fork-friendly Rebranding ++ .orElse(ServerBrandConstants.BRAND_NAME), // Purpur // Plazma - Fork-friendly Rebranding SharedConstants.getCurrentVersion().getId(), SharedConstants.getCurrentVersion().getName(), getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)