From d0db6c7ec4de7b7aad36befd51b7046894a51c45 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 13 Jun 2018 17:26:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20TextTemplate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mc/core/chat/CommanderChatProcessor.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/mc/core/chat/CommanderChatProcessor.java b/core/src/main/java/mc/core/chat/CommanderChatProcessor.java index 2e3df49..e12e4e6 100644 --- a/core/src/main/java/mc/core/chat/CommanderChatProcessor.java +++ b/core/src/main/java/mc/core/chat/CommanderChatProcessor.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import mc.core.player.Player; import mc.core.text.Text; import mc.core.text.TextColor; +import mc.core.text.TextTemplate; import org.slf4j.Marker; import org.slf4j.helpers.BasicMarkerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +23,11 @@ import java.util.Map; @Slf4j public class CommanderChatProcessor extends SimpleChatProcessor { private static final Marker COMMAND_MARKER = new BasicMarkerFactory().getMarker("Command"); + private static final TextTemplate UNKNOW_COMMAND_MSG = TextTemplate.builder() + .append(Text.of("Unknown command \"", TextColor.RED)) + .arg("command", TextColor.WHITE) + .append(Text.of("\"", TextColor.RED)) + .build(); @Autowired private ApplicationContext applicationContext; private Map commands = new HashMap<>(); @@ -73,11 +79,7 @@ public class CommanderChatProcessor extends SimpleChatProcessor { String[] args = message.substring(idx).split(" "); commands.get(command).execute(player, args); } else { - Text msg = Text.builder(TextColor.RED, "Unknown command \"") - .append(Text.of(TextColor.WHITE, command)) - .append(Text.of("\"")) - .build(); - player.getChannel().sendChatMessage(msg); + player.getChannel().sendChatMessage(UNKNOW_COMMAND_MSG.apply("command", command)); } } else { super.process(player, message);