From f8f1b4a1f69b591577ec047eb8e4f966e5ab840e Mon Sep 17 00:00:00 2001 From: szymon Date: Sun, 13 Jun 2021 19:17:48 +0200 Subject: [PATCH] Message saying the server is going to shut down is now set using MinecraftServer.getPlayerManager().broadcastChatMessage() --- .../szum123321/textile_backup/core/CustomLogger.java | 7 ++++++- .../textile_backup/core/restore/RestoreHelper.java | 11 +++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java b/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java index 7bd7daf..4e9f2c1 100644 --- a/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java +++ b/src/main/java/net/szum123321/textile_backup/core/CustomLogger.java @@ -21,6 +21,7 @@ package net.szum123321.textile_backup.core; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.szum123321.textile_backup.core.create.BackupContext; @@ -47,7 +48,11 @@ public class CustomLogger { this.messageFactory = ParameterizedMessageFactory.INSTANCE; this.logger = LogManager.getLogger(name, messageFactory); this.prefix = "[" + prefix + "]" + " "; - this.prefixText = new LiteralText(this.prefix).formatted(Formatting.AQUA); + this.prefixText = new LiteralText(this.prefix).styled(style -> style.withColor(0x5B23DA)); + } + + public MutableText getPrefixText() { + return prefixText.shallowCopy(); } public void log(Level level, String msg, Object... data) { diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java index 9fada41..f76bf4a 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java @@ -18,8 +18,12 @@ package net.szum123321.textile_backup.core.restore; +import net.minecraft.network.MessageType; import net.minecraft.server.MinecraftServer; import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; +import net.minecraft.util.Formatting; +import net.minecraft.util.Util; import net.szum123321.textile_backup.Statics; import net.szum123321.textile_backup.core.Utilities; @@ -46,8 +50,11 @@ public class RestoreHelper { } public static AwaitThread create(File backupFile, MinecraftServer server, String comment) { - server.getPlayerManager().getPlayerList() - .forEach(serverPlayerEntity -> serverPlayerEntity.sendMessage(new LiteralText("Warning! The server is going to shut down in " + Statics.CONFIG.restoreDelay + " seconds!"), false)); + MutableText msg = new LiteralText("Warning! The server is going to shut down in " + Statics.CONFIG.restoreDelay + " seconds!"); + msg.formatted(Formatting.WHITE); + msg = Statics.LOGGER.getPrefixText().append(msg); + + server.getPlayerManager().broadcastChatMessage(msg, MessageType.SYSTEM, Util.NIL_UUID); Statics.globalShutdownBackupFlag.set(false);