summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLMBishop <13875753+LMBishop@users.noreply.github.com>2023-07-06 22:12:36 +0100
committerLMBishop <13875753+LMBishop@users.noreply.github.com>2023-07-06 22:14:18 +0100
commit112fe6c0b7e0d46f5159bb6d56835f1933d8edc7 (patch)
tree00e522ddb8985606f400572831c28bdc737effa9
parentfb1dda5b78646f6a2775efe963d6c1ed05f5f32c (diff)
Add ecobosses_killing task type
Closes #521
-rw-r--r--bukkit/build.gradle4
-rw-r--r--bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java3
-rw-r--r--bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java60
-rw-r--r--docs/task-types/ecobosses_killing-(task-type).md36
4 files changed, 103 insertions, 0 deletions
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index dc60e669..4d50d79e 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -20,6 +20,8 @@ repositories {
maven { url = 'https://libraries.minecraft.net/' }
// CoreProtect
maven { url = 'https://maven.playpro.com/' }
+ // EcoBosses
+ maven { url = 'https://repo.auxilor.io/repository/maven-public/' }
// EssentialsX
maven { url = 'https://repo.essentialsx.net/releases/' }
// MMOItems, MythicLib
@@ -63,6 +65,8 @@ dependencies {
compileOnly('net.citizensnpcs:citizensapi:2.0.30-SNAPSHOT') { transitive = false }
// CoreProtect
compileOnly 'net.coreprotect:coreprotect:21.2'
+ // EcoBosses
+ compileOnly 'com.willfp:EcoBosses:9.14.0'
// EssentialsX
compileOnly('net.essentialsx:EssentialsX:2.19.7') { transitive = false }
// FabledSkyblock
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 fb4de482..7ad3ef5e 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -368,6 +368,9 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
taskTypeManager.registerTaskType(new PlaceholderAPIEvaluateTaskType(this));
}
+ if (Bukkit.getPluginManager().isPluginEnabled("EcoBosses")) {
+ taskTypeManager.registerTaskType(new EcoBossesKillingTaskType(this));
+ }
if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
taskTypeManager.registerTaskType(new EssentialsMoneyEarnTaskType(this));
taskTypeManager.registerTaskType(new EssentialsBalanceTaskType(this));
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
new file mode 100644
index 00000000..20001fa2
--- /dev/null
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java
@@ -0,0 +1,60 @@
+package com.leonardobishop.quests.bukkit.tasktype.type.dependent;
+
+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 com.willfp.ecobosses.bosses.EcoBoss;
+import com.willfp.ecobosses.events.BossKillEvent;
+import org.bukkit.entity.Player;
+
+public final class EcoBossesKillingTaskType extends BukkitTaskType {
+
+ private final BukkitQuestsPlugin plugin;
+
+ public EcoBossesKillingTaskType(BukkitQuestsPlugin plugin) {
+ super("ecobosses_killing", TaskUtils.TASK_ATTRIBUTION_STRING, "Kill a set amount of an EcoBosses entity.");
+ this.plugin = plugin;
+
+ super.addConfigValidator(TaskUtils.useRequiredConfigValidator(this, "id", "ids"));
+ super.addConfigValidator(TaskUtils.useRequiredConfigValidator(this, "amount"));
+ super.addConfigValidator(TaskUtils.useIntegerConfigValidator(this, "amount"));
+ }
+
+ public void onBossKill(BossKillEvent event) {
+ Player killer = event.getKiller();
+ EcoBoss boss = event.getBoss().getBoss();
+
+ QPlayer qPlayer = plugin.getPlayerManager().getPlayer(killer.getUniqueId());
+ if (qPlayer == null) {
+ return;
+ }
+
+ for (TaskUtils.PendingTask pendingTask : TaskUtils.getApplicableTasks(killer, qPlayer, this)) {
+ Quest quest = pendingTask.quest();
+ Task task = pendingTask.task();
+ TaskProgress taskProgress = pendingTask.taskProgress();
+
+ super.debug("Player killed EcoBosses mob '" + boss.getDisplayName() + "' (id = " + boss.getID() + ")", quest.getId(), task.getId(), killer.getUniqueId());
+
+ if (!TaskUtils.matchString(this, pendingTask, "id", "ids", boss.getID(), false, false, killer.getUniqueId())) {
+ super.debug("Continuing...", quest.getId(), task.getId(), killer.getUniqueId());
+ continue;
+ }
+
+ int progress = TaskUtils.incrementIntegerTaskProgress(taskProgress);
+ super.debug("Incrementing task progress (now " + progress + ")", quest.getId(), task.getId(), killer.getUniqueId());
+
+ int amount = (int) task.getConfigValue("amount");
+
+ if (progress >= amount) {
+ super.debug("Marking task as complete", quest.getId(), task.getId(), killer.getUniqueId());
+ taskProgress.setCompleted(true);
+ }
+ }
+ }
+
+}
diff --git a/docs/task-types/ecobosses_killing-(task-type).md b/docs/task-types/ecobosses_killing-(task-type).md
new file mode 100644
index 00000000..472a0f7c
--- /dev/null
+++ b/docs/task-types/ecobosses_killing-(task-type).md
@@ -0,0 +1,36 @@
+---
+title: ecobosses_killing
+parent: External task types
+grand_parent: Task types
+---
+
+# ecobosses_killing (task type)
+
+Since v3.14
+{: .label .label-green }
+
+Plugin 'EcoBosses' required
+{: .label }
+
+Kill a certain number of EcoBosses bosses.
+
+## Options
+
+| Key | Description | Type | Required | Default | Notes |
+|--------------|-------------------------------------------------|----------------------------|----------|---------|-------|
+| `amount` | The number of bosses to kill. | Integer | Yes | \- | \- |
+| `id` / `ids` | The EcoBosses boss ID(s). | String, or list of strings | Yes | \- | \- |
+| `worlds` | Worlds which should count towards the progress. | List of world names | No | \- | \- |
+
+## Examples
+
+Kill 1 EcoBosses boss with the ID "skeletalknight":
+
+``` yaml
+ecobosses:
+ type: "ecobosses_killing"
+ amount: 1 # amount of mobs to be killed
+ id: "skeletalknight" # internal name of mob (name in config - NOT display name)
+ worlds: # (OPTIONAL) restrict to certain worlds
+ - "world"
+```