diff options
3 files changed, 79 insertions, 1 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 379ccef8..7267f1da 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java @@ -70,6 +70,7 @@ import com.leonardobishop.quests.bukkit.tasktype.type.CommandTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.CompostingTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.ConsumeTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.CraftingTaskType; +import com.leonardobishop.quests.bukkit.tasktype.type.CuringTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.DealDamageTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.DistancefromTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.EnchantingTaskType; @@ -443,6 +444,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { taskTypeManager.registerTaskType(() -> new BlockshearingTaskType(this), () -> CompatUtils.classExists("io.papermc.paper.event.block.PlayerShearBlockEvent")); taskTypeManager.registerTaskType(() -> new BrewingTaskType(this), () -> CompatUtils.classWithMethodExists("org.bukkit.event.inventory.BrewEvent", "getResults")); taskTypeManager.registerTaskType(() -> new CompostingTaskType(this), () -> CompatUtils.classExists("io.papermc.paper.event.entity.EntityCompostItemEvent")); + taskTypeManager.registerTaskType(() -> new CuringTaskType(this), () -> CompatUtils.classExists("org.bukkit.event.entity.EntityTransformEvent")); taskTypeManager.registerTaskType(() -> new FarmingTaskType(this), () -> CompatUtils.classExists("org.bukkit.block.data.Ageable")); taskTypeManager.registerTaskType(() -> new HatchingTaskType(this), () -> CompatUtils.classExists("com.destroystokyo.paper.event.entity.ThrownEggHatchEvent")); taskTypeManager.registerTaskType(() -> new ItemmendingTaskType(this), () -> CompatUtils.classExists("org.bukkit.event.player.PlayerItemMendEvent")); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CuringTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CuringTaskType.java new file mode 100644 index 00000000..c65fe675 --- /dev/null +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CuringTaskType.java @@ -0,0 +1,77 @@ +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.bukkit.util.constraint.TaskConstraintSet; +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 org.bukkit.OfflinePlayer; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.entity.ZombieVillager; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityTransformEvent; + +public final class CuringTaskType extends BukkitTaskType { + + private final BukkitQuestsPlugin plugin; + + public CuringTaskType(BukkitQuestsPlugin plugin) { + super("curing", TaskUtils.TASK_ATTRIBUTION_STRING, "Cure a set amount of zombie villagers."); + this.plugin = plugin; + + super.addConfigValidator(TaskUtils.useRequiredConfigValidator(this, "amount")); + super.addConfigValidator(TaskUtils.useIntegerConfigValidator(this, "amount")); + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onEntityTransform(EntityTransformEvent event) { + EntityTransformEvent.TransformReason reason = event.getTransformReason(); + if (reason != EntityTransformEvent.TransformReason.CURED) { + return; + } + + Entity entity = event.getEntity(); + if (!(entity instanceof ZombieVillager zombieVillager)) { + return; + } + + OfflinePlayer offlinePlayer = zombieVillager.getConversionPlayer(); + if (!(offlinePlayer instanceof Player player)) { + return; + } + + if (player.hasMetadata("NPC")) { + return; + } + + QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); + if (qPlayer == null) { + return; + } + + for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(player, qPlayer, this, TaskConstraintSet.ALL)) { + Quest quest = pendingTask.quest(); + Task task = pendingTask.task(); + TaskProgress taskProgress = pendingTask.taskProgress(); + + super.debug("Player cured " + entity.getType(), quest.getId(), task.getId(), player.getUniqueId()); + + 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); + } + + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); + } + } +} diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/HatchingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/HatchingTaskType.java index 7752cbbf..2183bbae 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/HatchingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/HatchingTaskType.java @@ -9,7 +9,6 @@ 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 org.bukkit.entity.Egg; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; |