diff options
Diffstat (limited to 'bukkit/src/main')
3 files changed, 117 insertions, 7 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 acfab123..d0f4e151 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java @@ -301,6 +301,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { taskTypeManager.registerTaskType(new ConsumeTaskType(this)); taskTypeManager.registerTaskType(new WalkingTaskType(this)); taskTypeManager.registerTaskType(new TamingTaskType(this)); + taskTypeManager.registerTaskType(new TamingCertainTaskType(this)); taskTypeManager.registerTaskType(new MilkingTaskType(this)); taskTypeManager.registerTaskType(new ShearingTaskType(this)); taskTypeManager.registerTaskType(new PositionTaskType(this)); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingCertainTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingCertainTaskType.java new file mode 100644 index 00000000..002fbda6 --- /dev/null +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingCertainTaskType.java @@ -0,0 +1,108 @@ +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.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityTameEvent; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public final class TamingCertainTaskType extends BukkitTaskType { + + private final BukkitQuestsPlugin plugin; + + public TamingCertainTaskType(BukkitQuestsPlugin plugin) { + super("tamingcertain", TaskUtils.TASK_ATTRIBUTION_STRING, "Tame a set amount of certain animals."); + this.plugin = plugin; + } + + @Override + public @NotNull List<ConfigProblem> validateConfig(@NotNull String root, @NotNull HashMap<String, Object> config) { + ArrayList<ConfigProblem> problems = new ArrayList<>(); + if (TaskUtils.configValidateExists(root + ".amount", config.get("amount"), problems, "amount", super.getType())) + TaskUtils.configValidateInt(root + ".amount", config.get("amount"), problems, false, true, "amount"); + if (TaskUtils.configValidateExists(root + ".mob", config.get("mob"), problems, "mob", super.getType())) { + try { + EntityType.valueOf(String.valueOf(config.get("mob"))); + } catch (IllegalArgumentException ex) { + problems.add(new ConfigProblem(ConfigProblem.ConfigProblemType.WARNING, + ConfigProblemDescriptions.UNKNOWN_ENTITY_TYPE.getDescription(String.valueOf(config.get("mob"))), root + ".mob")); + } + } + return problems; + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onEntityTame(EntityTameEvent event) { + if (!(event.getOwner() instanceof Player)) { + return; + } + + Player player = (Player) event.getOwner(); + + if (player.hasMetadata("NPC")) 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; + } + + EntityType entityType; + try { + entityType = EntityType.valueOf((String) task.getConfigValue("mob")); + } catch (IllegalArgumentException ex) { + continue; + } + + if (event.getEntity().getType() != entityType) { + continue; + } + + int tamesNeeded = (int) task.getConfigValue("amount"); + + int progress; + if (taskProgress.getProgress() == null) { + progress = 0; + } else { + progress = (int) taskProgress.getProgress(); + } + + progress += 1; + taskProgress.setProgress(progress); + + if (progress >= tamesNeeded) { + taskProgress.setCompleted(true); + } + } + } + } + } + +} 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 6d1d3ff6..e1fc1e73 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 @@ -24,7 +24,7 @@ public final class TamingTaskType extends BukkitTaskType { private final BukkitQuestsPlugin plugin; public TamingTaskType(BukkitQuestsPlugin plugin) { - super("taming", TaskUtils.TASK_ATTRIBUTION_STRING, "Tame a set amount of animals."); + super("taming", TaskUtils.TASK_ATTRIBUTION_STRING, "Tame a set amount of any animals."); this.plugin = plugin; } @@ -37,7 +37,7 @@ public final class TamingTaskType extends BukkitTaskType { } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onTame(EntityTameEvent event) { + public void onEntityTame(EntityTameEvent event) { if (!(event.getOwner() instanceof Player)) { return; } @@ -66,16 +66,17 @@ public final class TamingTaskType extends BukkitTaskType { int tamesNeeded = (int) task.getConfigValue("amount"); - int progressTamed; + int progress; if (taskProgress.getProgress() == null) { - progressTamed = 0; + progress = 0; } else { - progressTamed = (int) taskProgress.getProgress(); + progress = (int) taskProgress.getProgress(); } - taskProgress.setProgress(progressTamed + 1); + progress += 1; + taskProgress.setProgress(progress); - if (((int) taskProgress.getProgress()) >= tamesNeeded) { + if (progress >= tamesNeeded) { taskProgress.setCompleted(true); } } |