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

All parameters on one line (for now)

Browse Source 
Easier picking of 1.7 changes
This commit is contained in:
yueh
2016-01-01 02:02:05 +01:00
parent e08ab38c52
commit f84b9a7e1d
147 changed files with 840 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/networking/BlockCableBus.java
+28 -105
View File
@@ -104,43 +104,29 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public void randomDisplayTick(
final World worldIn,
final BlockPos pos,
final IBlockState state,
final Random rand )
public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand )
{
this.cb( worldIn, pos ).randomDisplayTick( worldIn, pos, rand );
}
@Override
public void onNeighborChange(
final IBlockAccess w,
final BlockPos pos,
final BlockPos neighbor )
public void onNeighborChange( final IBlockAccess w, final BlockPos pos, final BlockPos neighbor )
{
this.cb( w, pos ).onNeighborChanged();
}
@Override
public Item getItemDropped(
final IBlockState state,
final Random rand,
final int fortune )
public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
{
return null;
}
@Override
public int getWeakPower(
final IBlockAccess w,
final BlockPos pos,
final IBlockState state,
final EnumFacing side )
public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side )
{
return this.cb( w, pos ).isProvidingWeakPower( side.getOpposite() ); // TODO:
// IS
// OPPOSITE!?
// IS
// OPPOSITE!?
}
@Override
@@ -150,31 +136,21 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public void onEntityCollidedWithBlock(
final World w,
final BlockPos pos,
final IBlockState state,
final Entity entityIn )
public void onEntityCollidedWithBlock( final World w, final BlockPos pos, final IBlockState state, final Entity entityIn )
{
this.cb( w, pos ).onEntityCollision( entityIn );
}
@Override
public int getStrongPower(
final IBlockAccess w,
final BlockPos pos,
final IBlockState state,
final EnumFacing side )
public int getStrongPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side )
{
return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() ); // TODO:
// IS
// OPPOSITE!?
// IS
// OPPOSITE!?
}
@Override
public int getLightValue(
final IBlockAccess world,
final BlockPos pos )
public int getLightValue( final IBlockAccess world, final BlockPos pos )
{
final IBlockState block = world.getBlockState( pos );
if( block != null && block.getBlock() != this )
@@ -189,37 +165,25 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public boolean isLadder(
final IBlockAccess world,
final BlockPos pos,
final EntityLivingBase entity )
public boolean isLadder( final IBlockAccess world, final BlockPos pos, final EntityLivingBase entity )
{
return this.cb( world, pos ).isLadder( entity );
}
@Override
public boolean isSideSolid(
final IBlockAccess w,
final BlockPos pos,
final EnumFacing side )
public boolean isSideSolid( final IBlockAccess w, final BlockPos pos, final EnumFacing side )
{
return this.cb( w, pos ).isSolidOnSide( side );
}
@Override
public boolean isReplaceable(
final World w,
final BlockPos pos )
public boolean isReplaceable( final World w, final BlockPos pos )
{
return this.cb( w, pos ).isEmpty();
}
@Override
public boolean removedByPlayer(
final World world,
final BlockPos pos,
final EntityPlayer player,
final boolean willHarvest )
public boolean removedByPlayer( final World world, final BlockPos pos, final EntityPlayer player, final boolean willHarvest )
{
if( player.capabilities.isCreativeMode )
{
@@ -234,10 +198,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public boolean canConnectRedstone(
final IBlockAccess w,
final BlockPos pos,
EnumFacing side )
public boolean canConnectRedstone( final IBlockAccess w, final BlockPos pos, EnumFacing side )
{
if( side == null )
{
@@ -248,8 +209,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public boolean canRenderInLayer(
final EnumWorldBlockLayer layer )
public boolean canRenderInLayer( final EnumWorldBlockLayer layer )
{
if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
{
@@ -260,10 +220,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public ItemStack getPickBlock(
final MovingObjectPosition target,
final World world,
final BlockPos pos )
public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final BlockPos pos )
{
final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
final SelectedPart sp = this.cb( world, pos ).selectPart( v3 );
@@ -282,10 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
@Override
@SideOnly( Side.CLIENT )
public boolean addHitEffects(
final World world,
final MovingObjectPosition target,
final EffectRenderer effectRenderer )
public boolean addHitEffects( final World world, final MovingObjectPosition target, final EffectRenderer effectRenderer )
{
final Object object = this.cb( world, target.getBlockPos() );
if( object instanceof IPartHost )
@@ -316,10 +270,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public boolean addDestroyEffects(
final World world,
final BlockPos pos,
final EffectRenderer effectRenderer )
public boolean addDestroyEffects( final World world, final BlockPos pos, final EffectRenderer effectRenderer )
{
final Object object = this.cb( world, pos );
if( object instanceof IPartHost )
@@ -345,11 +296,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public void onNeighborBlockChange(
final World w,
final BlockPos pos,
final IBlockState state,
final Block neighborBlock )
public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
{
if( Platform.isServer() )
{
@@ -357,9 +304,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
}
private ICableBusContainer cb(
final IBlockAccess w,
final BlockPos pos )
private ICableBusContainer cb( final IBlockAccess w, final BlockPos pos )
{
final TileEntity te = w.getTileEntity( pos );
ICableBusContainer out = null;
@@ -383,34 +328,18 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
public boolean onActivated(
final World w,
final BlockPos pos,
final EntityPlayer player,
final EnumFacing side,
final float hitX,
final float hitY,
final float hitZ )
public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
return this.cb( w, pos ).activate( player, new Vec3( hitX, hitY, hitZ ) );
}
@Override
public boolean recolorBlock(
final World world,
final BlockPos pos,
final EnumFacing side,
final EnumDyeColor color )
public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color )
{
return this.recolorBlock( world, pos, side, color, null );
}
public boolean recolorBlock(
final World world,
final BlockPos pos,
final EnumFacing side,
final EnumDyeColor color,
final EntityPlayer who )
public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color, final EntityPlayer who )
{
try
{
@@ -424,18 +353,13 @@ public class BlockCableBus extends AEBaseTileBlock // implements
@Override
@SideOnly( Side.CLIENT )
public void getCheckedSubBlocks(
final Item item,
final CreativeTabs tabs,
final List<ItemStack> itemStacks )
public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
{
// do nothing
}
@Override
public <T extends AEBaseTile> T getTileEntity(
final IBlockAccess w,
final BlockPos pos )
public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final BlockPos pos )
{
final TileEntity te = w.getTileEntity( pos );
@@ -453,8 +377,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
}
@Override
protected void setFeature(
final EnumSet<AEFeature> f )
protected void setFeature( final EnumSet<AEFeature> f )
{
final AECableBusFeatureHandler featureHandler = new AECableBusFeatureHandler( f, this, this.getFeatureSubName() );
this.setHandler( featureHandler );
src/main/java/appeng/block/networking/BlockController.java
+2 -7
View File
@@ -62,8 +62,7 @@ public class BlockController extends AEBaseTileBlock
}
@Override
public int getMetaFromState(
final IBlockState state )
public int getMetaFromState( final IBlockState state )
{
return ( (ControllerBlockState) state.getValue( CONTROLLER_STATE ) ).ordinal();
}
@@ -89,11 +88,7 @@ public class BlockController extends AEBaseTileBlock
}
@Override
public void onNeighborBlockChange(
final World w,
final BlockPos pos,
final IBlockState state,
final Block neighborBlock )
public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock )
{
final TileController tc = this.getTileEntity( w, pos );
if( tc != null )
src/main/java/appeng/block/networking/BlockEnergyCell.java
+1 -2
View File
@@ -50,8 +50,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
public static final PropertyInteger ENERGY_STORAGE = PropertyInteger.create( "fullness", 0, 8 );
@Override
public int getMetaFromState(
final IBlockState state )
public int getMetaFromState( final IBlockState state )
{
return (int) state.getValue( ENERGY_STORAGE );
}
src/main/java/appeng/block/networking/BlockWireless.java
+3 -20
View File
@@ -70,15 +70,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
}
@Override
public boolean onBlockActivated(
final World w,
final BlockPos pos,
final IBlockState state,
final EntityPlayer player,
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 player, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
{
if( player.isSneaking() )
{
@@ -98,11 +90,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
}
@Override
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool(
final World w,
final BlockPos pos,
final Entity thePlayer,
final boolean b )
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
{
final TileWireless tile = this.getTileEntity( w, pos );
if( tile != null )
@@ -164,12 +152,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
}
@Override
public void addCollidingBlockToList(
final World w,
final BlockPos pos,
final AxisAlignedBB bb,
final List<AxisAlignedBB> out,
final Entity e )
public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
{
final TileWireless tile = this.getTileEntity( w, pos );
if( tile != null )