From dd9053089dddb1c059367d7b080d4e5acd67c041 Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Wed, 3 Mar 2021 18:46:34 +0000 Subject: Rename shopguiplus task types --- .../java/com/leonardobishop/quests/Quests.java | 8 +- .../dependent/ShopGUIPlusBuyCertainTaskType.java | 85 ++++++++++++++++++++++ .../types/dependent/ShopGUIPlusBuyTaskType.java | 85 ---------------------- .../dependent/ShopGUIPlusSellCertainTaskType.java | 85 ++++++++++++++++++++++ .../types/dependent/ShopGUIPlusSellTaskType.java | 85 ---------------------- 5 files changed, 174 insertions(+), 174 deletions(-) create mode 100644 src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyCertainTaskType.java delete mode 100644 src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyTaskType.java create mode 100644 src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellCertainTaskType.java delete mode 100644 src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellTaskType.java (limited to 'src') diff --git a/src/main/java/com/leonardobishop/quests/Quests.java b/src/main/java/com/leonardobishop/quests/Quests.java index d7c4bda4..1997699b 100644 --- a/src/main/java/com/leonardobishop/quests/Quests.java +++ b/src/main/java/com/leonardobishop/quests/Quests.java @@ -55,8 +55,8 @@ import com.leonardobishop.quests.quests.tasktypes.types.dependent.EssentialsMone import com.leonardobishop.quests.quests.tasktypes.types.dependent.IridiumSkyblockValueType; import com.leonardobishop.quests.quests.tasktypes.types.dependent.MythicMobsKillingType; import com.leonardobishop.quests.quests.tasktypes.types.dependent.PlaceholderAPIEvaluateTaskType; -import com.leonardobishop.quests.quests.tasktypes.types.dependent.ShopGUIPlusBuyTaskType; -import com.leonardobishop.quests.quests.tasktypes.types.dependent.ShopGUIPlusSellTaskType; +import com.leonardobishop.quests.quests.tasktypes.types.dependent.ShopGUIPlusBuyCertainTaskType; +import com.leonardobishop.quests.quests.tasktypes.types.dependent.ShopGUIPlusSellCertainTaskType; import com.leonardobishop.quests.quests.tasktypes.types.dependent.uSkyBlockLevelType; import com.leonardobishop.quests.updater.Updater; import com.leonardobishop.quests.util.Messages; @@ -223,8 +223,8 @@ public class Quests extends JavaPlugin { } if (Bukkit.getPluginManager().isPluginEnabled("ShopGUIPlus")) { // not tested - taskTypeManager.registerTaskType(new ShopGUIPlusBuyTaskType()); - taskTypeManager.registerTaskType(new ShopGUIPlusSellTaskType()); + taskTypeManager.registerTaskType(new ShopGUIPlusBuyCertainTaskType()); + taskTypeManager.registerTaskType(new ShopGUIPlusSellCertainTaskType()); } taskTypeManager.closeRegistrations(); diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyCertainTaskType.java new file mode 100644 index 00000000..ae757e50 --- /dev/null +++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyCertainTaskType.java @@ -0,0 +1,85 @@ +package com.leonardobishop.quests.quests.tasktypes.types.dependent; + +import com.leonardobishop.quests.QuestsConfigLoader; +import com.leonardobishop.quests.api.QuestsAPI; +import com.leonardobishop.quests.player.QPlayer; +import com.leonardobishop.quests.player.questprogressfile.QuestProgress; +import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile; +import com.leonardobishop.quests.player.questprogressfile.TaskProgress; +import com.leonardobishop.quests.quests.Quest; +import com.leonardobishop.quests.quests.Task; +import com.leonardobishop.quests.quests.tasktypes.TaskType; +import com.leonardobishop.quests.quests.tasktypes.TaskUtils; +import net.brcdev.shopgui.event.ShopPreTransactionEvent; +import net.brcdev.shopgui.shop.ShopManager; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class ShopGUIPlusBuyCertainTaskType extends TaskType { + + public ShopGUIPlusBuyCertainTaskType() { + super("shopguiplus_buycertain", "LMBishop", "Purchase a given item from a ShopGUI+ shop"); + } + + @Override + public List detectProblemsInConfig(String root, HashMap config) { + ArrayList problems = new ArrayList<>(); + if (TaskUtils.configValidateExists(root + ".amount", config.get("amount"), problems, "amount", super.getType())) + TaskUtils.configValidateInt(root + ".amount", config.get("amount"), problems, false, false, "amount"); + TaskUtils.configValidateExists(root + ".id", config.get("id"), problems, "id", super.getType()); + return problems; + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onMobKill(ShopPreTransactionEvent event) { + if (event.getShopAction() != ShopManager.ShopAction.BUY) return; + + QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId()); + if (qPlayer == null) { + return; + } + + QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); + + for (Quest quest : super.getRegisteredQuests()) { + if (questProgressFile.hasStartedQuest(quest)) { + QuestProgress questProgress = questProgressFile.getQuestProgress(quest); + + for (Task task : quest.getTasksOfType(super.getType())) { + if (!TaskUtils.validateWorld(event.getPlayer().getWorld().getName(), task)) continue; + + TaskProgress taskProgress = questProgress.getTaskProgress(task.getId()); + + if (taskProgress.isCompleted()) { + continue; + } + + String configName = (String) task.getConfigValue("id"); + + if (!event.getShopItem().getId().equals(configName)) { + return; + } + + int amountNeeded = (int) task.getConfigValue("amount"); + + int progressAmount; + if (taskProgress.getProgress() == null) { + progressAmount = 0; + } else { + progressAmount = (int) taskProgress.getProgress(); + } + + taskProgress.setProgress(progressAmount + event.getAmount()); + + if (((int) taskProgress.getProgress()) >= amountNeeded) { + taskProgress.setCompleted(true); + } + } + } + } + } +} diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyTaskType.java deleted file mode 100644 index d3b69eed..00000000 --- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusBuyTaskType.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.leonardobishop.quests.quests.tasktypes.types.dependent; - -import com.leonardobishop.quests.QuestsConfigLoader; -import com.leonardobishop.quests.api.QuestsAPI; -import com.leonardobishop.quests.player.QPlayer; -import com.leonardobishop.quests.player.questprogressfile.QuestProgress; -import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile; -import com.leonardobishop.quests.player.questprogressfile.TaskProgress; -import com.leonardobishop.quests.quests.Quest; -import com.leonardobishop.quests.quests.Task; -import com.leonardobishop.quests.quests.tasktypes.TaskType; -import com.leonardobishop.quests.quests.tasktypes.TaskUtils; -import net.brcdev.shopgui.event.ShopPreTransactionEvent; -import net.brcdev.shopgui.shop.ShopManager; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class ShopGUIPlusBuyTaskType extends TaskType { - - public ShopGUIPlusBuyTaskType() { - super("shopguiplus_buy", "LMBishop", "Purchase a given item from a ShopGUI+ shop"); - } - - @Override - public List detectProblemsInConfig(String root, HashMap config) { - ArrayList problems = new ArrayList<>(); - if (TaskUtils.configValidateExists(root + ".amount", config.get("amount"), problems, "amount", super.getType())) - TaskUtils.configValidateInt(root + ".amount", config.get("amount"), problems, false, false, "amount"); - TaskUtils.configValidateExists(root + ".id", config.get("id"), problems, "id", super.getType()); - return problems; - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onMobKill(ShopPreTransactionEvent event) { - if (event.getShopAction() != ShopManager.ShopAction.BUY) return; - - QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId()); - if (qPlayer == null) { - return; - } - - QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); - - for (Quest quest : super.getRegisteredQuests()) { - if (questProgressFile.hasStartedQuest(quest)) { - QuestProgress questProgress = questProgressFile.getQuestProgress(quest); - - for (Task task : quest.getTasksOfType(super.getType())) { - if (!TaskUtils.validateWorld(event.getPlayer().getWorld().getName(), task)) continue; - - TaskProgress taskProgress = questProgress.getTaskProgress(task.getId()); - - if (taskProgress.isCompleted()) { - continue; - } - - String configName = (String) task.getConfigValue("id"); - - if (!event.getShopItem().getId().equals(configName)) { - return; - } - - int amountNeeded = (int) task.getConfigValue("amount"); - - int progressAmount; - if (taskProgress.getProgress() == null) { - progressAmount = 0; - } else { - progressAmount = (int) taskProgress.getProgress(); - } - - taskProgress.setProgress(progressAmount + event.getAmount()); - - if (((int) taskProgress.getProgress()) >= amountNeeded) { - taskProgress.setCompleted(true); - } - } - } - } - } -} diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellCertainTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellCertainTaskType.java new file mode 100644 index 00000000..1a062393 --- /dev/null +++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellCertainTaskType.java @@ -0,0 +1,85 @@ +package com.leonardobishop.quests.quests.tasktypes.types.dependent; + +import com.leonardobishop.quests.QuestsConfigLoader; +import com.leonardobishop.quests.api.QuestsAPI; +import com.leonardobishop.quests.player.QPlayer; +import com.leonardobishop.quests.player.questprogressfile.QuestProgress; +import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile; +import com.leonardobishop.quests.player.questprogressfile.TaskProgress; +import com.leonardobishop.quests.quests.Quest; +import com.leonardobishop.quests.quests.Task; +import com.leonardobishop.quests.quests.tasktypes.TaskType; +import com.leonardobishop.quests.quests.tasktypes.TaskUtils; +import net.brcdev.shopgui.event.ShopPreTransactionEvent; +import net.brcdev.shopgui.shop.ShopManager; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class ShopGUIPlusSellCertainTaskType extends TaskType { + + public ShopGUIPlusSellCertainTaskType() { + super("shopguiplus_sellcertain", "LMBishop", "Sell a given item from to a ShopGUI+ shop"); + } + + @Override + public List detectProblemsInConfig(String root, HashMap config) { + ArrayList problems = new ArrayList<>(); + if (TaskUtils.configValidateExists(root + ".amount", config.get("amount"), problems, "amount", super.getType())) + TaskUtils.configValidateInt(root + ".amount", config.get("amount"), problems, false, false, "amount"); + TaskUtils.configValidateExists(root + ".id", config.get("id"), problems, "id", super.getType()); + return problems; + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onMobKill(ShopPreTransactionEvent event) { + if (event.getShopAction() != ShopManager.ShopAction.SELL || event.getShopAction() != ShopManager.ShopAction.SELL_ALL) return; + + QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId()); + if (qPlayer == null) { + return; + } + + QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); + + for (Quest quest : super.getRegisteredQuests()) { + if (questProgressFile.hasStartedQuest(quest)) { + QuestProgress questProgress = questProgressFile.getQuestProgress(quest); + + for (Task task : quest.getTasksOfType(super.getType())) { + if (!TaskUtils.validateWorld(event.getPlayer().getWorld().getName(), task)) continue; + + TaskProgress taskProgress = questProgress.getTaskProgress(task.getId()); + + if (taskProgress.isCompleted()) { + continue; + } + + String configName = (String) task.getConfigValue("id"); + + if (!event.getShopItem().getId().equals(configName)) { + return; + } + + int amountNeeded = (int) task.getConfigValue("amount"); + + int progressAmount; + if (taskProgress.getProgress() == null) { + progressAmount = 0; + } else { + progressAmount = (int) taskProgress.getProgress(); + } + + taskProgress.setProgress(progressAmount + event.getAmount()); + + if (((int) taskProgress.getProgress()) >= amountNeeded) { + taskProgress.setCompleted(true); + } + } + } + } + } +} diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellTaskType.java deleted file mode 100644 index ddc4c87a..00000000 --- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/ShopGUIPlusSellTaskType.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.leonardobishop.quests.quests.tasktypes.types.dependent; - -import com.leonardobishop.quests.QuestsConfigLoader; -import com.leonardobishop.quests.api.QuestsAPI; -import com.leonardobishop.quests.player.QPlayer; -import com.leonardobishop.quests.player.questprogressfile.QuestProgress; -import com.leonardobishop.quests.player.questprogressfile.QuestProgressFile; -import com.leonardobishop.quests.player.questprogressfile.TaskProgress; -import com.leonardobishop.quests.quests.Quest; -import com.leonardobishop.quests.quests.Task; -import com.leonardobishop.quests.quests.tasktypes.TaskType; -import com.leonardobishop.quests.quests.tasktypes.TaskUtils; -import net.brcdev.shopgui.event.ShopPreTransactionEvent; -import net.brcdev.shopgui.shop.ShopManager; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class ShopGUIPlusSellTaskType extends TaskType { - - public ShopGUIPlusSellTaskType() { - super("shopguiplus_sell", "LMBishop", "Sell a given item from to a ShopGUI+ shop"); - } - - @Override - public List detectProblemsInConfig(String root, HashMap config) { - ArrayList problems = new ArrayList<>(); - if (TaskUtils.configValidateExists(root + ".amount", config.get("amount"), problems, "amount", super.getType())) - TaskUtils.configValidateInt(root + ".amount", config.get("amount"), problems, false, false, "amount"); - TaskUtils.configValidateExists(root + ".id", config.get("id"), problems, "id", super.getType()); - return problems; - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onMobKill(ShopPreTransactionEvent event) { - if (event.getShopAction() != ShopManager.ShopAction.SELL || event.getShopAction() != ShopManager.ShopAction.SELL_ALL) return; - - QPlayer qPlayer = QuestsAPI.getPlayerManager().getPlayer(event.getPlayer().getUniqueId()); - if (qPlayer == null) { - return; - } - - QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); - - for (Quest quest : super.getRegisteredQuests()) { - if (questProgressFile.hasStartedQuest(quest)) { - QuestProgress questProgress = questProgressFile.getQuestProgress(quest); - - for (Task task : quest.getTasksOfType(super.getType())) { - if (!TaskUtils.validateWorld(event.getPlayer().getWorld().getName(), task)) continue; - - TaskProgress taskProgress = questProgress.getTaskProgress(task.getId()); - - if (taskProgress.isCompleted()) { - continue; - } - - String configName = (String) task.getConfigValue("id"); - - if (!event.getShopItem().getId().equals(configName)) { - return; - } - - int amountNeeded = (int) task.getConfigValue("amount"); - - int progressAmount; - if (taskProgress.getProgress() == null) { - progressAmount = 0; - } else { - progressAmount = (int) taskProgress.getProgress(); - } - - taskProgress.setProgress(progressAmount + event.getAmount()); - - if (((int) taskProgress.getProgress()) >= amountNeeded) { - taskProgress.setCompleted(true); - } - } - } - } - } -} -- cgit v1.2.3-70-g09d2