Fix rebranding
This commit is contained in:
@@ -5,15 +5,19 @@ Subject: [PATCH] Rebrand to Luminol
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||||
index 652ff54e7c50412503725d628bfe72ed03059790..ee163b9fa8f441aa4b3e2309f33e8f932dfc02d7 100644
|
index 652ff54e7c50412503725d628bfe72ed03059790..db5e2f10278c20286779362cfdfadb2f42c724e0 100644
|
||||||
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||||
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||||
@@ -19,6 +19,13 @@ public interface ServerBuildInfo {
|
@@ -19,6 +19,17 @@ public interface ServerBuildInfo {
|
||||||
*/
|
*/
|
||||||
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
||||||
|
|
||||||
+ // Luminol start
|
+ // Luminol start
|
||||||
+ /**
|
+ /**
|
||||||
|
+ * The brand id for folia
|
||||||
|
+ */
|
||||||
|
+ Key BRAND_FOLIA_ID = Key.key("papermc", "folia");
|
||||||
|
+ /**
|
||||||
+ * The brand id for Luminol.
|
+ * The brand id for Luminol.
|
||||||
+ */
|
+ */
|
||||||
+ Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
|
+ Key BRAND_LUMINOL_ID = Key.key("luminolmc", "luminol");
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ index 29bd788ae8bc61c1e62a4f84b9e259931a7041ce..1676ac5e6c8369836bf719f338603fbb
|
|||||||
} else {
|
} else {
|
||||||
final Optional<String> gitBranch = build.gitBranch();
|
final Optional<String> gitBranch = build.gitBranch();
|
||||||
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 e741201fdbea0dbbc0e42313ebd33368014c9dc4..673a81734a0903a0790f3007772642d3d9a044cc 100644
|
index e741201fdbea0dbbc0e42313ebd33368014c9dc4..e3c5f4c31f084294a59830f3e764921433dd80d5 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
|
||||||
@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
|
@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl(
|
||||||
@@ -91,7 +91,7 @@ index e741201fdbea0dbbc0e42313ebd33368014c9dc4..673a81734a0903a0790f3007772642d3
|
|||||||
@Override
|
@Override
|
||||||
public boolean isBrandCompatible(final @NotNull Key brandId) {
|
public boolean isBrandCompatible(final @NotNull Key brandId) {
|
||||||
- return brandId.equals(this.brandId);
|
- return brandId.equals(this.brandId);
|
||||||
+ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Luminol
|
+ return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_FOLIA_ID); // Luminol
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user