fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format sourcecode

Browse Source
This commit is contained in:
yueh
2017-07-20 21:17:10 +02:00
parent 66437897be
commit 621910df91
295 changed files with 2142 additions and 1562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/entity/EntityChargedQuartz.java
+1 -1
View File
@@ -78,7 +78,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
this.delay++;
final int j = MathHelper.floor( this.posX );
final int i = MathHelper.floor( (this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY) / 2.0D );
final int i = MathHelper.floor( ( this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY ) / 2.0D );
final int k = MathHelper.floor( this.posZ );
IBlockState state = this.world.getBlockState( new BlockPos( j, i, k ) );
src/main/java/appeng/entity/EntityGrowingCrystal.java
+1 -1
View File
@@ -70,7 +70,7 @@ public final class EntityGrowingCrystal extends EntityItem
if( gc instanceof IGrowableCrystal ) // if it changes this just stops being an issue...
{
final int j = MathHelper.floor( this.posX );
final int i = MathHelper.floor( (this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY) / 2.0D );
final int i = MathHelper.floor( ( this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY ) / 2.0D );
final int k = MathHelper.floor( this.posZ );
final IBlockState state = this.world.getBlockState( new BlockPos( j, i, k ) );
src/main/java/appeng/entity/EntitySingularity.java
+2 -1
View File
@@ -122,7 +122,8 @@ public final class EntitySingularity extends AEBaseEntityItem
{
while( item.getCount() > 0 && other.getCount() > 0 )
{
other.grow( -1 );;
other.grow( -1 );
;
if( other.getCount() == 0 )
{
e.setDead();
src/main/java/appeng/entity/EntityTinyTNTPrimed.java
+6 -3
View File
@@ -94,7 +94,8 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
if( this.isInWater() && Platform.isServer() ) // put out the fuse.
{
AEApi.instance().definitions().blocks().tinyTNT().maybeStack( 1 ).ifPresent( tntStack -> {
AEApi.instance().definitions().blocks().tinyTNT().maybeStack( 1 ).ifPresent( tntStack ->
{
final EntityItem item = new EntityItem( this.world, this.posX, this.posY, this.posZ, tntStack );
item.motionX = this.motionX;
@@ -128,14 +129,16 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
// override :P
void explode()
{
this.world.playSound( null, this.posX, this.posY, this.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, ( 1.0F + ( this.world.rand.nextFloat() - this.world.rand.nextFloat() ) * 0.2F ) * 32.9F );
this.world.playSound( null, this.posX, this.posY, this.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F,
( 1.0F + ( this.world.rand.nextFloat() - this.world.rand.nextFloat() ) * 0.2F ) * 32.9F );
if( this.isInWater() )
{
return;
}
for( final Object e : this.world.getEntitiesWithinAABBExcludingEntity( this, new AxisAlignedBB( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ) )
for( final Object e : this.world.getEntitiesWithinAABBExcludingEntity( this,
new AxisAlignedBB( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ) )
{
if( e instanceof Entity )
{