diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java index 64278ed29..6ce478236 100644 --- a/src/main/java/world/bentobox/bentobox/api/user/User.java +++ b/src/main/java/world/bentobox/bentobox/api/user/User.java @@ -616,6 +616,7 @@ public void sendMessage(String reference, String... variables) { * @param message The message to send, containing inline commands in square brackets. */ public void sendRawMessage(String message) { + BentoBox.getInstance().logDebug(message); // Create a base TextComponent for the message TextComponent baseComponent = new TextComponent(); @@ -632,7 +633,7 @@ public void sendRawMessage(String message) { // Add any text before the current match if (matcher.start() > lastMatchEnd) { String beforeMatch = message.substring(lastMatchEnd, matcher.start()); - baseComponent.addExtra(new TextComponent(beforeMatch)); + baseComponent.addExtra(TextComponent.fromLegacy(beforeMatch)); } // Check if it's a recognized command or an unknown bracketed text @@ -658,12 +659,12 @@ public void sendRawMessage(String message) { break; default: // Unrecognized command; preserve it in the output text - baseComponent.addExtra(new TextComponent(matcher.group(0))); + baseComponent.addExtra(TextComponent.fromLegacy(matcher.group(0))); } } else if (matcher.group(3) != null) { // Unrecognized bracketed text; preserve it in the output - baseComponent.addExtra(new TextComponent("[[" + matcher.group(3) + "]]")); + baseComponent.addExtra(TextComponent.fromLegacy("[[" + matcher.group(3) + "]]")); } // Update the last match end position @@ -673,7 +674,7 @@ public void sendRawMessage(String message) { // Add any remaining text after the last match if (lastMatchEnd < message.length()) { String remainingText = message.substring(lastMatchEnd); - baseComponent.addExtra(new TextComponent(remainingText)); + baseComponent.addExtra(TextComponent.fromLegacy(remainingText)); } // Apply the first encountered ClickEvent and HoverEvent to the entire message diff --git a/src/test/java/world/bentobox/bentobox/AbstractCommonSetup.java b/src/test/java/world/bentobox/bentobox/AbstractCommonSetup.java index 11adee0ad..d81205f35 100644 --- a/src/test/java/world/bentobox/bentobox/AbstractCommonSetup.java +++ b/src/test/java/world/bentobox/bentobox/AbstractCommonSetup.java @@ -280,7 +280,7 @@ public void checkSpigotMessage(String expectedMessage, int expectedOccurrences) List capturedMessages = captor.getAllValues(); // Count the number of occurrences of the expectedMessage in the captured messages - long actualOccurrences = capturedMessages.stream().map(component -> component.toPlainText()) // Convert each TextComponent to plain text + long actualOccurrences = capturedMessages.stream().map(component -> component.toLegacyText()) // Convert each TextComponent to plain text .filter(messageText -> messageText.contains(expectedMessage)) // Check if the message contains the expected text .count(); // Count how many times the expected message appears