From 55e2bd5c90796dcdb43923b6f44c17e735da1902 Mon Sep 17 00:00:00 2001 From: OwenFeik Date: Mon, 20 Dec 2021 20:56:00 +1100 Subject: [PATCH 1/3] add scoreboard command --- .../listeners/DiscordEventListener.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java b/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java index b860c20..9c555c3 100644 --- a/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java +++ b/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java @@ -6,6 +6,9 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.scoreboard.ScoreboardObjective; +import net.minecraft.scoreboard.ScoreboardPlayerScore; +import net.minecraft.scoreboard.ServerScoreboard; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; @@ -64,7 +67,28 @@ public void onMessageReceived(@NotNull MessageReceivedEvent e) { !console : executes commands in the server console (admins only) ```"""; e.getChannel().sendMessage(help).queue(); + } else if (e.getMessage().getContentRaw().startsWith("!scoreboard")) { + String objName = e.getMessage().getContentRaw().replace("!scoreboard ", ""); + ServerScoreboard scoreboard = server.getScoreboard(); + ScoreboardObjective objective = scoreboard.getObjective(objName); + if (objective == null) { + e.getChannel().sendMessage("Scoreboard not found.").queue(); + return; + } + + String message = "```\n=============== " + objName + " ===============\n"; + + for (ScoreboardPlayerScore sps : scoreboard.getAllPlayerScores(objective)) { + message += ( + sps.getPlayerName() + + ": " + + sps.getScore() + + "\n" + ); + } + message += "\n```"; + e.getChannel().sendMessage(message).queue(); } else { LiteralText discord = new LiteralText(DisFabric.config.texts.coloredText.replace("%discordname%", Objects.requireNonNull(e.getMember()).getEffectiveName()).replace("%message%",e.getMessage().getContentDisplay().replace("§", DisFabric.config.texts.removeVanillaFormattingFromDiscord ? "&" : "§").replace("\n", DisFabric.config.texts.removeLineBreakFromDiscord ? " " : "\n") + ((e.getMessage().getAttachments().size() > 0) ? " " : "") + ((e.getMessage().getEmbeds().size() > 0) ? " " : ""))); discord.setStyle(discord.getStyle().withColor(TextColor.fromRgb(Objects.requireNonNull(e.getMember()).getColorRaw()))); From 20e087d8a489510f58a9f264802193f8858b8214 Mon Sep 17 00:00:00 2001 From: OwenFeik Date: Tue, 21 Dec 2021 08:53:06 +1100 Subject: [PATCH 2/3] add to help menu, bump version --- gradle.properties | 2 +- .../mods/disfabric/listeners/DiscordEventListener.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6a7d1ae..5b1e16d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ loader_version=0.12.8 fabric_version=0.43.1+1.18 # Mod Properties -mod_version=1.3.5 +mod_version=1.4.5 maven_group=br.com.brforgers.mods archives_base_name=disfabric diff --git a/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java b/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java index 9c555c3..99f1bee 100644 --- a/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java +++ b/src/main/java/br/com/brforgers/mods/disfabric/listeners/DiscordEventListener.java @@ -65,6 +65,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent e) { !online: list server online players !tps: shows loaded dimensions tps´s !console : executes commands in the server console (admins only) + !scoreboard : displays the scoreboard for an objective ```"""; e.getChannel().sendMessage(help).queue(); } else if (e.getMessage().getContentRaw().startsWith("!scoreboard")) { From 932be80bd76e87b6bbc8e589798ca867b0f8ff53 Mon Sep 17 00:00:00 2001 From: OwenFeik Date: Tue, 28 Dec 2021 18:50:15 +1100 Subject: [PATCH 3/3] properly semver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5b1e16d..259adbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ loader_version=0.12.8 fabric_version=0.43.1+1.18 # Mod Properties -mod_version=1.4.5 +mod_version=1.4.0 maven_group=br.com.brforgers.mods archives_base_name=disfabric