Puts everywhere brackets

This commit is contained in:
thatsIch
2015-04-29 02:30:53 +02:00
parent 23aa8fd72d
commit 64ed05a1b4
465 changed files with 6726 additions and 14 deletions
@@ -63,7 +63,9 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
super.onUpdate();
if( !AEConfig.instance.isFeatureEnabled( AEFeature.inWorldFluix ) )
{
return;
}
if( Platform.isClient() && this.delay > 30 && AEConfig.instance.enableEffects )
{
@@ -83,11 +85,15 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
if( this.transformTime > 60 )
{
if( !this.transform() )
{
this.transformTime = 0;
}
}
}
else
{
this.transformTime = 0;
}
}
public boolean transform()
@@ -111,10 +117,14 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
if( other != null && other.stackSize > 0 )
{
if( Platform.isSameItem( other, new ItemStack( Items.redstone ) ) )
{
redstone = (EntityItem) e;
}
if( Platform.isSameItem( other, new ItemStack( Items.quartz ) ) )
{
netherQuartz = (EntityItem) e;
}
}
}
}
@@ -126,13 +136,19 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
netherQuartz.getEntityItem().stackSize--;
if( this.getEntityItem().stackSize <= 0 )
{
this.setDead();
}
if( redstone.getEntityItem().stackSize <= 0 )
{
redstone.setDead();
}
if( netherQuartz.getEntityItem().stackSize <= 0 )
{
netherQuartz.setDead();
}
for( ItemStack fluixCrystalStack : materials.fluixCrystal().maybeStack( 2 ).asSet() )
{
@@ -48,10 +48,14 @@ public final class EntityFloatingItem extends EntityItem
public void onUpdate()
{
if( !this.isDead && this.parent.isDead )
{
this.setDead();
}
if( this.superDeath > 100 )
{
this.setDead();
}
this.superDeath++;
this.age = ageStatic;
@@ -61,6 +65,8 @@ public final class EntityFloatingItem extends EntityItem
{
this.progress = progress;
if( this.progress > 0.99 )
{
this.setDead();
}
}
}
@@ -58,10 +58,14 @@ public final class EntityGrowingCrystal extends EntityItem
super.onUpdate();
if( !AEConfig.instance.isFeatureEnabled( AEFeature.inWorldPurification ) )
{
return;
}
if( this.age > 600 )
{
this.age = 100;
}
ItemStack is = this.getEntityItem();
Item gc = is.getItem();
@@ -84,34 +88,52 @@ public final class EntityGrowingCrystal extends EntityItem
if( mat.isLiquid() )
{
if( isClient )
{
this.progress_1000++;
}
else
{
this.progress_1000 += speed;
}
}
else
{
this.progress_1000 = 0;
}
if( isClient )
{
int len = 40;
if( speed > 2 )
{
len = 20;
}
if( speed > 90 )
{
len = 15;
}
if( speed > 150 )
{
len = 10;
}
if( speed > 240 )
{
len = 7;
}
if( speed > 360 )
{
len = 3;
}
if( speed > 500 )
{
len = 1;
}
if( this.progress_1000 >= len )
{
@@ -138,22 +160,34 @@ public final class EntityGrowingCrystal extends EntityItem
int qty = 0;
if( this.isAccelerated( x + 1, y, z ) )
{
qty += per + qty * mul;
}
if( this.isAccelerated( x, y + 1, z ) )
{
qty += per + qty * mul;
}
if( this.isAccelerated( x, y, z + 1 ) )
{
qty += per + qty * mul;
}
if( this.isAccelerated( x - 1, y, z ) )
{
qty += per + qty * mul;
}
if( this.isAccelerated( x, y - 1, z ) )
{
qty += per + qty * mul;
}
if( this.isAccelerated( x, y, z - 1 ) )
{
qty += per + qty * mul;
}
return qty;
}
@@ -36,13 +36,21 @@ public final class EntityIds
public static int get( Class<? extends Entity> droppedEntity )
{
if( droppedEntity == EntityTinyTNTPrimed.class )
{
return TINY_TNT;
}
if( droppedEntity == EntitySingularity.class )
{
return SINGULARITY;
}
if( droppedEntity == EntityChargedQuartz.class )
{
return CHARGED_QUARTZ;
}
if( droppedEntity == EntityGrowingCrystal.class )
{
return GROWING_CRYSTAL;
}
throw new IllegalStateException( "Missing entity id: " + droppedEntity.getName() );
}
@@ -70,10 +70,14 @@ public final class EntitySingularity extends AEBaseEntityItem
public void doExplosion()
{
if( Platform.isClient() )
{
return;
}
if( !AEConfig.instance.isFeatureEnabled( AEFeature.inWorldSingularity ) )
{
return;
}
ItemStack item = this.getEntityItem();
@@ -120,7 +124,9 @@ public final class EntitySingularity extends AEBaseEntityItem
{
other.stackSize--;
if( other.stackSize == 0 )
{
e.setDead();
}
for( ItemStack singularityStack : materials.qESingularity().maybeStack( 2 ).asSet() )
{
@@ -135,7 +141,9 @@ public final class EntitySingularity extends AEBaseEntityItem
}
if( item.stackSize <= 0 )
{
this.setDead();
}
}
}
}
@@ -56,7 +56,9 @@ public class RenderFloatingItem extends RenderItem
GL11.glPushMatrix();
if( !( efi.getEntityItem().getItem() instanceof ItemBlock ) )
{
GL11.glTranslatef( 0, -0.15f, 0 );
}
super.doRender( efi, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_ );
GL11.glPopMatrix();