Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds option for display name in afk message (#1332)

Browse Source
This commit is contained in:
Rhythmic
2023-06-07 09:51:42 -07:00
committed by GitHub
parent 561164b800
commit f4296d6226
49 changed files with 156 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0285-Implement-ram-and-rambar-commands.patch
View File

@@ -18,7 +18,7 @@ index 6b05907bfec377e72a8858534d001bda10a1c88a..08bed4f01a27162902aa63bb8d35a915
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 15ec63fab5468bbfbfeefdf5475305fdf64b2b33..116cd0204177c313a4e15765340da2c97913bd77 100644
index a9158f9572a4c787247721a36465e362ad975c20..852266234cf3d63e3b23a71639e40defca91c1b8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 15ec63fab5468bbfbfeefdf5475305fdf64b2b33..116cd0204177c313a4e15765340da2c9
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2708,6 +2711,14 @@ public class ServerPlayer extends Player {
@@ -2713,6 +2716,14 @@ public class ServerPlayer extends Player {
}
}
@@ -61,10 +61,10 @@ index 15ec63fab5468bbfbfeefdf5475305fdf64b2b33..116cd0204177c313a4e15765340da2c9
return this.tpsBar;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3bfa8021a7da677fd15d3f2827b271fe17f514a1..82cf79cffbc961dc1db43a4afc6eb1efb5bfe297 100644
index 9e87afb01e569e6d5c2846b931440c4ce395adae..4142820c3053d77d4ae7186fec968d624f893056 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -181,6 +181,8 @@ public class PurpurConfig {
@@ -182,6 +182,8 @@ public class PurpurConfig {
public static String creditsCommandOutput = "<green>%s has been shown the end credits";
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
@@ -73,7 +73,7 @@ index 3bfa8021a7da677fd15d3f2827b271fe17f514a1..82cf79cffbc961dc1db43a4afc6eb1ef
public static String tpsbarCommandOutput = "<green>Tpsbar toggled <onoff> for <target>";
public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
public static String uptimeCommandOutput = "<green>Server uptime is <uptime>";
@@ -196,6 +198,8 @@ public class PurpurConfig {
@@ -198,6 +200,8 @@ public class PurpurConfig {
creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
@@ -82,7 +82,7 @@ index 3bfa8021a7da677fd15d3f2827b271fe17f514a1..82cf79cffbc961dc1db43a4afc6eb1ef
tpsbarCommandOutput = getString("settings.messages.tpsbar-command-output", tpsbarCommandOutput);
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
uptimeCommandOutput = getString("settings.messages.uptime-command-output", uptimeCommandOutput);
@@ -243,6 +247,15 @@ public class PurpurConfig {
@@ -245,6 +249,15 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}
@@ -98,7 +98,7 @@ index 3bfa8021a7da677fd15d3f2827b271fe17f514a1..82cf79cffbc961dc1db43a4afc6eb1ef
public static String commandTPSBarTitle = "<gray>TPS<yellow>:</yellow> <tps> MSPT<yellow>:</yellow> <mspt> Ping<yellow>:</yellow> <ping>ms";
public static BossBar.Overlay commandTPSBarProgressOverlay = BossBar.Overlay.NOTCHED_20;
public static TPSBarTask.FillMode commandTPSBarProgressFillMode = TPSBarTask.FillMode.MSPT;
@@ -270,6 +283,16 @@ public class PurpurConfig {
@@ -272,6 +285,16 @@ public class PurpurConfig {
public static String uptimeSecond = "%02d second";
public static String uptimeSeconds = "%02d seconds";
private static void commandSettings() {