deliver_item objective

Author: Malfrador

src/main/java/de/erethon/aether/Aether.java

@@ -12,6 +12,7 @@
 import de.erethon.aether.qxl.actions.ShowMobAction;
 import de.erethon.aether.qxl.actions.SpawnMobAction;
 import de.erethon.aether.qxl.actions.SpawnerAction;
+import de.erethon.aether.qxl.objectives.DeliverItemObjective;
 import de.erethon.aether.qxl.objectives.InteractMobObjective;
 import de.erethon.aether.qxl.objectives.KillMobObjective;
 import de.erethon.aether.spawning.MobSpawnConfig;
@@ -168,6 +169,7 @@ public void onEnable() {
             questsXL.registerComponent(QRegistries.ACTIONS, "show_mob", ShowMobAction::new);
             questsXL.registerComponent(QRegistries.ACTIONS, "hide_mob", HideMobAction::new);
             questsXL.registerComponent(QRegistries.ACTIONS, "remove_mob", RemoveMobAction::new);
+            questsXL.registerComponent(QRegistries.OBJECTIVES, "deliver_item", DeliverItemObjective::new);
             questsXL.registerComponent(QRegistries.OBJECTIVES, "kill_mob", KillMobObjective::new);
             questsXL.registerComponent(QRegistries.OBJECTIVES, "interact_mob", InteractMobObjective::new);
         }

src/main/java/de/erethon/aether/creature/AetherBaseMob.java

@@ -13,6 +13,7 @@
 import de.erethon.aether.events.CreatureDeathEvent;
 import de.erethon.aether.events.CreatureInteractEvent;
 import de.erethon.aether.events.CreatureLoadEvent;
+import de.erethon.aether.events.MobDeliverItemEvent;
 import de.erethon.aether.qxl.AetherHolder;
 import de.erethon.aether.tools.NMSUtils;
 import de.erethon.hecate.Hecate;
@@ -544,8 +545,27 @@ public boolean setTarget(LivingEntity entityliving, EntityTargetEvent.TargetReas
         if (hand == InteractionHand.OFF_HAND) { // Called for both hands, we only want main hand
             return super.mobInteract(player, hand);
         }
+        // Interaction event
         CreatureInteractEvent event = new CreatureInteractEvent((org.bukkit.entity.Player) player.getBukkitEntity(), this, data);
         Bukkit.getPluginManager().callEvent(event);
+
+        // Item delivery
+        ItemStack itemInHand = player.getItemInHand(hand);
+        if (!itemInHand.isEmpty()) {
+            HItem hItem = Aether.getInstance().getItemLibrary().get(itemInHand).getItem();
+            if (hItem != null) {
+                int amount = itemInHand.getCount();
+                MobDeliverItemEvent deliverEvent = new MobDeliverItemEvent((org.bukkit.entity.Player) player.getBukkitEntity(), data.getID(), hItem, amount);
+                deliverEvent.callEvent();
+                itemInHand.setCount(deliverEvent.getAmount());
+                if (itemInHand.getCount() <= 0) {
+                    player.setItemInHand(hand, new ItemStack(Items.AIR));
+                }
+                return super.mobInteract(player, hand); // Do not process dialogue if an item was delivered
+            }
+        }
+
+        // QXL
         try {
             QPlayer qPlayer = QuestsXL.get().getDatabaseManager().getCurrentPlayer((org.bukkit.entity.Player) player.getBukkitEntity());
             if (qPlayer != null && holder != null) {

src/main/java/de/erethon/aether/events/MobDeliverItemEvent.java

@@ -0,0 +1,53 @@
+package de.erethon.aether.events;
+
+import de.erethon.hephaestus.items.HItem;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public class MobDeliverItemEvent extends Event {
+    
+    private static final HandlerList handlers = new HandlerList();
+    
+    private Player player;
+    private String mobID;
+    private HItem item;
+    private int amount;
+
+    public MobDeliverItemEvent(Player player, String mobID, HItem item, int amount) {
+        this.player = player;
+        this.mobID = mobID;
+        this.item = item;
+        this.amount = amount;
+    }
+
+    public HItem getItem() {
+        return item;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+
+    public String getMobID() {
+        return mobID;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return handlers;
+    }
+    
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

src/main/java/de/erethon/aether/qxl/objectives/DeliverItemObjective.java

@@ -0,0 +1,64 @@
+package de.erethon.aether.qxl.objectives;
+
+import de.erethon.aether.events.MobDeliverItemEvent;
+import de.erethon.hephaestus.items.HItem;
+import de.erethon.questsxl.common.QConfig;
+import de.erethon.questsxl.common.QLoadableDoc;
+import de.erethon.questsxl.common.QParamDoc;
+import de.erethon.questsxl.common.QTranslatable;
+import de.erethon.questsxl.objective.ActiveObjective;
+import de.erethon.questsxl.objective.QBaseObjective;
+import org.bukkit.entity.Player;
+
+@QLoadableDoc(
+        value = "deliver_item",
+        description = "Deliver a specific item to a mob to complete this objective.",
+        shortExample = "deliver_item: item=minecraft:diamond, amount=5",
+        longExample = {
+                "deliver_item:",
+                "  item: minecraft:diamond # The item that needs to be delivered.",
+                "  amount: 5               # The amount of the item that needs to be delivered."
+        }
+)
+public class DeliverItemObjective extends QBaseObjective<MobDeliverItemEvent> {
+
+    @QParamDoc(name = "mob", description = "The ID of the mob to which the item must be delivered.", required = true)
+    private String mobID;
+    @QParamDoc(name = "item", description = "The Hephaestus ID of the item that needs to be delivered.", required = true)
+    private String itemID;
+    @QParamDoc(name = "amount", description = "The amount of the item that needs to be delivered.", def = "1")
+    private int amount;
+
+    @Override
+    protected QTranslatable getDefaultDisplayText(Player player) {
+        return null;
+    }
+
+    @Override
+    public Class<MobDeliverItemEvent> getEventType() {
+        return MobDeliverItemEvent.class;
+    }
+
+    @Override
+    public void check(ActiveObjective activeObjective, MobDeliverItemEvent event) {
+        if (!conditions(event.getPlayer())) {
+            return;
+        }
+        if (!event.getMobID().equalsIgnoreCase(mobID)) {
+            return;
+        }
+        HItem deliveredItem = event.getItem();
+        if (deliveredItem.getKey().toString().equalsIgnoreCase(itemID) && event.getAmount() >= amount) {
+            event.setAmount(event.getAmount() - amount);
+            checkCompletion(activeObjective, this, getPlayerHolder(event.getPlayer()));
+        }
+    }
+
+    @Override
+    public void load(QConfig cfg) {
+        super.load(cfg);
+        itemID = cfg.getString("item");
+        mobID = cfg.getString("mob");
+        amount = cfg.getInt("amount", 1);
+    }
+}