general fixes

- improve lectern handling
- fix water check exception
- update hippogryph rabbit food list when needed
- fix issue where hippogryph attack target bounces upward
- fix #5014
- fix #5008
- fix #5006

Author: SiverDX

src/main/java/com/github/alexthe666/iceandfire/entity/EntityHippogryph.java

@@ -786,7 +786,9 @@ public void travel(@NotNull Vec3 pTravelVector) {
                 float vertical = this.isGoingUp() ? 1.0F : this.isGoingDown() ? -1.0F : 0F;
 
                 float speedFactor = 1.0f;
-                if (this.isFlying() || this.isHovering()) {
+                boolean isFlying = this.isFlying() || this.isHovering();
+
+                if (isFlying) {
                     speedFactor *= flightSpeedFactor;
                     // Let server know we're flying before they kick us
                     this.setNoGravity(true);
@@ -811,7 +813,9 @@ public void travel(@NotNull Vec3 pTravelVector) {
 
                     // Vanilla travel has a smaller friction factor for Y axis
                     // Add more friction in case moving too fast on Y axis
-                    if (this.isFlying() || this.isHovering()) {
+                    if (isFlying) {
+                        // See LivingEntity#getFrictionInfluencedSpeed -> flyingSpeed (default: 0.02) is used when not on ground
+                        this.flyingSpeed = getSpeed();
                         this.setDeltaMovement(this.getDeltaMovement().multiply(1.0f, 0.92f, 1.0f));
                     }
                 } else if (rider instanceof Player) {
@@ -820,16 +824,18 @@ public void travel(@NotNull Vec3 pTravelVector) {
                     // Happens when stepping up blocks
                     // Might because client & server's onGround flag is out of sync
                     // I can't get it fixed, so it's disabled
-                    this.noPhysics = DISABLE_MOVEMENT_CHECK;
+//                    this.noPhysics = DISABLE_MOVEMENT_CHECK;
                 }
 
-                this.calculateEntityAnimation(this, false);
+                this.calculateEntityAnimation(this, isFlying);
                 this.tryCheckInsideBlocks();
             } else {
                 this.setNoGravity(false);
                 this.noPhysics = false;
 
                 this.setSpeed(0.02F);
+                flyingSpeed = getSpeed();
+
                 super.travel(pTravelVector);
             }
         } else {
@@ -849,6 +855,7 @@ public boolean doHurtTarget(@NotNull Entity entityIn) {
         return false;
     }
 
+    // FIXME :: Unused
     public ItemEntity createEgg(EntityHippogryph partner) {
         int i = Mth.floor(this.getX());
         int j = Mth.floor(this.getY());
@@ -895,13 +902,16 @@ public void aiStep() {
             if (dist < 8) {
                 attackTarget.hurt(DamageSource.mobAttack(this), ((int) this.getAttribute(Attributes.ATTACK_DAMAGE).getValue()));
                 attackTarget.hasImpulse = true;
+                /*
+                // Disabled because it causes the target (player) to bounce upward
                 float f = Mth.sqrt((float) (0.5 * 0.5 + 0.5 * 0.5));
                 attackTarget.setDeltaMovement(attackTarget.getDeltaMovement().add(-0.5 / (double) f, 1, -0.5 / (double) f));
                 attackTarget.setDeltaMovement(attackTarget.getDeltaMovement().multiply(0.5D, 1, 0.5D));
 
                 if (attackTarget.isOnGround()) {
                     attackTarget.setDeltaMovement(attackTarget.getDeltaMovement().add(0, 0.3, 0));
                 }
+                */
             }
         }
         if (!level.isClientSide && !this.isOverAir() && this.getNavigation().isDone() && attackTarget != null && attackTarget.getY() - 3 > this.getY() && this.getRandom().nextInt(15) == 0 && this.canMove() && !this.isHovering() && !this.isFlying()) {

src/main/java/com/github/alexthe666/iceandfire/entity/ai/HippogryphAITargetItems.java

@@ -55,6 +55,10 @@ public boolean canUse() {
             return false;
         }
 
+        return updateList();
+    }
+
+    private boolean updateList() {
         if (this.mob.level.getGameTime() % 4 == 0) // only update the list every 4 ticks
             list = this.mob.level.getEntitiesOfClass(ItemEntity.class, this.getTargetableArea(this.getFollowDistance()), this.targetEntitySelector);
 
@@ -96,6 +100,8 @@ public void tick() {
                     hippo.setOrderedToSit(true);
             }
             stop();
+        } else {
+            updateList();
         }
     }
 

src/main/java/com/github/alexthe666/iceandfire/entity/tile/TileEntityLectern.java

@@ -125,17 +125,25 @@ private List<EnumBestiaryPages> getPossiblePages() {
 
     @Override
     public void setItem(int index, ItemStack stack) {
-        boolean flag = !stack.isEmpty() && ItemStack.isSame(stack, this.stacks.get(index)) && ItemStack.matches(stack, this.stacks.get(index));
+        boolean isSame = !stack.isEmpty() && ItemStack.isSame(stack, this.stacks.get(index)) && ItemStack.matches(stack, this.stacks.get(index));
         this.stacks.set(index, stack);
 
         if (!stack.isEmpty() && stack.getCount() > this.getMaxStackSize()) {
             stack.setCount(this.getMaxStackSize());
         }
-        if (index == 0 && !flag) {
+
+        if (!isSame) {
             this.setChanged();
-            selectedPages = randomizePages(getItem(0), getItem(1));
-        }
 
+            if (/* Manuscripts */ this.stacks.get(1).isEmpty()) {
+                selectedPages[0] = null;
+                selectedPages[1] = null;
+                selectedPages[2] = null;
+                IceAndFire.sendMSGToAll(new MessageUpdateLectern(worldPosition.asLong(), -1, -1, -1, false, 0));
+            } else {
+                selectedPages = randomizePages(getItem(0), getItem(1));
+            }
+        }
     }
 
     public EnumBestiaryPages[] randomizePages(ItemStack bestiary, ItemStack manuscript) {

src/main/java/com/github/alexthe666/iceandfire/pathfinding/raycoms/SurfaceType.java

@@ -118,13 +118,15 @@ public static boolean isWater(final BlockGetter world, final BlockPos pos, @Null
             fluidState = world.getFluidState(pos);
         }
 
-        if (fluidState == null || fluidState.isEmpty()) {
+        if (fluidState.isEmpty()) {
             return false;
         }
 
-        if (state.getBlock() instanceof TrapDoorBlock || state.getBlock() instanceof HorizontalDirectionalBlock && !state.getValue(TrapDoorBlock.OPEN) && state.getValue(TrapDoorBlock.HALF) == Half.TOP)
-        {
-            return false;
+        if (state.getBlock() instanceof TrapDoorBlock || state.getBlock() instanceof HorizontalDirectionalBlock) {
+            // getvalue() will throw an exception if the property does not exist
+            if (state.hasProperty(TrapDoorBlock.OPEN) && !state.getValue(TrapDoorBlock.OPEN) && state.hasProperty(TrapDoorBlock.HALF) && state.getValue(TrapDoorBlock.HALF) == Half.TOP) {
+                return false;
+            }
         }
 
         final Fluid fluid = fluidState.getType();

src/main/resources/data/iceandfire/recipes/dragonsteel_fire_axe.json

@@ -2,8 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "pattern": [
     "DD",
-    "TD",
-    "T "
+    "DT",
+    " T"
   ],
   "key": {
     "D": {

src/main/resources/data/iceandfire/recipes/dragonsteel_ice_axe.json

@@ -2,8 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "pattern": [
     "DD",
-    "TD",
-    "T "
+    "DT",
+    " T"
   ],
   "key": {
     "D": {

src/main/resources/data/iceandfire/recipes/dragonsteel_lightning_axe.json

@@ -2,8 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "pattern": [
     "DD",
-    "TD",
-    "T "
+    "DT",
+    " T "
   ],
   "key": {
     "D": {