Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Fixed trait 'haunted' to be more fun and useful!

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-06-28 21:40:12 +02:00
parent df951e0abd
commit 7944530375
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sosnitzka/ztic_addon/traits/TraitHaunted.java
View File

@@ -4,6 +4,8 @@ import com.sosnitzka.ztic_addon.util.EntityAIPermanentPanic;
import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.*;
import net.minecraft.entity.passive.*;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
@@ -18,9 +20,16 @@ public class TraitHaunted extends AbstractTrait {
@Override @Override
public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) { public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) {
if (target instanceof EntityLiving) { if (random.nextFloat() < 0.1)
//((EntityLiving) target).tasks.addTask(0, new EntityAIAvoidEntity((EntityCreature) target, EntityPlayer.class,16f, 2.0d, 2.4D)); if (target instanceof EntityCow || target instanceof EntityZombie || target instanceof EntityWolf || target instanceof EntityPig || target instanceof EntitySpider ||
((EntityLiving) target).tasks.addTask(0, new EntityAIPermanentPanic((EntityCreature) target, 2.0D)); target instanceof EntityVillager || target instanceof EntitySheep || target instanceof EntityEnderman || target instanceof EntityEndermite ||
target instanceof EntityBlaze || target instanceof EntitySkeleton || target instanceof EntityWitch || target instanceof EntityHorse) {
((EntityLiving) target).tasks.taskEntries.clear();
((EntityLiving) target).tasks.taskEntries.clear();
((EntityLiving) target).targetTasks.taskEntries.clear();
((EntityLiving) target).targetTasks.taskEntries.clear();
((EntityLiving) target).tasks.addTask(0, new EntityAIPermanentPanic((EntityCreature) target, target.getAIMoveSpeed() + 2.0D));
} }
} }
} }

17
src/main/java/com/sosnitzka/ztic_addon/util/EntityAIPermanentPanic.java
View File

@@ -13,7 +13,7 @@ import net.minecraft.world.World;
public class EntityAIPermanentPanic extends EntityAIBase { public class EntityAIPermanentPanic extends EntityAIBase {
private EntityCreature theEntityCreature; private EntityCreature theEntityCreature;
private double speed; protected double speed;
private double randPosX; private double randPosX;
private double randPosY; private double randPosY;
private double randPosZ; private double randPosZ;
@@ -21,13 +21,13 @@ public class EntityAIPermanentPanic extends EntityAIBase {
public EntityAIPermanentPanic(EntityCreature creature, double speedIn) { public EntityAIPermanentPanic(EntityCreature creature, double speedIn) {
this.theEntityCreature = creature; this.theEntityCreature = creature;
this.speed = speedIn; this.speed = speedIn;
this.setMutexBits(1);
} }
/** /**
* Returns whether the EntityAIBase should begin execution. * Returns whether the EntityAIBase should begin execution.
*/ */
public boolean shouldExecute() { public boolean shouldExecute() {
Vec3d vec3d = RandomPositionGenerator.findRandomTarget(this.theEntityCreature, 5, 4); Vec3d vec3d = RandomPositionGenerator.findRandomTarget(this.theEntityCreature, 5, 4);
if (vec3d == null) { if (vec3d == null) {
@@ -45,10 +45,11 @@ public class EntityAIPermanentPanic extends EntityAIBase {
this.randPosY = (double) blockpos.getY(); this.randPosY = (double) blockpos.getY();
this.randPosZ = (double) blockpos.getZ(); this.randPosZ = (double) blockpos.getZ();
} }
} }
return true; return true;
} }
} }
/** /**
@@ -67,7 +68,7 @@ public class EntityAIPermanentPanic extends EntityAIBase {
private BlockPos getRandPos(World worldIn, Entity entityIn, int horizontalRange, int verticalRange) { private BlockPos getRandPos(World worldIn, Entity entityIn, int horizontalRange, int verticalRange) {
BlockPos blockpos = new BlockPos(entityIn); BlockPos blockpos = new BlockPos(entityIn);
BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(); BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
int i = blockpos.getX(); int i = blockpos.getX();
int j = blockpos.getY(); int j = blockpos.getY();
int k = blockpos.getZ(); int k = blockpos.getZ();
@@ -77,8 +78,8 @@ public class EntityAIPermanentPanic extends EntityAIBase {
for (int l = i - horizontalRange; l <= i + horizontalRange; ++l) { for (int l = i - horizontalRange; l <= i + horizontalRange; ++l) {
for (int i1 = j - verticalRange; i1 <= j + verticalRange; ++i1) { for (int i1 = j - verticalRange; i1 <= j + verticalRange; ++i1) {
for (int j1 = k - horizontalRange; j1 <= k + horizontalRange; ++j1) { for (int j1 = k - horizontalRange; j1 <= k + horizontalRange; ++j1) {
mutableBlockPos.setPos(l, i1, j1); blockpos$mutableblockpos.setPos(l, i1, j1);
IBlockState iblockstate = worldIn.getBlockState(mutableBlockPos); IBlockState iblockstate = worldIn.getBlockState(blockpos$mutableblockpos);
Block block = iblockstate.getBlock(); Block block = iblockstate.getBlock();
if (block == Blocks.WATER || block == Blocks.FLOWING_WATER) { if (block == Blocks.WATER || block == Blocks.FLOWING_WATER) {
@@ -86,7 +87,7 @@ public class EntityAIPermanentPanic extends EntityAIBase {
if (f1 < f) { if (f1 < f) {
f = f1; f = f1;
blockpos1 = new BlockPos(mutableBlockPos); blockpos1 = new BlockPos(blockpos$mutableblockpos);
} }
} }
} }