Skip to content

Add configuration option for MiniMessage-formatted MOTD #8242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wordandahalf wants to merge 2 commits into from
Closed

Add configuration option for MiniMessage-formatted MOTD #8242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
124b763
Add MOTD configuration option
wordandahalf Aug 8, 2022
fdc8aac
Use MOTD provided in Paper config, if it exists
wordandahalf Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions patches/server/0004-Paper-config-files.patch → patches/server/0096-Paper-config-files.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,10 @@ index 0000000000000000000000000000000000000000..31325994ab441c59a4c0bd9f3f9db3d9
+}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..456595e4b7e0c7f50617aa2694b0d2dfc368ab81
index 0000000000000000000000000000000000000000..f5100edd1bd664326d7b47b50d3a9f687ecb03d2
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -0,0 +1,265 @@
@@ -0,0 +1,269 @@
+package io.papermc.paper.configuration;
+
+import co.aikar.timings.MinecraftTimings;
Expand Down Expand Up @@ -467,6 +467,10 @@ index 0000000000000000000000000000000000000000..456595e4b7e0c7f50617aa2694b0d2df
+ }
+
+ public Component noPermission = Component.text("I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is in error.", NamedTextColor.RED);
+
+ @Nullable
+ public Component motd = null;
+
+ public boolean useDisplayNameInQuitMessage = false;
+ }
+
Expand Down Expand Up @@ -4193,7 +4197,7 @@ index 853e7c2019f5147e9681e95a82eaef0825b6341e..a48a12a31a3d09a9373b688dcc093035
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e7b1456a123208241d0b1c5956a137d6a5cfbfcd..7740e69617c3d543a67ed0942ba8ec550ad4386d 100644
index 15ecb1769a0604eed348b0cd31b86ce2010cbda0..8d65c989aef5ec92873a504f5b331dfe7d8b4bff 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -281,6 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand Down Expand Up @@ -4319,7 +4323,7 @@ index dbaec6fc4967d8140fd5af68456894bad1a0205a..4f67f7541ff257f35701610760fb8e04
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index f264607eb3df1f247c7c36d328405900b52df38e..b05cea49219c6582bacc705f41e72ca7c7eb6a8c 100644
index eca7833e722a876be29806c92b18b6b58aab5725..e8d71985f2e96574081e4f609d62a3b8bded8249 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -129,6 +129,19 @@ public class Main {
Expand Down
23 changes: 23 additions & 0 deletions patches/server/1025-Use-MOTD-provided-in-Paper-config-if-it-exists.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: wordandahalf <10679776+wordandahalf@users.noreply.github.com>
Date: Sun, 7 Aug 2022 20:06:23 -0500
Subject: [PATCH] Use MOTD provided in Paper config, if it exists


diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..750ed134ebf520ce91f9ea3d4ead3a56b624b566 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2184,6 +2184,12 @@ public final class CraftServer implements Server {
// Paper start
@Override
public net.kyori.adventure.text.Component motd() {
+ net.kyori.adventure.text.Component paperMotd =
+ io.papermc.paper.configuration.GlobalConfiguration.get().messages.motd;
+
+ if (paperMotd != null)
+ return paperMotd;
+
return console.getComponentMotd();
}
// Paper end