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

Reduces visibility of internal fields/methods

Browse Source 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent f054bd699b
commit e94a0cfccf
497 changed files with 7865 additions and 6908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+3 -3
View File
@@ -88,7 +88,7 @@ import appeng.util.item.AEItemStack;
public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem
{
static final Map<Integer, AEColor> ORE_TO_COLOR = new HashMap<Integer, AEColor>();
private static final Map<Integer, AEColor> ORE_TO_COLOR = new HashMap<Integer, AEColor>();
static
{
@@ -229,7 +229,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return this.getColorFromItem( this.getColor( tol ) );
}
public AEColor getColorFromItem( final ItemStack paintBall )
private AEColor getColorFromItem( final ItemStack paintBall )
{
if( paintBall == null )
{
@@ -350,7 +350,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
return newColor;
}
public void setColor( final ItemStack is, final ItemStack newColor )
private void setColor( final ItemStack is, final ItemStack newColor )
{
final NBTTagCompound data = Platform.openNbtData( is );
if( newColor == null )
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+16 -16
View File
@@ -143,19 +143,19 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
r = this.heatUp.get( new InWorldToolOperationIngredient( state.getBlock(), true ) );
}
if( r.BlockItem != null )
if( r.getBlockItem() != null )
{
final Block blk = Block.getBlockFromItem( r.BlockItem.getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.BlockItem.getItemDamage() ), 3 );
final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 );
}
else
{
w.setBlockToAir( pos );
}
if( r.Drops != null )
if( r.getDrops() != null )
{
Platform.spawnDrops( w, pos, r.Drops );
Platform.spawnDrops( w, pos, r.getDrops() );
}
}
@@ -180,19 +180,19 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
r = this.coolDown.get( new InWorldToolOperationIngredient( state.getBlock(), true ) );
}
if( r.BlockItem != null )
if( r.getBlockItem() != null )
{
final Block blk = Block.getBlockFromItem( r.BlockItem.getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.BlockItem.getItemDamage() ), 3 );
final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 );
}
else
{
w.setBlockToAir( pos );
}
if( r.Drops != null )
if( r.getDrops() != null )
{
Platform.spawnDrops( w, pos, r.Drops );
Platform.spawnDrops( w, pos, r.getDrops() );
}
}
@@ -245,7 +245,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
return item;
}
@Override
public boolean onItemUse(
final ItemStack item,
@@ -333,19 +333,19 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
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 )
if( or.getBlockItem() == null )
{
w.setBlockState( pos, Platform.AIR_BLOCK.getDefaultState(), 3 );
}
else
{
final Block blk = Block.getBlockFromItem( or.BlockItem.getItem() );
w.setBlockState( pos, blk.getStateFromMeta( or.BlockItem.getItemDamage() ), 3 );
final Block blk = Block.getBlockFromItem( or.getBlockItem().getItem() );
w.setBlockState( pos, blk.getStateFromMeta( or.getBlockItem().getItemDamage() ), 3 );
}
if( or.Drops != null )
if( or.getDrops() != null )
{
Platform.spawnDrops( w, pos, or.Drops );
Platform.spawnDrops( w, pos, or.getDrops() );
}
return true;
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+4 -4
View File
@@ -156,18 +156,18 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
{
return item;
}
final LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() );
final Vec3 vec3 = dir.a;
final Vec3 vec31 = dir.b;
final Vec3 vec3 = dir.getA();
final Vec3 vec31 = dir.getB();
final Vec3 direction = vec31.subtract( vec3 );
direction.normalize();
final double d0 = vec3.xCoord;
final double d1 = vec3.yCoord;
final double d2 = vec3.zCoord;
final float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f;
if( penetration <= 0 )
{