mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-23 08:49:18 +00:00
d39afc08ca
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@2af2e71 Updated Upstream (Paper) PurpurMC/Purpur@ffeb49d ignore `item_model` component for don't run with scissors feature alongside `custom_model_data` component
55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sat, 18 May 2024 01:10:38 +0300
|
|
Subject: [PATCH] Divine Branding
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 49546dfbb4dd006b5a2419908890ba4c2a0e207a..db5b44861cabd70f7d9acb6a8a951efd68b97a18 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -257,3 +257,12 @@ tasks.check {
|
|
dependsOn(scanJarForOldGeneratedCode)
|
|
}
|
|
// Paper end
|
|
+
|
|
+// DivineMC start - Hide unnecessary compilation warnings
|
|
+tasks.withType<JavaCompile> {
|
|
+ val compilerArgs = options.compilerArgs
|
|
+ compilerArgs.add("-Xlint:-module")
|
|
+ compilerArgs.add("-Xlint:-removal")
|
|
+ compilerArgs.add("-Xlint:-dep-ann")
|
|
+}
|
|
+// DivineMC end
|
|
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
index 7196594e07af19a14c320d77df893978525fe386..6811f38a2eaf614c8237190800a48d101c39cd99 100644
|
|
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
@@ -33,6 +33,13 @@ public interface ServerBuildInfo {
|
|
Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
|
|
// Purpur end
|
|
|
|
+ // DivineMC start
|
|
+ /**
|
|
+ * The brand id for DivineMC.
|
|
+ */
|
|
+ Key BRAND_DIVINEMC_ID = Key.key("divinemc", "divinemc");
|
|
+ // DivineMC end
|
|
+
|
|
/**
|
|
* Gets the {@code ServerBuildInfo}.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index c880d0010849ab733ad13bbd18fab3c864d0cf61..de6522adba933dca90338bfb19f833486e696b8d 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -259,7 +259,7 @@ public class VersionCommand extends BukkitCommand {
|
|
// Purpur start
|
|
int distance = getVersionFetcher().distance();
|
|
final Component message = Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()),
|
|
- ChatColor.parseMM("<grey>Current Purpur Version: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
|
|
+ ChatColor.parseMM("<grey>Current DivineMC Version: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()), // DivineMC
|
|
// Purpur end
|
|
msg
|
|
);
|