Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add configurable "sleep.not_possible" actionbar message (#1414)

Browse Source
This commit is contained in:
Joshua Prince
2023-08-22 23:58:26 -07:00
committed by GitHub
parent 20c48cd66b
commit ddc4fa9243
20 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0278-Implement-ram-and-rambar-commands.patch
View File

@@ -18,7 +18,7 @@ index 52b06c34d9d3ffb8844556e7b0eaed5a7f03da0c..5c0085589b08f199c75ceeab8d0cf25e
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 3d128b69ab5cc2ec75819ca8c88c5551d07e78f6..09db5ff64fb0df753d80dea5d14ad32d9be671ef 100644
index 4942f4b1a54f6583a9d627a0b0513d36c6f81a7a..9c729910a39b010bf2123517c0bffc5a8993e6d1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -280,6 +280,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 3d128b69ab5cc2ec75819ca8c88c5551d07e78f6..09db5ff64fb0df753d80dea5d14ad32d
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2803,6 +2806,14 @@ public class ServerPlayer extends Player {
@@ -2815,6 +2818,14 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index 3d128b69ab5cc2ec75819ca8c88c5551d07e78f6..09db5ff64fb0df753d80dea5d14ad32d
return this.tpsBar;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index bb3a1562a67c69fd120afa4fa44d6b075beec820..fb3212e696bbb0450dbb92844380cb02f736cfde 100644
index 6191efac8add7d45747036e07c7e895a70f6ff7b..77d927a28eb01aae3a49be3e7b7a5fe219b7739d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -182,6 +182,8 @@ public class PurpurConfig {
@@ -73,7 +73,7 @@ index bb3a1562a67c69fd120afa4fa44d6b075beec820..fb3212e696bbb0450dbb92844380cb02
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>";
@@ -198,6 +200,8 @@ public class PurpurConfig {
@@ -199,6 +201,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 bb3a1562a67c69fd120afa4fa44d6b075beec820..fb3212e696bbb0450dbb92844380cb02
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);
@@ -245,6 +249,15 @@ public class PurpurConfig {
@@ -247,6 +251,15 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}
@@ -98,7 +98,7 @@ index bb3a1562a67c69fd120afa4fa44d6b075beec820..fb3212e696bbb0450dbb92844380cb02
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;
@@ -272,6 +285,16 @@ public class PurpurConfig {
@@ -274,6 +287,16 @@ public class PurpurConfig {
public static String uptimeSecond = "%02d second";
public static String uptimeSeconds = "%02d seconds";
private static void commandSettings() {