Fix speed modifier, add preliminary BlockBreaker class

src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java

@@ -0,0 +1,92 @@
+package net.citizensnpcs.npc.ai;
+
+import net.minecraft.server.v1_4_R1.Block;
+import net.minecraft.server.v1_4_R1.Enchantment;
+import net.minecraft.server.v1_4_R1.EnchantmentManager;
+import net.minecraft.server.v1_4_R1.EntityHuman;
+import net.minecraft.server.v1_4_R1.EntityLiving;
+import net.minecraft.server.v1_4_R1.ItemStack;
+import net.minecraft.server.v1_4_R1.Material;
+import net.minecraft.server.v1_4_R1.MobEffectList;
+
+public class BlockBreaker {
+    private EntityLiving entity;
+    private ItemStack in;
+    private int lastDigTick, currentTick;
+
+    public boolean destroyable(Block block) {
+        if (block.material.isAlwaysDestroyable()) {
+            return true;
+        } else {
+            return in != null ? in.b(block) : false;
+        }
+    }
+
+    public void dig(int i, int j, int k, int l) {
+        if (true) {
+            entity.world.douseFire(null, i, j, k, l);
+            lastDigTick = currentTick;
+            float f = 1.0F;
+            int i1 = entity.world.getTypeId(i, j, k);
+            if (i1 > 0) {
+                Block.byId[i1].attack(entity.world, i, j, k, null);
+                // Allow fire punching to be blocked
+                entity.world.douseFire((EntityHuman) null, i, j, k, l);
+            }
+            if (i1 > 0) {
+                f = getStr(Block.byId[i1]);
+            }
+            EntityHuman m;
+            if (i1 > 0 && f >= 1.0F) {
+                // this.breakBlock(i, j, k);
+            } else {
+                // this.d = true;
+                // this.f = i;
+                // this.g = j;
+                // this.h = k;
+                int j1 = (int) (f * 10.0F);
+                entity.world.g(entity.id, i, j, k, j1);
+                // entity.o = j1;
+            }
+        }
+    }
+
+    public float getStr(Block block) {
+        float base = block.m(null, 0, 0, 0);
+        return base < 0.0F ? 0.0F : (!destroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+    }
+
+    public float strengthMod(Block block) {
+        float f = in.a(block);
+        int i = EnchantmentManager.getEnchantmentLevel(Enchantment.DURABILITY.id, in);
+        ItemStack itemstack = in;
+
+        if (i > 0 && itemstack != null) {
+            float f1 = i * i + 1;
+
+            if (!itemstack.b(block) && f <= 1.0F) {
+                f += f1 * 0.08F;
+            } else {
+                f += f1;
+            }
+        }
+
+        if (entity.hasEffect(MobEffectList.FASTER_DIG)) {
+            f *= 1.0F + (entity.getEffect(MobEffectList.FASTER_DIG).getAmplifier() + 1) * 0.2F;
+        }
+
+        if (entity.hasEffect(MobEffectList.SLOWER_DIG)) {
+            f *= 1.0F - (entity.getEffect(MobEffectList.SLOWER_DIG).getAmplifier() + 1) * 0.2F;
+        }
+
+        if (entity.a(Material.WATER) && !EnchantmentManager.hasWaterWorkerEnchantment(entity)) {
+            f /= 5.0F;
+        }
+
+        if (!entity.onGround) {
+            f /= 5.0F;
+        }
+
+        return f;
+    }
+}

src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java

@@ -31,7 +31,6 @@ public class CitizensNavigator implements Navigator, Runnable {
     private int lastX, lastY, lastZ;
     private NavigatorParameters localParams = defaultParams;
     private final NPC npc;
-
     private int stationaryTicks;
 
     public CitizensNavigator(NPC npc) {
@@ -56,7 +55,7 @@ public class CitizensNavigator implements Navigator, Runnable {
     @Override
     public NavigatorParameters getLocalParameters() {
         if (!isNavigating())
-            throw new IllegalStateException("not navigating");
+            return defaultParams;
         return localParams;
     }
 

src/main/java/net/citizensnpcs/npc/entity/BatController.java

@@ -57,6 +57,11 @@ public class BatController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             if (npc == null)

src/main/java/net/citizensnpcs/npc/entity/BlazeController.java

@@ -57,6 +57,11 @@ public class BlazeController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bn() {
             if (npc != null)

src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java

@@ -57,6 +57,11 @@ public class CaveSpiderController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/ChickenController.java

@@ -57,6 +57,11 @@ public class ChickenController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/CowController.java

@@ -57,6 +57,11 @@ public class CowController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/CreeperController.java

@@ -64,6 +64,11 @@ public class CreeperController extends MobEntityController {
                 super.a(entitylightning);
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java

@@ -56,6 +56,11 @@ public class EnderDragonController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bn() {
             if (npc == null)

src/main/java/net/citizensnpcs/npc/entity/EndermanController.java

@@ -57,6 +57,11 @@ public class EndermanController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java

@@ -47,7 +47,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
 
     @Override
     public float bB() {
-        return super.bB() * npc.getNavigator().getDefaultParameters().speed();
+        return super.bB() * npc.getNavigator().getLocalParameters().speed();
     }
 
     @Override

src/main/java/net/citizensnpcs/npc/entity/GhastController.java

@@ -39,10 +39,14 @@ public class GhastController extends MobEntityController {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 NMS.clearGoals(goalSelector, targetSelector);
-
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bn() {
             if (npc != null)

src/main/java/net/citizensnpcs/npc/entity/GiantController.java

@@ -43,6 +43,11 @@ public class GiantController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bn() {
             if (npc == null)

src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java

@@ -42,6 +42,11 @@ public class IronGolemController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java

@@ -44,6 +44,11 @@ public class MagmaCubeController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java

@@ -44,6 +44,11 @@ public class MushroomCowController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/OcelotController.java

@@ -43,6 +43,11 @@ public class OcelotController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/PigController.java

@@ -50,6 +50,11 @@ public class PigController extends MobEntityController {
                 super.a(entitylightning);
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java

@@ -44,6 +44,11 @@ public class PigZombieController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SheepController.java

@@ -43,6 +43,11 @@ public class SheepController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java

@@ -43,6 +43,11 @@ public class SilverfishController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java

@@ -43,6 +43,11 @@ public class SkeletonController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SlimeController.java

@@ -45,6 +45,11 @@ public class SlimeController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java

@@ -43,6 +43,11 @@ public class SnowmanController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SpiderController.java

@@ -43,6 +43,11 @@ public class SpiderController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/SquidController.java

@@ -43,11 +43,16 @@ public class SquidController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bn() {
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
-            else
+            } else
                 super.bn();
         }
 

src/main/java/net/citizensnpcs/npc/entity/VillagerController.java

@@ -51,6 +51,11 @@ public class VillagerController extends MobEntityController {
             return false; // block trades
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/WitchController.java

@@ -43,6 +43,11 @@ public class WitchController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/WitherController.java

@@ -43,6 +43,11 @@ public class WitherController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/WolfController.java

@@ -43,6 +43,11 @@ public class WolfController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();

src/main/java/net/citizensnpcs/npc/entity/ZombieController.java

@@ -43,6 +43,11 @@ public class ZombieController extends MobEntityController {
             }
         }
 
+        @Override
+        public float bB() {
+            return super.bB() * npc.getNavigator().getLocalParameters().speed();
+        }
+
         @Override
         public void bl() {
             super.bl();