Updated Upstream (Bukkit/CraftBukkit) (#8172)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
23f557a0 SPIGOT-5380, SPIGOT-6958, PR-772: Add some missing entity API

CraftBukkit Changes:
fc3071161 SPIGOT-5380, SPIGOT-6958, PR-1085: Add some missing entity API

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

@@ -305,9 +305,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
 @@ -0,0 +0,0 @@ public class CraftFox extends CraftAnimals implements Fox {
- 
-         this.getHandle().getEntityData().set(net.minecraft.world.entity.animal.Fox.DATA_TRUSTED_ID_1, player == null ? Optional.empty() : Optional.of(player.getUniqueId()));
+     public boolean isFaceplanted() {
+         return this.getHandle().isFaceplanted();
      }
++
 +    // Paper start - Add more fox behavior API
 +    @Override
 +    public void setInterested(boolean interested) {
@@ -343,11 +344,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public void setFaceplanted(boolean faceplanted) {
 +        this.getHandle().setFaceplanted(faceplanted);
 +    }
-+
-+    @Override
-+    public boolean isFaceplanted() {
-+        return this.getHandle().isFaceplanted();
-+    }
 +    // Paper end - Add more fox behavior API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
@@ -355,22 +351,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
 @@ -0,0 +0,0 @@ public class CraftGhast extends CraftFlying implements Ghast {
-     public EntityType getType() {
-         return EntityType.GHAST;
+     public void setCharging(boolean flag) {
+         this.getHandle().setCharging(flag);
      }
 +
 +    // Paper start
 +    @Override
-+    public boolean isCharging() {
-+        return this.getHandle().isCharging();
-+    }
-+
-+    @Override
-+    public void setCharging(boolean charging) {
-+        this.getHandle().setCharging(charging);
-+    }
-+
-+    @Override
 +    public int getExplosionPower() {
 +        return this.getHandle().getExplosionPower();
 +    }
@@ -402,16 +388,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public void setSneezing(boolean sneeze) {
-+        this.getHandle().sneeze(sneeze);
-+    }
-+
-+    @Override
-+    public boolean isSneezing() {
-+        return this.getHandle().isSneezing();
-+    }
-+
-+    @Override
 +    public void setEatingTicks(int ticks) {
 +        this.getHandle().setEatCounter(ticks);
 +    }
@@ -425,45 +401,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public void setUnhappyTicks(int ticks) {
 +        this.getHandle().setUnhappyCounter(ticks);
 +    }
-+
-+    @Override
-+    public int getUnhappyTicks() {
-+        return this.getHandle().getUnhappyCounter();
-+    }
-+
-+    @Override
-+    public boolean isRolling() {
-+        return this.getHandle().isRolling();
-+    }
-+
-+    @Override
-+    public void setRolling(boolean rolling) {
-+        this.getHandle().roll(rolling);
-+    }
-+
-+    @Override
-+    public boolean isOnBack() {
-+        return this.getHandle().isOnBack();
-+    }
-+
-+    @Override
-+    public void setIsOnBack(boolean onBack) {
-+        this.getHandle().setOnBack(onBack);
-+    }
-+
-+    @Override
-+    public boolean isSitting() {
-+        return this.getHandle().isSitting();
-+    }
-+
-+    @Override
-+    public void setSitting(boolean sitting) {
-+        this.getHandle().sit(sitting);
-+    }
 +    // Paper end - Panda API
  
-     public static Gene fromNms(net.minecraft.world.entity.animal.Panda.Gene gene) {
-         Preconditions.checkArgument(gene != null, "Gene may not be null");
+     @Override
+     public boolean isRolling() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
@@ -651,23 +592,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-@@ -0,0 +0,0 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
-     public void setCollarColor(DyeColor color) {
-         this.getHandle().setCollarColor(net.minecraft.world.item.DyeColor.byId(color.getWoolData()));
-     }
-+    // Paper start
-+    @Override
-+    public void setInterested(boolean interested) {
-+        this.getHandle().setIsInterested(interested);
-+    }
-+
-+    @Override
-+    public boolean isInterested() {
-+        return this.getHandle().isInterested();
-+    }
-+    // Paper end
- }