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/tile/AEBaseTile.java
+1 -5
View File
@@ -76,11 +76,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
private EnumFacing up = null;
@Override
public boolean shouldRefresh(
final World world,
final BlockPos pos,
final IBlockState oldState,
final IBlockState newSate )
public boolean shouldRefresh( final World world, final BlockPos pos, final IBlockState oldState, final IBlockState newSate )
{
return newSate.getBlock() != oldState.getBlock(); // state dosn't change tile entities in AE2.
}
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+1 -4
View File
@@ -397,10 +397,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
}
@Override
public void getDrops(
final World w,
final BlockPos pos,
final List<ItemStack> drops )
public void getDrops( final World w, final BlockPos pos, final List<ItemStack> drops )
{
super.getDrops( w, pos, drops );
src/main/java/appeng/tile/grid/AENetworkInvTile.java
+1 -2
View File
@@ -101,8 +101,7 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return 0;
}
src/main/java/appeng/tile/grindstone/TileCrank.java
+2 -11
View File
@@ -154,11 +154,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable
}
@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 double xOff = -0.15 * this.getUp().getFrontOffsetX();
final double yOff = -0.15 * this.getUp().getFrontOffsetY();
@@ -167,12 +163,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable
}
@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 double xOff = -0.15 * this.getUp().getFrontOffsetX();
final double yOff = -0.15 * this.getUp().getFrontOffsetY();
src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
+4 -9
View File
@@ -275,30 +275,25 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return 0;
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
}
src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
+4 -9
View File
@@ -280,30 +280,25 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return 0;
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
}
src/main/java/appeng/tile/inventory/AppEngNullInventory.java
+4 -9
View File
@@ -110,30 +110,25 @@ public class AppEngNullInventory implements IInventory
}
@Override
public void openInventory(
final EntityPlayer player )
public void openInventory( final EntityPlayer player )
{
}
@Override
public void closeInventory(
final EntityPlayer player )
public void closeInventory( final EntityPlayer player )
{
}
@Override
public int getField(
final int id )
public int getField( final int id )
{
return 0;
}
@Override
public void setField(
final int id,
final int value )
public void setField( final int id, final int value )
{
}
src/main/java/appeng/tile/misc/TileCellWorkbench.java
+1 -4
View File
@@ -236,10 +236,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
}
@Override
public void getDrops(
final World w,
final BlockPos pos,
final List<ItemStack> drops )
public void getDrops( final World w, final BlockPos pos, final List<ItemStack> drops )
{
super.getDrops( w, pos, drops );
src/main/java/appeng/tile/misc/TileInscriber.java
+1 -4
View File
@@ -196,10 +196,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public void getDrops(
final World w,
final BlockPos pos,
final List<ItemStack> drops )
public void getDrops( final World w, final BlockPos pos, final List<ItemStack> drops )
{
super.getDrops( w, pos, drops );
src/main/java/appeng/tile/misc/TileInterface.java
+1 -4
View File
@@ -141,10 +141,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT
}
@Override
public void getDrops(
final World w,
final BlockPos pos,
final List<ItemStack> drops )
public void getDrops( final World w, final BlockPos pos, final List<ItemStack> drops )
{
this.duality.addDrops( drops );
}
src/main/java/appeng/tile/misc/TileSecurity.java
+1 -4
View File
@@ -116,10 +116,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp
}
@Override
public void getDrops(
final World w,
final BlockPos pos,
final List<ItemStack> drops )
public void getDrops( final World w, final BlockPos pos, final List<ItemStack> drops )
{
if( !this.getConfigSlot().isEmpty() )
{
src/main/java/appeng/tile/networking/TileCableBus.java
+2 -10
View File
@@ -345,12 +345,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
}
@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 )
{
for( final AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, pos, e, false ) )
{
@@ -384,10 +379,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
}
@Override
public boolean recolourBlock(
final EnumFacing side,
final AEColor colour,
final EntityPlayer who )
public boolean recolourBlock( final EnumFacing side, final AEColor colour, final EntityPlayer who )
{
return this.getCableBus().recolourBlock( side, colour, who );
}
src/main/java/appeng/tile/storage/TileChest.java
+1 -4
View File
@@ -842,10 +842,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
}
@Override
public boolean recolourBlock(
final EnumFacing side,
final AEColor newPaintedColor,
final EntityPlayer who )
public boolean recolourBlock( final EnumFacing side, final AEColor newPaintedColor, final EntityPlayer who )
{
if( this.paintedColor == newPaintedColor )
{
src/main/java/appeng/tile/storage/TileIOPort.java
+1 -4
View File
@@ -564,10 +564,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
* @param drops drops of tile entity
*/
@Override
public void getDrops(
final World w,
final BlockPos pos,
final List<ItemStack> drops )
public void getDrops( final World w, final BlockPos pos, final List<ItemStack> drops )
{
super.getDrops( w, pos, drops );