From 24dc4921ab175b1899c221e481fc8ddc4a12ec4a Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 28 Aug 2020 12:25:07 +0200 Subject: [PATCH] Fix Schalker bullets --- .../spackenmobs/entities/EntitySchalker.java | 5 +- .../entities/EntitySchalkerBullet.java | 468 ------------------ 2 files changed, 3 insertions(+), 470 deletions(-) delete mode 100644 src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalkerBullet.java diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java index ee7e3f5..ef6635f 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalker.java @@ -29,6 +29,7 @@ import net.minecraft.entity.monster.EntityGolem; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntityShulkerBullet; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; @@ -106,9 +107,9 @@ public class EntitySchalker extends EntityGolem implements IMob if (this.attackTime <= 0) { this.attackTime = 20 + EntitySchalker.this.rand.nextInt(10) * 20 / 2; - EntitySchalkerBullet entityschalkerbullet = new EntitySchalkerBullet(EntitySchalker.this.world, EntitySchalker.this, entitylivingbase, + EntityShulkerBullet entityshulkerbullet = new EntityShulkerBullet(EntitySchalker.this.world, EntitySchalker.this, entitylivingbase, EntitySchalker.this.getAttachmentFacing().getAxis()); - EntitySchalker.this.world.spawnEntity(entityschalkerbullet); + EntitySchalker.this.world.spawnEntity(entityshulkerbullet); EntitySchalker.this.playSound(ModSoundEvents.ENTITY_SCHALKER_SHOOT, 2.0F, (EntitySchalker.this.rand.nextFloat() - EntitySchalker.this.rand.nextFloat()) * 0.2F + 1.0F); } } diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalkerBullet.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalkerBullet.java deleted file mode 100644 index f196fe6..0000000 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntitySchalkerBullet.java +++ /dev/null @@ -1,468 +0,0 @@ -package mod.acgaming.spackenmobs.entities; - -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nullable; - -import com.google.common.collect.Lists; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.ProjectileHelper; -import net.minecraft.init.MobEffects; -import net.minecraft.init.SoundEvents; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.EnumDifficulty; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class EntitySchalkerBullet extends Entity -{ - private EntityLivingBase owner; - private Entity target; - @Nullable - private EnumFacing direction; - private int steps; - private double targetDeltaX; - private double targetDeltaY; - private double targetDeltaZ; - @Nullable - private UUID ownerUniqueId; - private BlockPos ownerBlockPos; - @Nullable - private UUID targetUniqueId; - private BlockPos targetBlockPos; - - public EntitySchalkerBullet(World worldIn) - { - super(worldIn); - this.setSize(0.3125F, 0.3125F); - this.noClip = true; - } - - @SideOnly(Side.CLIENT) - public EntitySchalkerBullet(World worldIn, double x, double y, double z, double motionXIn, double motionYIn, double motionZIn) - { - this(worldIn); - this.setLocationAndAngles(x, y, z, this.rotationYaw, this.rotationPitch); - this.motionX = motionXIn; - this.motionY = motionYIn; - this.motionZ = motionZIn; - } - - public EntitySchalkerBullet(World worldIn, EntityLivingBase ownerIn, Entity targetIn, EnumFacing.Axis p_i46772_4_) - { - this(worldIn); - this.owner = ownerIn; - BlockPos blockpos = new BlockPos(ownerIn); - double d0 = blockpos.getX() + 0.5D; - double d1 = blockpos.getY() + 0.5D; - double d2 = blockpos.getZ() + 0.5D; - this.setLocationAndAngles(d0, d1, d2, this.rotationYaw, this.rotationPitch); - this.target = targetIn; - this.direction = EnumFacing.UP; - this.selectNextMoveDirection(p_i46772_4_); - } - - /** - * Called when the entity is attacked. - */ - @Override - public boolean attackEntityFrom(DamageSource source, float amount) - { - if (!this.world.isRemote) - { - this.playSound(SoundEvents.ENTITY_SHULKER_BULLET_HURT, 1.0F, 1.0F); - ((WorldServer) this.world).spawnParticle(EnumParticleTypes.CRIT, this.posX, this.posY, this.posZ, 15, 0.2D, 0.2D, 0.2D, 0.0D); - this.setDead(); - } - - return true; - } - - protected void bulletHit(RayTraceResult result) - { - if (result.entityHit == null) - { - ((WorldServer) this.world).spawnParticle(EnumParticleTypes.EXPLOSION_LARGE, this.posX, this.posY, this.posZ, 2, 0.2D, 0.2D, 0.2D, 0.0D); - this.playSound(SoundEvents.ENTITY_SHULKER_BULLET_HIT, 1.0F, 1.0F); - } - else - { - boolean flag = result.entityHit.attackEntityFrom(DamageSource.causeIndirectDamage(this, this.owner).setProjectile(), 4.0F); - - if (flag) - { - this.applyEnchantments(this.owner, result.entityHit); - - if (result.entityHit instanceof EntityLivingBase) - { - ((EntityLivingBase) result.entityHit).addPotionEffect(new PotionEffect(MobEffects.LEVITATION, 200)); - } - } - } - - this.setDead(); - } - - /** - * Returns true if other Entities should be prevented from moving through this Entity. - */ - @Override - public boolean canBeCollidedWith() - { - return true; - } - - @Override - protected void entityInit() - { - } - - /** - * Gets how bright this entity is. - */ - @Override - public float getBrightness() - { - return 1.0F; - } - - @Override - @SideOnly(Side.CLIENT) - public int getBrightnessForRender() - { - return 15728880; - } - - @Override - public SoundCategory getSoundCategory() - { - return SoundCategory.HOSTILE; - } - - /** - * Returns true if the entity is on fire. Used by render to add the fire effect on rendering. - */ - @Override - public boolean isBurning() - { - return false; - } - - /** - * Checks if the entity is in range to render. - */ - @Override - @SideOnly(Side.CLIENT) - public boolean isInRangeToRenderDist(double distance) - { - return distance < 16384.0D; - } - - /** - * Called to update the entity's position/logic. - */ - @Override - public void onUpdate() - { - if (!this.world.isRemote && this.world.getDifficulty() == EnumDifficulty.PEACEFUL) - { - this.setDead(); - } - else - { - super.onUpdate(); - - if (!this.world.isRemote) - { - if (this.target == null && this.targetUniqueId != null) - { - for (EntityLivingBase entitylivingbase : this.world.getEntitiesWithinAABB(EntityLivingBase.class, - new AxisAlignedBB(this.targetBlockPos.add(-2, -2, -2), this.targetBlockPos.add(2, 2, 2)))) - { - if (entitylivingbase.getUniqueID().equals(this.targetUniqueId)) - { - this.target = entitylivingbase; - break; - } - } - - this.targetUniqueId = null; - } - - if (this.owner == null && this.ownerUniqueId != null) - { - for (EntityLivingBase entitylivingbase1 : this.world.getEntitiesWithinAABB(EntityLivingBase.class, - new AxisAlignedBB(this.ownerBlockPos.add(-2, -2, -2), this.ownerBlockPos.add(2, 2, 2)))) - { - if (entitylivingbase1.getUniqueID().equals(this.ownerUniqueId)) - { - this.owner = entitylivingbase1; - break; - } - } - - this.ownerUniqueId = null; - } - - if (this.target == null || !this.target.isEntityAlive() || this.target instanceof EntityPlayer && ((EntityPlayer) this.target).isSpectator()) - { - if (!this.hasNoGravity()) - { - this.motionY -= 0.04D; - } - } - else - { - this.targetDeltaX = MathHelper.clamp(this.targetDeltaX * 1.025D, -1.0D, 1.0D); - this.targetDeltaY = MathHelper.clamp(this.targetDeltaY * 1.025D, -1.0D, 1.0D); - this.targetDeltaZ = MathHelper.clamp(this.targetDeltaZ * 1.025D, -1.0D, 1.0D); - this.motionX += (this.targetDeltaX - this.motionX) * 0.2D; - this.motionY += (this.targetDeltaY - this.motionY) * 0.2D; - this.motionZ += (this.targetDeltaZ - this.motionZ) * 0.2D; - } - - RayTraceResult raytraceresult = ProjectileHelper.forwardsRaycast(this, true, false, this.owner); - - if (raytraceresult != null && !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) - { - this.bulletHit(raytraceresult); - } - } - - this.setPosition(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - ProjectileHelper.rotateTowardsMovement(this, 0.5F); - - if (this.world.isRemote) - { - this.world.spawnParticle(EnumParticleTypes.END_ROD, this.posX - this.motionX, this.posY - this.motionY + 0.15D, this.posZ - this.motionZ, 0.0D, 0.0D, 0.0D); - } - else if (this.target != null && !this.target.isDead) - { - if (this.steps > 0) - { - --this.steps; - - if (this.steps == 0) - { - this.selectNextMoveDirection(this.direction == null ? null : this.direction.getAxis()); - } - } - - if (this.direction != null) - { - BlockPos blockpos = new BlockPos(this); - EnumFacing.Axis enumfacing$axis = this.direction.getAxis(); - - if (this.world.isBlockNormalCube(blockpos.offset(this.direction), false)) - { - this.selectNextMoveDirection(enumfacing$axis); - } - else - { - BlockPos blockpos1 = new BlockPos(this.target); - - if (enumfacing$axis == EnumFacing.Axis.X && blockpos.getX() == blockpos1.getX() || enumfacing$axis == EnumFacing.Axis.Z && blockpos.getZ() == blockpos1.getZ() - || enumfacing$axis == EnumFacing.Axis.Y && blockpos.getY() == blockpos1.getY()) - { - this.selectNextMoveDirection(enumfacing$axis); - } - } - } - } - } - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - @Override - protected void readEntityFromNBT(NBTTagCompound compound) - { - this.steps = compound.getInteger("Steps"); - this.targetDeltaX = compound.getDouble("TXD"); - this.targetDeltaY = compound.getDouble("TYD"); - this.targetDeltaZ = compound.getDouble("TZD"); - - if (compound.hasKey("Dir", 99)) - { - this.direction = EnumFacing.getFront(compound.getInteger("Dir")); - } - - if (compound.hasKey("Owner", 10)) - { - NBTTagCompound nbttagcompound = compound.getCompoundTag("Owner"); - this.ownerUniqueId = NBTUtil.getUUIDFromTag(nbttagcompound); - this.ownerBlockPos = new BlockPos(nbttagcompound.getInteger("X"), nbttagcompound.getInteger("Y"), nbttagcompound.getInteger("Z")); - } - - if (compound.hasKey("Target", 10)) - { - NBTTagCompound nbttagcompound1 = compound.getCompoundTag("Target"); - this.targetUniqueId = NBTUtil.getUUIDFromTag(nbttagcompound1); - this.targetBlockPos = new BlockPos(nbttagcompound1.getInteger("X"), nbttagcompound1.getInteger("Y"), nbttagcompound1.getInteger("Z")); - } - } - - private void selectNextMoveDirection(@Nullable - EnumFacing.Axis p_184569_1_) - { - double d0 = 0.5D; - BlockPos blockpos; - - if (this.target == null) - { - blockpos = (new BlockPos(this)).down(); - } - else - { - d0 = this.target.height * 0.5D; - blockpos = new BlockPos(this.target.posX, this.target.posY + d0, this.target.posZ); - } - - double d1 = blockpos.getX() + 0.5D; - double d2 = blockpos.getY() + d0; - double d3 = blockpos.getZ() + 0.5D; - EnumFacing enumfacing = null; - - if (blockpos.distanceSqToCenter(this.posX, this.posY, this.posZ) >= 4.0D) - { - BlockPos blockpos1 = new BlockPos(this); - List list = Lists.newArrayList(); - - if (p_184569_1_ != EnumFacing.Axis.X) - { - if (blockpos1.getX() < blockpos.getX() && this.world.isAirBlock(blockpos1.east())) - { - list.add(EnumFacing.EAST); - } - else if (blockpos1.getX() > blockpos.getX() && this.world.isAirBlock(blockpos1.west())) - { - list.add(EnumFacing.WEST); - } - } - - if (p_184569_1_ != EnumFacing.Axis.Y) - { - if (blockpos1.getY() < blockpos.getY() && this.world.isAirBlock(blockpos1.up())) - { - list.add(EnumFacing.UP); - } - else if (blockpos1.getY() > blockpos.getY() && this.world.isAirBlock(blockpos1.down())) - { - list.add(EnumFacing.DOWN); - } - } - - if (p_184569_1_ != EnumFacing.Axis.Z) - { - if (blockpos1.getZ() < blockpos.getZ() && this.world.isAirBlock(blockpos1.south())) - { - list.add(EnumFacing.SOUTH); - } - else if (blockpos1.getZ() > blockpos.getZ() && this.world.isAirBlock(blockpos1.north())) - { - list.add(EnumFacing.NORTH); - } - } - - enumfacing = EnumFacing.random(this.rand); - - if (list.isEmpty()) - { - for (int i = 5; !this.world.isAirBlock(blockpos1.offset(enumfacing)) && i > 0; --i) - { - enumfacing = EnumFacing.random(this.rand); - } - } - else - { - enumfacing = list.get(this.rand.nextInt(list.size())); - } - - d1 = this.posX + enumfacing.getFrontOffsetX(); - d2 = this.posY + enumfacing.getFrontOffsetY(); - d3 = this.posZ + enumfacing.getFrontOffsetZ(); - } - - this.setDirection(enumfacing); - double d6 = d1 - this.posX; - double d7 = d2 - this.posY; - double d4 = d3 - this.posZ; - double d5 = MathHelper.sqrt(d6 * d6 + d7 * d7 + d4 * d4); - - if (d5 == 0.0D) - { - this.targetDeltaX = 0.0D; - this.targetDeltaY = 0.0D; - this.targetDeltaZ = 0.0D; - } - else - { - this.targetDeltaX = d6 / d5 * 0.15D; - this.targetDeltaY = d7 / d5 * 0.15D; - this.targetDeltaZ = d4 / d5 * 0.15D; - } - - this.isAirBorne = true; - this.steps = 10 + this.rand.nextInt(5) * 10; - } - - private void setDirection(@Nullable - EnumFacing directionIn) - { - this.direction = directionIn; - } - - /** - * (abstract) Protected helper method to write subclass entity data to NBT. - */ - @Override - protected void writeEntityToNBT(NBTTagCompound compound) - { - if (this.owner != null) - { - BlockPos blockpos = new BlockPos(this.owner); - NBTTagCompound nbttagcompound = NBTUtil.createUUIDTag(this.owner.getUniqueID()); - nbttagcompound.setInteger("X", blockpos.getX()); - nbttagcompound.setInteger("Y", blockpos.getY()); - nbttagcompound.setInteger("Z", blockpos.getZ()); - compound.setTag("Owner", nbttagcompound); - } - - if (this.target != null) - { - BlockPos blockpos1 = new BlockPos(this.target); - NBTTagCompound nbttagcompound1 = NBTUtil.createUUIDTag(this.target.getUniqueID()); - nbttagcompound1.setInteger("X", blockpos1.getX()); - nbttagcompound1.setInteger("Y", blockpos1.getY()); - nbttagcompound1.setInteger("Z", blockpos1.getZ()); - compound.setTag("Target", nbttagcompound1); - } - - if (this.direction != null) - { - compound.setInteger("Dir", this.direction.getIndex()); - } - - compound.setInteger("Steps", this.steps); - compound.setDouble("TXD", this.targetDeltaX); - compound.setDouble("TYD", this.targetDeltaY); - compound.setDouble("TZD", this.targetDeltaZ); - } -} \ No newline at end of file