Update robit teleport to owner while following logic to match new vanilla logic for tamed animals teleporting to their owners

Author: pupnewfster

src/main/java/mekanism/common/entity/ai/RobitAIBase.java

@@ -7,7 +7,8 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.goal.Goal;
 import net.minecraft.world.entity.ai.navigation.PathNavigation;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
 
@@ -39,10 +40,6 @@ protected PathNavigation getNavigator() {
         return theRobit.getNavigation();
     }
 
-    protected Level getWorld() {
-        return theRobit.level();
-    }
-
     @Override
     public void start() {
         timeToRecalcPath = 0;
@@ -61,40 +58,57 @@ protected void updateTask(Entity target) {
         if (--timeToRecalcPath <= 0) {
             timeToRecalcPath = MekanismUtils.TICKS_PER_HALF_SECOND;
             if (!theRobit.isPassenger()) {
+                //Math from TamableAnimal#shouldTryTeleportToOwner and tryToTeleportToOwner
                 if (theRobit.distanceToSqr(target) >= 144.0) {
-                    BlockPos targetPos = target.blockPosition();
-                    for (int i = 0; i < 10; i++) {
-                        if (tryPathTo(target, targetPos.getX() + randomize(-3, 3), targetPos.getY() + randomize(-1, 1), targetPos.getZ() + randomize(-3, 3))) {
-                            return;
-                        }
-                    }
+                    teleportToAroundBlockPos(target.blockPosition());
                 } else {
                     getNavigator().moveTo(target, moveSpeed);
                 }
             }
         }
     }
 
-    private int randomize(int min, int max) {
-        return theRobit.getRandom().nextInt(max - min + 1) + min;
+    /**
+     * Copy of {@link net.minecraft.world.entity.TamableAnimal#teleportToAroundBlockPos(BlockPos)}
+     */
+    private void teleportToAroundBlockPos(BlockPos pos) {
+        for (int i = 0; i < 10; i++) {
+            int j = theRobit.getRandom().nextIntBetweenInclusive(-3, 3);
+            int k = theRobit.getRandom().nextIntBetweenInclusive(-3, 3);
+            if (Math.abs(j) >= 2 || Math.abs(k) >= 2) {
+                int l = theRobit.getRandom().nextIntBetweenInclusive(-1, 1);
+                if (maybeTeleportTo(pos.getX() + j, pos.getY() + l, pos.getZ() + k)) {
+                    return;
+                }
+            }
+        }
     }
 
-    private boolean tryPathTo(Entity target, int x, int y, int z) {
-        if (Math.abs(x - target.getX()) < 2 && Math.abs(z - target.getZ()) < 2 || !canNavigate(new BlockPos(x, y, z))) {
-            return false;
+    /**
+     * Copy of {@link net.minecraft.world.entity.TamableAnimal#maybeTeleportTo(int, int, int)}
+     */
+    private boolean maybeTeleportTo(int x, int y, int z) {
+        if (canTeleportTo(new BlockPos(x, y, z))) {
+            theRobit.moveTo(x + 0.5, y, z + 0.5, theRobit.getYRot(), theRobit.getXRot());
+            getNavigator().stop();
+            return true;
         }
-        theRobit.moveTo(x + 0.5, y, z + 0.5, theRobit.getYRot(), theRobit.getXRot());
-        getNavigator().stop();
-        return true;
+        return false;
     }
 
-    private boolean canNavigate(BlockPos pos) {
-        Level world = getWorld();
-        PathType pathnodetype = WalkNodeEvaluator.getPathTypeStatic(theRobit, pos);
-        if (pathnodetype == PathType.WALKABLE) {
-            BlockPos blockpos = pos.subtract(theRobit.blockPosition());
-            return world.noCollision(theRobit, theRobit.getBoundingBox().move(blockpos));
+    /**
+     * Copy of {@link net.minecraft.world.entity.TamableAnimal#canTeleportTo(BlockPos)}
+     */
+    private boolean canTeleportTo(BlockPos pos) {
+        PathType pathtype = WalkNodeEvaluator.getPathTypeStatic(theRobit, pos);
+        if (pathtype != PathType.WALKABLE) {
+            return false;
         }
-        return false;
+        BlockState blockstate = theRobit.level().getBlockState(pos.below());
+        if (blockstate.getBlock() instanceof LeavesBlock) {
+            return false;
+        }
+        BlockPos blockpos = pos.subtract(theRobit.blockPosition());
+        return theRobit.level().noCollision(theRobit, theRobit.getBoundingBox().move(blockpos));
     }
 }