Llama API

patches/api/0008-Llama-API.patch

@@ -1,137 +0,0 @@
-From 0000000000000000000000000000000000000000 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] Llama API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc04d6a829 100644
---- a/src/main/java/org/bukkit/entity/Llama.java
-+++ b/src/main/java/org/bukkit/entity/Llama.java
-@@ -119,4 +119,20 @@ public interface Llama extends ChestedHorse, RangedEntity { // Paper
-     @org.jetbrains.annotations.Nullable
-     Llama getCaravanTail();
-     // Paper end
-+
-+    // 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);
-+    // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e34c37579dc8a5a108c03b9eff6bb916a910d867
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java
-@@ -0,0 +1,60 @@
-+package org.purpurmc.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.ApiStatus;
-+import org.jspecify.annotations.NullMarked;
-+
-+/**
-+ * Called when a Llama tries to join a caravan.
-+ * <p>
-+ * Cancelling the event will not let the Llama join. To prevent future attempts
-+ * at joining a caravan use {@link Llama#setShouldJoinCaravan(boolean)}.
-+ */
-+@NullMarked
-+public class LlamaJoinCaravanEvent extends EntityEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean canceled;
-+    private final Llama head;
-+
-+    @ApiStatus.Internal
-+    public LlamaJoinCaravanEvent(Llama llama, Llama head) {
-+        super(llama);
-+        this.head = head;
-+    }
-+
-+    @Override
-+    public Llama getEntity() {
-+        return (Llama) entity;
-+    }
-+
-+    /**
-+     * Get the Llama that this Llama is about to follow
-+     *
-+     * @return Llama about to be followed
-+     */
-+    public Llama getHead() {
-+        return head;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return canceled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        canceled = cancel;
-+    }
-+
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..23ea41ff5dc43a915a263aeb1a246705de8bf9e1
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java
-@@ -0,0 +1,34 @@
-+package org.purpurmc.purpur.event.entity;
-+
-+import org.bukkit.entity.Llama;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jspecify.annotations.NullMarked;
-+
-+/**
-+ * Called when a Llama leaves a caravan
-+ */
-+@NullMarked
-+public class LlamaLeaveCaravanEvent extends EntityEvent {
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    @ApiStatus.Internal
-+    public LlamaLeaveCaravanEvent(Llama llama) {
-+        super(llama);
-+    }
-+
-+    @Override
-+    public Llama getEntity() {
-+        return (Llama) entity;
-+    }
-+
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/server/0010-Llama-API.patch

@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 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] Llama API
-
-
-diff --git a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-index df695b444fa2a993d381e2f197182c3e91a68502..eb0faf58fa1a408f294fc62120b140def97f998d 100644
---- a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-+++ b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-@@ -22,6 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
- 
-     @Override
-     public boolean canUse() {
-+        if (!this.llama.shouldJoinCaravan) return false; // Purpur
-         if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
-             List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity -> {
-                 EntityType<?> entityType = entity.getType();
-@@ -71,6 +72,7 @@ public class LlamaFollowCaravanGoal extends Goal {
- 
-     @Override
-     public boolean canContinueToUse() {
-+        if (!this.llama.shouldJoinCaravan) return false; // Purpur
-         if (this.llama.inCaravan() && this.llama.getCaravanHead().isAlive() && this.firstIsLeashed(this.llama, 0)) {
-             double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
-             if (d > 676.0) {
-diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
-index 83fdbf55384a5c4429d65a88fcb788e449a8862a..cbab482bd44c0a0fa82a80f41fdfd8c124c58c43 100644
---- a/net/minecraft/world/entity/animal/horse/Llama.java
-+++ b/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -72,6 +72,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-     private Llama caravanHead;
-     @Nullable
-     public Llama caravanTail; // Paper
-+    public boolean shouldJoinCaravan = true; // Purpur
- 
-     public Llama(EntityType<? extends Llama> type, Level world) {
-         super(type, world);
-@@ -167,6 +168,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         super.addAdditionalSaveData(nbt);
-         nbt.putInt("Variant", this.getVariant().id);
-         nbt.putInt("Strength", this.getStrength());
-+        nbt.putBoolean("Purpur.ShouldJoinCaravan", shouldJoinCaravan); // Purpur
-     }
- 
-     @Override
-@@ -174,6 +176,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         this.setStrength(nbt.getInt("Strength"));
-         super.readAdditionalSaveData(nbt);
-         this.setVariant(Llama.Variant.byId(nbt.getInt("Variant")));
-+        if (nbt.contains("Purpur.ShouldJoinCaravan")) this.shouldJoinCaravan = nbt.getBoolean("Purpur.ShouldJoinCaravan"); // Purpur
-     }
- 
-     @Override
-@@ -441,6 +444,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
- 
-     public void leaveCaravan() {
-         if (this.caravanHead != null) {
-+            new org.purpurmc.purpur.event.entity.LlamaLeaveCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity()).callEvent(); // Purpur
-             this.caravanHead.caravanTail = null;
-         }
- 
-@@ -448,6 +452,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-     }
- 
-     public void joinCaravan(Llama llama) {
-+        if (!shouldJoinCaravan || !new org.purpurmc.purpur.event.entity.LlamaJoinCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity(), (org.bukkit.entity.Llama) llama.getBukkitEntity()).callEvent()) return; // Purpur
-         this.caravanHead = llama;
-         this.caravanHead.caravanTail = this;
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 351f42842b780d053cd2e5bad9ae299449141b10..4860574e7fad7a9527dda599703c573c5b4b234b 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-@@ -90,4 +90,16 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
-         return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public boolean shouldJoinCaravan() {
-+        return getHandle().shouldJoinCaravan;
-+    }
-+
-+    @Override
-+    public void setShouldJoinCaravan(boolean shouldJoinCaravan) {
-+        getHandle().shouldJoinCaravan = shouldJoinCaravan;
-+    }
-+    // Purpur end
- }

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Llama.java.patch

@@ -0,0 +1,23 @@
+--- a/src/main/java/org/bukkit/entity/Llama.java
++++ b/src/main/java/org/bukkit/entity/Llama.java
+@@ -119,4 +_,20 @@
+     @org.jetbrains.annotations.Nullable
+     Llama getCaravanTail();
+     // Paper end
++
++    // 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);
++    // Purpur end
+ }

purpur-api/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java

@@ -0,0 +1,60 @@
+package org.purpurmc.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.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when a Llama tries to join a caravan.
+ * <p>
+ * Cancelling the event will not let the Llama join. To prevent future attempts
+ * at joining a caravan use {@link Llama#setShouldJoinCaravan(boolean)}.
+ */
+@NullMarked
+public class LlamaJoinCaravanEvent extends EntityEvent implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+    private boolean canceled;
+    private final Llama head;
+
+    @ApiStatus.Internal
+    public LlamaJoinCaravanEvent(Llama llama, Llama head) {
+        super(llama);
+        this.head = head;
+    }
+
+    @Override
+    public Llama getEntity() {
+        return (Llama) entity;
+    }
+
+    /**
+     * Get the Llama that this Llama is about to follow
+     *
+     * @return Llama about to be followed
+     */
+    public Llama getHead() {
+        return head;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return canceled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        canceled = cancel;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

purpur-api/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java

@@ -0,0 +1,34 @@
+package org.purpurmc.purpur.event.entity;
+
+import org.bukkit.entity.Llama;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when a Llama leaves a caravan
+ */
+@NullMarked
+public class LlamaLeaveCaravanEvent extends EntityEvent {
+    private static final HandlerList handlers = new HandlerList();
+
+    @ApiStatus.Internal
+    public LlamaLeaveCaravanEvent(Llama llama) {
+        super(llama);
+    }
+
+    @Override
+    public Llama getEntity() {
+        return (Llama) entity;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

purpur-server/minecraft-patches/features/0001-Ridables.patch

@@ -2409,10 +2409,10 @@ index c6d0700f29d6c8123e96efe225faf2d99202ac81..361bf346153912bcbfcf962d7f716dfe
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
 diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
-index 58bb056ce934c793b16e63e44a4029be955c7caa..81a72b5ddbf7644d65dea972821d19e8fccd9b48 100644
+index 7618207f4ec7adeec8496e426037e6d17689daab..be40cfeb2f387ba50dea086432a453a268f18579 100644
 --- a/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -77,7 +77,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -78,7 +78,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          super(entityType, level);
          this.getNavigation().setRequiredPathLength(40.0F);
          this.maxDomestication = 30; // Paper - Missing entity API; configure max temper instead of a hardcoded value
@@ -2464,7 +2464,7 @@ index 58bb056ce934c793b16e63e44a4029be955c7caa..81a72b5ddbf7644d65dea972821d19e8
  
      public boolean isTraderLlama() {
          return false;
-@@ -118,6 +162,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -121,6 +165,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -2472,7 +2472,7 @@ index 58bb056ce934c793b16e63e44a4029be955c7caa..81a72b5ddbf7644d65dea972821d19e8
          this.goalSelector.addGoal(1, new RunAroundLikeCrazyGoal(this, 1.2));
          this.goalSelector.addGoal(2, new LlamaFollowCaravanGoal(this, 2.1F));
          this.goalSelector.addGoal(3, new RangedAttackGoal(this, 1.25, 40, 20.0F));
-@@ -128,6 +173,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -131,6 +176,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 0.7));
          this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(9, new RandomLookAroundGoal(this));

purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch

@@ -717,10 +717,10 @@ index 361bf346153912bcbfcf962d7f716dfe12ae2a7b..8bd118e82da9e4d4153de0a3efaf6d69
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
 diff --git a/net/minecraft/world/entity/animal/horse/Llama.java b/net/minecraft/world/entity/animal/horse/Llama.java
-index 81a72b5ddbf7644d65dea972821d19e8fccd9b48..4946bc7140ca7859d908bcd46a9acb4dac3f3417 100644
+index be40cfeb2f387ba50dea086432a453a268f18579..8b6beeff7ad0c7ca7bc09f505891f560096d5c9a 100644
 --- a/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -123,6 +123,23 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -124,6 +124,23 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
      // Purpur end - Ridables
  
@@ -1321,7 +1321,7 @@ index a58a0d5d3872a57c8c5e464bd0f6d2fd7a054990..acfb473c0a085ed516ff25ebac366700
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
-index 4dfc35f04ff841aa4fa198412c97cf59f843b4c2..83a8efba5937d61437c745f9b4be5aa02e7aac83 100644
+index 87507f5fad41e7339b02e8a425d41d6213656fbb..9c17ffa96361ad374ec2d0d5816f3cb300b45b15 100644
 --- a/net/minecraft/world/entity/monster/Shulker.java
 +++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -105,6 +105,12 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java.patch

@@ -0,0 +1,18 @@
+--- a/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
++++ b/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
+@@ -22,6 +_,7 @@
+ 
+     @Override
+     public boolean canUse() {
++        if (!this.llama.shouldJoinCaravan) return false; // Purpur - Llama API
+         if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
+             List<Entity> entities = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity1 -> {
+                 EntityType<?> type = entity1.getType();
+@@ -71,6 +_,7 @@
+ 
+     @Override
+     public boolean canContinueToUse() {
++        if (!this.llama.shouldJoinCaravan) return false; // Purpur - Llama API
+         if (this.llama.inCaravan() && this.llama.getCaravanHead().isAlive() && this.firstIsLeashed(this.llama, 0)) {
+             double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
+             if (d > 676.0) {

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/horse/Llama.java.patch

@@ -0,0 +1,42 @@
+--- a/net/minecraft/world/entity/animal/horse/Llama.java
++++ b/net/minecraft/world/entity/animal/horse/Llama.java
+@@ -72,6 +_,7 @@
+     private Llama caravanHead;
+     @Nullable
+     public Llama caravanTail; // Paper
++    public boolean shouldJoinCaravan = true; // Purpur - Llama API
+ 
+     public Llama(EntityType<? extends Llama> entityType, Level level) {
+         super(entityType, level);
+@@ -106,6 +_,7 @@
+         super.addAdditionalSaveData(compound);
+         compound.putInt("Variant", this.getVariant().id);
+         compound.putInt("Strength", this.getStrength());
++        compound.putBoolean("Purpur.ShouldJoinCaravan", shouldJoinCaravan); // Purpur - Llama API
+     }
+ 
+     @Override
+@@ -113,6 +_,7 @@
+         this.setStrength(compound.getInt("Strength"));
+         super.readAdditionalSaveData(compound);
+         this.setVariant(Llama.Variant.byId(compound.getInt("Variant")));
++        if (compound.contains("Purpur.ShouldJoinCaravan")) this.shouldJoinCaravan = compound.getBoolean("Purpur.ShouldJoinCaravan"); // Purpur - Llama API
+     }
+ 
+     @Override
+@@ -386,6 +_,7 @@
+ 
+     public void leaveCaravan() {
+         if (this.caravanHead != null) {
++            new org.purpurmc.purpur.event.entity.LlamaLeaveCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity()).callEvent(); // Purpur - Llama API
+             this.caravanHead.caravanTail = null;
+         }
+ 
+@@ -393,6 +_,7 @@
+     }
+ 
+     public void joinCaravan(Llama caravanHead) {
++        if (!shouldJoinCaravan || !new org.purpurmc.purpur.event.entity.LlamaJoinCaravanEvent((org.bukkit.entity.Llama) getBukkitEntity(), (org.bukkit.entity.Llama) caravanHead.getBukkitEntity()).callEvent()) return; // Purpur - Llama API
+         this.caravanHead = caravanHead;
+         this.caravanHead.caravanTail = this;
+     }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch

@@ -0,0 +1,19 @@
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+@@ -90,4 +_,16 @@
+         return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
+     }
+     // Paper end
++
++    // Purpur start
++    @Override
++    public boolean shouldJoinCaravan() {
++        return getHandle().shouldJoinCaravan;
++    }
++
++    @Override
++    public void setShouldJoinCaravan(boolean shouldJoinCaravan) {
++        getHandle().shouldJoinCaravan = shouldJoinCaravan;
++    }
++    // Purpur end
+ }