summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLMBishop <13875753+LMBishop@users.noreply.github.com>2022-07-06 21:28:01 +0100
committerLMBishop <13875753+LMBishop@users.noreply.github.com>2022-07-06 21:28:01 +0100
commit417a5fabeac5edee9ef5884830e1a5880e8512b1 (patch)
treed686dc589962be0dd9887498e7307e2d8aee0b7d
parent77cded0fe148b79ce39b98941df3515b23e5f9de (diff)
Add extended description to warning type
-rw-r--r--bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java18
-rw-r--r--common/src/main/java/com/leonardobishop/quests/common/config/ConfigProblem.java13
2 files changed, 23 insertions, 8 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java
index ddf3db4f..6cbb0934 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java
@@ -51,17 +51,25 @@ public class CommandUtils {
for (ConfigProblem problem : sortedProblems.get(type)) {
if (Chat.isModernChatAvailable()) {
String color = Chat.matchConfigProblemToColorName(problem.getType());
- String extendedDescription = String.format("<%s>%s</%s><br><gray>Problem location: </gray><white>%s</white><br><br><grey>%s</grey>",
+ String extendedDescription = problem.getExtendedDescription() != null ? String.format("<%s>%s</%s><br><gray>Problem location: </gray><white>%s</white><br><br><grey>%s</grey>",
color,
problem.getDescription(),
color,
problem.getLocation(),
problem.getExtendedDescription()
- );
+ ) : "<dark_grey>This error has no extended description</dark_grey>";
extendedDescription = extendedDescription.replace("'", "\\'");
+ String problemDescription = String.format("<%s>%s</%s><br>%s",
+ color,
+ problem.getType().getTitle(),
+ color,
+ problem.getType().getDescription()
+ );
+ problemDescription = problemDescription.replace("'", "\\'");
String message = String.format(
- "<dark_gray> | - </dark_gray><%s>%s</%s><dark_gray>:</dark_gray> <hover:show_text:'%s'><gray>%s</gray></hover><dark_gray> :%s</dark_gray>",
+ "<dark_gray> | - </dark_gray><hover:show_text:'%s'><%s>%s</%s></hover><dark_gray>:</dark_gray> <hover:show_text:'%s'><gray>%s</gray></hover><dark_gray> :%s</dark_gray>",
+ problemDescription,
color,
problem.getType().getShortened(),
color,
@@ -90,7 +98,9 @@ public class CommandUtils {
sender.sendMessage(ChatColor.DARK_GRAY.toString() + "----");
sender.sendMessage(ChatColor.GRAY.toString() + count + " problem(s) | " + String.join(ChatColor.DARK_GRAY + ", ", legend));
- sender.sendMessage(ChatColor.DARK_GRAY.toString() + "Mouse-over for more information.");
+ if (Chat.isModernChatAvailable()) {
+ sender.sendMessage(ChatColor.DARK_GRAY + "Mouse-over for more information.");
+ }
} else {
sender.sendMessage(ChatColor.GRAY + "Quests did not detect any problems with your configuration.");
}
diff --git a/common/src/main/java/com/leonardobishop/quests/common/config/ConfigProblem.java b/common/src/main/java/com/leonardobishop/quests/common/config/ConfigProblem.java
index e2fdc093..f9e9de33 100644
--- a/common/src/main/java/com/leonardobishop/quests/common/config/ConfigProblem.java
+++ b/common/src/main/java/com/leonardobishop/quests/common/config/ConfigProblem.java
@@ -10,7 +10,7 @@ public final class ConfigProblem {
public ConfigProblem(ConfigProblemType type, String description, String extendedDescription, String location) {
this.type = type;
this.description = description == null ? "?" : description;
- this.extendedDescription = extendedDescription == null ? "<dark_grey>This error has no extended description</dark_grey>" : extendedDescription;
+ this.extendedDescription = extendedDescription;
this.location = location == null ? "?" : location;
}
@@ -36,17 +36,19 @@ public final class ConfigProblem {
public enum ConfigProblemType {
- ERROR("Error", "E", 1),
- WARNING("Warning", "W", 2);
+ ERROR("Error", "E", 1, "An error prevents a quest from being loaded"),
+ WARNING("Warning", "W", 2, "A warning indicates a quest may not work as expected");
private final String title;
private final String shortened;
private final int priority;
+ private final String description;
- ConfigProblemType(String title, String shortened, int priority) {
+ ConfigProblemType(String title, String shortened, int priority, String description) {
this.title = title;
this.shortened = shortened;
this.priority = priority;
+ this.description = description;
}
public String getTitle() {
@@ -61,5 +63,8 @@ public final class ConfigProblem {
return priority;
}
+ public String getDescription() {
+ return description;
+ }
}
} \ No newline at end of file