mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
update purpur rebrand settings
This commit is contained in:
@@ -62,7 +62,7 @@ index 1c064e1d2edcda5d0b10fb3cc3417937ac0b3835..3b6d2cf670caefd42536de896d3e13c9
|
|||||||
throw new IllegalStateException("Failed to initialize server");
|
throw new IllegalStateException("Failed to initialize server");
|
||||||
}
|
}
|
||||||
diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java
|
diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java
|
||||||
index 614c7d9f673c926562acc8fa3b3788623900db41..33456c7c106abbddf743e1203a6e8122cf10b797 100644
|
index 614c7d9f673c926562acc8fa3b3788623900db41..937469a134e721c47e235a34acc565f12adf85ff 100644
|
||||||
--- a/net/minecraft/server/gui/MinecraftServerGui.java
|
--- a/net/minecraft/server/gui/MinecraftServerGui.java
|
||||||
+++ b/net/minecraft/server/gui/MinecraftServerGui.java
|
+++ b/net/minecraft/server/gui/MinecraftServerGui.java
|
||||||
@@ -51,7 +51,7 @@ public class MinecraftServerGui extends JComponent {
|
@@ -51,7 +51,7 @@ public class MinecraftServerGui extends JComponent {
|
||||||
@@ -70,7 +70,7 @@ index 614c7d9f673c926562acc8fa3b3788623900db41..33456c7c106abbddf743e1203a6e8122
|
|||||||
}
|
}
|
||||||
|
|
||||||
- final JFrame jFrame = new JFrame("Purpur Minecraft server"); // Purpur - Improve GUI
|
- final JFrame jFrame = new JFrame("Purpur Minecraft server"); // Purpur - Improve GUI
|
||||||
+ final JFrame jFrame = new JFrame("DivineMC Minecraft server"); // Purpur - Improve GUI // DivineMC - Rebrand
|
+ final JFrame jFrame = new JFrame(org.purpurmc.purpur.PurpurConfig.serverGUIName); // Purpur - Improve GUI // DivineMC - Update Purpur rebrand settings
|
||||||
final MinecraftServerGui minecraftServerGui = new MinecraftServerGui(server);
|
final MinecraftServerGui minecraftServerGui = new MinecraftServerGui(server);
|
||||||
jFrame.setDefaultCloseOperation(2);
|
jFrame.setDefaultCloseOperation(2);
|
||||||
jFrame.add(minecraftServerGui);
|
jFrame.add(minecraftServerGui);
|
||||||
@@ -79,7 +79,7 @@ index 614c7d9f673c926562acc8fa3b3788623900db41..33456c7c106abbddf743e1203a6e8122
|
|||||||
jFrame.setVisible(true);
|
jFrame.setVisible(true);
|
||||||
// Paper start - Improve ServerGUI
|
// Paper start - Improve ServerGUI
|
||||||
- jFrame.setName("Purpur Minecraft server"); // Purpur - Improve GUI
|
- jFrame.setName("Purpur Minecraft server"); // Purpur - Improve GUI
|
||||||
+ jFrame.setName("DivineMC Minecraft server"); // Purpur - Improve GUI // DivineMC - Rebrand
|
+ jFrame.setName(org.purpurmc.purpur.PurpurConfig.serverGUIName); // Purpur - Improve GUI // DivineMC - Update Purpur rebrand settings
|
||||||
try {
|
try {
|
||||||
jFrame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png"))));
|
jFrame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png"))));
|
||||||
} catch (java.io.IOException ignore) {
|
} catch (java.io.IOException ignore) {
|
||||||
@@ -88,7 +88,7 @@ index 614c7d9f673c926562acc8fa3b3788623900db41..33456c7c106abbddf743e1203a6e8122
|
|||||||
public void windowClosing(WindowEvent event) {
|
public void windowClosing(WindowEvent event) {
|
||||||
if (!minecraftServerGui.isClosing.getAndSet(true)) {
|
if (!minecraftServerGui.isClosing.getAndSet(true)) {
|
||||||
- jFrame.setTitle("Purpur Minecraft server - shutting down!"); // Purpur - Improve GUI
|
- jFrame.setTitle("Purpur Minecraft server - shutting down!"); // Purpur - Improve GUI
|
||||||
+ jFrame.setTitle("DivineMC Minecraft server - shutting down!"); // Purpur - Improve GUI // DivineMC - Rebrand
|
+ jFrame.setTitle(org.purpurmc.purpur.PurpurConfig.serverGUIName + " - shutting down!"); // Purpur - Improve GUI // DivineMC - Update Purpur rebrand settings
|
||||||
server.halt(true);
|
server.halt(true);
|
||||||
minecraftServerGui.runFinalizers();
|
minecraftServerGui.runFinalizers();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
||||||
|
Date: Fri, 11 Jul 2025 20:26:35 +0300
|
||||||
|
Subject: [PATCH] Update Purpur rebrand settings
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
|
index 31bf765d2dfa75d854f7f8e55bab7792ace843ab..d923efc61592c430e3945fd9c38e558f9e85710e 100644
|
||||||
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
|
@@ -230,10 +230,14 @@ public class PurpurConfig {
|
||||||
|
deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // DivineMC start - Update Purpur rebrand settings
|
||||||
|
public static String serverModName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName();
|
||||||
|
- private static void serverModName() {
|
||||||
|
- serverModName = getString("settings.server-mod-name", serverModName);
|
||||||
|
+ public static String serverGUIName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName() + " Console";
|
||||||
|
+ private static void serverName() {
|
||||||
|
+ serverModName = getString("settings.rebrand.server-mod-name", serverModName);
|
||||||
|
+ serverGUIName = getString("settings.rebrand.server-gui-name", serverGUIName);
|
||||||
|
}
|
||||||
|
+ // DivineMC end - Update Purpur rebrand settings
|
||||||
|
|
||||||
|
public static double laggingThreshold = 19.0D;
|
||||||
|
private static void tickLoopSettings() {
|
||||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing purpur config options
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
index 72fcad4a0b5857551221741b9c73fa75596e6981..374af5eb6b55c731535be4e8c242ffc3a6e4647a 100644
|
index d923efc61592c430e3945fd9c38e558f9e85710e..01094a003a96118bdc1fdc7a665cce89a2f54dfb 100644
|
||||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
@@ -327,6 +327,7 @@ public class PurpurConfig {
|
@@ -331,6 +331,7 @@ public class PurpurConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int barrelRows = 3;
|
public static int barrelRows = 3;
|
||||||
@@ -16,7 +16,7 @@ index 72fcad4a0b5857551221741b9c73fa75596e6981..374af5eb6b55c731535be4e8c242ffc3
|
|||||||
public static boolean enderChestSixRows = false;
|
public static boolean enderChestSixRows = false;
|
||||||
public static boolean enderChestPermissionRows = false;
|
public static boolean enderChestPermissionRows = false;
|
||||||
public static boolean cryingObsidianValidForPortalFrame = false;
|
public static boolean cryingObsidianValidForPortalFrame = false;
|
||||||
@@ -370,6 +371,7 @@ public class PurpurConfig {
|
@@ -374,6 +375,7 @@ public class PurpurConfig {
|
||||||
case 1 -> 9;
|
case 1 -> 9;
|
||||||
default -> 27;
|
default -> 27;
|
||||||
});
|
});
|
||||||
@@ -25,7 +25,7 @@ index 72fcad4a0b5857551221741b9c73fa75596e6981..374af5eb6b55c731535be4e8c242ffc3
|
|||||||
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
|
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
|
||||||
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
|
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
|
||||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||||
index 3346e45393776c9ed120c2be70e24a9289f74fd3..225d3fab20ef461c87b260b2674229806649bc56 100644
|
index a03e166b490952534e8050654c1afa975795f731..1b17643fffecd7af6ec60ef8a24eac85ddd7b80d 100644
|
||||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||||
@@ -1184,12 +1184,20 @@ public class PurpurWorldConfig {
|
@@ -1184,12 +1184,20 @@ public class PurpurWorldConfig {
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize default values for configs
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
index e5bf7ea47143cf3f8d4c0f1840698068bb70cbf8..72fcad4a0b5857551221741b9c73fa75596e6981 100644
|
index 01094a003a96118bdc1fdc7a665cce89a2f54dfb..34edbde5707326ac6e364a24c9640ac1263c85b0 100644
|
||||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||||
@@ -240,7 +240,7 @@ public class PurpurConfig {
|
@@ -244,7 +244,7 @@ public class PurpurConfig {
|
||||||
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
|
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,10 +18,10 @@ index e5bf7ea47143cf3f8d4c0f1840698068bb70cbf8..72fcad4a0b5857551221741b9c73fa75
|
|||||||
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
|
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||||
index a03e166b490952534e8050654c1afa975795f731..3346e45393776c9ed120c2be70e24a9289f74fd3 100644
|
index 1b17643fffecd7af6ec60ef8a24eac85ddd7b80d..225d3fab20ef461c87b260b2674229806649bc56 100644
|
||||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||||
@@ -3164,8 +3164,8 @@ public class PurpurWorldConfig {
|
@@ -3208,8 +3208,8 @@ public class PurpurWorldConfig {
|
||||||
public boolean villagerDisplayTradeItem = true;
|
public boolean villagerDisplayTradeItem = true;
|
||||||
public int villagerSpawnIronGolemRadius = 0;
|
public int villagerSpawnIronGolemRadius = 0;
|
||||||
public int villagerSpawnIronGolemLimit = 0;
|
public int villagerSpawnIronGolemLimit = 0;
|
||||||
Reference in New Issue
Block a user