Add more llama API

patches/api/0017-Add-more-llama-API.patch

@@ -0,0 +1,192 @@
+From 1d4b77522dae9f37f5649de7a1206fc9092a4de1 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Fri, 18 Oct 2019 22:50:05 -0500
+Subject: [PATCH] Add more llama API
+
+---
+ .../event/entity/LlamaJoinCaravanEvent.java   | 55 ++++++++++++++++
+ .../event/entity/LlamaLeaveCaravanEvent.java  | 31 ++++++++++
+ src/main/java/org/bukkit/entity/Llama.java    | 62 +++++++++++++++++++
+ 3 files changed, 148 insertions(+)
+ create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
+ create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
+
+diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
+new file mode 100644
+index 000000000..2cb006f5d
+--- /dev/null
++++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
+@@ -0,0 +1,55 @@
++package net.pl3x.purpur.event.entity;
++
++import org.bukkit.entity.Llama;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.NotNull;
++
++public class LlamaJoinCaravanEvent extends EntityEvent implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private boolean canceled;
++    private final Llama head;
++
++    public LlamaJoinCaravanEvent(@NotNull Llama llama, @NotNull Llama head) {
++        super(llama);
++        this.head = head;
++    }
++
++    @Override
++    @NotNull
++    public Llama getEntity() {
++        return (Llama) entity;
++    }
++
++    /**
++     * Get the Llama that this Llama is about to follow
++     *
++     * @return Llama about to be followed
++     */
++    @NotNull
++    public Llama getHead() {
++        return head;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return canceled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        canceled = cancel;
++    }
++
++    @Override
++    @NotNull
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
+new file mode 100644
+index 000000000..ea61463f0
+--- /dev/null
++++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
+@@ -0,0 +1,31 @@
++package net.pl3x.purpur.event.entity;
++
++import org.bukkit.entity.Llama;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.NotNull;
++
++public class LlamaLeaveCaravanEvent extends EntityEvent {
++    private static final HandlerList handlers = new HandlerList();
++
++    public LlamaLeaveCaravanEvent(@NotNull Llama llama) {
++        super(llama);
++    }
++
++    @Override
++    @NotNull
++    public Llama getEntity() {
++        return (Llama) entity;
++    }
++
++    @Override
++    @NotNull
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
+index d23226ccb..1ef9479c9 100644
+--- a/src/main/java/org/bukkit/entity/Llama.java
++++ b/src/main/java/org/bukkit/entity/Llama.java
+@@ -3,6 +3,7 @@ package org.bukkit.entity;
+ import com.destroystokyo.paper.entity.RangedEntity;
+ import org.bukkit.inventory.LlamaInventory;
+ import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable; // Purpur
+ 
+ /**
+  * Represents a Llama.
+@@ -67,4 +68,65 @@ public interface Llama extends ChestedHorse, RangedEntity { // Paper
+     @NotNull
+     @Override
+     LlamaInventory getInventory();
++
++    // Purpur start
++
++    /**
++     * Check if this Llama should attempt to join a caravan
++     *
++     * @return True if Llama is allowed to join a caravan
++     */
++    boolean shouldJoinCaravan();
++
++    /**
++     * Set if this Llama should attempt to join a caravan
++     *
++     * @param shouldJoinCaravan True to allow joining a caravan
++     */
++    void setShouldJoinCaravan(boolean shouldJoinCaravan);
++
++    /**
++     * Check if Llama is in a caravan
++     *
++     * @return True if in caravan
++     */
++    boolean inCaravan();
++
++    /**
++     * Join a caravan
++     *
++     * @param llama Head of caravan to join
++     */
++    void joinCaravan(@NotNull Llama llama);
++
++    /**
++     * Leave current caravan if in one
++     */
++    void leaveCaravan();
++
++    /**
++     * Check if another Llama is following this Llama
++     *
++     * @return True if being followed in the caravan
++     */
++    boolean hasCaravanTail();
++
++    /**
++     * Get the Llama that this Llama is following
++     * <p>
++     * Does not necessarily mean the leader of the entire caravan
++     *
++     * @return The Llama being followed
++     */
++    @Nullable
++    Llama getCaravanHead();
++
++    /**
++     * Get the Llama following this Llama, if any
++     *
++     * @return The Llama following this one
++     */
++    @Nullable
++    Llama getCaravanTail();
++    // Purpur end
+ }
+-- 
+2.23.0.rc1
+

patches/server/0069-Add-more-llama-API.patch

@@ -0,0 +1,169 @@
+From c8c4d0de5474cae2b320ffdc1124dcc6b83ecfdc Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Fri, 18 Oct 2019 22:50:12 -0500
+Subject: [PATCH] Add more llama API
+
+---
+ .../net/minecraft/server/EntityLlama.java     | 20 ++++++---
+ .../server/PathfinderGoalLlamaFollow.java     |  4 +-
+ .../bukkit/craftbukkit/entity/CraftLlama.java | 44 +++++++++++++++++++
+ 3 files changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
+index 72372497d9..a8cf42fd35 100644
+--- a/src/main/java/net/minecraft/server/EntityLlama.java
++++ b/src/main/java/net/minecraft/server/EntityLlama.java
+@@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+     @Nullable
+     private EntityLlama bM;
+     @Nullable
+-    private EntityLlama bN;
++    private EntityLlama bN; @Nullable public EntityLlama getCaravanTail() { return bN; } // Purpur - OBFHELPER
++    public boolean shouldJoinCaravan = true; // Purpur
+ 
+     public EntityLlama(EntityTypes<? extends EntityLlama> entitytypes, World world) {
+         super(entitytypes, world);
+@@ -63,7 +64,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+         if (!this.inventoryChest.getItem(1).isEmpty()) {
+             nbttagcompound.set("DecorItem", this.inventoryChest.getItem(1).save(new NBTTagCompound()));
+         }
+-
++        nbttagcompound.setBoolean("Purpur.ShouldJoinCaravan", shouldJoinCaravan); // Purpur
+     }
+ 
+     @Override
+@@ -74,7 +75,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+         if (nbttagcompound.hasKeyOfType("DecorItem", 10)) {
+             this.inventoryChest.setItem(1, ItemStack.a(nbttagcompound.getCompound("DecorItem")));
+         }
+-
++        // Purpur start
++        if (nbttagcompound.hasKey("Purpur.ShouldJoinCaravan")) {
++            nbttagcompound.setBoolean("Purpur.ShouldJoinCaravan", shouldJoinCaravan);
++        }
++        // Purpur end
+         this.en();
+     }
+ 
+@@ -409,29 +414,34 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+         }
+     }
+ 
++    public void leaveCaravan() { eG(); } // Purpur - OBFHELPER
+     public void eG() {
+         if (this.bM != null) {
++            new net.pl3x.purpur.event.entity.LlamaLeaveCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity()).callEvent(); // Purpur
+             this.bM.bN = null;
+         }
+ 
+         this.bM = null;
+     }
+ 
++    public void joinCaravan(EntityLlama entitiyllama) { a(entitiyllama); } // Purpur - OBFHELPER
+     public void a(EntityLlama entityllama) {
++        if (!shouldJoinCaravan || !new net.pl3x.purpur.event.entity.LlamaJoinCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity(), (org.bukkit.entity.Llama) entityllama.getBukkitEntity()).callEvent()) return; // Purpur
+         this.bM = entityllama;
+         this.bM.bN = this;
+     }
+ 
++    public boolean hasCaravanTail() { return eH(); } // Purpur - OBFHELPER
+     public boolean eH() {
+         return this.bN != null;
+     }
+ 
++    public boolean inCaravan() { return eI(); } // Purpur - OBFHELPER
+     public boolean eI() {
+         return this.bM != null;
+     }
+ 
+-    @Nullable
+-    public EntityLlama eJ() {
++    public EntityLlama getCaravanHead() { return eJ(); } @Nullable public EntityLlama eJ() { // Purpur - OBFHELPER
+         return this.bM;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
+index a46a985a65..9cc0d2e956 100644
+--- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
++++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
+@@ -6,7 +6,7 @@ import java.util.List;
+ 
+ public class PathfinderGoalLlamaFollow extends PathfinderGoal {
+ 
+-    public final EntityLlama a;
++    public final EntityLlama a; public EntityLlama getLlama() { return a; } // Purpur
+     private double b;
+     private int c;
+ 
+@@ -18,6 +18,7 @@ public class PathfinderGoalLlamaFollow extends PathfinderGoal {
+ 
+     @Override
+     public boolean a() {
++        if (!getLlama().shouldJoinCaravan) return false; // Purpur
+         if (!this.a.isLeashed() && !this.a.eI()) {
+             List<Entity> list = this.a.world.getEntities(this.a, this.a.getBoundingBox().grow(9.0D, 4.0D, 9.0D), (entity) -> {
+                 EntityTypes<?> entitytypes = entity.getEntityType();
+@@ -77,6 +78,7 @@ public class PathfinderGoalLlamaFollow extends PathfinderGoal {
+ 
+     @Override
+     public boolean b() {
++        if (!getLlama().shouldJoinCaravan) return false; // Purpur
+         if (this.a.eI() && this.a.eJ().isAlive() && this.a(this.a, 0)) {
+             double d0 = this.a.h((Entity) this.a.eJ());
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+index 3f94c5a920..a027634801 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+@@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE
+     public EntityType getType() {
+         return EntityType.LLAMA;
+     }
++
++    // Purpur start
++    @Override
++    public boolean shouldJoinCaravan() {
++        return getHandle().shouldJoinCaravan;
++    }
++
++    @Override
++    public void setShouldJoinCaravan(boolean shouldJoinCaravan) {
++        getHandle().shouldJoinCaravan = shouldJoinCaravan;
++    }
++
++    @Override
++    public boolean inCaravan() {
++        return getHandle().inCaravan();
++    }
++
++    @Override
++    public void joinCaravan(Llama llama) {
++        if (llama != null) {
++            getHandle().joinCaravan(((CraftLlama) llama).getHandle());
++        }
++    }
++
++    @Override
++    public void leaveCaravan() {
++        getHandle().leaveCaravan();
++    }
++
++    @Override
++    public boolean hasCaravanTail() {
++        return getHandle().hasCaravanTail();
++    }
++
++    @Override
++    public Llama getCaravanHead() {
++        return getHandle().getCaravanHead() == null ? null : (Llama) getHandle().getCaravanHead().getBukkitEntity();
++    }
++
++    @Override
++    public Llama getCaravanTail() {
++        return getHandle().getCaravanTail() == null ? null : (Llama) getHandle().getCaravanTail().getBukkitEntity();
++    }
++    // Purpur end
+ }
+-- 
+2.23.0.rc1
+