All parameters on one line (for now)
Easier picking of 1.7 changes
This commit is contained in:
@@ -53,9 +53,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAESprite getIcon(
|
||||
final EnumFacing side,
|
||||
final IBlockState state )
|
||||
public IAESprite getIcon( final EnumFacing side, final IBlockState state )
|
||||
{
|
||||
if( side != EnumFacing.SOUTH )
|
||||
{
|
||||
|
||||
@@ -54,21 +54,13 @@ public class BlockCraftingStorage extends BlockCraftingUnit
|
||||
{
|
||||
default:
|
||||
case STORAGE_1K:
|
||||
return formed ?
|
||||
super.getIcon( side, state ) :
|
||||
ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
|
||||
return formed ? super.getIcon( side, state ) : ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
|
||||
case STORAGE_4K:
|
||||
return formed ?
|
||||
ExtraBlockTextures.BlockCraftingStorage4k.getIcon() :
|
||||
ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
|
||||
return formed ? ExtraBlockTextures.BlockCraftingStorage4k.getIcon() : ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
|
||||
case STORAGE_16K:
|
||||
return formed ?
|
||||
ExtraBlockTextures.BlockCraftingStorage16k.getIcon() :
|
||||
ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
|
||||
return formed ? ExtraBlockTextures.BlockCraftingStorage16k.getIcon() : ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
|
||||
case STORAGE_64K:
|
||||
return formed ?
|
||||
ExtraBlockTextures.BlockCraftingStorage64k.getIcon() :
|
||||
ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
|
||||
return formed ? ExtraBlockTextures.BlockCraftingStorage64k.getIcon() : ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,10 +138,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
|
||||
@Override
|
||||
protected IProperty[] getAEStates()
|
||||
{
|
||||
return new IProperty[] {
|
||||
POWERED,
|
||||
FORMED
|
||||
};
|
||||
return new IProperty[] { POWERED, FORMED };
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -68,15 +68,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(
|
||||
final World w,
|
||||
final BlockPos pos,
|
||||
final IBlockState state,
|
||||
final EntityPlayer p,
|
||||
final EnumFacing side,
|
||||
final float hitX,
|
||||
final float hitY,
|
||||
final float hitZ )
|
||||
public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
|
||||
{
|
||||
final TileMolecularAssembler tg = this.getTileEntity( w, pos );
|
||||
if( tg != null && !p.isSneaking() )
|
||||
|
||||
Reference in New Issue
Block a user