diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index ae1775f..c04b40a 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/eu/mhsl/minenet/minigames/Main.java b/src/main/java/eu/mhsl/minenet/minigames/Main.java index 65f25ee..645ba9b 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/Main.java +++ b/src/main/java/eu/mhsl/minenet/minigames/Main.java @@ -15,7 +15,6 @@ import java.util.logging.Logger; public class Main { /** * Starts minenet minigames services - * @param args startflags */ private final static Logger logger = Logger.getGlobal(); public static void main(String[] args) { @@ -24,7 +23,7 @@ public class Main { MinecraftServer server = MinecraftServer.init(); PvpExtension.init(); - MinecraftServer.setBrandName("minenet"); + MinecraftServer.setBrandName("mhsl.eu - minenet - credits to minestom"); MinecraftServer.setCompressionThreshold(0); System.setProperty("minestom.chunk-view-distance", "12"); diff --git a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/DebugCommand.java b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/DebugCommand.java index 8572ab3..6a41503 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/command/privileged/DebugCommand.java +++ b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/DebugCommand.java @@ -26,7 +26,7 @@ public class DebugCommand extends Command { add("Test"); } }; - new ChatMessage(Icon.STAR) + new ChatMessage(Icon.STAR, true) .appendTranslated("score#result") .newLine() .indent() diff --git a/src/main/java/eu/mhsl/minenet/minigames/message/type/ChatMessage.java b/src/main/java/eu/mhsl/minenet/minigames/message/type/ChatMessage.java index d5afbd6..62bf22d 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/message/type/ChatMessage.java +++ b/src/main/java/eu/mhsl/minenet/minigames/message/type/ChatMessage.java @@ -5,16 +5,25 @@ import eu.mhsl.minenet.minigames.message.TranslatableMessage; import net.minestom.server.entity.Player; public class ChatMessage extends TranslatableMessage { - public ChatMessage(Icon icon) { - super.appendStatic(" "); - pipe(); - super.appendStatic("\n"); - appendStatic(icon.getComponent()); - pipe(); + public ChatMessage() { + construct(Icon.CHAT, false); } - public ChatMessage() { - appendStatic(Icon.CHAT.getComponent()); + public ChatMessage(Icon icon) { + construct(icon, false); + } + + public ChatMessage(Icon icon, boolean preSpace) { + construct(icon, preSpace); + } + + private void construct(Icon icon, boolean preSpace) { + if(preSpace) { + super.appendStatic(" "); + pipe(); + super.appendStatic("\n"); + } + appendStatic(icon.getComponent()); pipe(); } diff --git a/src/main/java/eu/mhsl/minenet/minigames/score/Score.java b/src/main/java/eu/mhsl/minenet/minigames/score/Score.java index ecfa2e7..82d6294 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/score/Score.java +++ b/src/main/java/eu/mhsl/minenet/minigames/score/Score.java @@ -31,7 +31,7 @@ public abstract class Score { public void setDone() { isDone = true; - new ChatMessage(Icon.STAR) + new ChatMessage(Icon.STAR, true) .appendTranslated("score#result") .newLine() .indent()