Message cleanup fixes

mattboy9921 · Aug 4, 2022 · 94f7386 · 94f7386
1 parent 55afc8c
commit 94f7386
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/main/java/net/mattlabs/crewchat/messaging/Messages.java b/src/main/java/net/mattlabs/crewchat/messaging/Messages.java
@@ -1028,7 +1028,7 @@ public Component invalidColor(String invalidHex) {
 
     public Component partyCreated(String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(partyCreated,
-                        TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD)))));
+                        TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD)))));
     }
 
     // Party Joined
@@ -1038,7 +1038,7 @@ public Component partyCreated(String partyName, TextColor textColor) {
 
     public Component partyJoined(String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(partyJoined,
-                        TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD)))));
+                        TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD)))));
     }
 
     // Already in Party
@@ -1048,7 +1048,7 @@ public Component partyJoined(String partyName, TextColor textColor) {
 
     public Component alreadyInParty(String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(alreadyInParty,
-                        TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD)))));
+                        TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD)))));
     }
 
     // Party Left
@@ -1058,7 +1058,7 @@ public Component alreadyInParty(String partyName, TextColor textColor) {
 
     public Component partyLeft(String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(partyLeft,
-                        TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD)))));
+                        TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD)))));
     }
 
     // Not in Party
@@ -1068,7 +1068,7 @@ public Component partyLeft(String partyName, TextColor textColor) {
 
     public Component notInParty(String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(notInParty,
-                        TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD)))));
+                        TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD)))));
     }
 
     // Player Joined Party
@@ -1079,7 +1079,7 @@ public Component notInParty(String partyName, TextColor textColor) {
     public Component playerJoinedParty(String prefix, String playerName, String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(playerJoinedParty,
                         TagResolver.resolver(Placeholder.parsed("player_name", prefix + playerName),
-                                TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD))))));
+                                TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD))))));
     }
 
     // Player Joined Party
@@ -1090,7 +1090,7 @@ public Component playerJoinedParty(String prefix, String playerName, String part
     public Component playerLeftParty(String prefix, String playerName, String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(playerLeftParty,
                         TagResolver.resolver(Placeholder.parsed("player_name", prefix + playerName),
-                                TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD))))));
+                                TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD))))));
     }
 
     @Comment("\nAppears in the party player list command.\n" +
@@ -1099,11 +1099,11 @@ public Component playerLeftParty(String prefix, String playerName, String partyN
 
     public Component partyPlayerListHeader(String partyName, TextColor textColor) {
         return partyHeader.append(MiniMessage.miniMessage().deserialize(partyPlayerListHeader,
-                        TagResolver.resolver("party_name", Tag.inserting(Component.text(partyName, textColor, BOLD)))));
+                        TagResolver.resolver("party_name", Tag.selfClosingInserting(Component.text(partyName, textColor, BOLD)))));
     }
 
     public Component partyPlayerListEntry(String prefix, String playerName) {
-        return hyphenHeader.append(MiniMessage.miniMessage().deserialize(prefix + playerName));
+        return hyphenHeader.append(MessageUtil.legacyDeserialize(prefix).append(MiniMessage.miniMessage().deserialize(playerName)));
     }
 
     /*================================================================================
@@ -1286,7 +1286,7 @@ public String chatLinkHoverText() {
 
     // Click to run
     private transient Component clickToRun = Component.text("Click", DARK_GREEN, BOLD)
-            .append(Component.text(" to run.", WHITE));
+            .append(Component.text(" to run.", WHITE).decoration(BOLD, false));
 
     // ** Bad Config **