diff options
47 files changed, 86 insertions, 75 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java index 0c51f174..d364c7e7 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java @@ -110,7 +110,7 @@ public final class BlockItemdroppingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java index 86e32410..1a17567c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java @@ -61,7 +61,8 @@ public final class BlockshearingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java index 462bd3c0..3fd0e081 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java @@ -111,7 +111,8 @@ public final class BreedingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java index 6596c3f5..20c61209 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java @@ -124,7 +124,8 @@ public final class BrewingTaskType extends BukkitTaskType { taskProgress.setProgress(amount); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketEmptyTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketEmptyTaskType.java index 4f7d0be2..43e80842 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketEmptyTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketEmptyTaskType.java @@ -19,5 +19,4 @@ public final class BucketEmptyTaskType extends BucketInteractionTaskType { public void onBucketEmpty(PlayerBucketEmptyEvent event) { super.onBucket(event.getPlayer(), event.getBucket(), plugin); } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketFillTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketFillTaskType.java index cbfe6759..cb7be547 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketFillTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketFillTaskType.java @@ -21,5 +21,4 @@ public final class BucketFillTaskType extends BucketInteractionTaskType { super.onBucket(event.getPlayer(), event.getItemStack().getType(), plugin); } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java index da6e5e56..aeb83353 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java @@ -56,8 +56,8 @@ public abstract class BucketInteractionTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java index 27fcc937..2e0b365d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java @@ -65,7 +65,8 @@ public final class BuildingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } @@ -107,6 +108,4 @@ public final class BuildingTaskType extends BukkitTaskType { super.debug("Decrementing task progress (now " + progress + ")", quest.getId(), task.getId(), player.getUniqueId()); } } - - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java index 926bb5ad..f7e3ee20 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java @@ -82,7 +82,8 @@ public final class ConsumeTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java index db85c445..2ce477ce 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java @@ -112,8 +112,8 @@ public final class CraftingTaskType extends BukkitTaskType { taskProgress.setProgress(amount); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java index 8dcd8d12..e2131f37 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java @@ -70,7 +70,7 @@ public final class DealDamageTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java index ceee05aa..fb2b63b4 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java @@ -109,7 +109,8 @@ public final class EnchantingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, enchantsNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java index 4d1e4403..da0a7fb9 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java @@ -54,7 +54,8 @@ public final class ExpEarnTaskType extends BukkitTaskType { taskProgress.setProgress(expNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, expNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java index 0b534915..ffad0a6d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java @@ -138,7 +138,8 @@ public final class FarmingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java index d2316745..f174119a 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java @@ -95,7 +95,8 @@ public final class FishingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java index 1826d56d..bad80afb 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java @@ -105,7 +105,8 @@ public final class InteractTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } -}
\ No newline at end of file +} diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java index a399a0bc..a40a09ee 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java @@ -163,8 +163,8 @@ public final class InventoryTaskType extends BukkitTaskType { } } } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } - }
\ No newline at end of file diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java index 43f9bf89..ef4c2c33 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java @@ -58,8 +58,8 @@ public final class MilkingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, breedingNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java index 4df51308..8cef018b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java @@ -104,7 +104,8 @@ public final class MiningTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); }; boolean coreProtectEnabled = TaskUtils.getConfigBoolean(task, "check-coreprotect"); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java index 320ed26c..1308999b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java @@ -130,7 +130,8 @@ public final class MobkillingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PermissionTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PermissionTaskType.java index b389a625..dedceb2d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PermissionTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PermissionTaskType.java @@ -64,5 +64,4 @@ public final class PermissionTaskType extends BukkitTaskType { this.poll.cancel(); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java index 9dd34b98..e5f46ae7 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java @@ -57,8 +57,8 @@ public final class PlayerkillingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), killer.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(killer, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(killer, quest, task, taskProgress, playerKillsNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java index 04d0d07d..fae9715d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java @@ -66,7 +66,8 @@ public final class PlaytimeTaskType extends BukkitTaskType { PlaytimeTaskType.super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, minutes); } } } @@ -80,5 +81,4 @@ public final class PlaytimeTaskType extends BukkitTaskType { // this.poll.cancel(); // } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java index 93691640..306b4c1d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java @@ -81,7 +81,8 @@ public final class ReplenishingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java index 3d50a9e5..d3b2d1ed 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java @@ -69,7 +69,8 @@ public final class ShearingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java index b6e1701f..4f0ea576 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java @@ -130,8 +130,8 @@ public final class SmeltingTaskType extends BukkitTaskType { taskProgress.setProgress(amount); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java index 4f7c3e08..7fdac494 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java @@ -119,7 +119,8 @@ public final class SmithingTaskType extends BukkitTaskType { taskProgress.setProgress(amount); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java index adda0306..3125b418 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java @@ -67,7 +67,8 @@ public final class TamingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java index 3f2cb918..e1432797 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java @@ -106,7 +106,8 @@ public final class WalkingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, distanceNeeded); } } @@ -134,5 +135,4 @@ public final class WalkingTaskType extends BukkitTaskType { default -> false; }; } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java index 0f1d69d0..f192cc96 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java @@ -51,7 +51,8 @@ public final class ASkyBlockLevelTaskType extends BukkitTaskType { taskProgress.setProgress(islandLevelNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java index 233b78da..bff1d22f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java @@ -71,7 +71,8 @@ public final class BentoBoxLevelTaskType extends BukkitTaskType { taskProgress.setProgress(newLevel); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensDeliverTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensDeliverTaskType.java index e423381f..f732c8b9 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensDeliverTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensDeliverTaskType.java @@ -151,8 +151,8 @@ public final class CitizensDeliverTaskType extends BukkitTaskType { } } } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensInteractTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensInteractTaskType.java index 63bfd3dd..295d531f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensInteractTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CitizensInteractTaskType.java @@ -77,5 +77,4 @@ public final class CitizensInteractTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java index d9ab6354..ae9f0ff0 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java @@ -57,8 +57,8 @@ public final class EcoBossesKillingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), killer.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(killer, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(killer, quest, task, taskProgress, amount); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java index abfd7164..9bf483d7 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java @@ -95,8 +95,8 @@ public final class EssentialsBalanceTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, earningsNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java index f11b9c85..b0245156 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java @@ -69,8 +69,8 @@ public final class EssentialsMoneyEarnTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, earningsNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyblockLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyblockLevelTaskType.java index ee323502..edacb2ee 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyblockLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyblockLevelTaskType.java @@ -64,9 +64,9 @@ public final class FabledSkyblockLevelTaskType extends BukkitTaskType { taskProgress.setProgress(islandLevelNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); } } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java index 9ea55779..cf480da8 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java @@ -67,10 +67,8 @@ public final class IridiumSkyblockValueTaskType extends BukkitTaskType { taskProgress.setProgress(islandValueNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandValueNeeded); } } - } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java index 5f86774e..e9ee63d1 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java @@ -129,8 +129,8 @@ public final class MythicMobsKillingTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java index 1ec5905a..3db9ad5f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java @@ -55,8 +55,8 @@ public final class NuVotifierVoteTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, votesNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java index 9aae76a1..10736327 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java @@ -61,7 +61,8 @@ public final class PlayerPointsEarnTaskType extends BukkitTaskType { taskProgress.setProgress(amount); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java index f6c877f5..b38a717f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java @@ -122,7 +122,8 @@ public abstract class ShopGUIPlusInteractionTaskType extends BukkitTaskType { taskProgress.setProgress(amountNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amountNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java index d4587dd2..f9316d28 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java @@ -59,7 +59,8 @@ public final class SuperiorSkyblockLevelType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java index 56b9b6fd..c16c650c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java @@ -59,7 +59,8 @@ public final class SuperiorSkyblockWorthType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java index 7692cade..6b09c1d6 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java @@ -55,8 +55,8 @@ public final class VotingPluginVoteType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, votesNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java index 33a52429..65fca94b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java @@ -50,8 +50,8 @@ public final class uSkyBlockLevelTaskType extends BukkitTaskType { taskProgress.setProgress(islandLevelNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); } } - } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java index 40880bd0..93b7506c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java @@ -150,7 +150,7 @@ public class TaskUtils { return progress; } - public static void sendTrackAdvancement(Player player, Quest quest, Task task, TaskProgress taskProgress) { + public static void sendTrackAdvancement(Player player, Quest quest, Task task, TaskProgress taskProgress, Number amount) { boolean useActionBar = plugin.getConfig().getBoolean("options.actionbar.progress", false) || (taskProgress.isCompleted() && plugin.getConfig().getBoolean("options.actionbar.complete", false)); boolean useBossBar = plugin.getConfig().getBoolean("options.bossbar.progress", false) @@ -200,7 +200,7 @@ public class TaskUtils { } if (useBossBar) { - sendTrackAdvancementBossBar(player, quest, task, taskProgress, title); + sendTrackAdvancementBossBar(player, quest, task, taskProgress, title, amount); } } @@ -208,7 +208,7 @@ public class TaskUtils { plugin.getActionBarHandle().sendActionBar(player, title); } - private static void sendTrackAdvancementBossBar(Player player, Quest quest, Task task, TaskProgress taskProgress, String title) { + private static void sendTrackAdvancementBossBar(Player player, Quest quest, Task task, TaskProgress taskProgress, String title, Number amount) { Double bossBarProgress = null; if (!taskProgress.isCompleted()) { @@ -218,10 +218,7 @@ public class TaskUtils { } if (bossBarProgress != null) { // if has value - Object amount = task.getConfigValue("amount"); - if (amount instanceof Number amountNumber) { - bossBarProgress /= amountNumber.doubleValue(); // calculate progress - } + bossBarProgress /= amount.doubleValue(); // calculate progress } } |