From dcdb4293c0b3dc5a437fea34b98eda863cf41ab1 Mon Sep 17 00:00:00 2001 From: Artemis-the-gr8 Date: Fri, 15 Jul 2022 20:33:57 +0200 Subject: [PATCH] Wrote sharedSignature, did more testing with Adventure --- .../artemis/the/gr8/playerstats/ShareManager.java | 7 ++----- .../the/gr8/playerstats/msg/ComponentFactory.java | 15 ++++++++++++--- .../the/gr8/playerstats/msg/MessageWriter.java | 8 +++++--- .../the/gr8/playerstats/msg/OutputManager.java | 6 ++---- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/ShareManager.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/ShareManager.java index b989791..c3e6e8f 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/ShareManager.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/ShareManager.java @@ -115,12 +115,9 @@ public final class ShareManager { sharedResults.offer(shareCode); } StatResult result = statResultQueue.remove(shareCode); - MyLogger.logMsg("StatResult record exists: " + (result != null)); - MyLogger.logMsg("Its TextComponent: " + result.statResult()); - MyLogger.logMsg("Its ID: " + result.ID()); - MyLogger.logMsg("Its uuid: " + result.uuid()); return result.statResult(); - } else { + } + else { return null; } } diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/ComponentFactory.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/ComponentFactory.java index 2f76522..12eec3f 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/ComponentFactory.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/ComponentFactory.java @@ -306,9 +306,18 @@ public class ComponentFactory { } public TextComponent sharedButtonComponent(String playerName) { - return surroundingBracketComponent( - text("Shared!") - .color(CLICKED_MSG)); + if (playerName == null) { + return surroundingBracketComponent( + text("Shared!") + .color(CLICKED_MSG)); + } else { + return surroundingBracketComponent( + text("Shared by ") + .color(CLICKED_MSG) + .append(text(playerName) + .color(MSG_ACCENT)) + .append(text("!"))); + } } private TextComponent surroundingBracketComponent(TextComponent component) { diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/MessageWriter.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/MessageWriter.java index f788baa..847e3a3 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/MessageWriter.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/MessageWriter.java @@ -193,7 +193,6 @@ public class MessageWriter { TextComponent list = getTopStatList(topStats, request); return shareCode -> { - MyLogger.logMsg("Function triggered with shareCode " + shareCode); TextComponent.Builder topBuilder = Component.text().append(title); if (shareCode != null) { topBuilder @@ -201,12 +200,15 @@ public class MessageWriter { .append(componentFactory.shareButtonComponent(shareCode)); } topBuilder.append(list); - MyLogger.logMsg(topBuilder.build() + ""); return topBuilder.build(); }; } - public TextComponent sharedButton(String playerName) { + public TextComponent sharedButton() { + return componentFactory.sharedButtonComponent(null); + } + + public TextComponent sharedSignature(String playerName) { return componentFactory.sharedButtonComponent(playerName); } diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/OutputManager.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/OutputManager.java index 699a25f..03e9c1d 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/OutputManager.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/OutputManager.java @@ -5,7 +5,6 @@ import com.gmail.artemis.the.gr8.playerstats.ShareManager; import com.gmail.artemis.the.gr8.playerstats.config.ConfigHandler; import com.gmail.artemis.the.gr8.playerstats.enums.StandardMessage; import com.gmail.artemis.the.gr8.playerstats.models.StatRequest; -import com.gmail.artemis.the.gr8.playerstats.utils.MyLogger; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.TextComponent; @@ -77,12 +76,11 @@ public class OutputManager { } public void shareStatResults(CommandSender sender, @NotNull TextComponent statResult) { - MyLogger.logMsg("statResult: " + statResult); adventure.all() .filterAudience(player -> !player.get(Identity.NAME) .orElse("").equalsIgnoreCase(sender.getName())).sendMessage(statResult); - MyLogger.logMsg("SharedButton: " + msg.sharedButton(sender.getName())); - adventure.sender(sender).sendMessage(msg.sharedButton(sender.getName())); + //TODO add sharedSignature + adventure.sender(sender).sendMessage(msg.sharedButton()); } public void sendPlayerStat(StatRequest request, int playerStat) {