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

final variables and parameters

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:24:40 +02:00
parent 059523f543
commit 8b3a954f73
732 changed files with 9253 additions and 9256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/ToolChargedStaff.java
+4 -4
View File
@@ -46,7 +46,7 @@ public class ToolChargedStaff extends AEBasePoweredItem
}
@Override
public boolean hitEntity( ItemStack item, EntityLivingBase target, EntityLivingBase hitter )
public boolean hitEntity( final ItemStack item, final EntityLivingBase target, final EntityLivingBase hitter )
{
if( this.getAECurrentPower( item ) > 300 )
{
@@ -56,9 +56,9 @@ public class ToolChargedStaff extends AEBasePoweredItem
for( int x = 0; x < 2; x++ )
{
final AxisAlignedBB entityBoundingBox = target.getEntityBoundingBox();
float dx = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minX );
float dy = (float) ( Platform.getRandomFloat() * target.height + entityBoundingBox.minY );
float dz = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minZ );
final float dx = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minX );
final float dy = (float) ( Platform.getRandomFloat() * target.height + entityBoundingBox.minY );
final float dz = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minZ );
ServerHelper.proxy.sendToAllNearExcept( null, dx, dy, dz, 32.0, target.worldObj, new PacketLightning( dx, dy, dz ) );
}
}
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+63 -63
View File
@@ -93,7 +93,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
static
{
for( AEColor col : AEColor.values() )
for( final AEColor col : AEColor.values() )
{
if( col == AEColor.Transparent )
{
@@ -123,23 +123,23 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
@Override
public boolean onItemUse(
ItemStack is,
EntityPlayer p,
World w,
BlockPos pos,
EnumFacing side,
float hitX,
float hitY,
float hitZ )
final ItemStack is,
final EntityPlayer p,
final World w,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
{
Block blk = w.getBlockState( pos ).getBlock();
final Block blk = w.getBlockState( pos ).getBlock();
ItemStack paintBall = this.getColor( is );
IMEInventory<IAEItemStack> inv = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
final IMEInventory<IAEItemStack> inv = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
if( inv != null )
{
IAEItemStack option = inv.extractItems( AEItemStack.create( paintBall ), Actionable.SIMULATE, new BaseActionSource() );
final IAEItemStack option = inv.extractItems( AEItemStack.create( paintBall ), Actionable.SIMULATE, new BaseActionSource() );
if( option != null )
{
@@ -156,10 +156,10 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return false;
}
double powerPerUse = 100;
final double powerPerUse = 100;
if( paintBall != null && paintBall.getItem() instanceof ItemSnowball )
{
TileEntity te = w.getTileEntity( pos );
final TileEntity te = w.getTileEntity( pos );
// clean cables.
if( te instanceof IColorableTile )
{
@@ -175,8 +175,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
// clean paint balls..
Block testBlk = w.getBlockState( pos.offset( side ) ).getBlock();
TileEntity painted = w.getTileEntity( pos.offset( side ) );
final Block testBlk = w.getBlockState( pos.offset( side ) ).getBlock();
final TileEntity painted = w.getTileEntity( pos.offset( side ) );
if( this.getAECurrentPower( is ) > powerPerUse && testBlk instanceof BlockPaint && painted instanceof TilePaint )
{
inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() );
@@ -187,7 +187,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
else if( paintBall != null )
{
AEColor color = this.getColorFromItem( paintBall );
final AEColor color = this.getColorFromItem( paintBall );
if( color != null && this.getAECurrentPower( is ) > powerPerUse )
{
@@ -210,11 +210,11 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public String getItemStackDisplayName( ItemStack par1ItemStack )
public String getItemStackDisplayName( final ItemStack par1ItemStack )
{
String extra = GuiText.Empty.getLocal();
AEColor selected = this.getActiveColor( par1ItemStack );
final AEColor selected = this.getActiveColor( par1ItemStack );
if( selected != null && Platform.isClient() )
{
@@ -224,12 +224,12 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return super.getItemStackDisplayName( par1ItemStack ) + " - " + extra;
}
public AEColor getActiveColor( ItemStack tol )
public AEColor getActiveColor( final ItemStack tol )
{
return this.getColorFromItem( this.getColor( tol ) );
}
public AEColor getColorFromItem( ItemStack paintBall )
public AEColor getColorFromItem( final ItemStack paintBall )
{
if( paintBall == null )
{
@@ -243,14 +243,14 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( paintBall.getItem() instanceof ItemPaintBall )
{
ItemPaintBall ipb = (ItemPaintBall) paintBall.getItem();
final ItemPaintBall ipb = (ItemPaintBall) paintBall.getItem();
return ipb.getColor( paintBall );
}
else
{
int[] id = OreDictionary.getOreIDs( paintBall );
final int[] id = OreDictionary.getOreIDs( paintBall );
for( int oreID : id )
for( final int oreID : id )
{
if( ORE_TO_COLOR.containsKey( oreID ) )
{
@@ -262,13 +262,13 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return null;
}
public ItemStack getColor( ItemStack is )
public ItemStack getColor( final ItemStack is )
{
NBTTagCompound c = is.getTagCompound();
final NBTTagCompound c = is.getTagCompound();
if( c != null && c.hasKey( "color" ) )
{
NBTTagCompound color = c.getCompoundTag( "color" );
ItemStack oldColor = ItemStack.loadItemStackFromNBT( color );
final NBTTagCompound color = c.getCompoundTag( "color" );
final ItemStack oldColor = ItemStack.loadItemStackFromNBT( color );
if( oldColor != null )
{
return oldColor;
@@ -278,17 +278,17 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return this.findNextColor( is, null, 0 );
}
private ItemStack findNextColor( ItemStack is, ItemStack anchor, int scrollOffset )
private ItemStack findNextColor( final ItemStack is, final ItemStack anchor, final int scrollOffset )
{
ItemStack newColor = null;
IMEInventory<IAEItemStack> inv = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
final IMEInventory<IAEItemStack> inv = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
if( inv != null )
{
IItemList<IAEItemStack> itemList = inv.getAvailableItems( AEApi.instance().storage().createItemList() );
final IItemList<IAEItemStack> itemList = inv.getAvailableItems( AEApi.instance().storage().createItemList() );
if( anchor == null )
{
IAEItemStack firstItem = itemList.getFirstItem();
final IAEItemStack firstItem = itemList.getFirstItem();
if( firstItem != null )
{
newColor = firstItem.getItemStack();
@@ -296,9 +296,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
else
{
LinkedList<IAEItemStack> list = new LinkedList<IAEItemStack>();
final LinkedList<IAEItemStack> list = new LinkedList<IAEItemStack>();
for( IAEItemStack i : itemList )
for( final IAEItemStack i : itemList )
{
list.add( i );
}
@@ -307,7 +307,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
{
@Override
public int compare( IAEItemStack a, IAEItemStack b )
public int compare( final IAEItemStack a, final IAEItemStack b )
{
return ItemSorters.compareInt( a.getItemDamage(), b.getItemDamage() );
}
@@ -350,28 +350,28 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return newColor;
}
public void setColor( ItemStack is, ItemStack newColor )
public void setColor( final ItemStack is, final ItemStack newColor )
{
NBTTagCompound data = Platform.openNbtData( is );
final NBTTagCompound data = Platform.openNbtData( is );
if( newColor == null )
{
data.removeTag( "color" );
}
else
{
NBTTagCompound color = new NBTTagCompound();
final NBTTagCompound color = new NBTTagCompound();
newColor.writeToNBT( color );
data.setTag( "color", color );
}
}
private boolean recolourBlock( Block blk, EnumFacing side, World w, BlockPos pos, EnumFacing orientation, AEColor newColor, EntityPlayer p )
private boolean recolourBlock( final Block blk, final EnumFacing side, final World w, final BlockPos pos, final EnumFacing orientation, final AEColor newColor, final EntityPlayer p )
{
IBlockState state = w.getBlockState( pos );
final IBlockState state = w.getBlockState( pos );
if( blk instanceof BlockColored )
{
EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockColored.COLOR );
final EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockColored.COLOR );
if( newColor.dye == color )
{
@@ -388,7 +388,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( blk == Blocks.stained_glass )
{
EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockStainedGlass.COLOR );
final EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockStainedGlass.COLOR );
if( newColor.dye == color )
{
@@ -405,7 +405,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
if( blk == Blocks.stained_glass_pane )
{
EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockStainedGlassPane.COLOR );
final EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockStainedGlassPane.COLOR );
if( newColor.dye == color )
{
@@ -428,7 +428,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return blk.recolorBlock( w, pos, side, newColor.dye );
}
public void cycleColors( ItemStack is, ItemStack paintBall, int i )
public void cycleColors( final ItemStack is, final ItemStack paintBall, final int i )
{
if( paintBall == null )
{
@@ -441,15 +441,15 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
public void addCheckedInformation( final ItemStack stack, final EntityPlayer player, final List<String> lines, final boolean displayMoreInfo )
{
super.addCheckedInformation( stack, player, lines, displayMoreInfo );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
final IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
if( cdi instanceof CellInventoryHandler )
{
ICellInventory cd = ( (ICellInventoryHandler) cdi ).getCellInv();
final ICellInventory cd = ( (ICellInventoryHandler) cdi ).getCellInv();
if( cd != null )
{
lines.add( cd.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' + cd.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal() );
@@ -459,31 +459,31 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public int getBytes( ItemStack cellItem )
public int getBytes( final ItemStack cellItem )
{
return 512;
}
@Override
public int getBytesPerType( ItemStack cellItem )
public int getBytesPerType( final ItemStack cellItem )
{
return 8;
}
@Override
public int getTotalTypes( ItemStack cellItem )
public int getTotalTypes( final ItemStack cellItem )
{
return 27;
}
@Override
public boolean isBlackListed( ItemStack cellItem, IAEItemStack requestedAddition )
public boolean isBlackListed( final ItemStack cellItem, final IAEItemStack requestedAddition )
{
if( requestedAddition != null )
{
int[] id = OreDictionary.getOreIDs( requestedAddition.getItemStack() );
final int[] id = OreDictionary.getOreIDs( requestedAddition.getItemStack() );
for( int x : id )
for( final int x : id )
{
if( ORE_TO_COLOR.containsKey( x ) )
{
@@ -508,7 +508,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public boolean isStorageCell( ItemStack i )
public boolean isStorageCell( final ItemStack i )
{
return true;
}
@@ -520,51 +520,51 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public String getUnlocalizedGroupName( Set<ItemStack> others, ItemStack is )
public String getUnlocalizedGroupName( final Set<ItemStack> others, final ItemStack is )
{
return GuiText.StorageCells.getUnlocalized();
}
@Override
public boolean isEditable( ItemStack is )
public boolean isEditable( final ItemStack is )
{
return true;
}
@Override
public IInventory getUpgradesInventory( ItemStack is )
public IInventory getUpgradesInventory( final ItemStack is )
{
return new CellUpgrades( is, 2 );
}
@Override
public IInventory getConfigInventory( ItemStack is )
public IInventory getConfigInventory( final ItemStack is )
{
return new CellConfig( is );
}
@Override
public FuzzyMode getFuzzyMode( ItemStack is )
public FuzzyMode getFuzzyMode( final ItemStack is )
{
String fz = Platform.openNbtData( is ).getString( "FuzzyMode" );
final String fz = Platform.openNbtData( is ).getString( "FuzzyMode" );
try
{
return FuzzyMode.valueOf( fz );
}
catch( Throwable t )
catch( final Throwable t )
{
return FuzzyMode.IGNORE_ALL;
}
}
@Override
public void setFuzzyMode( ItemStack is, FuzzyMode fzMode )
public void setFuzzyMode( final ItemStack is, final FuzzyMode fzMode )
{
Platform.openNbtData( is ).setString( "FuzzyMode", fzMode.name() );
}
@Override
public void onWheel( ItemStack is, boolean up )
public void onWheel( final ItemStack is, final boolean up )
{
this.cycleColors( is, this.getColor( is ), up ? 1 : -1 );
}
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+32 -32
View File
@@ -75,7 +75,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
this.coolDown.put( new InWorldToolOperationIngredient( Blocks.flowing_lava, true ), new InWorldToolOperationResult( new ItemStack( Blocks.obsidian ) ) );
this.coolDown.put( new InWorldToolOperationIngredient( Blocks.grass, true ), new InWorldToolOperationResult( new ItemStack( Blocks.dirt ) ) );
List<ItemStack> snowBalls = new ArrayList<ItemStack>();
final List<ItemStack> snowBalls = new ArrayList<ItemStack>();
snowBalls.add( new ItemStack( Items.snowball ) );
this.coolDown.put( new InWorldToolOperationIngredient( Blocks.flowing_water, true ), new InWorldToolOperationResult( null, snowBalls ) );
this.coolDown.put( new InWorldToolOperationIngredient( Blocks.water, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ice ) ) );
@@ -98,15 +98,15 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
private final IBlockState state;
private boolean blockOnly;
public InWorldToolOperationIngredient( IBlockState state )
public InWorldToolOperationIngredient( final IBlockState state )
{
this.state = state;
blockOnly = false;
}
public InWorldToolOperationIngredient(
Block blk,
boolean b )
final Block blk,
final boolean b )
{
state = blk.getDefaultState();
blockOnly = b;
@@ -119,7 +119,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
@Override
public boolean equals( Object obj )
public boolean equals( final Object obj )
{
if( obj == null )
{
@@ -129,12 +129,12 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
{
return false;
}
InWorldToolOperationIngredient other = (InWorldToolOperationIngredient) obj;
final InWorldToolOperationIngredient other = (InWorldToolOperationIngredient) obj;
return state == other.state && ( blockOnly && state.getBlock() == other.state.getBlock() );
}
}
private void heat( IBlockState state, World w, BlockPos pos )
private void heat( final IBlockState state, final World w, final BlockPos pos )
{
InWorldToolOperationResult r = this.heatUp.get( new InWorldToolOperationIngredient( state ) );
@@ -145,7 +145,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
if( r.BlockItem != null )
{
Block blk = Block.getBlockFromItem( r.BlockItem.getItem() );
final Block blk = Block.getBlockFromItem( r.BlockItem.getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.BlockItem.getItemDamage() ), 3 );
}
else
@@ -159,7 +159,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
}
private boolean canHeat( IBlockState state )
private boolean canHeat( final IBlockState state )
{
InWorldToolOperationResult r = this.heatUp.get( new InWorldToolOperationIngredient( state ) );
@@ -171,7 +171,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
return r != null;
}
private void cool( IBlockState state, World w, BlockPos pos )
private void cool( final IBlockState state, final World w, final BlockPos pos )
{
InWorldToolOperationResult r = this.coolDown.get( new InWorldToolOperationIngredient( state ) );
@@ -182,7 +182,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
if( r.BlockItem != null )
{
Block blk = Block.getBlockFromItem( r.BlockItem.getItem() );
final Block blk = Block.getBlockFromItem( r.BlockItem.getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.BlockItem.getItemDamage() ), 3 );
}
else
@@ -196,7 +196,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
}
private boolean canCool( IBlockState state )
private boolean canCool( final IBlockState state )
{
InWorldToolOperationResult r = this.coolDown.get( new InWorldToolOperationIngredient( state ) );
@@ -209,7 +209,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
@Override
public boolean hitEntity( ItemStack item, EntityLivingBase target, EntityLivingBase hitter )
public boolean hitEntity( final ItemStack item, final EntityLivingBase target, final EntityLivingBase hitter )
{
if( this.getAECurrentPower( item ) > 1600 )
{
@@ -221,9 +221,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
@Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer p )
public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer p )
{
MovingObjectPosition target = this.getMovingObjectPositionFromPlayer( w, p, true );
final MovingObjectPosition target = this.getMovingObjectPositionFromPlayer( w, p, true );
if( target == null )
{
@@ -248,14 +248,14 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
@Override
public boolean onItemUse(
ItemStack item,
EntityPlayer p,
World w,
BlockPos pos,
EnumFacing side,
float hitX,
float hitY,
float hitZ )
final ItemStack item,
final EntityPlayer p,
final World w,
final BlockPos pos,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
{
if( this.getAECurrentPower( item ) > 1600 )
{
@@ -264,8 +264,8 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
return false;
}
IBlockState state = w.getBlockState( pos );
Block blockID = state.getBlock();
final IBlockState state = w.getBlockState( pos );
final Block blockID = state.getBlock();
if( p.isSneaking() )
{
@@ -299,14 +299,14 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
return true;
}
ItemStack[] stack = Platform.getBlockDrops( w, pos );
List<ItemStack> out = new ArrayList<ItemStack>();
final ItemStack[] stack = Platform.getBlockDrops( w, pos );
final List<ItemStack> out = new ArrayList<ItemStack>();
boolean hasFurnaceable = false;
boolean canFurnaceable = true;
for( ItemStack i : stack )
for( final ItemStack i : stack )
{
ItemStack result = FurnaceRecipes.instance().getSmeltingResult( i );
final ItemStack result = FurnaceRecipes.instance().getSmeltingResult( i );
if( result != null )
{
@@ -330,7 +330,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
if( hasFurnaceable && canFurnaceable )
{
this.extractAEPower( item, 1600 );
InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) );
final InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) );
w.playSoundEffect( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F );
if( or.BlockItem == null )
@@ -339,7 +339,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
else
{
Block blk = Block.getBlockFromItem( or.BlockItem.getItem() );
final Block blk = Block.getBlockFromItem( or.BlockItem.getItem() );
w.setBlockState( pos, blk.getStateFromMeta( or.BlockItem.getItemDamage() ), 3 );
}
@@ -352,7 +352,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
}
else
{
BlockPos offsetPos = pos.offset( side );
final BlockPos offsetPos = pos.offset( side );
if( !p.canPlayerEdit( offsetPos, side, item ) )
{
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+66 -66
View File
@@ -96,15 +96,15 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
@Override
public void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
public void addCheckedInformation( final ItemStack stack, final EntityPlayer player, final List<String> lines, final boolean displayMoreInfo )
{
super.addCheckedInformation( stack, player, lines, displayMoreInfo );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
final IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
if( cdi instanceof CellInventoryHandler )
{
ICellInventory cd = ( (ICellInventoryHandler) cdi ).getCellInv();
final ICellInventory cd = ( (ICellInventoryHandler) cdi ).getCellInv();
if( cd != null )
{
lines.add( cd.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' + cd.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal() );
@@ -114,22 +114,22 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
@Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer p )
public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer p )
{
if( this.getAECurrentPower( item ) > 1600 )
{
int shots = 1;
CellUpgrades cu = (CellUpgrades) this.getUpgradesInventory( item );
final CellUpgrades cu = (CellUpgrades) this.getUpgradesInventory( item );
if( cu != null )
{
shots += cu.getInstalledUpgrades( Upgrades.SPEED );
}
IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( item, null, StorageChannel.ITEMS );
final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( item, null, StorageChannel.ITEMS );
if( inv != null )
{
IItemList itemList = inv.getAvailableItems( AEApi.instance().storage().createItemList() );
final IItemList itemList = inv.getAvailableItems( AEApi.instance().storage().createItemList() );
IAEStack aeAmmo = itemList.getFirstItem();
if( aeAmmo instanceof IAEItemStack )
{
@@ -144,7 +144,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
aeAmmo.setStackSize( 1 );
ItemStack ammo = ( (IAEItemStack) aeAmmo ).getItemStack();
final ItemStack ammo = ( (IAEItemStack) aeAmmo ).getItemStack();
if( ammo == null )
{
return item;
@@ -157,21 +157,21 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
return item;
}
LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() );
final LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() );
Vec3 vec3 = dir.a;
Vec3 vec31 = dir.b;
Vec3 direction = vec31.subtract( vec3 );
final Vec3 vec3 = dir.a;
final Vec3 vec31 = dir.b;
final Vec3 direction = vec31.subtract( vec3 );
direction.normalize();
double d0 = vec3.xCoord;
double d1 = vec3.yCoord;
double d2 = vec3.zCoord;
final double d0 = vec3.xCoord;
final double d1 = vec3.yCoord;
final double d2 = vec3.zCoord;
float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f;
final float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f;
if( penetration <= 0 )
{
ItemStack type = ( (IAEItemStack) aeAmmo ).getItemStack();
final ItemStack type = ( (IAEItemStack) aeAmmo ).getItemStack();
if( type.getItem() instanceof ItemPaintBall )
{
this.shootPaintBalls( type, w, p, vec3, vec31, direction, d0, d1, d2 );
@@ -197,17 +197,17 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
return item;
}
private void shootPaintBalls( ItemStack type, World w, EntityPlayer p, Vec3 vec3, Vec3 vec31, Vec3 direction, double d0, double d1, double d2 )
private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3 vec3, final Vec3 vec31, final Vec3 direction, final double d0, final double d1, final double d2 )
{
AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 );
final AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 );
Entity entity = null;
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
double closest = 9999999.0D;
for( int l = 0; l < list.size(); ++l )
{
Entity entity1 = (Entity) list.get( l );
final Entity entity1 = (Entity) list.get( l );
if( !entity1.isDead && entity1 != p && !( entity1 instanceof EntityItem ) )
{
@@ -219,14 +219,14 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
continue;
}
float f1 = 0.3F;
final float f1 = 0.3F;
AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
final AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
final MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
if( movingObjectPosition != null )
{
double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec );
final double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec );
if( nd < closest )
{
@@ -240,7 +240,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, false );
Vec3 vec = new Vec3( d0, d1, d2 );
final Vec3 vec = new Vec3( d0, d1, d2 );
if( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest )
{
pos = new MovingObjectPosition( entity );
@@ -254,27 +254,27 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
{
CommonHelper.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord, (float) direction.yCoord, (float) direction.zCoord, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) );
}
catch( Exception err )
catch( final Exception err )
{
AELog.error( err );
}
if( pos != null && type != null && type.getItem() instanceof ItemPaintBall )
{
ItemPaintBall ipb = (ItemPaintBall) type.getItem();
final ItemPaintBall ipb = (ItemPaintBall) type.getItem();
AEColor col = ipb.getColor( type );
final AEColor col = ipb.getColor( type );
// boolean lit = ipb.isLumen( type );
if( pos.typeOfHit == MovingObjectType.ENTITY )
{
int id = pos.entityHit.getEntityId();
PlayerColor marker = new PlayerColor( id, col, 20 * 30 );
final int id = pos.entityHit.getEntityId();
final PlayerColor marker = new PlayerColor( id, col, 20 * 30 );
TickHandler.INSTANCE.getPlayerColors().put( id, marker );
if( pos.entityHit instanceof EntitySheep )
{
EntitySheep sh = (EntitySheep) pos.entityHit;
final EntitySheep sh = (EntitySheep) pos.entityHit;
sh.setFleeceColor( col.dye );
}
@@ -283,49 +283,49 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
else if( pos.typeOfHit == MovingObjectType.BLOCK )
{
EnumFacing side = pos.sideHit;
BlockPos hitPos = pos.getBlockPos().offset( side );
final EnumFacing side = pos.sideHit;
final BlockPos hitPos = pos.getBlockPos().offset( side );
if( !Platform.hasPermissions( new DimensionalCoord( w, hitPos ), p ) )
{
return;
}
Block whatsThere = w.getBlockState( hitPos ).getBlock();
final Block whatsThere = w.getBlockState( hitPos ).getBlock();
if( whatsThere.isReplaceable( w, hitPos ) && w.isAirBlock( hitPos ) )
{
for( Block paintBlock : AEApi.instance().definitions().blocks().paint().maybeBlock().asSet() )
for( final Block paintBlock : AEApi.instance().definitions().blocks().paint().maybeBlock().asSet() )
{
w.setBlockState( hitPos, paintBlock.getDefaultState(), 3 );
}
}
TileEntity te = w.getTileEntity( hitPos );
final TileEntity te = w.getTileEntity( hitPos );
if( te instanceof TilePaint )
{
Vec3 hp = pos.hitVec.subtract( hitPos.getX(), hitPos.getY(), hitPos.getZ() );
final Vec3 hp = pos.hitVec.subtract( hitPos.getX(), hitPos.getY(), hitPos.getZ() );
( (TilePaint) te ).addBlot( type, side.getOpposite(), hp );
}
}
}
}
private void standardAmmo( float penetration, World w, EntityPlayer p, Vec3 vec3, Vec3 vec31, Vec3 direction, double d0, double d1, double d2 )
private void standardAmmo( float penetration, final World w, final EntityPlayer p, final Vec3 vec3, final Vec3 vec31, final Vec3 direction, final double d0, final double d1, final double d2 )
{
boolean hasDestroyed = true;
while( penetration > 0 && hasDestroyed )
{
hasDestroyed = false;
AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 );
final AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 );
Entity entity = null;
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
double closest = 9999999.0D;
for( int l = 0; l < list.size(); ++l )
{
Entity entity1 = (Entity) list.get( l );
final Entity entity1 = (Entity) list.get( l );
if( !entity1.isDead && entity1 != p && !( entity1 instanceof EntityItem ) )
{
@@ -337,14 +337,14 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
continue;
}
float f1 = 0.3F;
final float f1 = 0.3F;
AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
final AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
final MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
if( movingObjectPosition != null )
{
double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec );
final double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec );
if( nd < closest )
{
@@ -356,7 +356,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
}
Vec3 vec = new Vec3( d0, d1, d2 );
final Vec3 vec = new Vec3( d0, d1, d2 );
MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true );
if( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest )
{
@@ -371,22 +371,22 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
{
CommonHelper.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord, (float) direction.yCoord, (float) direction.zCoord, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) );
}
catch( Exception err )
catch( final Exception err )
{
AELog.error( err );
}
if( pos != null )
{
DamageSource dmgSrc = DamageSource.causePlayerDamage( p );
final DamageSource dmgSrc = DamageSource.causePlayerDamage( p );
dmgSrc.damageType = "masscannon";
if( pos.typeOfHit == MovingObjectType.ENTITY )
{
int dmg = (int) Math.ceil( penetration / 20.0f );
final int dmg = (int) Math.ceil( penetration / 20.0f );
if( pos.entityHit instanceof EntityLivingBase )
{
EntityLivingBase el = (EntityLivingBase) pos.entityHit;
final EntityLivingBase el = (EntityLivingBase) pos.entityHit;
penetration -= dmg;
el.knockBack( p, 0, -direction.xCoord, -direction.zCoord );
// el.knockBack( p, 0, vec3.xCoord,
@@ -415,11 +415,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
else
{
Block b = w.getBlockState( pos.getBlockPos() ).getBlock();
final Block b = w.getBlockState( pos.getBlockPos() ).getBlock();
// int meta = w.getBlockMetadata(
// pos.blockX, pos.blockY, pos.blockZ );
float hardness = b.getBlockHardness( w, pos.getBlockPos() ) * 9.0f;
final float hardness = b.getBlockHardness( w, pos.getBlockPos() ) * 9.0f;
if( hardness >= 0.0 )
{
if( penetration > hardness && Platform.hasPermissions( new DimensionalCoord( w, pos.getBlockPos() ), p ) )
@@ -437,65 +437,65 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
@Override
public boolean isEditable( ItemStack is )
public boolean isEditable( final ItemStack is )
{
return true;
}
@Override
public IInventory getUpgradesInventory( ItemStack is )
public IInventory getUpgradesInventory( final ItemStack is )
{
return new CellUpgrades( is, 4 );
}
@Override
public IInventory getConfigInventory( ItemStack is )
public IInventory getConfigInventory( final ItemStack is )
{
return new CellConfig( is );
}
@Override
public FuzzyMode getFuzzyMode( ItemStack is )
public FuzzyMode getFuzzyMode( final ItemStack is )
{
String fz = Platform.openNbtData( is ).getString( "FuzzyMode" );
final String fz = Platform.openNbtData( is ).getString( "FuzzyMode" );
try
{
return FuzzyMode.valueOf( fz );
}
catch( Throwable t )
catch( final Throwable t )
{
return FuzzyMode.IGNORE_ALL;
}
}
@Override
public void setFuzzyMode( ItemStack is, FuzzyMode fzMode )
public void setFuzzyMode( final ItemStack is, final FuzzyMode fzMode )
{
Platform.openNbtData( is ).setString( "FuzzyMode", fzMode.name() );
}
@Override
public int getBytes( ItemStack cellItem )
public int getBytes( final ItemStack cellItem )
{
return 512;
}
@Override
public int getBytesPerType( ItemStack cellItem )
public int getBytesPerType( final ItemStack cellItem )
{
return 8;
}
@Override
public int getTotalTypes( ItemStack cellItem )
public int getTotalTypes( final ItemStack cellItem )
{
return 1;
}
@Override
public boolean isBlackListed( ItemStack cellItem, IAEItemStack requestedAddition )
public boolean isBlackListed( final ItemStack cellItem, final IAEItemStack requestedAddition )
{
float pen = AEApi.instance().registries().matterCannon().getPenetration( requestedAddition.getItemStack() );
final float pen = AEApi.instance().registries().matterCannon().getPenetration( requestedAddition.getItemStack() );
if( pen > 0 )
{
return false;
@@ -516,7 +516,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
@Override
public boolean isStorageCell( ItemStack i )
public boolean isStorageCell( final ItemStack i )
{
return true;
}
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
+18 -18
View File
@@ -66,7 +66,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
}
@Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player )
public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer player )
{
Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL );
return item;
@@ -80,15 +80,15 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
}
@Override
public void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
public void addCheckedInformation( final ItemStack stack, final EntityPlayer player, final List<String> lines, final boolean displayMoreInfo )
{
super.addCheckedInformation( stack, player, lines, displayMoreInfo );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
final IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
if( cdi instanceof CellInventoryHandler )
{
ICellInventory cd = ( (ICellInventoryHandler) cdi ).getCellInv();
final ICellInventory cd = ( (ICellInventoryHandler) cdi ).getCellInv();
if( cd != null )
{
lines.add( cd.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' + cd.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal() );
@@ -98,25 +98,25 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
}
@Override
public int getBytes( ItemStack cellItem )
public int getBytes( final ItemStack cellItem )
{
return 512;
}
@Override
public int getBytesPerType( ItemStack cellItem )
public int getBytesPerType( final ItemStack cellItem )
{
return 8;
}
@Override
public int getTotalTypes( ItemStack cellItem )
public int getTotalTypes( final ItemStack cellItem )
{
return 27;
}
@Override
public boolean isBlackListed( ItemStack cellItem, IAEItemStack requestedAddition )
public boolean isBlackListed( final ItemStack cellItem, final IAEItemStack requestedAddition )
{
return false;
}
@@ -128,7 +128,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
}
@Override
public boolean isStorageCell( ItemStack i )
public boolean isStorageCell( final ItemStack i )
{
return true;
}
@@ -140,51 +140,51 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
}
@Override
public String getUnlocalizedGroupName( Set<ItemStack> others, ItemStack is )
public String getUnlocalizedGroupName( final Set<ItemStack> others, final ItemStack is )
{
return GuiText.StorageCells.getUnlocalized();
}
@Override
public boolean isEditable( ItemStack is )
public boolean isEditable( final ItemStack is )
{
return true;
}
@Override
public IInventory getUpgradesInventory( ItemStack is )
public IInventory getUpgradesInventory( final ItemStack is )
{
return new CellUpgrades( is, 2 );
}
@Override
public IInventory getConfigInventory( ItemStack is )
public IInventory getConfigInventory( final ItemStack is )
{
return new CellConfig( is );
}
@Override
public FuzzyMode getFuzzyMode( ItemStack is )
public FuzzyMode getFuzzyMode( final ItemStack is )
{
String fz = Platform.openNbtData( is ).getString( "FuzzyMode" );
final String fz = Platform.openNbtData( is ).getString( "FuzzyMode" );
try
{
return FuzzyMode.valueOf( fz );
}
catch( Throwable t )
catch( final Throwable t )
{
return FuzzyMode.IGNORE_ALL;
}
}
@Override
public void setFuzzyMode( ItemStack is, FuzzyMode fzMode )
public void setFuzzyMode( final ItemStack is, final FuzzyMode fzMode )
{
Platform.openNbtData( is ).setString( "FuzzyMode", fzMode.name() );
}
@Override
public IGuiItemObject getGuiObject( ItemStack is, World w, BlockPos pos )
public IGuiItemObject getGuiObject( final ItemStack is, final World w, final BlockPos pos )
{
return new PortableCellViewer( is, pos.getX() );
}
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+13 -13
View File
@@ -57,7 +57,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
}
@Override
public ItemStack onItemRightClick( ItemStack item, World w, EntityPlayer player )
public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer player )
{
AEApi.instance().registries().wireless().openWirelessTerminalGui( item, w, player );
return item;
@@ -71,16 +71,16 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
}
@Override
public void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
public void addCheckedInformation( final ItemStack stack, final EntityPlayer player, final List<String> lines, final boolean displayMoreInfo )
{
super.addCheckedInformation( stack, player, lines, displayMoreInfo );
if( stack.hasTagCompound() )
{
NBTTagCompound tag = Platform.openNbtData( stack );
final NBTTagCompound tag = Platform.openNbtData( stack );
if( tag != null )
{
String encKey = tag.getString( "encryptionKey" );
final String encKey = tag.getString( "encryptionKey" );
if( encKey == null || encKey.isEmpty() )
{
@@ -99,19 +99,19 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
}
@Override
public boolean canHandle( ItemStack is )
public boolean canHandle( final ItemStack is )
{
return AEApi.instance().definitions().items().wirelessTerminal().isSameAs( is );
}
@Override
public boolean usePower( EntityPlayer player, double amount, ItemStack is )
public boolean usePower( final EntityPlayer player, final double amount, final ItemStack is )
{
return this.extractAEPower( is, amount ) >= amount - 0.5;
}
@Override
public boolean hasPower( EntityPlayer player, double amt, ItemStack is )
public boolean hasPower( final EntityPlayer player, final double amt, final ItemStack is )
{
return this.getAECurrentPower( is ) >= amt;
}
@@ -123,9 +123,9 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
{
@Override
public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
{
NBTTagCompound data = Platform.openNbtData( target );
final NBTTagCompound data = Platform.openNbtData( target );
manager.writeToNBT( data );
}
} );
@@ -139,16 +139,16 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
}
@Override
public String getEncryptionKey( ItemStack item )
public String getEncryptionKey( final ItemStack item )
{
NBTTagCompound tag = Platform.openNbtData( item );
final NBTTagCompound tag = Platform.openNbtData( item );
return tag.getString( "encryptionKey" );
}
@Override
public void setEncryptionKey( ItemStack item, String encKey, String name )
public void setEncryptionKey( final ItemStack item, final String encKey, final String name )
{
NBTTagCompound tag = Platform.openNbtData( item );
final NBTTagCompound tag = Platform.openNbtData( item );
tag.setString( "encryptionKey", encKey );
tag.setString( "name", name );
}
src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.google.common.base.Optional;
public abstract class AEBasePoweredItem extends AERootPoweredItem
{
public AEBasePoweredItem( double powerCapacity, Optional<String> subName )
public AEBasePoweredItem( final double powerCapacity, final Optional<String> subName )
{
super( powerCapacity, subName );
src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java
+21 -21
View File
@@ -42,7 +42,7 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
private static final String POWER_NBT_KEY = "internalCurrentPower";
private final double powerCapacity;
public AERootPoweredItem( double powerCapacity, Optional<String> subName )
public AERootPoweredItem( final double powerCapacity, final Optional<String> subName )
{
super( subName );
this.setMaxDamage( 32 );
@@ -53,18 +53,18 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
}
@Override
public void addCheckedInformation( ItemStack stack, EntityPlayer player, List<String> lines, boolean displayMoreInfo )
public void addCheckedInformation( final ItemStack stack, final EntityPlayer player, final List<String> lines, final boolean displayMoreInfo )
{
NBTTagCompound tag = stack.getTagCompound();
final NBTTagCompound tag = stack.getTagCompound();
double internalCurrentPower = 0;
double internalMaxPower = this.getAEMaxPower( stack );
final double internalMaxPower = this.getAEMaxPower( stack );
if( tag != null )
{
internalCurrentPower = tag.getDouble( "internalCurrentPower" );
}
double percent = internalCurrentPower / internalMaxPower;
final double percent = internalCurrentPower / internalMaxPower;
lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) );
}
@@ -76,7 +76,7 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
}
@Override
protected void getCheckedSubItems( Item sameItem, CreativeTabs creativeTab, List<ItemStack> itemStacks )
protected void getCheckedSubItems( final Item sameItem, final CreativeTabs creativeTab, final List<ItemStack> itemStacks )
{
super.getCheckedSubItems( sameItem, creativeTab, itemStacks );
@@ -95,29 +95,29 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
}
@Override
public double getDurabilityForDisplay( ItemStack is )
public double getDurabilityForDisplay( final ItemStack is )
{
return 1 - this.getAECurrentPower( is ) / this.getAEMaxPower( is );
}
@Override
public boolean isDamaged( ItemStack stack )
public boolean isDamaged( final ItemStack stack )
{
return true;
}
@Override
public void setDamage( ItemStack stack, int damage )
public void setDamage( final ItemStack stack, final int damage )
{
}
private double getInternalBattery( ItemStack is, batteryOperation op, double adjustment )
private double getInternalBattery( final ItemStack is, final batteryOperation op, final double adjustment )
{
NBTTagCompound data = Platform.openNbtData( is );
final NBTTagCompound data = Platform.openNbtData( is );
double currentStorage = data.getDouble( POWER_NBT_KEY );
double maxStorage = this.getAEMaxPower( is );
final double maxStorage = this.getAEMaxPower( is );
switch( op )
{
@@ -125,7 +125,7 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
currentStorage += adjustment;
if( currentStorage > maxStorage )
{
double diff = currentStorage - maxStorage;
final double diff = currentStorage - maxStorage;
data.setDouble( POWER_NBT_KEY, maxStorage );
return diff;
}
@@ -150,11 +150,11 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
/**
* inject external
*/
double injectExternalPower( PowerUnits input, ItemStack is, double amount, boolean simulate )
double injectExternalPower( final PowerUnits input, final ItemStack is, final double amount, final boolean simulate )
{
if( simulate )
{
int requiredEU = (int) PowerUnits.AE.convertTo( PowerUnits.EU, this.getAEMaxPower( is ) - this.getAECurrentPower( is ) );
final int requiredEU = (int) PowerUnits.AE.convertTo( PowerUnits.EU, this.getAEMaxPower( is ) - this.getAECurrentPower( is ) );
if( amount < requiredEU )
{
return 0;
@@ -163,37 +163,37 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow
}
else
{
double powerRemainder = this.injectAEPower( is, PowerUnits.EU.convertTo( PowerUnits.AE, amount ) );
final double powerRemainder = this.injectAEPower( is, PowerUnits.EU.convertTo( PowerUnits.AE, amount ) );
return PowerUnits.AE.convertTo( PowerUnits.EU, powerRemainder );
}
}
@Override
public double injectAEPower( ItemStack is, double amt )
public double injectAEPower( final ItemStack is, final double amt )
{
return this.getInternalBattery( is, batteryOperation.INJECT, amt );
}
@Override
public double extractAEPower( ItemStack is, double amt )
public double extractAEPower( final ItemStack is, final double amt )
{
return this.getInternalBattery( is, batteryOperation.EXTRACT, amt );
}
@Override
public double getAEMaxPower( ItemStack is )
public double getAEMaxPower( final ItemStack is )
{
return this.powerCapacity;
}
@Override
public double getAECurrentPower( ItemStack is )
public double getAECurrentPower( final ItemStack is )
{
return this.getInternalBattery( is, batteryOperation.STORAGE, 0 );
}
@Override
public AccessRestriction getPowerFlow( ItemStack is )
public AccessRestriction getPowerFlow( final ItemStack is )
{
return AccessRestriction.WRITE;
}