From 964cbc26104111aab5438347ba91ce0bca3b01cc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 Jan 2025 11:17:01 -0800
Subject: [PATCH] Configurable server mod name

---
 .../0013-Configurable-server-mod-name.patch   | 35 -------------------
 .../server/MinecraftServer.java.patch         | 11 ++++++
 .../org/purpurmc/purpur/PurpurConfig.java     |  5 +++
 3 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 patches/server/0013-Configurable-server-mod-name.patch
 create mode 100644 purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch
deleted file mode 100644
index 0dfaf817d..000000000
--- a/patches/server/0013-Configurable-server-mod-name.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 21 Mar 2020 11:47:39 -0500
-Subject: [PATCH] Configurable server mod name
-
-
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ce4ce361061932162ace58070d44d1aa70189dbd..d61f6cf5a5d3320516339a7078f2e9fb2ab59dfa 100644
---- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -2013,7 +2013,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
--        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
-+        return org.purpurmc.purpur.PurpurConfig.serverModName; // Paper // Purpur
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 82f0ae89ef3f0dc614edb4ccd3caa66cb387044c..47ffe5ef0429101414b33a41e91631712a92b32d 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -191,6 +191,11 @@ public class PurpurConfig {
-         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
-     }
- 
-+    public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
-+    private static void serverModName() {
-+        serverModName = getString("settings.server-mod-name", serverModName);
-+    }
-+
-     public static int barrelRows = 3;
-     public static boolean enderChestSixRows = false;
-     public static boolean enderChestPermissionRows = false;
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
new file mode 100644
index 000000000..d75ef2647
--- /dev/null
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/MinecraftServer.java
++++ b/net/minecraft/server/MinecraftServer.java
+@@ -1854,7 +_,7 @@
+ 
+     @DontObfuscate
+     public String getServerModName() {
+-        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
++        return org.purpurmc.purpur.PurpurConfig.serverModName; // Paper // Purpur - Configurable server mod name
+     }
+ 
+     public SystemReport fillSystemReport(SystemReport systemReport) {
diff --git a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 103b90bc6..a886a9f13 100644
--- a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -172,6 +172,11 @@ public class PurpurConfig {
         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
     }
 
+    public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
+    private static void serverModName() {
+        serverModName = getString("settings.server-mod-name", serverModName);
+    }
+
     public static int barrelRows = 3;
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;