From de79433c32edae6ff02a2d5d52dfa9269f4352e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sun, 1 Oct 2023 01:40:31 +0200
Subject: [PATCH] Better prespace system for chatmessages

---
 .../compileJava/previous-compilation-data.bin | Bin 63510 -> 63510 bytes
 .../java/eu/mhsl/minenet/minigames/Main.java  |   3 +--
 .../command/privileged/DebugCommand.java      |   2 +-
 .../minigames/message/type/ChatMessage.java   |  25 ++++++++++++------
 .../mhsl/minenet/minigames/score/Score.java   |   2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index ae1775f18f2d33c98c7e4ed611fb428751b30882..c04b40a4c088aaf301184b57828b1264818d46a4 100644
GIT binary patch
delta 138
zcmV;50CoSC@B^0c1F$Is5E&L-!5@?QS&@;oTC977o|8EQN)Wa8aC;s6C^%D_PTC@z
zE^V`u1Y-mc*&z7A;g3>XAj&#i=`G9XlLiSq5CJ*a<u3ywpL0civLkf>N0U+sxe#~-
s1$vvmqUFK!mGhP?4db&L3Ofi8VyIoBV0R>&zk4wVFh04Tvt|;o<r%s=H2?qr

delta 138
zcmV;50CoSC@B^0c1F$Is5WrPI;4>9flB6#&8~!<QZId|!N)T!>Kl5H%Q0CG<u;(vi
zwMw&-1Y-mcvvN?dB7h(*_)(g50hDyXlLiSq5cEG&kqu+OzV9P+JDg&bX_Hb3xey=t
sR|VSr#M+Af^1>NNq_?vh3Ofi8?830>2_kU#EAe5;>cQKrvt|;o<?InZGynhq

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()