Fix legacy formatting code support (#8613)

Author: APickledWalrus

src/main/java/ch/njol/skript/command/Commands.java

@@ -181,23 +181,25 @@ static boolean handleEffectCommand(CommandSender sender, String command) {
 				Effect effect = Effect.parse(command, null);
 				parserInstance.deleteCurrentEvent();
 
+				TextComponentParser textParser = TextComponentParser.instance();
 				if (effect != null) {
 					log.clear(); // ignore warnings and stuff
 					log.printLog();
 					if (!effectCommand.isCancelled()) {
-						sender.sendRichMessage("<gray>Executing '" + TextComponentParser.instance().escape(command) + "'");
+						sender.sendMessage(textParser.parse("<gray>Executing '" + textParser.escape(command) + "'"));
 						if (SkriptConfig.logEffectCommands.value() && !(sender instanceof ConsoleCommandSender))
-							Skript.info(sender.getName() + " issued effect command: " + TextComponentParser.instance().escape(command));
+							Skript.info(sender.getName() + " issued effect command: " + textParser.escape(command));
 						TriggerItem.walk(effect, effectCommand);
 						Variables.removeLocals(effectCommand);
 					} else {
-						sender.sendRichMessage("<red>Your effect command '" + TextComponentParser.instance().escape(command) + "' was cancelled.");
+						sender.sendMessage(textParser.parse("<red>Your effect command '" + textParser.escape(command) + "' was cancelled."));
 					}
 				} else {
 					if (sender == Bukkit.getConsoleSender()) // log as SEVERE instead of INFO like printErrors below
-						SkriptLogger.LOGGER.severe("Error in: " + TextComponentParser.instance().escape(command));
+						// No need to escape command here, logger will do it
+						SkriptLogger.LOGGER.severe("Error in: " + command);
 					else
-						sender.sendRichMessage("<red>Error in: <gray>" + TextComponentParser.instance().escape(command));
+						sender.sendMessage(textParser.parse("<red>Error in: <gray>" + textParser.escape(command)));
 					// TODO errors likely need to be escaped too
 					log.printErrors(sender, "(No specific information is available)");
 				}

src/main/java/org/skriptlang/skript/bukkit/text/TextComponentParser.java

@@ -127,7 +127,7 @@ public TextReplacementConfig textReplacementConfig() {
 	 * A pattern for matching legacy hex codes ({@code &x&1&2&3&4&5&6}).
 	 * It also matches all preceding backslashes to determine whether the supposed tag is escaped.
 	 */
-	static final Pattern LEGACY_CODE_PATTERN = Pattern.compile("(\\\\*)([&§][a-f0-9])");
+	static final Pattern LEGACY_CODE_PATTERN = Pattern.compile("(\\\\*)([&§][a-f0-9klomnr])");
 
 	static {
 		INSTANCE = new TextComponentParser();

src/test/java/org/skriptlang/skript/bukkit/text/TextComponentParserTest.java

@@ -4,6 +4,8 @@
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.ChatColor;
 import org.junit.Test;
 
 import java.util.Set;
@@ -58,6 +60,12 @@ public void testLegacy() {
 		assertEquals(parser.parse("<#123456>hello"), parser.parse("&x&1&2&3&4&5&6hello"));
 		assertEquals(Component.text("&chello"), parser.parse("\\&chello"));
 		assertEquals(Component.text("&x&1&2&3&4&5&6hello"), parser.parse("&x\\&1\\&2\\&3\\&4\\&5\\&6hello"));
+
+		//noinspection deprecation - yes i know
+		for (ChatColor color : ChatColor.values()) {
+			String message = "&" + color.getChar() + "hello";
+			assertEquals(LegacyComponentSerializer.legacyAmpersand().deserialize(message), parser.parse(message));
+		}
 	}
 
 	@Test