Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

real build fix

Browse Source
This commit is contained in:
AlphaKR93
2024-06-02 22:01:33 +09:00
parent 1d63c3808d
commit 443f09d9e7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@@ -4,9 +4,9 @@ on:
push: push:
branches: [ "ver/*", "dev/*", "feat/**/*" ] branches: [ "ver/*", "dev/*", "feat/**/*" ]
paths: paths:
- "release.yml"
- "*.patch" - "*.patch"
- "gradle.properties" - "gradle.properties"
- "release.yml"
workflow_dispatch: workflow_dispatch:
env: env:

1
buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt
View File

@@ -13,6 +13,7 @@ import org.plazmamc.alwaysuptodate.utils.registerTask
class AlwaysUpToDate : Plugin<Project> { class AlwaysUpToDate : Plugin<Project> {
@Suppress("UNUSED_VARIABLE")
override fun apply(target: Project): Unit = with(target) { override fun apply(target: Project): Unit = with(target) {
Git.checkForGit() Git.checkForGit()

4
patches/server/0004-Fork-friendly-Rebranding.patch
View File

@@ -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 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 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
@@ -30,10 +30,6 @@ public record ServerBuildInfoImpl( @@ -30,10 +30,6 @@ public record ServerBuildInfoImpl(
@@ -186,7 +186,7 @@ index a27797afd0dc262a72dbd7906c6f00641619c7eb..a4af02bddf744b6ab271096d1b526cc4
+ .orElse(BRAND_ID), // Purpur // Plazma - Fork-friendly Rebranding + .orElse(BRAND_ID), // Purpur // Plazma - Fork-friendly Rebranding
getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME) getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
- .orElse(BRAND_PURPUR_NAME), // Purpur - .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().getId(),
SharedConstants.getCurrentVersion().getName(), SharedConstants.getCurrentVersion().getName(),
getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER) getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)