diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java index bf67c88..1612b46 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/report/Report.java @@ -25,6 +25,16 @@ import java.util.Optional; import java.util.UUID; public class Report extends Appliance { + public static Component helpText() { + return Component.text() + .appendNewline() + .append(Component.text(" Um einen Spieler zu melden, verwende ", NamedTextColor.GRAY)).appendNewline() + .append(Component.text("/report", NamedTextColor.GOLD)).appendNewline() + .append(Component.text("oder", NamedTextColor.GRAY)).appendNewline() + .append(Component.text("/report ", NamedTextColor.GOLD)).appendNewline() + .build(); + } + private final URI apiEndpoint; public Report() { super("report"); @@ -36,7 +46,7 @@ public class Report extends Appliance { public void reportToUnknown(@NotNull Player issuer) { Request request = new Request(issuer.getUniqueId(), null, ""); - issueReport(issuer, request); + this.issueReport(issuer, request); } public void reportToKnown(@NotNull Player issuer, @NotNull String targetUsername, @Nullable String reason) { @@ -49,7 +59,7 @@ public class Report extends Appliance { } Request request = new Request(issuer.getUniqueId(), offlinePlayer.getUniqueId(), Optional.ofNullable(reason).orElse("")); - issueReport(issuer, request); + this.issueReport(issuer, request); } private void issueReport(Player issuer, Request reportRequest) { @@ -62,7 +72,7 @@ public class Report extends Appliance { .build(); HttpResponse httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); - printResultMessage(issuer, httpResponse); + this.printResultMessage(issuer, httpResponse); } catch (IOException | InterruptedException e) { issuer.sendMessage( Component.text("Internal server error: " + e.getMessage()).color(NamedTextColor.RED) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java index 33818b7..7e2baf3 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/tablist/Tablist.java @@ -2,6 +2,7 @@ package eu.mhsl.craftattack.spawn.appliances.tablist; import eu.mhsl.craftattack.spawn.Main; import eu.mhsl.craftattack.spawn.appliance.Appliance; +import eu.mhsl.craftattack.spawn.appliances.report.Report; import eu.mhsl.craftattack.spawn.util.ComponentUtil; import eu.mhsl.craftattack.spawn.util.RainbowComponent; import net.kyori.adventure.text.Component; @@ -48,14 +49,7 @@ public class Tablist extends Appliance { } public void updateFooter(Player player) { - player.sendPlayerListFooter( - Component.text() - .appendNewline() - .append(Component.text(" Um einen Spieler zu melden, verwende ", NamedTextColor.GRAY)) - .appendNewline() - .append(Component.text("/report ", NamedTextColor.GOLD)) - .appendNewline() - ); + player.sendPlayerListFooter(Report.helpText()); } @Override