[ci skip] spotlessApply with the new settings

This commit is contained in:
Jason Mitchell committed 2023-01-28 18:04:28 -08:00
1 parent 83698cb73c
commit 84c2239244
561 files changed
+8872 -9300

No files matched your search

@@ -1,9 +1,7 @@
package tconstruct.tools.entity;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import io.netty.buffer.ByteBuf;
import java.util.*;
import net.minecraft.block.Block;
import net.minecraft.crash.*;
import net.minecraft.entity.*;
@@ -17,8 +15,13 @@ import net.minecraft.network.play.server.S2BPacketChangeGameState;
import net.minecraft.util.*;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import io.netty.buffer.ByteBuf;
@Deprecated
public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnData {
public ItemStack returnStack;
public float mass;
public int baseDamage;
@@ -48,8 +51,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
@Override
public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) {
if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) {
boolean flag =
this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode;
boolean flag = this.canBePickedUp == 1
|| this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode;
if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(returnStack)) {
flag = false;
@@ -57,7 +60,9 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (flag) {
this.playSound(
"random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
"random.pop",
0.2F,
((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
par1EntityPlayer.onItemPickup(this, 1);
if (returnStack.stackSize <= 0 || this.canBePickedUp == 2) this.setDead();
}
@@ -73,8 +78,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) {
float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw =
this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D
/ Math.PI);
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI);
}
@@ -82,7 +87,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
i.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(
this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.worldObj,
this.field_145791_d,
this.field_145792_e,
this.field_145789_f);
if (axisalignedbb != null
&& axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) {
@@ -116,12 +124,12 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
} else {
++this.ticksInAir;
Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
Vec3 vec31 = Vec3.createVectorHelper(
this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
Vec3 vec31 = Vec3
.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec3, vec31, false, true, false);
vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
vec31 = Vec3.createVectorHelper(
this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
vec31 = Vec3
.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
if (movingobjectposition != null) {
vec31 = Vec3.createVectorHelper(
@@ -133,9 +141,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
Entity entity = null;
List<Entity> list = this.worldObj.getEntitiesWithinAABBExcludingEntity(
this,
this.boundingBox
.addCoord(this.motionX, this.motionY, this.motionZ)
.expand(1.0D, 1.0D, 1.0D));
this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D));
double d0 = 0.0D;
int l;
float ySpeed;
@@ -166,9 +172,8 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (movingobjectposition != null && movingobjectposition.entityHit instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit;
if (entityplayer.capabilities.disableDamage
|| this.shootingEntity instanceof EntityPlayer
&& !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) {
if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer
&& !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) {
movingobjectposition = null;
}
}
@@ -234,8 +239,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (f3 > 0.0F) {
float knockback = knockbackStrength + knockbackStrengthMod;
movingobjectposition.entityHit.addVelocity(
this.motionX
* (double) this.knockbackStrength
this.motionX * (double) this.knockbackStrength
* 0.6000000238418579D
/ (double) f3,
0.1D,
@@ -249,12 +253,11 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
damagesource = DamageSource.causeArrowDamage(this, this.shootingEntity);
}
if (this.shootingEntity != null
&& movingobjectposition.entityHit != this.shootingEntity
if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity
&& movingobjectposition.entityHit instanceof EntityPlayer
&& this.shootingEntity instanceof EntityPlayerMP) {
((EntityPlayerMP) this.shootingEntity)
.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0));
((EntityPlayerMP) this.shootingEntity).playerNetServerHandler
.sendPacket(new S2BPacketChangeGameState(6, 0));
// TConstruct.packetPipeline.sendTo(new
// S2BPacketChangeGameState(6, 0),
// (EntityPlayerMP) this.shootingEntity);
@@ -287,10 +290,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
this.field_145791_d = movingobjectposition.blockX;
this.field_145792_e = movingobjectposition.blockY;
this.field_145789_f = movingobjectposition.blockZ;
this.field_145790_g =
this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.inData = this.worldObj.getBlockMetadata(
this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.field_145790_g = this.worldObj
.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.inData = this.worldObj
.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.motionX = (float) (movingobjectposition.hitVec.xCoord - this.posX);
this.motionY = (float) (movingobjectposition.hitVec.yCoord - this.posY);
this.motionZ = (float) (movingobjectposition.hitVec.zCoord - this.posZ);
@@ -306,7 +309,11 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (this.field_145790_g != Blocks.air) {
this.field_145790_g.onEntityCollidedWithBlock(
this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this);
this.worldObj,
this.field_145791_d,
this.field_145792_e,
this.field_145789_f,
this);
}
}
}
@@ -470,8 +477,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
private int storeItemStack(ItemStack par1ItemStack, EntityLivingBase living) {
for (int slotID = 0; slotID < 5; ++slotID) {
ItemStack stack = living.getEquipmentInSlot(slotID);
if (stack != null
&& stack.isItemEqual(par1ItemStack)
if (stack != null && stack.isItemEqual(par1ItemStack)
&& ItemStack.areItemStackTagsEqual(stack, par1ItemStack)
&& stack.isStackable()
&& stack.stackSize < stack.getMaxStackSize()) {
@@ -4,10 +4,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.*;
import net.minecraft.world.World;
import tconstruct.library.entity.ProjectileBase;
import tconstruct.library.tools.*;
public class DaggerEntity extends ProjectileBase {
public int roll;
public DaggerEntity(World world) {
@@ -24,7 +26,11 @@ public class DaggerEntity extends ProjectileBase {
float pitch = Math.max(-90f, player.rotationPitch - 20f);
// same as in the others, but with pitch upped
this.setLocationAndAngles(
player.posX, player.posY + (double) player.getEyeHeight(), player.posZ, player.rotationYaw, pitch);
player.posX,
player.posY + (double) player.getEyeHeight(),
player.posZ,
player.rotationYaw,
pitch);
this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
this.posY -= 0.10000000149011612D;
this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F;
@@ -49,8 +55,10 @@ public class DaggerEntity extends ProjectileBase {
@Override
public void onHitEntity(MovingObjectPosition movingobjectposition) {
AbilityHelper.onLeftClickEntity(
returnStack, (EntityPlayer) shootingEntity, movingobjectposition.entityHit, (ToolCore)
returnStack.getItem());
returnStack,
(EntityPlayer) shootingEntity,
movingobjectposition.entityHit,
(ToolCore) returnStack.getItem());
// super.onHitEntity(movingobjectposition);
}
@@ -7,6 +7,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
public class FancyEntityItem extends EntityItem {
public FancyEntityItem(World par1World, double par2, double par4, double par6) {
super(par1World, par2, par4, par6);
this.isImmuneToFire = true;
@@ -16,8 +17,7 @@ public class FancyEntityItem extends EntityItem {
public FancyEntityItem(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) {
this(par1World, par2, par4, par6);
this.setEntityItemStack(par8ItemStack);
this.lifespan = (par8ItemStack.getItem() == null
? 6000
this.lifespan = (par8ItemStack.getItem() == null ? 6000
: par8ItemStack.getItem().getEntityLifespan(par8ItemStack, par1World));
}
@@ -1,7 +1,7 @@
package tconstruct.tools.entity;
import cpw.mods.fml.relauncher.*;
import java.util.*;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.init.Items;
@@ -11,7 +11,10 @@ import net.minecraft.potion.*;
import net.minecraft.util.*;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.*;
public class LaunchedPotion extends EntityThrowable {
/**
* The damage value of the thrown potion that this EntityPotion represents.
*/
@@ -67,8 +70,7 @@ public class LaunchedPotion extends EntityThrowable {
}
/**
* Returns the damage value of the thrown potion that this EntityPotion
* represents.
* Returns the damage value of the thrown potion that this EntityPotion represents.
*/
public int getPotionDamage() {
if (this.potionDamage == null) {
@@ -88,8 +90,8 @@ public class LaunchedPotion extends EntityThrowable {
if (list != null && !list.isEmpty()) {
AxisAlignedBB axisalignedbb = this.boundingBox.expand(4.0D, 2.0D, 4.0D);
List<EntityLivingBase> list1 =
this.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
List<EntityLivingBase> list1 = this.worldObj
.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
if (list1 != null && !list1.isEmpty()) {
@@ -108,13 +110,16 @@ public class LaunchedPotion extends EntityThrowable {
if (Potion.potionTypes[i].isInstant()) {
Potion.potionTypes[i].affectEntity(
this.getThrower(), entityliving, potioneffect.getAmplifier(), d1);
this.getThrower(),
entityliving,
potioneffect.getAmplifier(),
d1);
} else {
int j = (int) (d1 * (double) potioneffect.getDuration() + 0.5D);
if (j > 20) {
entityliving.addPotionEffect(
new PotionEffect(i, j, potioneffect.getAmplifier()));
entityliving
.addPotionEffect(new PotionEffect(i, j, potioneffect.getAmplifier()));
}
}
}
@@ -1,9 +1,7 @@
package tconstruct.tools.entity;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import io.netty.buffer.ByteBuf;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,7 +10,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.*;
import net.minecraft.world.World;
import tconstruct.library.tools.AbilityHelper;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import io.netty.buffer.ByteBuf;
@Deprecated
public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
@@ -56,20 +58,17 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
posZ -= MathHelper.sin((rotationYaw / 180F) * 3.141593F) * 0.16F;
setPosition(posX, posY, posZ);
yOffset = 0.0F;
motionX =
-MathHelper.sin((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F);
motionX = -MathHelper.sin((rotationYaw / 180F) * 3.141593F)
* MathHelper.cos((rotationPitch / 180F) * 3.141593F);
motionZ = MathHelper.cos((rotationYaw / 180F) * 3.141593F) * MathHelper.cos((rotationPitch / 180F) * 3.141593F);
motionY = -MathHelper.sin((rotationPitch / 180F) * 3.141593F - 0.2f);
setArrowHeading(motionX, motionY, motionZ, f, f1);
}
/*
* public void setOnGround(boolean flag) { onGround = flag;
* this.dataWatcher.updateObject(6, Byte.valueOf((byte) (flag == true ? 1 :
* 0))); }
*
* public boolean getOnGround() { return
* this.dataWatcher.getWatchableObjectByte(0) == 1 ? true : false; }
* public void setOnGround(boolean flag) { onGround = flag; this.dataWatcher.updateObject(6, Byte.valueOf((byte)
* (flag == true ? 1 : 0))); } public boolean getOnGround() { return this.dataWatcher.getWatchableObjectByte(0) == 1
* ? true : false; }
*/
@Override
@@ -89,11 +88,9 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
}
/*
* public void returnToPlayer() { damageDagger(0, true);
* if(returnStack.stackSize < 1) { return; } if(returnStackSlot > 0) {
* mod_Infi2x2.forceAddToInv((EntityPlayer)returnsTo, returnStack,
* returnStackSlot, true); } else {
* mod_Infi2x2.addToInv((EntityPlayer)returnsTo, returnStack, true); } }
* public void returnToPlayer() { damageDagger(0, true); if(returnStack.stackSize < 1) { return; }
* if(returnStackSlot > 0) { mod_Infi2x2.forceAddToInv((EntityPlayer)returnsTo, returnStack, returnStackSlot, true);
* } else { mod_Infi2x2.addToInv((EntityPlayer)returnsTo, returnStack, true); } }
*/
public void determineRotation() {
@@ -161,8 +158,8 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
* this.motionX = 0; this.motionY = 0; this.motionZ = 0;
*/
/*
* ticksInGround++; if (ticksInGround == 1200) { setDead(); } if
* (ticksInGround == maxGroundTicks) { setDead(); }
* ticksInGround++; if (ticksInGround == 1200) { setDead(); } if (ticksInGround == maxGroundTicks) {
* setDead(); }
*/
if (!hasHitGround) {
hasHitGround = true;
@@ -187,7 +184,8 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
}
Entity entity = null;
List<Entity> list = worldObj.getEntitiesWithinAABBExcludingEntity(
this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
this,
boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D));
double d = 0.0D;
for (Entity entity1 : list) {
if (!entity1.canBeCollidedWith() || entity1 == owner && ticksInAir < 5) {
@@ -265,22 +263,12 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
}
/*
* public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) {
* super.readEntityFromNBT(par1NBTTagCompound);
*
* if (par1NBTTagCompound.hasKey("Potion")) { this.potionDamage =
* ItemStack.loadItemStackFromNBT
* public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { super.readEntityFromNBT(par1NBTTagCompound);
* if (par1NBTTagCompound.hasKey("Potion")) { this.potionDamage = ItemStack.loadItemStackFromNBT
* (par1NBTTagCompound.getCompoundTag("Potion")); } else {
* this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); }
*
* if (this.potionDamage == null) { this.setDead(); } }
*
* public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) {
* super.writeEntityToNBT(par1NBTTagCompound);
*
* if (this.potionDamage != null) {
*
* } }
* this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); } if (this.potionDamage == null) {
* this.setDead(); } } public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) {
* super.writeEntityToNBT(par1NBTTagCompound); if (this.potionDamage != null) { } }
*/
@Override
@@ -325,7 +313,10 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData {
}
if (!doNotRetrieve) AbilityHelper.addToInv(entityplayer, returnStack, true);
worldObj.playSoundAtEntity(
this, "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
this,
"random.pop",
0.2F,
((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
entityplayer.onItemPickup(this, 1);
kill();
}