From f75806d2dd7e776e4441edf38656fe5fe59fe8c9 Mon Sep 17 00:00:00 2001 From: Keir Nellyer Date: Thu, 14 Jul 2016 21:11:43 +0100 Subject: [PATCH] Ensure messages shown to players are consistent --- .../src/mineplex/core/report/ReportHandlerMessenger.java | 4 ++-- .../src/mineplex/core/report/ui/ReportCategoryPage.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportHandlerMessenger.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportHandlerMessenger.java index dcb551eb1..b12c50f0e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportHandlerMessenger.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportHandlerMessenger.java @@ -43,10 +43,10 @@ public class ReportHandlerMessenger extends BukkitRunnable _reportManager.getReportRepository().getAccountName(_report.getSuspectId()) .thenAccept(suspectName -> { - String prefix = F.main("Report", ""); + String prefix = F.main(ReportManager.getReportPrefix(reportId), ""); ChildJsonMessage jsonMessage = new JsonMessage("\n") - .extra(prefix + C.cAqua + "Handling" + C.cGold + " #" + reportId) + .extra(prefix + C.cAqua + "Report Overview") .add("\n") .add(prefix + C.cAqua + "Suspect - " + C.cGold + suspectName) .add("\n") diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCategoryPage.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCategoryPage.java index 50d29d3c7..34d1fd991 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCategoryPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCategoryPage.java @@ -9,8 +9,10 @@ import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import mineplex.core.common.util.C; +import mineplex.core.common.util.F; import mineplex.core.gui.SimpleGui; import mineplex.core.report.ReportCategory; +import mineplex.core.report.ReportManager; import mineplex.core.report.ReportPlugin; /** @@ -66,7 +68,7 @@ public class ReportCategoryPage extends SimpleGui if (reportIdOptional.isPresent()) { - _reporter.sendMessage(C.cGreen + "Report sent successfully (" + C.cGold + "#" + reportIdOptional.get() + C.cGreen + ")."); + _reporter.sendMessage(F.main(ReportManager.getReportPrefix(reportIdOptional.get()), C.cGreen + "Successfully created report.")); error = false; } }