Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove legacy objective message code

This commit is contained in:
PikaMug 2024-03-19 03:51:56 -04:00
parent a4446cc3d5
commit f908d1c353
1 changed files with 154 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

533
core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
View File

@ -1199,17 +1199,8 @@ public class BukkitQuester implements Quester {
for (final ItemStack progress : data.blocksBroken) { for (final ItemStack progress : data.blocksBroken) {
if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) { if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) {
final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "break"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "break"),
if (message.contains("<count>")) { progress.getAmount(), goal.getAmount());
message = message.replace("<count>", "" + color + progress.getAmount() + "/"
+ goal.getAmount());
} else {
// Legacy
message += " <item>" + color + color + ": " + progress.getAmount() + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(progress)); message = message.replace("<item>", BukkitItemUtil.getName(progress));
} }
@ -1221,17 +1212,8 @@ public class BukkitQuester implements Quester {
for (final ItemStack progress : data.blocksDamaged) { for (final ItemStack progress : data.blocksDamaged) {
if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) { if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) {
final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "damage"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "damage"),
if (message.contains("<count>")) { progress.getAmount(), goal.getAmount());
message = message.replace("<count>", "" + color + progress.getAmount() + "/"
+ goal.getAmount());
} else {
// Legacy
message += " <item>" + color + color + ": " + progress.getAmount() + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(progress)); message = message.replace("<item>", BukkitItemUtil.getName(progress));
} }
@ -1242,18 +1224,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getBlocksToPlace()) { for (final ItemStack goal : stage.getBlocksToPlace()) {
for (final ItemStack progress : data.blocksPlaced) { for (final ItemStack progress : data.blocksPlaced) {
final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "place"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "place"),
progress.getAmount(), goal.getAmount());
if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) { if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) {
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + progress.getAmount() + "/"
+ goal.getAmount());
} else {
// Legacy
message += " <item>" + color + color + ": " + progress.getAmount() + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(progress)); message = message.replace("<item>", BukkitItemUtil.getName(progress));
} }
@ -1264,18 +1237,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getBlocksToUse()) { for (final ItemStack goal : stage.getBlocksToUse()) {
for (final ItemStack progress : data.blocksUsed) { for (final ItemStack progress : data.blocksUsed) {
final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "use"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "use"),
progress.getAmount(), goal.getAmount());
if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) { if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) {
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + progress.getAmount() + "/"
+ goal.getAmount());
} else {
// Legacy
message += " <item>" + color + ": " + progress.getAmount() + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(progress)); message = message.replace("<item>", BukkitItemUtil.getName(progress));
} }
@ -1286,18 +1250,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getBlocksToCut()) { for (final ItemStack goal : stage.getBlocksToCut()) {
for (final ItemStack progress : data.blocksCut) { for (final ItemStack progress : data.blocksCut) {
final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "cut"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "cut"),
progress.getAmount(), goal.getAmount());
if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) { if (progress.getType().equals(goal.getType()) && progress.getDurability() == goal.getDurability()) {
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + progress.getAmount() + "/"
+ goal.getAmount());
} else {
// Legacy
message += " <item>" + color + ": " + progress.getAmount() + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(progress)); message = message.replace("<item>", BukkitItemUtil.getName(progress));
} }
@ -1309,19 +1264,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getItemsToCraft()) { for (final ItemStack goal : stage.getItemsToCraft()) {
if (data.itemsCrafted.size() > craftIndex) { if (data.itemsCrafted.size() > craftIndex) {
final ItemStack progress = data.itemsCrafted.get(craftIndex); final ItemStack progress = data.itemsCrafted.get(craftIndex);
final int crafted = progress.getAmount(); final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
final int toCraft = goal.getAmount(); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "craftItem"),
final ChatColor color = crafted < toCraft ? ChatColor.GREEN : ChatColor.GRAY; progress.getAmount(), goal.getAmount());
String message = color + BukkitLang.get(getPlayer(), "craftItem");
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + crafted + "/" + toCraft);
} else {
// Legacy
message += color + ": " + crafted + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(goal)); message = message.replace("<item>", BukkitItemUtil.getName(goal));
} }
@ -1333,19 +1278,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getItemsToSmelt()) { for (final ItemStack goal : stage.getItemsToSmelt()) {
if (data.itemsSmelted.size() > smeltIndex) { if (data.itemsSmelted.size() > smeltIndex) {
final ItemStack progress = data.itemsSmelted.get(smeltIndex); final ItemStack progress = data.itemsSmelted.get(smeltIndex);
final int smelted = progress.getAmount(); final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
final int toSmelt = goal.getAmount(); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "smeltItem"),
final ChatColor color = smelted < toSmelt ? ChatColor.GREEN : ChatColor.GRAY; progress.getAmount(), goal.getAmount());
String message = color + BukkitLang.get(getPlayer(), "smeltItem");
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + smelted + "/" + toSmelt);
} else {
// Legacy
message += color + ": " + smelted + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(goal)); message = message.replace("<item>", BukkitItemUtil.getName(goal));
} }
@ -1357,19 +1292,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getItemsToEnchant()) { for (final ItemStack goal : stage.getItemsToEnchant()) {
if (data.itemsEnchanted.size() > enchantIndex) { if (data.itemsEnchanted.size() > enchantIndex) {
final ItemStack progress = data.itemsEnchanted.get(enchantIndex); final ItemStack progress = data.itemsEnchanted.get(enchantIndex);
final int enchanted = progress.getAmount(); final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
final int toEnchant = goal.getAmount(); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "enchItem"),
final ChatColor color = enchanted < toEnchant ? ChatColor.GREEN : ChatColor.GRAY; progress.getAmount(), goal.getAmount());
String message = color + BukkitLang.get(getPlayer(), "enchItem");
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + enchanted + "/" + toEnchant);
} else {
// Legacy
message += color + ": " + enchanted + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(goal)); message = message.replace("<item>", BukkitItemUtil.getName(goal));
} }
@ -1392,19 +1317,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getItemsToBrew()) { for (final ItemStack goal : stage.getItemsToBrew()) {
if (data.itemsBrewed.size() > brewIndex) { if (data.itemsBrewed.size() > brewIndex) {
final ItemStack progress = data.itemsBrewed.get(brewIndex); final ItemStack progress = data.itemsBrewed.get(brewIndex);
final int brewed = progress.getAmount(); final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
final int toBrew = goal.getAmount(); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "brewItem"),
final ChatColor color = brewed < toBrew ? ChatColor.GREEN : ChatColor.GRAY; progress.getAmount(), goal.getAmount());
String message = color + BukkitLang.get(getPlayer(), "brewItem");
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + brewed + "/" + toBrew);
} else {
// Legacy
message += color + ": " + brewed + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(goal)); message = message.replace("<item>", BukkitItemUtil.getName(goal));
} }
@ -1416,19 +1331,9 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getItemsToConsume()) { for (final ItemStack goal : stage.getItemsToConsume()) {
if (data.itemsConsumed.size() > consumeIndex) { if (data.itemsConsumed.size() > consumeIndex) {
final ItemStack progress = data.itemsConsumed.get(consumeIndex); final ItemStack progress = data.itemsConsumed.get(consumeIndex);
final int consumed = progress.getAmount(); final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
final int toConsume = goal.getAmount(); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "consumeItem"),
final ChatColor color = consumed < toConsume ? ChatColor.GREEN : ChatColor.GRAY; progress.getAmount(), goal.getAmount());
String message = color + BukkitLang.get(getPlayer(), "consumeItem");
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + consumed + "/" + toConsume);
} else {
// Legacy
message += color + ": " + consumed + "/" + goal.getAmount();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(goal)); message = message.replace("<item>", BukkitItemUtil.getName(goal));
} }
@ -1440,20 +1345,11 @@ public class BukkitQuester implements Quester {
for (final ItemStack goal : stage.getItemsToDeliver()) { for (final ItemStack goal : stage.getItemsToDeliver()) {
if (data.itemsDelivered.size() > deliverIndex) { if (data.itemsDelivered.size() > deliverIndex) {
final ItemStack progress = data.itemsDelivered.get(deliverIndex); final ItemStack progress = data.itemsDelivered.get(deliverIndex);
final int delivered = progress.getAmount();
final int toDeliver = goal.getAmount();
final UUID npc = stage.getItemDeliveryTargets().get(deliverIndex); final UUID npc = stage.getItemDeliveryTargets().get(deliverIndex);
final ChatColor color = delivered < toDeliver ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress.getAmount() < goal.getAmount() ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "deliver").replace("<npc>", depends.getNpcName(npc)); String message = formatCurrentObjectiveMessage(color,
if (message.contains("<count>")) { BukkitLang.get(getPlayer(), "deliver").replace("<npc>", depends.getNpcName(npc)),
message = message.replace("<count>", "" + color + delivered + "/" + toDeliver); progress.getAmount(), goal.getAmount());
} else {
// Legacy
message += color + ": " + delivered + "/" + toDeliver;
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
if (formatNames) { if (formatNames) {
message = message.replace("<item>", BukkitItemUtil.getName(goal)); message = message.replace("<item>", BukkitItemUtil.getName(goal));
} }
@ -1464,67 +1360,56 @@ public class BukkitQuester implements Quester {
int interactIndex = 0; int interactIndex = 0;
for (final UUID n : stage.getNpcsToInteract()) { for (final UUID n : stage.getNpcsToInteract()) {
if (data.npcsInteracted.size() > interactIndex) { if (data.npcsInteracted.size() > interactIndex) {
final boolean interacted = data.npcsInteracted.get(interactIndex); final boolean progress = data.npcsInteracted.get(interactIndex);
final ChatColor color = !interacted ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = !progress ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "talkTo") String message = color + BukkitLang.get(getPlayer(), "talkTo")
.replace("<npc>", depends.getNpcName(n)); .replace("<npc>", depends.getNpcName(n));
if (depends.getPlaceholderApi() != null) { if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message); message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
} }
objectives.add(new BukkitObjective(ObjectiveType.TALK_TO_NPC, message, interacted ? 1 : 0, 1)); objectives.add(new BukkitObjective(ObjectiveType.TALK_TO_NPC, message, progress ? 1 : 0, 1));
} }
interactIndex++; interactIndex++;
} }
int npcKillIndex = 0; int npcKillIndex = 0;
for (final UUID n : stage.getNpcsToKill()) { for (final UUID n : stage.getNpcsToKill()) {
int npcKilled = 0; int progress = 0;
if (data.npcsNumKilled.size() > npcKillIndex) { if (data.npcsNumKilled.size() > npcKillIndex) {
npcKilled = data.npcsNumKilled.get(npcKillIndex); progress = data.npcsNumKilled.get(npcKillIndex);
} }
final int toNpcKill = stage.getNpcNumToKill().get(npcKillIndex); final int goal = stage.getNpcNumToKill().get(npcKillIndex);
final ChatColor color = npcKilled < toNpcKill ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "kill"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "kill"),
progress, goal);
if (message.contains("<mob>")) { if (message.contains("<mob>")) {
message = message.replace("<mob>", depends.getNpcName(n)); message = message.replace("<mob>", depends.getNpcName(n));
} else { } else {
message += " " + depends.getNpcName(n); message += " " + depends.getNpcName(n);
} }
if (message.contains("<count>")) { objectives.add(new BukkitObjective(ObjectiveType.KILL_NPC, message, progress, goal));
message = message.replace("<count>", "" + color + npcKilled + "/" + toNpcKill);
} else {
// Legacy
message += color + ": " + npcKilled + "/" + toNpcKill;
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
objectives.add(new BukkitObjective(ObjectiveType.KILL_NPC, message, npcKilled, toNpcKill));
npcKillIndex++; npcKillIndex++;
} }
int mobKillIndex = 0; int mobKillIndex = 0;
for (final EntityType e : stage.getMobsToKill()) { for (final EntityType e : stage.getMobsToKill()) {
int mobKilled = 0; int progress = 0;
if (data.mobNumKilled.size() > mobKillIndex) { if (data.mobNumKilled.size() > mobKillIndex) {
mobKilled = data.mobNumKilled.get(mobKillIndex); progress = data.mobNumKilled.get(mobKillIndex);
} }
final int toMobKill = stage.getMobNumToKill().get(mobKillIndex); final int goal = stage.getMobNumToKill().get(mobKillIndex);
final ChatColor color = mobKilled < toMobKill ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + ""; String message = color + "";
if (stage.getLocationsToKillWithin().isEmpty()) { if (stage.getLocationsToKillWithin().isEmpty()) {
message += BukkitLang.get(getPlayer(), "kill"); message += BukkitLang.get(getPlayer(), "kill");
if (message.contains("<count>")) { if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + mobKilled + "/" + toMobKill); message = message.replace("<count>", "" + color + progress + "/" + goal);
} else {
// Legacy
message += ChatColor.AQUA + " <mob>" + color + ": " + mobKilled + "/" + toMobKill;
} }
} else { } else {
message += BukkitLang.get(getPlayer(), "killAtLocation").replace("<location>", message += BukkitLang.get(getPlayer(), "killAtLocation").replace("<location>",
stage.getKillNames().get(stage.getMobsToKill().indexOf(e))); stage.getKillNames().get(stage.getMobsToKill().indexOf(e)));
if (message.contains("<count>")) { if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + mobKilled + "/" + toMobKill); message = message.replace("<count>", "" + color + progress + "/" + goal);
} else { } else {
message += color + ": " + mobKilled + "/" + toMobKill; message += color + ": " + progress + "/" + goal;
} }
} }
if (depends.getPlaceholderApi() != null) { if (depends.getPlaceholderApi() != null) {
@ -1534,131 +1419,96 @@ public class BukkitQuester implements Quester {
message = message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(e.name())); message = message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(e.name()));
} }
objectives.add(new BukkitObjective(ObjectiveType.KILL_MOB, message, objectives.add(new BukkitObjective(ObjectiveType.KILL_MOB, message,
new BukkitCountableMob(e, mobKilled), new BukkitCountableMob(e, toMobKill))); new BukkitCountableMob(e, progress), new BukkitCountableMob(e, goal)));
mobKillIndex++; mobKillIndex++;
} }
int tameIndex = 0; int tameIndex = 0;
for (final EntityType e : stage.getMobsToTame()) { for (final EntityType e : stage.getMobsToTame()) {
int tamed = 0; int progress = 0;
if (data.mobsTamed.size() > tameIndex) { if (data.mobsTamed.size() > tameIndex) {
tamed = data.mobsTamed.get(tameIndex); progress = data.mobsTamed.get(tameIndex);
} }
final int toTame = stage.getMobNumToTame().get(tameIndex); final int goal = stage.getMobNumToTame().get(tameIndex);
final ChatColor color = tamed < toTame ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "tame"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "tame"),
progress, goal);
if (!message.contains("<mob>")) { if (!message.contains("<mob>")) {
message += " <mob>"; message += " <mob>";
} }
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + tamed + "/" + toTame);
} else {
// Legacy
message += color + ": " + tamed + "/" + toTame;
}
if (formatNames) { if (formatNames) {
message = message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(stage.getMobsToTame().get(tameIndex).name())); message = message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(stage.getMobsToTame().get(tameIndex).name()));
} }
objectives.add(new BukkitObjective(ObjectiveType.TAME_MOB, message, objectives.add(new BukkitObjective(ObjectiveType.TAME_MOB, message,
new BukkitCountableMob(e, tamed), new BukkitCountableMob(e, toTame))); new BukkitCountableMob(e, progress), new BukkitCountableMob(e, goal)));
tameIndex++; tameIndex++;
} }
if (stage.getFishToCatch() != null) { if (stage.getFishToCatch() != null) {
final int caught = data.getFishCaught(); final int progress = data.getFishCaught();
final int toCatch = stage.getFishToCatch(); final int goal = stage.getFishToCatch();
final ChatColor color = caught < toCatch ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "catchFish"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "catchFish"),
if (message.contains("<count>")) { progress, goal);
message = message.replace("<count>", "" + color + caught + "/" + toCatch); objectives.add(new BukkitObjective(ObjectiveType.CATCH_FISH, message, progress, goal));
} else {
// Legacy
message += color + ": " + caught + "/" + toCatch;
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
objectives.add(new BukkitObjective(ObjectiveType.CATCH_FISH, message, caught, toCatch));
} }
if (stage.getCowsToMilk() != null) { if (stage.getCowsToMilk() != null) {
final int milked = data.getCowsMilked(); final int progress = data.getCowsMilked();
final int toMilk = stage.getCowsToMilk(); final int goal = stage.getCowsToMilk();
final ChatColor color = milked < toMilk ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "milkCow"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "milkCow"),
if (message.contains("<count>")) { progress, goal);
message = message.replace("<count>", "" + color + milked + "/" + toMilk); objectives.add(new BukkitObjective(ObjectiveType.MILK_COW, message, progress, goal));
} else {
// Legacy
message += color + ": " + milked + "/" + toMilk;
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
objectives.add(new BukkitObjective(ObjectiveType.MILK_COW, message, milked, toMilk));
} }
int shearIndex = 0; int shearIndex = 0;
for (final int toShear : stage.getSheepNumToShear()) { for (final int goal : stage.getSheepNumToShear()) {
int sheared = 0; int progress = 0;
if (data.sheepSheared.size() > shearIndex) { if (data.sheepSheared.size() > shearIndex) {
sheared = data.sheepSheared.get(shearIndex); progress = data.sheepSheared.get(shearIndex);
} }
final ChatColor color = sheared < toShear ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "shearSheep"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "shearSheep"),
progress, goal);
message = message.replace("<color>", BukkitMiscUtil.getPrettyDyeColorName(stage.getSheepToShear() message = message.replace("<color>", BukkitMiscUtil.getPrettyDyeColorName(stage.getSheepToShear()
.get(shearIndex))); .get(shearIndex)));
if (message.contains("<count>")) { objectives.add(new BukkitObjective(ObjectiveType.SHEAR_SHEEP, message, progress, goal));
message = message.replace("<count>", "" + color + sheared + "/" + toShear);
} else {
// Legacy
message += color + ": " + sheared + "/" + toShear;
}
objectives.add(new BukkitObjective(ObjectiveType.SHEAR_SHEEP, message, sheared, toShear));
shearIndex++; shearIndex++;
} }
if (stage.getPlayersToKill() != null) { if (stage.getPlayersToKill() != null) {
final int killed = data.getPlayersKilled(); final int progress = data.getPlayersKilled();
final int toKill = stage.getPlayersToKill(); final int goal = stage.getPlayersToKill();
final ChatColor color = data.getPlayersKilled() < stage.getPlayersToKill() ? ChatColor.GREEN final ChatColor color = data.getPlayersKilled() < stage.getPlayersToKill() ? ChatColor.GREEN
: ChatColor.GRAY; : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "killPlayer"); String message = formatCurrentObjectiveMessage(color, BukkitLang.get(getPlayer(), "killPlayer"),
if (message.contains("<count>")) { progress, goal);
message = message.replace("<count>", "" + color + data.getPlayersKilled() + "/" objectives.add(new BukkitObjective(ObjectiveType.KILL_PLAYER, message, progress, goal));
+ stage.getPlayersToKill());
} else {
// Legacy
message += color + ": " + data.getPlayersKilled() + "/" + stage.getPlayersToKill();
}
if (depends.getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
objectives.add(new BukkitObjective(ObjectiveType.KILL_PLAYER, message, killed, toKill));
} }
for (int i = 0 ; i < stage.getLocationsToReach().size(); i++) { for (int i = 0 ; i < stage.getLocationsToReach().size(); i++) {
if (i < data.locationsReached.size()) { if (i < data.locationsReached.size()) {
final boolean reached = data.locationsReached.get(i); final boolean progress = data.locationsReached.get(i);
final ChatColor color = !reached ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = !progress ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + BukkitLang.get(getPlayer(), "goTo"); String message = color + BukkitLang.get(getPlayer(), "goTo");
message = message.replace("<location>", stage.getLocationNames().get(i)); message = message.replace("<location>", stage.getLocationNames().get(i));
objectives.add(new BukkitObjective(ObjectiveType.REACH_LOCATION, message, reached ? 1 : 0, 1)); objectives.add(new BukkitObjective(ObjectiveType.REACH_LOCATION, message, progress ? 1 : 0, 1));
} }
} }
int passIndex = 0; int passIndex = 0;
for (final String s : stage.getPasswordDisplays()) { for (final String s : stage.getPasswordDisplays()) {
boolean said = false; boolean progress = false;
if (data.passwordsSaid.size() > passIndex) { if (data.passwordsSaid.size() > passIndex) {
said = data.passwordsSaid.get(passIndex); progress = data.passwordsSaid.get(passIndex);
} }
final ChatColor color = !said ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = !progress ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + s; String message = color + s;
objectives.add(new BukkitObjective(ObjectiveType.PASSWORD, message, said ? 1 : 0, 1)); objectives.add(new BukkitObjective(ObjectiveType.PASSWORD, message, progress ? 1 : 0, 1));
passIndex++; passIndex++;
} }
int customIndex = 0; int customIndex = 0;
for (final CustomObjective co : stage.getCustomObjectives()) { for (final CustomObjective co : stage.getCustomObjectives()) {
int cleared = 0; int progress = 0;
if (data.customObjectiveCounts.size() > customIndex) { if (data.customObjectiveCounts.size() > customIndex) {
cleared = data.customObjectiveCounts.get(customIndex); progress = data.customObjectiveCounts.get(customIndex);
} }
final int toClear = stage.getCustomObjectiveCounts().get(customIndex); final int goal = stage.getCustomObjectiveCounts().get(customIndex);
final ChatColor color = cleared < toClear ? ChatColor.GREEN : ChatColor.GRAY; final ChatColor color = progress < goal ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + co.getDisplay(); String message = color + co.getDisplay();
for (final Entry<String,Object> prompt : co.getData()) { for (final Entry<String,Object> prompt : co.getData()) {
final String replacement = "%" + prompt.getKey() + "%"; final String replacement = "%" + prompt.getKey() + "%";
@ -1677,15 +1527,35 @@ public class BukkitQuester implements Quester {
} }
} }
if (co.canShowCount()) { if (co.canShowCount()) {
message = message.replace("%count%", cleared + "/" + toClear); message = message.replace("%count%", progress + "/" + goal);
} }
message = BukkitConfigUtil.parseString(message.trim().replaceAll("\\s{2,}", "")); message = BukkitConfigUtil.parseString(message.trim().replaceAll("\\s{2,}", ""));
objectives.add(new BukkitObjective(ObjectiveType.CUSTOM, message, cleared, toClear)); objectives.add(new BukkitObjective(ObjectiveType.CUSTOM, message, progress, goal));
customIndex++; customIndex++;
} }
return objectives; return objectives;
} }
/**
* Format current objective message with count and placeholders
*
* @param color Color for text
* @param message Text to format
* @param progress Objective progress
* @param goal Objective goal
* @return Formatted message
*/
private String formatCurrentObjectiveMessage(ChatColor color, String message, int progress, int goal) {
message = color + message;
if (message.contains("<count>")) {
message = message.replace("<count>", "" + color + progress + "/" + goal);
}
if (plugin.getDependencies().getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
return message;
}
/** /**
* Show current objectives for a quest, if applicable<p> * Show current objectives for a quest, if applicable<p>
* *
@ -1700,7 +1570,7 @@ public class BukkitQuester implements Quester {
plugin.getLogger().severe("Quest was null when showing objectives for " + quester.getLastKnownName()); plugin.getLogger().severe("Quest was null when showing objectives for " + quester.getLastKnownName());
return; return;
} }
BukkitQuester q = (BukkitQuester)quester; final BukkitQuester q = (BukkitQuester)quester;
final Stage stage = quester.getCurrentStage(quest); final Stage stage = quester.getCurrentStage(quest);
if (stage == null) { if (stage == null) {
plugin.getLogger().warning("Current stage was null when showing objectives for " + quest.getName()); plugin.getLogger().warning("Current stage was null when showing objectives for " + quest.getName());
@ -1756,8 +1626,8 @@ public class BukkitQuester implements Quester {
} }
} }
} else if (objective.getProgressAsMob() != null && objective.getGoalAsMob() != null) { } else if (objective.getProgressAsMob() != null && objective.getGoalAsMob() != null) {
BukkitCountableMob progress = objective.getProgressAsMob(); final BukkitCountableMob progress = objective.getProgressAsMob();
BukkitCountableMob goal = objective.getGoalAsMob(); final BukkitCountableMob goal = objective.getGoalAsMob();
if (!settings.canShowCompletedObjs() && progress.getCount() >= goal.getCount()) { if (!settings.canShowCompletedObjs() && progress.getCount() >= goal.getCount()) {
continue; continue;
} }
@ -3442,13 +3312,7 @@ public class BukkitQuester implements Quester {
sendMessage(message); sendMessage(message);
} }
} else if (type.equals(ObjectiveType.BREAK_BLOCK)) { } else if (type.equals(ObjectiveType.BREAK_BLOCK)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "break"); final String message = formatCompletedObjectiveMessage("break", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += " <item>" + ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(),
@ -3459,13 +3323,7 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment))); sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment)));
} }
} else if (type.equals(ObjectiveType.DAMAGE_BLOCK)) { } else if (type.equals(ObjectiveType.DAMAGE_BLOCK)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "damage"); final String message = formatCompletedObjectiveMessage("damage", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += " <item>" + ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(),
@ -3476,13 +3334,7 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment))); sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment)));
} }
} else if (type.equals(ObjectiveType.PLACE_BLOCK)) { } else if (type.equals(ObjectiveType.PLACE_BLOCK)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "place"); final String message = formatCompletedObjectiveMessage("place", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += " <item>" + ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(),
@ -3493,13 +3345,7 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment))); sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment)));
} }
} else if (type.equals(ObjectiveType.USE_BLOCK)) { } else if (type.equals(ObjectiveType.USE_BLOCK)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "use"); final String message = formatCompletedObjectiveMessage("use", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += " <item>" + ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(),
@ -3510,13 +3356,7 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment))); sendMessage(message.replace("<item>", BukkitItemUtil.getName(increment)));
} }
} else if (type.equals(ObjectiveType.CUT_BLOCK)) { } else if (type.equals(ObjectiveType.CUT_BLOCK)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "cut"); final String message = formatCompletedObjectiveMessage("cut", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += " <item>" + ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, increment.getType(), increment.getDurability(),
@ -3529,13 +3369,7 @@ public class BukkitQuester implements Quester {
} else if (type.equals(ObjectiveType.CRAFT_ITEM)) { } else if (type.equals(ObjectiveType.CRAFT_ITEM)) {
final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToCraft().get(getCurrentStage(quest).getItemsToCraft() final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToCraft().get(getCurrentStage(quest).getItemsToCraft()
.indexOf(goal)); .indexOf(goal));
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "craftItem"); final String message = formatCompletedObjectiveMessage("craftItem", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + is.getAmount() + "/" + is.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + is.getAmount() + "/" + is.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null)) { if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null)) {
@ -3547,13 +3381,7 @@ public class BukkitQuester implements Quester {
} else if (type.equals(ObjectiveType.SMELT_ITEM)) { } else if (type.equals(ObjectiveType.SMELT_ITEM)) {
final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToSmelt().get(getCurrentStage(quest).getItemsToSmelt() final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToSmelt().get(getCurrentStage(quest).getItemsToSmelt()
.indexOf(goal)); .indexOf(goal));
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "smeltItem"); final String message = formatCompletedObjectiveMessage("smeltItem", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + is.getAmount() + "/" + is.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + is.getAmount() + "/" + is.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null)) { if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null)) {
@ -3565,13 +3393,7 @@ public class BukkitQuester implements Quester {
} else if (type.equals(ObjectiveType.ENCHANT_ITEM)) { } else if (type.equals(ObjectiveType.ENCHANT_ITEM)) {
final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToEnchant().get(getCurrentStage(quest) final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToEnchant().get(getCurrentStage(quest)
.getItemsToEnchant().indexOf(goal)); .getItemsToEnchant().indexOf(goal));
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "enchItem"); final String message = formatCompletedObjectiveMessage("enchItem", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + is.getAmount() + "/" + is.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + is.getAmount() + "/" + is.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) { if (plugin.getConfigSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
// Bukkit version is 1.9+ // Bukkit version is 1.9+
if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(),
@ -3603,13 +3425,7 @@ public class BukkitQuester implements Quester {
} else if (type.equals(ObjectiveType.BREW_ITEM)) { } else if (type.equals(ObjectiveType.BREW_ITEM)) {
final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToBrew().get(getCurrentStage(quest).getItemsToBrew() final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToBrew().get(getCurrentStage(quest).getItemsToBrew()
.indexOf(goal)); .indexOf(goal));
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "brewItem"); final String message = formatCompletedObjectiveMessage("brewItem", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + is.getAmount() + "/" + is.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + is.getAmount() + "/" + is.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) { if (plugin.getConfigSettings().canTranslateNames() && is.hasItemMeta() && !is.getItemMeta().hasDisplayName()) {
// Bukkit version is 1.9+ // Bukkit version is 1.9+
if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(),
@ -3629,13 +3445,7 @@ public class BukkitQuester implements Quester {
} else if (type.equals(ObjectiveType.CONSUME_ITEM)) { } else if (type.equals(ObjectiveType.CONSUME_ITEM)) {
final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToConsume().get(getCurrentStage(quest) final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToConsume().get(getCurrentStage(quest)
.getItemsToConsume().indexOf(goal)); .getItemsToConsume().indexOf(goal));
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "consumeItem"); final String message = formatCompletedObjectiveMessage("consumeItem", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + is.getAmount() + "/" + is.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + is.getAmount() + "/" + is.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null)) { if (!plugin.getLocaleManager().sendMessage(p, message, goal.getType(), goal.getDurability(), null)) {
@ -3647,15 +3457,9 @@ public class BukkitQuester implements Quester {
} else if (type.equals(ObjectiveType.DELIVER_ITEM)) { } else if (type.equals(ObjectiveType.DELIVER_ITEM)) {
final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToDeliver().get(getCurrentStage(quest) final ItemStack is = ((BukkitStage) getCurrentStage(quest)).getItemsToDeliver().get(getCurrentStage(quest)
.getItemsToDeliver().indexOf(goal)); .getItemsToDeliver().indexOf(goal));
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "deliver") final String message = formatCompletedObjectiveMessage("deliver", goal.getAmount())
.replace("<npc>", plugin.getDependencies().getNpcName(getCurrentStage(quest) .replace("<npc>", plugin.getDependencies().getNpcName(getCurrentStage(quest)
.getItemDeliveryTargets().get(getCurrentStage(quest).getItemsToDeliver().indexOf(goal)))); .getItemDeliveryTargets().get(getCurrentStage(quest).getItemsToDeliver().indexOf(goal))));
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + is.getAmount() + "/" + is.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + is.getAmount() + "/" + is.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta() if (plugin.getConfigSettings().canTranslateNames() && !goal.hasItemMeta()
&& !goal.getItemMeta().hasDisplayName()) { && !goal.getItemMeta().hasDisplayName()) {
if (!plugin.getLocaleManager().sendMessage(p, message, is.getType(), is.getDurability(), null)) { if (!plugin.getLocaleManager().sendMessage(p, message, is.getType(), is.getDurability(), null)) {
@ -3665,32 +3469,13 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<item>", BukkitItemUtil.getName(is))); sendMessage(message.replace("<item>", BukkitItemUtil.getName(is)));
} }
} else if (type.equals(ObjectiveType.MILK_COW)) { } else if (type.equals(ObjectiveType.MILK_COW)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "milkCow"); final String message = formatCompletedObjectiveMessage("milkCow", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
sendMessage(message); sendMessage(message);
} else if (type.equals(ObjectiveType.CATCH_FISH)) { } else if (type.equals(ObjectiveType.CATCH_FISH)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "catchFish"); final String message = formatCompletedObjectiveMessage("catchFish", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
sendMessage(message); sendMessage(message);
} else if (type.equals(ObjectiveType.KILL_MOB)) { } else if (type.equals(ObjectiveType.KILL_MOB)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "kill"); final String message = formatCompletedObjectiveMessage("kill", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.AQUA + " <mob>" + ChatColor.GREEN + ": " + goal.getAmount() + "/"
+ goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames()) { if (plugin.getConfigSettings().canTranslateNames()) {
if (!plugin.getLocaleManager().sendMessage(p, message, mob, extra)) { if (!plugin.getLocaleManager().sendMessage(p, message, mob, extra)) {
sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name()))); sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name())));
@ -3699,39 +3484,17 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name()))); sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name())));
} }
} else if (type.equals(ObjectiveType.KILL_PLAYER)) { } else if (type.equals(ObjectiveType.KILL_PLAYER)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "killPlayer"); final String message = formatCompletedObjectiveMessage("killPlayer", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
sendMessage(message); sendMessage(message);
} else if (type.equals(ObjectiveType.TALK_TO_NPC)) { } else if (type.equals(ObjectiveType.TALK_TO_NPC)) {
final String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "talkTo") final String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") "
.replace("<npc>", plugin.getDependencies().getNpcName(npc)); + BukkitLang.get(p, "talkTo").replace("<npc>", plugin.getDependencies().getNpcName(npc));
sendMessage(message); sendMessage(message);
} else if (type.equals(ObjectiveType.KILL_NPC)) { } else if (type.equals(ObjectiveType.KILL_NPC)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "kill"); final String message = formatCompletedObjectiveMessage("kill", goal.getAmount());
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.AQUA + " <mob>" + ChatColor.GREEN + ": " + goal.getAmount() + "/"
+ goal.getAmount();
}
sendMessage(message.replace("<mob>", plugin.getDependencies().getNpcName(npc))); sendMessage(message.replace("<mob>", plugin.getDependencies().getNpcName(npc)));
} else if (type.equals(ObjectiveType.TAME_MOB)) { } else if (type.equals(ObjectiveType.TAME_MOB)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "tame"); final String message = formatCompletedObjectiveMessage("tame", goal.getAmount());
if (!message.contains("<mob>")) {
message += " <mob>";
}
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
if (plugin.getConfigSettings().canTranslateNames()) { if (plugin.getConfigSettings().canTranslateNames()) {
if (!plugin.getLocaleManager().sendMessage(p, message, mob, extra)) { if (!plugin.getLocaleManager().sendMessage(p, message, mob, extra)) {
sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name()))); sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name())));
@ -3740,21 +3503,15 @@ public class BukkitQuester implements Quester {
sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name()))); sendMessage(message.replace("<mob>", BukkitMiscUtil.snakeCaseToUpperCamelCase(mob.name())));
} }
} else if (type.equals(ObjectiveType.SHEAR_SHEEP)) { } else if (type.equals(ObjectiveType.SHEAR_SHEEP)) {
String message = ChatColor.GREEN + "(" + BukkitLang.get(p, "completed") + ") " + BukkitLang.get(p, "shearSheep"); final String message = formatCompletedObjectiveMessage("shearSheep", goal.getAmount())
message = message.replace("<color>", BukkitMiscUtil.getPrettyDyeColorName(color)); .replace("<color>", BukkitMiscUtil.getPrettyDyeColorName(color));
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal.getAmount() + "/" + goal.getAmount());
} else {
// Legacy
message += ChatColor.GREEN + ": " + goal.getAmount() + "/" + goal.getAmount();
}
sendMessage(message); sendMessage(message);
} else if (type.equals(ObjectiveType.REACH_LOCATION)) { } else if (type.equals(ObjectiveType.REACH_LOCATION)) {
String obj = BukkitLang.get(p, "goTo"); String obj = BukkitLang.get(p, "goTo");
try { try {
obj = obj.replace("<location>", getCurrentStage(quest).getLocationNames().get(getCurrentStage(quest) obj = obj.replace("<location>", getCurrentStage(quest).getLocationNames().get(getCurrentStage(quest)
.getLocationsToReach().indexOf(location))); .getLocationsToReach().indexOf(location)));
} catch(final IndexOutOfBoundsException e) { } catch (final IndexOutOfBoundsException e) {
plugin.getLogger().severe("Unable to get final location " + location + " for quest ID " plugin.getLogger().severe("Unable to get final location " + location + " for quest ID "
+ quest.getId() + ", please report on Github"); + quest.getId() + ", please report on Github");
obj = obj.replace("<location>", "ERROR"); obj = obj.replace("<location>", "ERROR");
@ -3793,6 +3550,24 @@ public class BukkitQuester implements Quester {
quest.nextStage(this, true); quest.nextStage(this, true);
} }
} }
/**
* Format completed objective message with count and placeholders
*
* @param langKey Label as it appears in lang file
* @param goal Objective goal
* @return Formatted message
*/
private String formatCompletedObjectiveMessage(final String langKey, final int goal) {
String message = ChatColor.GREEN + "(" + BukkitLang.get("completed") + ") " + BukkitLang.get(langKey);
if (message.contains("<count>")) {
message = message.replace("<count>", "" + ChatColor.GREEN + goal + "/" + goal);
}
if (plugin.getDependencies().getPlaceholderApi() != null) {
message = PlaceholderAPI.setPlaceholders(getPlayer(), message);
}
return message;
}
/** /**
* Check whether this Quester has completed all objectives for their current stage * Check whether this Quester has completed all objectives for their current stage