Puts everywhere brackets
This commit is contained in:
@@ -142,7 +142,9 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
|
||||
}
|
||||
}
|
||||
if( newDamage > END )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
this.setProgress( is, newDamage );
|
||||
return is;
|
||||
@@ -183,13 +185,19 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
|
||||
int damage = this.getProgress( is );
|
||||
|
||||
if( damage < Certus + SINGLE_OFFSET )
|
||||
{
|
||||
return this.getUnlocalizedName() + ".Certus";
|
||||
}
|
||||
|
||||
if( damage < Nether + SINGLE_OFFSET )
|
||||
{
|
||||
return this.getUnlocalizedName() + ".Nether";
|
||||
}
|
||||
|
||||
if( damage < Fluix + SINGLE_OFFSET )
|
||||
{
|
||||
return this.getUnlocalizedName() + ".Fluix";
|
||||
}
|
||||
|
||||
return this.getUnlocalizedName();
|
||||
}
|
||||
@@ -226,8 +234,9 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
|
||||
int damage = this.getProgress( stack );
|
||||
|
||||
if( damage < Certus + SINGLE_OFFSET )
|
||||
{
|
||||
list = this.certus;
|
||||
|
||||
}
|
||||
else if( damage < Nether + SINGLE_OFFSET )
|
||||
{
|
||||
damage -= Nether;
|
||||
@@ -241,14 +250,22 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
|
||||
}
|
||||
|
||||
if( list == null )
|
||||
{
|
||||
return Items.diamond.getIconFromDamage( 0 );
|
||||
}
|
||||
|
||||
if( damage < LEVEL_OFFSET )
|
||||
{
|
||||
return list[0];
|
||||
}
|
||||
else if( damage < LEVEL_OFFSET * 2 )
|
||||
{
|
||||
return list[1];
|
||||
}
|
||||
else
|
||||
{
|
||||
return list[2];
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -285,7 +302,9 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
|
||||
egc.motionZ = location.motionZ;
|
||||
|
||||
if( location instanceof EntityItem )
|
||||
{
|
||||
egc.delayBeforeCanPickup = ( (EntityItem) location ).delayBeforeCanPickup;
|
||||
}
|
||||
|
||||
return egc;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,9 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
|
||||
this.setFeature( EnumSet.of( AEFeature.Patterns ) );
|
||||
this.setMaxStackSize( 1 );
|
||||
if( Platform.isClient() )
|
||||
{
|
||||
MinecraftForgeClient.registerItemRenderer( this, new ItemEncodedPatternRenderer() );
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -76,7 +78,9 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
|
||||
if( player.isSneaking() )
|
||||
{
|
||||
if( Platform.isClient() )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
InventoryPlayer inv = player.inventory;
|
||||
|
||||
@@ -159,16 +163,22 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
|
||||
{
|
||||
ItemStack out = SIMPLE_CACHE.get( item );
|
||||
if( out != null )
|
||||
{
|
||||
return out;
|
||||
}
|
||||
|
||||
World w = CommonHelper.proxy.getWorld();
|
||||
if( w == null )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
ICraftingPatternDetails details = this.getPatternForItem( item, w );
|
||||
|
||||
if( details == null )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
SIMPLE_CACHE.put( item, out = details.getCondensedOutputs()[0].getItemStack() );
|
||||
return out;
|
||||
|
||||
@@ -46,7 +46,9 @@ public class ItemPaintBall extends AEBaseItem
|
||||
this.setHasSubtypes( true );
|
||||
|
||||
if( Platform.isClient() )
|
||||
{
|
||||
MinecraftForgeClient.registerItemRenderer( this, new PaintBallRender() );
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -64,10 +66,14 @@ public class ItemPaintBall extends AEBaseItem
|
||||
{
|
||||
int dmg = is.getItemDamage();
|
||||
if( dmg >= DAMAGE_THRESHOLD )
|
||||
{
|
||||
dmg -= DAMAGE_THRESHOLD;
|
||||
}
|
||||
|
||||
if( dmg >= AEColor.values().length )
|
||||
{
|
||||
return AEColor.Transparent;
|
||||
}
|
||||
|
||||
return AEColor.values()[dmg];
|
||||
}
|
||||
@@ -76,12 +82,20 @@ public class ItemPaintBall extends AEBaseItem
|
||||
public void getSubItems( Item i, CreativeTabs ct, List l )
|
||||
{
|
||||
for( AEColor c : AEColor.values() )
|
||||
{
|
||||
if( c != AEColor.Transparent )
|
||||
{
|
||||
l.add( new ItemStack( this, 1, c.ordinal() ) );
|
||||
}
|
||||
}
|
||||
|
||||
for( AEColor c : AEColor.values() )
|
||||
{
|
||||
if( c != AEColor.Transparent )
|
||||
{
|
||||
l.add( new ItemStack( this, 1, DAMAGE_THRESHOLD + c.ordinal() ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isLumen( ItemStack is )
|
||||
|
||||
Reference in New Issue
Block a user