Add more entity api (#7564)

patches/server/0276-Turtle-API.patch

@@ -52,10 +52,10 @@ index ea1bb6924043dfd05452b793afd7651c867de5dc..1b0be28ebfd7ec2f978b5d87f6d26e4d
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..a3849ebba14b47b33f1af57c47f94c02aebea232 100644
+index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..b78289dd6a71b962c02247af578e939bc97847c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-@@ -24,4 +24,36 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
+@@ -24,4 +24,41 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
      public EntityType getType() {
          return EntityType.TURTLE;
      }
@@ -90,5 +90,10 @@ index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..a3849ebba14b47b33f1af57c47f94c02
 +    public void setHasEgg(boolean hasEgg) {
 +        getHandle().setHasEgg(hasEgg);
 +    }
++
++    @Override
++    public boolean isLayingEgg() {
++        return this.getHandle().isLayingEgg();
++    }
 +    // Paper end
  }

patches/server/0587-added-Wither-API.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 5 Jul 2020 15:39:19 -0700
-Subject: [PATCH] added Wither API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 32b302aad0319ce3ee412912425c1c8db9979f8a..92734f767fde60351a179a88350a97b861be0e88 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-         return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable();
-     };
-     private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
-+    // Paper start
-+    private boolean canPortal = false;
-+
-+    public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; }
-+    // Paper end
- 
-     public WitherBoss(EntityType<? extends WitherBoss> type, Level world) {
-         super(type, world);
-@@ -602,7 +607,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
- 
-     @Override
-     public boolean canChangeDimensions() {
--        return false;
-+        return super.canChangeDimensions() && canPortal; // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 640b0860fbe3412da32d03187e6f355ba8f099ea..299d5e47489cfe489ac130a33a08cdb29ba76d72 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-@@ -38,4 +38,31 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
-     public BossBar getBossBar() {
-         return this.bossBar;
-     }
-+
-+    // Paper start
-+    @Override
-+    public boolean isCharged() {
-+        return getHandle().isPowered();
-+    }
-+
-+    @Override
-+    public int getInvulnerableTicks() {
-+        return getHandle().getInvulnerableTicks();
-+    }
-+
-+    @Override
-+    public void setInvulnerableTicks(int ticks) {
-+        getHandle().setInvulnerableTicks(ticks);
-+    }
-+
-+    @Override
-+    public boolean canTravelThroughPortals() {
-+        return getHandle().canChangeDimensions();
-+    }
-+
-+    @Override
-+    public void setCanTravelThroughPortals(boolean value) {
-+        getHandle().setCanTravelThroughPortals(value);
-+    }
-+    // Paper end
- }

patches/server/0614-Implement-Keyed-on-World.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Keyed on World
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6124142faeeb792c0f7f6c167f8da47af446cba9..153c2551544dffe36e836fa62f2752160e2cd64a 100644
+index 841d984292b7d3d7610a671b7f6192d6cbd48835..48e2d5e2b53e32af53387f2e63c67ff9e0a7c5bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1231,7 +1231,7 @@ public final class CraftServer implements Server {

patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c75005b934271e4b8864d949052d56465571f011..4a7e4c2038dd4a7496ed4084a19f31a611ee319a 100644
+index 327e39646bd2ab398d9da582d4620052c3c92bc1..f06ba478f3ed7c333cba18c2443d62f0eb01d4d7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -106,6 +106,13 @@ public class PaperConfig {

patches/server/0627-Add-bypass-host-check.patch

@@ -8,7 +8,7 @@ Paper.bypassHostCheck
 Seriously, fix your firewalls. -.-
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 54de844431cf9cc88d6e82014d5eb69babd7784c..b5b929a504164aefd2498cd9fad66a5c7aaf59e4 100644
+index 8060d6461835d5b5b4429e9b280d08eae4e435e9..f74b6d2110e51c76eeb1aea7665153509b6e6371 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL

patches/server/0658-Fix-and-optimise-world-force-upgrading.patch

@@ -272,7 +272,7 @@ index 69dc1271be0a3f3f2fb4ce15981ed25d24dce785..1e0d261439255091a6f61485c0747231
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1cac02ba1eced8c1cda0de750dfe640acdca21c0..e2f647f3bdacd950ba098103d82a6f4f90794f36 100644
+index abb6b8f3b69826d69956a248770fc7b87745ba9a..5a2c5dc61580ff343ca96561fa56400c31995529 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -557,11 +557,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -357,7 +357,7 @@ index 4bc33c31d497aa7d69226ab870fd78902bedfd5b..089e8414c7bdc102ba0d914af576df1a
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cca74c494c089e8668750eead58b508e61689515..2256a680d4f53d143e4ebfd82221074a84a86fdc 100644
+index 486fe0d067dc11b42263b26592039e210acce06b..99a679945337f412fe7d1c51280b05b5b0bcfb5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1192,12 +1192,7 @@ public final class CraftServer implements Server {

patches/server/0660-Add-Unix-domain-socket-support.patch

@@ -107,7 +107,7 @@ index c36089ead51d2e7dc3369d5f9a1869f58ff5391c..bfa519b9335c960a5baec50b0da95d95
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index b5b929a504164aefd2498cd9fad66a5c7aaf59e4..97ee159867c4800c8fdec9a5fa42f648112be186 100644
+index f74b6d2110e51c76eeb1aea7665153509b6e6371..e76b9670213de966ee275e624e7ee5f673d3f210 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -44,6 +44,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL

patches/server/0676-Make-item-validations-configurable.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4a7e4c2038dd4a7496ed4084a19f31a611ee319a..b33ece9a98f94d0c09b837bc95dbfab82ff6cabe 100644
+index f06ba478f3ed7c333cba18c2443d62f0eb01d4d7..86cd1409de5d367e9c48460c1b5bcc1554ecfa98 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -504,4 +504,19 @@ public class PaperConfig {

patches/server/0682-Missing-Entity-Behavior-API.patch

@@ -3,6 +3,8 @@ From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 Date: Mon, 21 Jun 2021 23:56:07 -0400
 Subject: [PATCH] Missing Entity Behavior API
 
+Co-authored-by: Nassim Jahnke <jahnke.nassim@gmail.com>
+Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d68ba51b79 100644
@@ -35,6 +37,52 @@ index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d6
      public void setStanding(boolean angry) {
          if (angry) {
              this.setEating(false);
+diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+index 32b302aad0319ce3ee412912425c1c8db9979f8a..92734f767fde60351a179a88350a97b861be0e88 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
++++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+@@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+         return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable();
+     };
+     private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
++    // Paper start
++    private boolean canPortal = false;
++
++    public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; }
++    // Paper end
+ 
+     public WitherBoss(EntityType<? extends WitherBoss> type, Level world) {
+         super(type, world);
+@@ -602,7 +607,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+ 
+     @Override
+     public boolean canChangeDimensions() {
+-        return false;
++        return super.canChangeDimensions() && canPortal; // Paper
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+index 4920f5465298b4da33b53f80b8af6220cb0e8ccc..411eb4d495907aa1d646673bf07d56ff01e52eee 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+@@ -429,6 +429,16 @@ public class EnderMan extends Monster implements NeutralMob {
+         this.entityData.set(EnderMan.DATA_STARED_AT, true);
+     }
+ 
++    // Paper start
++    public void setCreepy(boolean creepy) {
++        this.entityData.set(EnderMan.DATA_CREEPY, creepy);
++    }
++
++    public void setHasBeenStaredAt(boolean hasBeenStaredAt) {
++        this.entityData.set(EnderMan.DATA_STARED_AT, hasBeenStaredAt);
++    }
++    // Paper end
++
+     @Override
+     public boolean requiresCustomPersistence() {
+         return super.requiresCustomPersistence() || this.getCarriedBlock() != null;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..77a5f8339df5a46967713b51570735de828f0b49 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
@@ -52,6 +100,31 @@ index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..77a5f8339df5a46967713b51570735de
      @Override
      protected boolean shouldDespawnInPeaceful() {
          return true;
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+index a367f50b0e3fe9e7a1b87892a8c98e88bd678f6f..1b31b32d42eeb54680b902cd7e82d10ba7daa5d0 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
+@@ -105,6 +105,20 @@ public class ThrownTrident extends AbstractArrow {
+         return (Boolean) this.entityData.get(ThrownTrident.ID_FOIL);
+     }
+ 
++    // Paper start
++    public void setFoil(boolean foil) {
++        this.entityData.set(ThrownTrident.ID_FOIL, foil);
++    }
++
++    public int getLoyalty() {
++        return this.entityData.get(ThrownTrident.ID_LOYALTY);
++    }
++
++    public void setLoyalty(byte loyalty) {
++        this.entityData.set(ThrownTrident.ID_LOYALTY, loyalty);
++    }
++    // Paper end
++
+     @Nullable
+     @Override
+     protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 index 254d4f2e45d7c8f572a4368eccd84560d4d0d836..299ab868252c8f326e3a56e878c9ee230c9635dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -123,6 +196,39 @@ index a4f909123de26d911aea7cd767d2315ed1f697c9..0eee53c068bca070a86645d0ba54fb1a
 +    }
 +    // Paper End - More cat api
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
+index ae669a970aa1f17ed786640de8a481364543c58e..acdc4e578d70f8121c8c6be7682ba1ecef7687cf 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
+@@ -39,6 +39,28 @@ public class CraftEnderman extends CraftMonster implements Enderman {
+         this.getHandle().setCarriedBlock(blockData == null ? null : ((CraftBlockData) blockData).getState());
+     }
+ 
++    // Paper start
++    @Override
++    public boolean isScreaming() {
++        return this.getHandle().isCreepy();
++    }
++
++    @Override
++    public void setScreaming(boolean screaming) {
++        this.getHandle().setCreepy(screaming);
++    }
++
++    @Override
++    public boolean hasBeenStaredAt() {
++        return this.getHandle().hasBeenStaredAt();
++    }
++
++    @Override
++    public void setHasBeenStaredAt(boolean hasBeenStaredAt) {
++        this.getHandle().setHasBeenStaredAt(hasBeenStaredAt);
++    }
++    // Paper end
++
+     @Override
+     public EnderMan getHandle() {
+         return (EnderMan) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 index b647a5b9fdc1da61c4035d6f2cef7814033dc608..9795341efa748c2d94567e882cd5f26adf0f1591 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
@@ -287,3 +393,113 @@ index 2d2620dbb16aec850e8afda02174508a4be5a313..ba4e6deaaa725296be830324d2c64868
  
      public static Gene fromNms(net.minecraft.world.entity.animal.Panda.Gene gene) {
          Preconditions.checkArgument(gene != null, "Gene may not be null");
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
+index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3eee01e53b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java
+@@ -23,4 +23,16 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
+     public EntityType getType() {
+         return EntityType.POLAR_BEAR;
+     }
++
++    // Paper start
++    @Override
++    public boolean isStanding() {
++        return this.getHandle().isStanding();
++    }
++
++    @Override
++    public void setStanding(boolean standing) {
++        this.getHandle().setStanding(standing);
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
+index 27a8a2b1e03254b1fc6fe8edc3ff77841a42f5f6..8d77b870fd9de69b57ae1affdfbd2a02f62e75c7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java
+@@ -58,4 +58,16 @@ public abstract class CraftRaider extends CraftMonster implements Raider {
+     public void setCanJoinRaid(boolean join) {
+         this.getHandle().setCanJoinRaid(join);
+     }
++
++    // Paper start
++    @Override
++    public boolean isCelebrating() {
++        return this.getHandle().isCelebrating();
++    }
++
++    @Override
++    public void setCelebrating(boolean celebrating) {
++        this.getHandle().setCelebrating(celebrating);
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
+index bf5b2fd6676c4430578db4cc6c603c501cc5e349..832981b07ef5c633ef00a382f56798ee87eec0df 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
+@@ -37,4 +37,27 @@ public class CraftTrident extends CraftArrow implements Trident {
+     public EntityType getType() {
+         return EntityType.TRIDENT;
+     }
++
++    // Paper start
++    @Override
++    public boolean hasGlint() {
++        return this.getHandle().isFoil();
++    }
++
++    @Override
++    public void setGlint(boolean glint) {
++        this.getHandle().setFoil(glint);
++    }
++
++    @Override
++    public int getLoyaltyLevel() {
++        return this.getHandle().getLoyalty();
++    }
++
++    @Override
++    public void setLoyaltyLevel(int loyaltyLevel) {
++        com.google.common.base.Preconditions.checkArgument(loyaltyLevel >= 0 && loyaltyLevel <= 127, "The loyalty level has to be between 0 and 127");
++        this.getHandle().setLoyalty((byte) loyaltyLevel);
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
+index 640b0860fbe3412da32d03187e6f355ba8f099ea..299d5e47489cfe489ac130a33a08cdb29ba76d72 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
+@@ -38,4 +38,31 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
+     public BossBar getBossBar() {
+         return this.bossBar;
+     }
++
++    // Paper start
++    @Override
++    public boolean isCharged() {
++        return getHandle().isPowered();
++    }
++
++    @Override
++    public int getInvulnerableTicks() {
++        return getHandle().getInvulnerableTicks();
++    }
++
++    @Override
++    public void setInvulnerableTicks(int ticks) {
++        getHandle().setInvulnerableTicks(ticks);
++    }
++
++    @Override
++    public boolean canTravelThroughPortals() {
++        return getHandle().canChangeDimensions();
++    }
++
++    @Override
++    public void setCanTravelThroughPortals(boolean value) {
++        getHandle().setCanTravelThroughPortals(value);
++    }
++    // Paper end
+ }