From bf20ca900b8a581ed84d97697572753c169c541b Mon Sep 17 00:00:00 2001 From: Krakenied Date: Sat, 10 Dec 2022 21:02:54 +0100 Subject: Add block shearing task type Closes https://github.com/LMBishop/Quests/issues/416 --- .../quests/bukkit/BukkitQuestsPlugin.java | 4 ++ .../tasktype/type/BlockshearingTaskType.java | 64 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java (limited to 'bukkit') 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 f902395e..8334d251 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java @@ -318,6 +318,10 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { Class.forName("org.bukkit.block.data.Ageable"); taskTypeManager.registerTaskType(new FarmingTaskType(this)); } catch (ClassNotFoundException ignored) { } // server version cannot support task type + try { + Class.forName("io.papermc.paper.event.block.PlayerShearBlockEvent"); + taskTypeManager.registerTaskType(new BlockshearingTaskType(this)); + } catch (ClassNotFoundException ignored) { } // server version cannot support task type if (Bukkit.getPluginManager().isPluginEnabled("ASkyBlock")) { taskTypeManager.registerTaskType(new ASkyBlockLevelTaskType(this)); } 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 new file mode 100644 index 00000000..4c0fee8b --- /dev/null +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java @@ -0,0 +1,64 @@ +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.player.QPlayer; +import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress; +import com.leonardobishop.quests.common.quest.Quest; +import com.leonardobishop.quests.common.quest.Task; +import io.papermc.paper.event.block.PlayerShearBlockEvent; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +public final class BlockshearingTaskType extends BukkitTaskType { + + private final BukkitQuestsPlugin plugin; + + public BlockshearingTaskType(BukkitQuestsPlugin plugin) { + super("blockshearing", TaskUtils.TASK_ATTRIBUTION_STRING, "Shear a set amount of certain blocks."); + this.plugin = plugin; + + super.addConfigValidator(TaskUtils.useRequiredConfigValidator(this, "amount")); + super.addConfigValidator(TaskUtils.useIntegerConfigValidator(this, "amount")); + super.addConfigValidator(TaskUtils.useMaterialListConfigValidator(this, "block", "blocks")); + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onPlayerShearBlock(PlayerShearBlockEvent event) { + Player player = event.getPlayer(); + if (player.hasMetadata("NPC")) { + return; + } + + QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); + if (qPlayer == null) { + return; + } + + for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player.getPlayer(), qPlayer, this, TaskUtils.TaskConstraint.WORLD)) { + Quest quest = pendingTask.quest(); + Task task = pendingTask.task(); + TaskProgress taskProgress = pendingTask.taskProgress(); + + Block block = event.getBlock(); + super.debug("Player sheared a block, current block is " + block.getType(), quest.getId(), task.getId(), player.getUniqueId()); + + if (!TaskUtils.matchBlock(this, pendingTask, block, player.getUniqueId())) { + super.debug("Continuing...", quest.getId(), task.getId(), player.getUniqueId()); + continue; + } + + int progress = TaskUtils.incrementIntegerTaskProgress(taskProgress); + super.debug("Incrementing task progress (now " + progress + ")", quest.getId(), task.getId(), player.getUniqueId()); + + int amount = (int) task.getConfigValue("amount"); + if (progress >= amount) { + super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); + taskProgress.setCompleted(true); + } + } + } +} -- cgit v1.2.3-70-g09d2