diff --git a/bin/assets/kitsumedievalcraft/models/HotIronPlate.png b/bin/assets/kitsumedievalcraft/models/HotIronPlate.png index da7050e5..73be3581 100644 Binary files a/bin/assets/kitsumedievalcraft/models/HotIronPlate.png and b/bin/assets/kitsumedievalcraft/models/HotIronPlate.png differ diff --git a/bin/assets/kitsumedievalcraft/models/IronPlate.png b/bin/assets/kitsumedievalcraft/models/IronPlate.png index 60c8601c..2df29e3d 100644 Binary files a/bin/assets/kitsumedievalcraft/models/IronPlate.png and b/bin/assets/kitsumedievalcraft/models/IronPlate.png differ diff --git a/bin/assets/kitsumedievalcraft/models/MyHotLapisBlock.png b/bin/assets/kitsumedievalcraft/models/MyHotLapisBlock.png index 10c1e512..1f68d2ad 100644 Binary files a/bin/assets/kitsumedievalcraft/models/MyHotLapisBlock.png and b/bin/assets/kitsumedievalcraft/models/MyHotLapisBlock.png differ diff --git a/bin/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png b/bin/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png index 026bf138..f0cf27d9 100644 Binary files a/bin/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png and b/bin/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png differ diff --git a/bin/assets/kitsumedievalcraft/models/MyLapisBlock.png b/bin/assets/kitsumedievalcraft/models/MyLapisBlock.png index d1d83b4d..c3de1ad1 100644 Binary files a/bin/assets/kitsumedievalcraft/models/MyLapisBlock.png and b/bin/assets/kitsumedievalcraft/models/MyLapisBlock.png differ diff --git a/bin/assets/kitsumedievalcraft/models/MyRedstoneBlock.png b/bin/assets/kitsumedievalcraft/models/MyRedstoneBlock.png index a8c74688..fb7471ca 100644 Binary files a/bin/assets/kitsumedievalcraft/models/MyRedstoneBlock.png and b/bin/assets/kitsumedievalcraft/models/MyRedstoneBlock.png differ diff --git a/bin/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.class b/bin/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.class index 0628ff61..c9481bc9 100644 Binary files a/bin/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.class and b/bin/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.class differ diff --git a/src/main/java/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.java b/src/main/java/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.java index c4efed81..f3a167a2 100644 --- a/src/main/java/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.java +++ b/src/main/java/com/kitsu/medievalcraft/entityAI/EntityAIWaterMob.java @@ -1,8 +1,11 @@ package com.kitsu.medievalcraft.entityAI; +import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.monster.IMob; @@ -10,9 +13,13 @@ import net.minecraft.entity.passive.EntitySquid; import net.minecraft.entity.passive.EntityWaterMob; import net.minecraft.entity.passive.IAnimals; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.pathfinding.PathEntity; +import net.minecraft.pathfinding.PathFinder; +import net.minecraft.profiler.Profiler; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; +import net.minecraft.world.ChunkCache; import net.minecraft.world.World; public class EntityAIWaterMob extends EntityWaterMob implements IAnimals{ @@ -30,6 +37,7 @@ public class EntityAIWaterMob extends EntityWaterMob implements IAnimals{ protected boolean Agrooed = false; protected boolean landBounce = true; protected float moreDamage = 0.5F; + public Profiler theProfiler; public EntityAIWaterMob(World world) @@ -88,15 +96,6 @@ public class EntityAIWaterMob extends EntityWaterMob implements IAnimals{ } - protected Entity findPreySquid() - { - //EntitySquid squid = this.worldObj.getClosestVulnerablePlayerToEntity(this, 16.0D); - //AxisAlignedBB ab = new AxisAlignedBB(-16d, -16d, -16d, 16d, 16d, 16d); - EntitySquid squid = (EntitySquid) this.worldObj.getEntitiesWithinAABB(EntitySquid.class, AxisAlignedBB.getBoundingBox(-106d, -106d, -106d, 106d, 106d, 106d)); - System.out.println("Finding Squid"); - return (squid != null) && (canEntityBeSeen(squid)) ? squid : null; - - } public boolean attackEntityAsMob(Entity entity) { @@ -172,14 +171,7 @@ public class EntityAIWaterMob extends EntityWaterMob implements IAnimals{ this.targetZ = this.targetedEntity.posZ; this.isAttacking = true; } - this.targetedEntity = findPreySquid(); - if ((this.targetedEntity != null) && (this.targetedEntity.isInWater())) - { - this.targetX = this.targetedEntity.posX; - this.targetY = this.targetedEntity.posY; - this.targetZ = this.targetedEntity.posZ; - this.isAttacking = true; - } + } this.renderYawOffset += (-(float)Math.atan2(this.motionX, this.motionZ) * 180.0F / 3.141593F - this.renderYawOffset) * 0.5F; this.rotationYaw = this.renderYawOffset; diff --git a/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png b/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png index da7050e5..73be3581 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png and b/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png b/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png index 60c8601c..2df29e3d 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png and b/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/MyHotLapisBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/MyHotLapisBlock.png index 10c1e512..1f68d2ad 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/MyHotLapisBlock.png and b/src/main/resources/assets/kitsumedievalcraft/models/MyHotLapisBlock.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png index 026bf138..f0cf27d9 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png and b/src/main/resources/assets/kitsumedievalcraft/models/MyHotRedstoneBlock.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/MyLapisBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/MyLapisBlock.png index d1d83b4d..c3de1ad1 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/MyLapisBlock.png and b/src/main/resources/assets/kitsumedievalcraft/models/MyLapisBlock.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/MyRedstoneBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/MyRedstoneBlock.png index a8c74688..fb7471ca 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/MyRedstoneBlock.png and b/src/main/resources/assets/kitsumedievalcraft/models/MyRedstoneBlock.png differ