Add bucket task types (closes #226)

4 files changed, 144 insertions, 0 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
index 9e2ab000..1fbbfdf7 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -285,6 +285,8 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
             taskTypeManager.registerTaskType(new DistancefromTaskType(this));
             taskTypeManager.registerTaskType(new CommandTaskType(this));
             taskTypeManager.registerTaskType(new CraftingTaskType(this));
+            taskTypeManager.registerTaskType(new BucketEmptyTaskType(this));
+            taskTypeManager.registerTaskType(new BucketFillTaskType(this));
             // TODO: FIX
             // taskTypeManager.registerTaskType(new BrewingCertainTaskType());
             try {
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
new file mode 100644
index 00000000..4f7d0be2
--- /dev/null
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketEmptyTaskType.java
@@ -0,0 +1,23 @@
+package com.leonardobishop.quests.bukkit.tasktype.type;
+
+import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
+import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+
+public final class BucketEmptyTaskType extends BucketInteractionTaskType {
+
+    private final BukkitQuestsPlugin plugin;
+
+    public BucketEmptyTaskType(BukkitQuestsPlugin plugin) {
+        super("bucketempty", TaskUtils.TASK_ATTRIBUTION_STRING, "Empty a specific bucket.");
+        this.plugin = plugin;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    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
new file mode 100644
index 00000000..539d35cc
--- /dev/null
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketFillTaskType.java
@@ -0,0 +1,26 @@
+package com.leonardobishop.quests.bukkit.tasktype.type;
+
+import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
+import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerBucketFillEvent;
+
+public final class BucketFillTaskType extends BucketInteractionTaskType {
+
+    private final BukkitQuestsPlugin plugin;
+
+    public BucketFillTaskType(BukkitQuestsPlugin plugin) {
+        super("bucketfill", TaskUtils.TASK_ATTRIBUTION_STRING, "Fill a specific bucket.");
+        this.plugin = plugin;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBucketFill(PlayerBucketFillEvent event) {
+        if (event.getItemStack() == null) return;
+
+        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
new file mode 100644
index 00000000..48d72190
--- /dev/null
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java
@@ -0,0 +1,93 @@
+package com.leonardobishop.quests.bukkit.tasktype.type;
+
+import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
+import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskType;
+import com.leonardobishop.quests.bukkit.util.TaskUtils;
+import com.leonardobishop.quests.common.config.ConfigProblem;
+import com.leonardobishop.quests.common.config.ConfigProblemDescriptions;
+import com.leonardobishop.quests.common.player.QPlayer;
+import com.leonardobishop.quests.common.player.questprogressfile.QuestProgress;
+import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
+import com.leonardobishop.quests.common.quest.Quest;
+import com.leonardobishop.quests.common.quest.Task;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerBucketEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public abstract class BucketInteractionTaskType extends BukkitTaskType {
+
+    public BucketInteractionTaskType(@NotNull String type, String author, String description) {
+        super(type, author, description);
+    }
+
+    @Override
+    public @NotNull List<ConfigProblem> validateConfig(@NotNull String root, @NotNull HashMap<String, Object> config) {
+        ArrayList<ConfigProblem> problems = new ArrayList<>();
+        if (config.get("bucket") == null) {
+            TaskUtils.configValidateExists(root + ".bucket", config.get("bucket"), problems, "bucket", super.getType());
+        } else {
+            String configBlock = config.get("bucket").toString();
+
+            String[] split = configBlock.split(":");
+            if (Material.getMaterial(String.valueOf(split[0])) == null) {
+                problems.add(new ConfigProblem(ConfigProblem.ConfigProblemType.WARNING,
+                        ConfigProblemDescriptions.UNKNOWN_MATERIAL.getDescription(configBlock), root + ".bucket"));
+            }
+        }
+        if (TaskUtils.configValidateExists(root + ".amount", config.get("amount"), problems, "amount", super.getType()))
+            TaskUtils.configValidateInt(root + ".amount", config.get("amount"), problems, false, true, "amount");
+        return problems;
+    }
+
+    public void onBucket(Player player, Material bucket, BukkitQuestsPlugin plugin) {
+        if (!player.isOnline() || player.hasMetadata("NPC") || bucket == null) return;
+
+        QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId());
+
+        if (qPlayer == null) return;
+
+        for (Quest quest : super.getRegisteredQuests()) {
+            if (qPlayer.hasStartedQuest(quest)) {
+                QuestProgress questProgress = qPlayer.getQuestProgressFile().getQuestProgress(quest);
+
+                for (Task task : quest.getTasksOfType(super.getType())) {
+                    if (!TaskUtils.validateWorld(player, task)) continue;
+
+                    TaskProgress taskProgress = questProgress.getTaskProgress(task.getId());
+
+                    if (taskProgress.isCompleted()) {
+                        continue;
+                    }
+
+                    int amount = (int) task.getConfigValue("amount");
+                    Object configBucket = task.getConfigValue("bucket");
+                    Material material = Material.getMaterial((String) configBucket);
+
+                    if (bucket != material) {
+                        continue;
+                    }
+
+                    int progress;
+                    if (taskProgress.getProgress() == null) {
+                        progress = 0;
+                    } else {
+                        progress = (int) taskProgress.getProgress();
+                    }
+
+                    taskProgress.setProgress(progress + 1);
+
+                    if ((int) taskProgress.getProgress() >= amount) {
+                        taskProgress.setProgress(amount);
+                        taskProgress.setCompleted(true);
+                    }
+                }
+            }
+        }
+    }
+
+}