Deal with legacy colour codes on construct signs correctly

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/builders/exterior/InstantBlockPresetBuilder.java

@@ -37,6 +37,7 @@
 import me.eccentric_nz.tardischunkgenerator.worldgen.TARDISChunkGenerator;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -335,10 +336,15 @@ public void buildPreset() {
                                             front.line(1, Component.text(line1, sign_colour));
                                             front.line(2, Component.text(line2, sign_colour));
                                         } else {
-                                            front.line(0, Component.text(rscs.getLine1()));
-                                            front.line(1, Component.text(rscs.getLine2()));
-                                            front.line(2, Component.text(rscs.getLine3()));
-                                            front.line(3, Component.text(rscs.getLine4()));
+                                            // player has set custom text - potentially with colour codes
+                                            Component raw1 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine1());
+                                            Component raw2 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine2());
+                                            Component raw3 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine3());
+                                            Component raw4 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine4());
+                                            front.line(0, raw1);
+                                            front.line(1, raw2);
+                                            front.line(2, raw3);
+                                            front.line(3, raw4);
                                         }
                                     }
                                 }

src/main/java/me/eccentric_nz/TARDIS/builders/exterior/MaterialiseBlockPreset.java

@@ -43,6 +43,7 @@
 import me.eccentric_nz.tardischunkgenerator.worldgen.TARDISChunkGenerator;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -432,10 +433,15 @@ public void run() {
                                                         front.line(1, Component.text(line1, sign_colour));
                                                         front.line(2, Component.text(line2, sign_colour));
                                                     } else {
-                                                        front.line(0, Component.text(rscs.getLine1()));
-                                                        front.line(1, Component.text(rscs.getLine2()));
-                                                        front.line(2, Component.text(rscs.getLine3()));
-                                                        front.line(3, Component.text(rscs.getLine4()));
+                                                        // player has set custom text - potentially with colour codes
+                                                        Component raw1 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine1());
+                                                        Component raw2 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine2());
+                                                        Component raw3 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine3());
+                                                        Component raw4 = LegacyComponentSerializer.legacyAmpersand().deserialize(rscs.getLine4());
+                                                        front.line(0, raw1);
+                                                        front.line(1, raw2);
+                                                        front.line(2, raw3);
+                                                        front.line(3, raw4);
                                                     }
                                                 }
                                             }

src/main/java/me/eccentric_nz/TARDIS/commands/tardis/ConstructCommand.java

@@ -68,13 +68,14 @@ public boolean setLine(Player player, String[] args) {
         where.put("tardis_id", id);
         HashMap<String, Object> set = new HashMap<>();
         int l = TARDISNumberParsers.parseInt(args[1]);
-        Component raw = LegacyComponentSerializer.legacyAmpersand().deserialize(String.join(" ", Arrays.copyOfRange(args, 2, args.length)));
+        String joined = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
+        Component raw = LegacyComponentSerializer.legacyAmpersand().deserialize(joined);
         // strip color codes and check length
         if (ComponentUtils.stripColour(raw).length() > 16) {
             plugin.getMessenger().send(player, TardisModule.TARDIS, "CONSTRUCT_LINE_LEN");
             return true;
         }
-        set.put("line" + l, raw);
+        set.put("line" + l, joined);
         // save it
         plugin.getQueryFactory().doUpdate("chameleon", set, where);
         plugin.getMessenger().send(player, TardisModule.TARDIS, "CONSTRUCT_LINE_SAVED");