From f177b652ac3a2b43ee026a6cec0c9419d08d9ef3 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Tue, 14 Jul 2020 01:27:39 -0400 Subject: [PATCH] Include ability to set display of Custom Requirements, fixes #1340 --- .../me/blackvein/quests/CustomObjective.java | 18 +++++------ .../blackvein/quests/CustomRequirement.java | 9 ++++++ .../me/blackvein/quests/CustomReward.java | 32 +++++++++++++------ .../main/java/me/blackvein/quests/Quest.java | 9 +++--- .../java/me/blackvein/quests/Quester.java | 6 ++-- 5 files changed, 50 insertions(+), 24 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/CustomObjective.java b/main/src/main/java/me/blackvein/quests/CustomObjective.java index 7ddaaf517..f37fd6991 100644 --- a/main/src/main/java/me/blackvein/quests/CustomObjective.java +++ b/main/src/main/java/me/blackvein/quests/CustomObjective.java @@ -28,10 +28,10 @@ public abstract class CustomObjective implements Listener { private Quests plugin = Quests.getPlugin(Quests.class); private String name = null; private String author = null; + private String display = "Progress: %count%"; private LinkedList> data = new LinkedList>(); private Map descriptions = new HashMap(); private String countPrompt = "Enter number"; - private String display = "Progress: %count%"; private boolean showCount = true; private int count = 1; @@ -50,6 +50,14 @@ public abstract class CustomObjective implements Listener { public void setAuthor(String author) { this.author = author; } + + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + this.display = display; + } public LinkedList> getData() { return data; @@ -105,14 +113,6 @@ public abstract class CustomObjective implements Listener { public void setShowCount(boolean showCount) { this.showCount = showCount; } - - public String getDisplay() { - return display; - } - - public void setDisplay(String display) { - this.display = display; - } public Map getDataForPlayer(Player player, CustomObjective customObj, Quest quest) { Quester quester = plugin.getQuester(player.getUniqueId()); diff --git a/main/src/main/java/me/blackvein/quests/CustomRequirement.java b/main/src/main/java/me/blackvein/quests/CustomRequirement.java index b01ff088c..ecbf45aaf 100644 --- a/main/src/main/java/me/blackvein/quests/CustomRequirement.java +++ b/main/src/main/java/me/blackvein/quests/CustomRequirement.java @@ -21,6 +21,7 @@ public abstract class CustomRequirement { private String name = null; private String author = null; + private String display = null; private Map data = new HashMap(); private Map descriptions = new HashMap(); @@ -41,6 +42,14 @@ public abstract class CustomRequirement { public void setAuthor(String author) { this.author = author; } + + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + display = name; + } public Map getData() { return data; diff --git a/main/src/main/java/me/blackvein/quests/CustomReward.java b/main/src/main/java/me/blackvein/quests/CustomReward.java index 2a905f588..106810405 100644 --- a/main/src/main/java/me/blackvein/quests/CustomReward.java +++ b/main/src/main/java/me/blackvein/quests/CustomReward.java @@ -21,7 +21,7 @@ public abstract class CustomReward { private String name = null; private String author = null; - private String rewardName = null; + private String display = null; private Map data = new HashMap(); private Map descriptions = new HashMap(); @@ -43,6 +43,28 @@ public abstract class CustomReward { this.author = author; } + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + this.display = display; + } + + /** + * @deprecated Use {@link #getDisplay()} + */ + public String getRewardName() { + return display; + } + + /** + * @deprecated Use {@link #setDisplay(String)} + */ + public void setRewardName(String name) { + display = name; + } + public Map getData() { return data; } @@ -64,12 +86,4 @@ public abstract class CustomReward { public Map getDescriptions() { return descriptions; } - - public String getRewardName() { - return rewardName; - } - - public void setRewardName(String name) { - rewardName = name; - } } diff --git a/main/src/main/java/me/blackvein/quests/Quest.java b/main/src/main/java/me/blackvein/quests/Quest.java index 82aef3867..f4c2cf6c5 100644 --- a/main/src/main/java/me/blackvein/quests/Quest.java +++ b/main/src/main/java/me/blackvein/quests/Quest.java @@ -734,8 +734,8 @@ public class Quest { if (rews.getMcmmoSkills().isEmpty() == false) { for (String s : rews.getMcmmoSkills()) { p.sendMessage("- " + ChatColor.DARK_GREEN - + rews.getMcmmoAmounts().get(rews.getMcmmoSkills().indexOf(s)) + " " + ChatColor.DARK_PURPLE - + s + " " + Lang.get(p, "experience")); + + rews.getMcmmoAmounts().get(rews.getMcmmoSkills().indexOf(s)) + " " + + ChatColor.DARK_PURPLE + s + " " + Lang.get(p, "experience")); } } if (rews.getHeroesClasses().isEmpty() == false) { @@ -760,14 +760,15 @@ public class Quest { } if (found != null) { Map datamap = rews.getCustomRewards().get(found.getName()); - String message = found.getRewardName(); + String message = found.getDisplay(); if (message != null) { for (String key : datamap.keySet()) { message = message.replace("%" + key + "%", datamap.get(key).toString()); } p.sendMessage("- " + ChatColor.GOLD + message); } else { - plugin.getLogger().warning("Failed to notify player: Custom Reward does not have an assigned name"); + plugin.getLogger().warning("Failed to notify player: " + + "Custom Reward does not have an assigned name"); } found.giveReward(p, rews.getCustomRewards().get(s)); } else { diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index 5281fc35b..79fcd0ec9 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -774,9 +774,11 @@ public class Quester { if (cr.getName().equalsIgnoreCase(m.getKey())) { if (cr != null) { if (cr.testRequirement(getPlayer(), m.getValue())) { - finishedRequirements.add(ChatColor.GREEN + "" + m.getKey()); + finishedRequirements.add(ChatColor.GREEN + "" + + (cr.getDisplay() != null ? cr.getDisplay() : m.getKey())); } else { - unfinishedRequirements.add(ChatColor.GRAY + "" + m.getKey()); + unfinishedRequirements.add(ChatColor.GRAY + "" + + (cr.getDisplay() != null ? cr.getDisplay() : m.getKey())); } } }