diff options
Diffstat (limited to 'bukkit')
3 files changed, 128 insertions, 5 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 063c5e66..706b9175 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java @@ -50,6 +50,7 @@ import com.leonardobishop.quests.bukkit.scheduler.folia.FoliaServerScheduler; import com.leonardobishop.quests.bukkit.storage.MySqlStorageProvider; import com.leonardobishop.quests.bukkit.storage.YamlStorageProvider; import com.leonardobishop.quests.bukkit.tasktype.BukkitTaskTypeManager; +import com.leonardobishop.quests.bukkit.tasktype.type.BlockItemdroppingTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.BlockshearingTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.BreedingTaskType; import com.leonardobishop.quests.bukkit.tasktype.type.BrewingTaskType; @@ -407,8 +408,6 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { Class.forName("org.bukkit.event.inventory.SmithItemEvent"); taskTypeManager.registerTaskType(new SmithingTaskType(this)); } catch (ClassNotFoundException ignored) { } // server version cannot support task type - // TODO: FIX - // taskTypeManager.registerTaskType(new BrewingCertainTaskType()); try { Class.forName("org.bukkit.block.data.Ageable"); taskTypeManager.registerTaskType(new FarmingTaskType(this)); @@ -421,6 +420,10 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { Class.forName("com.destroystokyo.paper.loottable.LootableInventoryReplenishEvent"); taskTypeManager.registerTaskType(new ReplenishingTaskType(this)); } catch (ClassNotFoundException ignored) { } // server version cannot support task type + try { + Class.forName("org.bukkit.event.block.BlockDropItemEvent"); + taskTypeManager.registerTaskType(new BlockItemdroppingTaskType(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/BlockItemdroppingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java new file mode 100644 index 00000000..0c51f174 --- /dev/null +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java @@ -0,0 +1,116 @@ +package com.leonardobishop.quests.bukkit.tasktype.type; + +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; +import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin; +import com.leonardobishop.quests.bukkit.item.QuestItem; +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.block.BlockState; +import org.bukkit.entity.Item; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.BlockDropItemEvent; +import org.bukkit.inventory.ItemStack; + +import java.util.List; + +public final class BlockItemdroppingTaskType extends BukkitTaskType { + + private final BukkitQuestsPlugin plugin; + private final Table<String, String, QuestItem> fixedQuestItemCache = HashBasedTable.create(); + + public BlockItemdroppingTaskType(BukkitQuestsPlugin plugin) { + super("blockitemdropping", TaskUtils.TASK_ATTRIBUTION_STRING, "Drop certain amount of items from a block."); + this.plugin = plugin; + + super.addConfigValidator(TaskUtils.useRequiredConfigValidator(this, "amount")); + super.addConfigValidator(TaskUtils.useIntegerConfigValidator(this, "amount")); + super.addConfigValidator(TaskUtils.useItemStackConfigValidator(this, "item")); + super.addConfigValidator(TaskUtils.useIntegerConfigValidator(this, "data")); + super.addConfigValidator(TaskUtils.useBooleanConfigValidator(this, "exact-match")); + super.addConfigValidator(TaskUtils.useMaterialListConfigValidator(this, TaskUtils.MaterialListConfigValidatorMode.BLOCK, "block", "blocks")); + } + + @Override + public void onReady() { + fixedQuestItemCache.clear(); + } + + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onBlockDropItem(BlockDropItemEvent event) { + Player player = event.getPlayer(); + if (player.hasMetadata("NPC")) { + return; + } + + QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); + if (qPlayer == null) { + return; + } + + BlockState state = event.getBlockState(); + + List<Item> drops = event.getItems(); + for (Item drop : drops) { + handle(player, qPlayer, state, drop.getItemStack()); + } + } + + private void handle(Player player, QPlayer qPlayer, BlockState state, ItemStack item) { + 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 dropped item from block", quest.getId(), task.getId(), player.getUniqueId()); + + if (task.hasConfigKey("item")) { + if (item == null) { + super.debug("Specific item is required, dropped item is null; continuing...", quest.getId(), task.getId(), player.getUniqueId()); + continue; + } + + super.debug("Specific item is required; dropped item is of type '" + item.getType() + "'", quest.getId(), task.getId(), player.getUniqueId()); + + QuestItem qi; + if ((qi = fixedQuestItemCache.get(quest.getId(), task.getId())) == null) { + QuestItem fetchedItem = TaskUtils.getConfigQuestItem(task, "item", "data"); + fixedQuestItemCache.put(quest.getId(), task.getId(), fetchedItem); + qi = fetchedItem; + } + + boolean exactMatch = TaskUtils.getConfigBoolean(task, "exact-match", true); + if (!qi.compareItemStack(item, exactMatch)) { + super.debug("Item does not match required item, continuing...", quest.getId(), task.getId(), player.getUniqueId()); + continue; + } else { + super.debug("Item matches required item", quest.getId(), task.getId(), player.getUniqueId()); + } + } + + if (!TaskUtils.matchBlock(this, pendingTask, state, 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); + } + + TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress); + } + } +} diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java index 5c0cd45d..d0a5832a 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/TaskUtils.java @@ -19,6 +19,7 @@ import com.leonardobishop.quests.common.tasktype.TaskType; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.Block; +import org.bukkit.block.BlockState; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Entity; @@ -260,6 +261,10 @@ public class TaskUtils { public record PendingTask(Quest quest, Task task, QuestProgress questProgress, TaskProgress taskProgress) { } public static boolean matchBlock(@NotNull BukkitTaskType type, @NotNull PendingTask pendingTask, @NotNull Block block, @NotNull UUID player) { + return matchBlock(type, pendingTask, block.getState(), player); + } + + public static boolean matchBlock(@NotNull BukkitTaskType type, @NotNull PendingTask pendingTask, @NotNull BlockState state, @NotNull UUID player) { Task task = pendingTask.task; List<String> checkBlocks = TaskUtils.getConfigStringList(task, task.getConfigValues().containsKey("block") ? "block" : "blocks"); @@ -271,9 +276,8 @@ public class TaskUtils { Object configData = task.getConfigValue("data"); - Material blockMaterial = block.getType(); - //noinspection deprecation - byte blockData = block.getData(); + Material blockMaterial = state.getType(); + byte blockData = state.getRawData(); Material material; int comparableData; |