diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java index be7ffa116..aef30287b 100644 --- a/src/main/java/appeng/block/AEBaseItemBlock.java +++ b/src/main/java/appeng/block/AEBaseItemBlock.java @@ -88,7 +88,7 @@ public class AEBaseItemBlock extends ItemBlock { return this.blockType.getUnlocalizedName( is ); } - + @Override public boolean placeBlockAt( final ItemStack stack, diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 7a75f1b69..58efaa94a 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -95,7 +95,6 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, this.setTileProvider( this.hasBlockTileEntity() ); } - // update Block value. private void setTileProvider( final boolean b ) { @@ -115,7 +114,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, @Nullable public T getTileEntity( final IBlockAccess w, final int x, final int y, final int z ) { - return this.getTileEntity( w, new BlockPos(x,y,z) ); + return this.getTileEntity( w, new BlockPos( x, y, z ) ); } @Nullable @@ -163,7 +162,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, final BlockPos pos, final IBlockState state ) { - final AEBaseTile te = this.getTileEntity( w,pos ); + final AEBaseTile te = this.getTileEntity( w, pos ); if( te != null ) { final ArrayList drops = new ArrayList(); @@ -183,7 +182,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, // super will remove the TE, as it is not an instance of BlockContainer super.breakBlock( w, pos, state ); } - + @Override public final EnumFacing[] getValidRotations( final World w, final BlockPos pos ) { @@ -219,7 +218,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, return false; } - return super.recolorBlock( world, pos, side, color); + return super.recolorBlock( world, pos, side, color ); } @Override @@ -243,7 +242,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, final int eventID, final int eventParam ) { - super.onBlockEventReceived( worldIn, pos, state ,eventID, eventParam); + super.onBlockEventReceived( worldIn, pos, state, eventID, eventParam ); final TileEntity tileentity = worldIn.getTileEntity( pos ); return tileentity != null ? tileentity.receiveClientEvent( eventID, eventParam ) : false; } diff --git a/src/main/java/appeng/block/UnlistedBlockAccess.java b/src/main/java/appeng/block/UnlistedBlockAccess.java index 4ca85e721..afeec12dd 100644 --- a/src/main/java/appeng/block/UnlistedBlockAccess.java +++ b/src/main/java/appeng/block/UnlistedBlockAccess.java @@ -1,8 +1,11 @@ + package appeng.block; + import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.property.IUnlistedProperty; + public final class UnlistedBlockAccess implements IUnlistedProperty { @Override diff --git a/src/main/java/appeng/block/UnlistedBlockPos.java b/src/main/java/appeng/block/UnlistedBlockPos.java index 924826b18..49e391866 100644 --- a/src/main/java/appeng/block/UnlistedBlockPos.java +++ b/src/main/java/appeng/block/UnlistedBlockPos.java @@ -1,8 +1,11 @@ + package appeng.block; + import net.minecraft.util.BlockPos; import net.minecraftforge.common.property.IUnlistedProperty; + public final class UnlistedBlockPos implements IUnlistedProperty { @Override diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index b7e8164c7..def8031c1 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -60,10 +60,10 @@ public class BlockCraftingMonitor extends BlockCraftingUnit { for( final Block craftingUnitBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() ) { - return ( (BlockCraftingUnit)craftingUnitBlock ).getIcon( side, state ); + return ( (BlockCraftingUnit) craftingUnitBlock ).getIcon( side, state ); } } - + return ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon(); } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java index 8f6caef4e..7264fef52 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java @@ -32,10 +32,10 @@ import appeng.tile.crafting.TileCraftingStorageTile; public class BlockCraftingStorage extends BlockCraftingUnit { - + public BlockCraftingStorage( final CraftingUnitType type ) { - super(type ); + super( type ); this.setTileEntity( TileCraftingStorageTile.class ); } @@ -46,29 +46,29 @@ public class BlockCraftingStorage extends BlockCraftingUnit } @Override - public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state) + public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state ) { - final boolean formed = (boolean)state.getValue( FORMED ); - switch( this.type ) + final boolean formed = (boolean) state.getValue( FORMED ); + switch( this.type ) { 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(); + } } diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index 77d7b7229..6aa103121 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -61,7 +61,7 @@ public class BlockCrank extends AEBaseTileBlock { return RenderBlockCrank.class; } - + @Override public boolean onActivated( final World w, @@ -95,7 +95,7 @@ public class BlockCrank extends AEBaseTileBlock world.destroyBlock( pos, true ); // w.destroyBlock( x, y, z, true ); world.markBlockForUpdate( pos ); } - + @Override public void onBlockPlacedBy( final World world, @@ -120,7 +120,7 @@ public class BlockCrank extends AEBaseTileBlock this.dropCrank( world, pos ); } } - + @Override public boolean isValidOrientation( final World w, @@ -146,12 +146,12 @@ public class BlockCrank extends AEBaseTileBlock private boolean isCrankable( final World world, final BlockPos pos, final EnumFacing offset ) { - final BlockPos o = pos.offset( offset); + final BlockPos o = pos.offset( offset ); final TileEntity te = world.getTileEntity( o ); return te instanceof ICrankable && ( (ICrankable) te ).canCrankAttach( offset.getOpposite() ); } - + @Override public void onNeighborBlockChange( final World world, diff --git a/src/main/java/appeng/block/grindstone/BlockGrinder.java b/src/main/java/appeng/block/grindstone/BlockGrinder.java index 804a4c1dc..cea9b3290 100644 --- a/src/main/java/appeng/block/grindstone/BlockGrinder.java +++ b/src/main/java/appeng/block/grindstone/BlockGrinder.java @@ -61,7 +61,7 @@ public class BlockGrinder extends AEBaseTileBlock // TODO Auto-generated method stub return super.onBlockActivated( worldIn, pos, state, playerIn, side, hitX, hitY, hitZ ); } - + @Override public boolean onActivated( final World w, diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index cda2bac12..740bd6aee 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -95,8 +95,8 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision return true; } - - @Override + + @Override @SideOnly( Side.CLIENT ) public void randomDisplayTick( final World w, diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index a6f7a8ae2..b28fa7472 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -55,7 +55,7 @@ public class BlockInscriber extends AEBaseTileBlock { return RenderBlockInscriber.class; } - + @Override public boolean onActivated( final World w, diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index 634e891e1..e0eb74379 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -45,7 +45,7 @@ import appeng.helpers.MetaRotation; import appeng.tile.misc.TileLightDetector; -public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock,ICustomCollision +public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision { public BlockLightDetector() @@ -66,18 +66,18 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl { return 0; } - + @Override public IBlockState getStateFromMeta( final int meta ) { return this.getDefaultState(); } - + @Override protected IProperty[] getAEStates() { - return new IProperty[]{ BlockTorch.FACING }; + return new IProperty[] { BlockTorch.FACING }; } @Override @@ -140,7 +140,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl { return w.isSideSolid( pos.offset( dir ), dir.getOpposite(), false ); } - + @Override public Iterable getSelectedBoundingBoxesFromPool( final World w, @@ -168,7 +168,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl * + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); */ } - + @Override public void onNeighborBlockChange( final World w, @@ -188,7 +188,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl w.destroyBlock( pos, true ); w.markBlockForUpdate( pos ); } - + @Override public boolean canPlaceBlockAt( final World w, @@ -213,6 +213,6 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl @Override public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos ) { - return new MetaRotation( w, pos,true ); + return new MetaRotation( w, pos, true ); } } diff --git a/src/main/java/appeng/block/misc/BlockPaint.java b/src/main/java/appeng/block/misc/BlockPaint.java index f623a82e1..f10072805 100644 --- a/src/main/java/appeng/block/misc/BlockPaint.java +++ b/src/main/java/appeng/block/misc/BlockPaint.java @@ -77,7 +77,7 @@ public class BlockPaint extends AEBaseTileBlock { // do nothing } - + @Override public AxisAlignedBB getCollisionBoundingBox( final World worldIn, @@ -127,9 +127,9 @@ public class BlockPaint extends AEBaseTileBlock final float chance, final int fortune ) { - + } - + @Override public void fillWithRain( final World w, @@ -140,7 +140,7 @@ public class BlockPaint extends AEBaseTileBlock w.setBlockToAir( pos ); } } - + @Override public int getLightValue( final IBlockAccess w, @@ -163,7 +163,7 @@ public class BlockPaint extends AEBaseTileBlock { return true; } - + @Override public boolean isReplaceable( final World worldIn, @@ -171,5 +171,5 @@ public class BlockPaint extends AEBaseTileBlock { return true; } - + } diff --git a/src/main/java/appeng/block/misc/BlockQuartzTorch.java b/src/main/java/appeng/block/misc/BlockQuartzTorch.java index edc7a6710..18df92f2c 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzTorch.java +++ b/src/main/java/appeng/block/misc/BlockQuartzTorch.java @@ -63,25 +63,25 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I this.setFullSize( false ); this.setOpaque( false ); } - + @Override public int getMetaFromState( final IBlockState state ) { return 0; } - + @Override public IBlockState getStateFromMeta( final int meta ) { return this.getDefaultState(); } - + @Override protected IProperty[] getAEStates() { - return new IProperty[]{ BlockTorch.FACING }; + return new IProperty[] { BlockTorch.FACING }; } @Override @@ -120,7 +120,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I * + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); */ } - + @Override @SideOnly( Side.CLIENT ) public void randomDisplayTick( @@ -196,6 +196,6 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I @Override public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos ) { - return new MetaRotation( w, pos,true ); + return new MetaRotation( w, pos, true ); } } diff --git a/src/main/java/appeng/block/misc/BlockSecurity.java b/src/main/java/appeng/block/misc/BlockSecurity.java index 3f1e11aa3..195bf1c9e 100644 --- a/src/main/java/appeng/block/misc/BlockSecurity.java +++ b/src/main/java/appeng/block/misc/BlockSecurity.java @@ -59,7 +59,7 @@ public class BlockSecurity extends AEBaseTileBlock { return RendererSecurity.class; } - + @Override public boolean onActivated( final World w, diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/BlockSkyCompass.java index 810739054..e8b2dff9a 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/BlockSkyCompass.java @@ -183,6 +183,6 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision final List out, final Entity e ) { - + } } diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index f555d7f8c..1b9a83e2b 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -52,9 +52,9 @@ public final class BlockVibrationChamber extends AEBaseTileBlock this.setHardness( 4.2F ); this.setFeature( EnumSet.of( AEFeature.PowerGen ) ); } - + @Override - public appeng.client.texture.IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side) + public appeng.client.texture.IAESprite getIcon( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { final IAESprite ico = super.getIcon( w, pos, side ); final TileVibrationChamber tvc = this.getTileEntity( w, pos ); diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 50380335f..7415414ac 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -49,36 +49,36 @@ public class BlockController extends AEBaseTileBlock { return this.name(); } - + }; - public static final PropertyEnum CONTROLLER_STATE = PropertyEnum.create("state",ControllerBlockState.class); - - @Override - protected IProperty[] getAEStates() - { - return new IProperty[]{ CONTROLLER_STATE }; - } - + public static final PropertyEnum CONTROLLER_STATE = PropertyEnum.create( "state", ControllerBlockState.class ); + + @Override + protected IProperty[] getAEStates() + { + return new IProperty[] { CONTROLLER_STATE }; + } + @Override public int getMetaFromState( final IBlockState state ) { - return ((ControllerBlockState)state.getValue( CONTROLLER_STATE )).ordinal(); + return ( (ControllerBlockState) state.getValue( CONTROLLER_STATE ) ).ordinal(); } - + @Override public IBlockState getStateFromMeta( final int meta ) { return this.getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.OFFLINE ); } - + @Override public EnumWorldBlockLayer getBlockLayer() { return EnumWorldBlockLayer.CUTOUT; } - + public BlockController() { super( Material.iron ); diff --git a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java index e566bca3f..116a0baa3 100644 --- a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java @@ -36,9 +36,9 @@ public class BlockDenseEnergyCell extends BlockEnergyCell } @Override - public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state) + public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final net.minecraft.block.state.IBlockState state ) { - switch( (int)state.getValue( ENERGY_STORAGE ) ) + switch( (int) state.getValue( ENERGY_STORAGE ) ) { default: case 0: @@ -59,7 +59,7 @@ public class BlockDenseEnergyCell extends BlockEnergyCell return ExtraBlockTextures.MEDenseEnergyCell7.getIcon(); } } - + @Override public double getMaxPower() { diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index f210c9630..205eefba3 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -52,15 +52,15 @@ public class BlockEnergyCell extends AEBaseTileBlock public int getMetaFromState( final IBlockState state ) { - return (int)state.getValue( ENERGY_STORAGE ); + return (int) state.getValue( ENERGY_STORAGE ); } - + @Override public IBlockState getStateFromMeta( final int meta ) { - return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) ); + return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) ); } - + public BlockEnergyCell() { super( AEGlassMaterial.INSTANCE ); @@ -76,9 +76,9 @@ public class BlockEnergyCell extends AEBaseTileBlock } @Override - public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state) + public appeng.client.texture.IAESprite getIcon( final net.minecraft.util.EnumFacing side, final IBlockState state ) { - switch( (int)state.getValue( ENERGY_STORAGE ) ) + switch( (int) state.getValue( ENERGY_STORAGE ) ) { default: case 0: @@ -122,7 +122,7 @@ public class BlockEnergyCell extends AEBaseTileBlock @Override protected IProperty[] getAEStates() { - return new IProperty[]{ENERGY_STORAGE}; + return new IProperty[] { ENERGY_STORAGE }; } @Override diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index c5f3677d8..96c62d9e2 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -67,7 +67,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision { return EnumWorldBlockLayer.CUTOUT; } - + @Override public boolean onBlockActivated( final World w, diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index 572571761..e9159b1f0 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -53,7 +53,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto { return EnumWorldBlockLayer.CUTOUT; } - + @Override public void onNeighborBlockChange( final World w, diff --git a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java index e91509885..23a447ca3 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java @@ -47,7 +47,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase { super( AEGlassMaterial.INSTANCE ); } - + @Override public void randomDisplayTick( final World w, @@ -105,7 +105,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase final double onePixel = 2.0 / 16.0; return Collections.singletonList( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); } - + @Override public void addCollidingBlockToList( final World w, diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index bf08d4357..2d7fa1d88 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -78,7 +78,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) // } ); } - + @Override public void addCollidingBlockToList( final World w, diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java index e0106fa17..ba37aa769 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java @@ -57,7 +57,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock tsp.onNeighborBlockChange(); } } - + @Override public int getLightValue( final IBlockAccess w, diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index af7742f41..ab177d41c 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -43,7 +43,7 @@ import appeng.util.Platform; public class BlockChest extends AEBaseTileBlock { - + public BlockChest() { super( Material.iron ); diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index 77a01d4b4..610f7de15 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -58,7 +58,7 @@ public class BlockDrive extends AEBaseTileBlock { return RenderDrive.class; } - + @Override public boolean onActivated( final World w, diff --git a/src/main/java/appeng/block/storage/BlockIOPort.java b/src/main/java/appeng/block/storage/BlockIOPort.java index c2b24b823..66e0ed4d4 100644 --- a/src/main/java/appeng/block/storage/BlockIOPort.java +++ b/src/main/java/appeng/block/storage/BlockIOPort.java @@ -45,7 +45,7 @@ public class BlockIOPort extends AEBaseTileBlock this.setTileEntity( TileIOPort.class ); this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) ); } - + @Override public void onNeighborBlockChange( final World w, @@ -59,7 +59,7 @@ public class BlockIOPort extends AEBaseTileBlock te.updateRedstoneState(); } } - + @Override public boolean onActivated( final World w, diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index f627416cc..5030f744f 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -46,14 +46,14 @@ import appeng.util.Platform; public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision { - + public static enum SkyChestType { STONE, BLOCK }; public final SkyChestType type; - + public BlockSkyChest( final SkyChestType type ) { super( Material.rock, Optional.of( type.name() ) ); @@ -90,7 +90,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision return true; } - + @Override public Iterable getSelectedBoundingBoxesFromPool( final World w, @@ -113,7 +113,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision final double sc = 0.06; return Collections.singletonList( AxisAlignedBB.fromBounds( Math.max( 0.0, offsetX - o.getFrontOffsetX() * sc ), Math.max( 0.0, offsetY - o.getFrontOffsetY() * sc ), Math.max( 0.0, offsetZ - o.getFrontOffsetZ() * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.getFrontOffsetX() * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.getFrontOffsetY() * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.getFrontOffsetZ() * sc ) ) ); } - + @Override public void addCollidingBlockToList( final World w, diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index d77a9d1a5..7a0a79214 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -123,23 +123,24 @@ public class ClientHelper extends ServerHelper @Override public void init() { - // final Block fluixBlock = GameRegistry.findBlock( "appliedenergistics2", "fluix" ); - // Item fluixItem = Item.getItemFromBlock( fluixBlock ); - // ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix", "inventory" ); -// final int DEFAULT_ITEM_SUBTYPE = 0; -// final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); -// // mesher.register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation ); -// -// final ResourceLocation resource = new ResourceLocation( "appliedenergistics2", "stair.fluix" ); -// final ModelResourceLocation fluixStairModel = new ModelResourceLocation( resource, "inventory" ); -// AELog.info( "FluixStairModel: " + fluixStairModel ); -// -// final Set items = AEApi.instance().definitions().blocks().fluixStair().maybeItem().asSet(); -// for( Item item : items ) -// { -// AELog.info( "Registering with %s with unlocalized %s", item, item.getUnlocalizedName() ); -// mesher.register( item, DEFAULT_ITEM_SUBTYPE, fluixStairModel ); -// } + // final Block fluixBlock = GameRegistry.findBlock( "appliedenergistics2", "fluix" ); + // Item fluixItem = Item.getItemFromBlock( fluixBlock ); + // ModelResourceLocation itemModelResourceLocation = new ModelResourceLocation( "appliedenergistics2:fluix", + // "inventory" ); + // final int DEFAULT_ITEM_SUBTYPE = 0; + // final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); + // // mesher.register( fluixItem, DEFAULT_ITEM_SUBTYPE, itemModelResourceLocation ); + // + // final ResourceLocation resource = new ResourceLocation( "appliedenergistics2", "stair.fluix" ); + // final ModelResourceLocation fluixStairModel = new ModelResourceLocation( resource, "inventory" ); + // AELog.info( "FluixStairModel: " + fluixStairModel ); + // + // final Set items = AEApi.instance().definitions().blocks().fluixStair().maybeItem().asSet(); + // for( Item item : items ) + // { + // AELog.info( "Registering with %s with unlocalized %s", item, item.getUnlocalizedName() ); + // mesher.register( item, DEFAULT_ITEM_SUBTYPE, fluixStairModel ); + // } } @Override @@ -258,7 +259,7 @@ public class ClientHelper extends ServerHelper @Override public void postInit() { - //RenderingRegistry.registerBlockHandler( WorldRender.INSTANCE ); + // RenderingRegistry.registerBlockHandler( WorldRender.INSTANCE ); final RenderManager inst = Minecraft.getMinecraft().getRenderManager(); inst.entityRenderMap.put( EntityTinyTNTPrimed.class, new RenderTinyTNTPrimed( inst ) ); @@ -573,7 +574,7 @@ public class ClientHelper extends ServerHelper this.extraIcons.forEach( ev.map::registerSprite ); - //if( ev.map.getTextureType() == ITEM_RENDERER ) + // if( ev.map.getTextureType() == ITEM_RENDERER ) { for( final ExtraItemTextures et : ExtraItemTextures.values() ) { @@ -581,7 +582,7 @@ public class ClientHelper extends ServerHelper } } - //if( ev.map. == BLOCK_RENDERER ) + // if( ev.map. == BLOCK_RENDERER ) { for( final ExtraBlockTextures et : ExtraBlockTextures.values() ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java index 7115ab0ab..69a04c51a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java +++ b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java @@ -48,7 +48,7 @@ public class GuiQuartzKnife extends AEBaseGui { super.initGui(); - this.name = new GuiTextField( 0,this.fontRendererObj, this.guiLeft + 24, this.guiTop + 32, 79, this.fontRendererObj.FONT_HEIGHT ); + this.name = new GuiTextField( 0, this.fontRendererObj, this.guiLeft + 24, this.guiTop + 32, 79, this.fontRendererObj.FONT_HEIGHT ); this.name.setEnableBackgroundDrawing( false ); this.name.setMaxStringLength( 32 ); this.name.setTextColor( 0xFFFFFF ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java index 2b090d73c..79658a4a5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java @@ -154,7 +154,7 @@ public class GuiUpgradeable extends AEBaseGui } if( this.schedulingMode != null ) { - this.schedulingMode.setVisibility(this.bc.getInstalledUpgrades( Upgrades.CAPACITY ) > 0 && this.bc instanceof PartExportBus ); + this.schedulingMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.CAPACITY ) > 0 && this.bc instanceof PartExportBus ); } } diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 586032e61..88b48a5b2 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -416,7 +416,6 @@ public class GuiImgButton extends GuiButton implements ITooltip } } - private static class ButtonAppearance { public int index; diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java index c0e421640..87bb61834 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java @@ -55,11 +55,11 @@ public class GuiTabButton extends GuiButton implements ITooltip /** * Using itemstack as an icon * - * @param x x pos of button - * @param y y pos of button - * @param ico used icon + * @param x x pos of button + * @param y y pos of button + * @param ico used icon * @param message mouse over message - * @param ir renderer + * @param ir renderer */ public GuiTabButton( final int x, final int y, final ItemStack ico, final String message, final RenderItem ir ) { diff --git a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java b/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java index f10cbca78..5298b7bf4 100644 --- a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java +++ b/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java @@ -45,10 +45,10 @@ public class MEGuiTextField extends GuiTextField * Pays attention to the '_' caret. * * @param fontRenderer renderer for the strings - * @param xPos absolute left position - * @param yPos absolute top position - * @param width absolute width - * @param height absolute height + * @param xPos absolute left position + * @param yPos absolute top position + * @param width absolute width + * @param height absolute height */ public MEGuiTextField( final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, final int height ) { diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 7d634475f..1c67e0d9f 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -66,7 +66,7 @@ public class BaseBlockRender private final FloatBuffer rotMat = BufferUtils.createFloatBuffer( 16 ); private static int dynRender = 0; - private final ModelResourceLocation modelPath = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicRender"+dynRender++ ), "inventory" ); + private final ModelResourceLocation modelPath = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicRender" + dynRender++ ), "inventory" ); public BaseBlockRender() { @@ -330,7 +330,7 @@ public class BaseBlockRender return ORIENTATION_MAP[a][b][c]; } - public void renderInvBlock( final EnumSet sides, final B block, final ItemStack item, final int color, final ModelGenerator tess ) + public void renderInvBlock( final EnumSet sides, final B block, final ItemStack item, final int color, final ModelGenerator tess ) { if( block != null && block.hasSubtypes() && item != null ) { @@ -338,48 +338,48 @@ public class BaseBlockRender } final IAESprite[] icons = tess.getIcon( item == null ? block.getDefaultState() : block.getStateFromMeta( item.getMetadata() ) ); - final BlockPos zero = new BlockPos(0,0,0); + final BlockPos zero = new BlockPos( 0, 0, 0 ); if( sides.contains( AEPartLocation.DOWN ) ) { tess.setNormal( 0.0F, -1.0F, 0.0F ); tess.setColorOpaque_I( color ); - tess.renderFaceYNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.DOWN ), icons[ AEPartLocation.DOWN.ordinal() ] ) ); + tess.renderFaceYNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.DOWN ), icons[AEPartLocation.DOWN.ordinal()] ) ); } if( sides.contains( AEPartLocation.UP ) ) { tess.setNormal( 0.0F, 1.0F, 0.0F ); tess.setColorOpaque_I( color ); - tess.renderFaceYPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.UP ), icons[ AEPartLocation.UP.ordinal() ] ) ); + tess.renderFaceYPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.UP ), icons[AEPartLocation.UP.ordinal()] ) ); } if( sides.contains( AEPartLocation.NORTH ) ) { tess.setNormal( 0.0F, 0.0F, -1.0F ); tess.setColorOpaque_I( color ); - tess.renderFaceZNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.NORTH ), icons[ AEPartLocation.NORTH.ordinal() ] ) ); + tess.renderFaceZNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.NORTH ), icons[AEPartLocation.NORTH.ordinal()] ) ); } if( sides.contains( AEPartLocation.SOUTH ) ) { tess.setNormal( 0.0F, 0.0F, 1.0F ); tess.setColorOpaque_I( color ); - tess.renderFaceZPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.SOUTH ), icons[ AEPartLocation.SOUTH.ordinal() ] ) ); + tess.renderFaceZPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.SOUTH ), icons[AEPartLocation.SOUTH.ordinal()] ) ); } if( sides.contains( AEPartLocation.WEST ) ) { tess.setNormal( -1.0F, 0.0F, 0.0F ); tess.setColorOpaque_I( color ); - tess.renderFaceXNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.WEST ), icons[ AEPartLocation.WEST.ordinal() ] ) ); + tess.renderFaceXNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.WEST ), icons[AEPartLocation.WEST.ordinal()] ) ); } if( sides.contains( AEPartLocation.EAST ) ) { tess.setNormal( 1.0F, 0.0F, 0.0F ); tess.setColorOpaque_I( color ); - tess.renderFaceXPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.EAST ), icons[ AEPartLocation.EAST.ordinal() ]) ); + tess.renderFaceXPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.EAST ), icons[AEPartLocation.EAST.ordinal()] ) ); } } @@ -557,25 +557,25 @@ public class BaseBlockRender final double layerBX = 0.0; final double layerAY = 0.0; - this.renderFace(orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, + this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, // u -> u 0, 1.0, // v -> v 0, edgeThickness, ico, flip ); - this.renderFace( orientation,tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, + this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, // u -> u 0.0, edgeThickness, // v -> v edgeThickness, 1.0 - edgeThickness, ico, flip ); - this.renderFace( orientation,tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, + this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, // u -> u 1.0 - edgeThickness, 1.0, // v -> v edgeThickness, 1.0 - edgeThickness, ico, flip ); - this.renderFace( orientation,tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, + this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ, // u -> u 0, 1.0, // v -> v @@ -583,14 +583,14 @@ public class BaseBlockRender } @SideOnly( Side.CLIENT ) - private void renderFace( final EnumFacing face, final ModelGenerator tess, final double offsetX, final double offsetY, final double offsetZ, final double ax, final double ay, final double az, final double bx, final double by, final double bz, final double ua, final double ub, final double va, final double vb, final IAESprite ico, final boolean flip ) + private void renderFace( final EnumFacing face, final ModelGenerator tess, final double offsetX, final double offsetY, final double offsetZ, final double ax, final double ay, final double az, final double bx, final double by, final double bz, final double ua, final double ub, final double va, final double vb, final IAESprite ico, final boolean flip ) { if( flip ) { - tess.addVertexWithUV( face,offsetX + ax * ua + bx * va, offsetY + ay * ua + by * va, offsetZ + az * ua + bz * va, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( va * 16.0 ) ); - tess.addVertexWithUV( face,offsetX + ax * ua + bx * vb, offsetY + ay * ua + by * vb, offsetZ + az * ua + bz * vb, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) ); - tess.addVertexWithUV( face,offsetX + ax * ub + bx * vb, offsetY + ay * ub + by * vb, offsetZ + az * ub + bz * vb, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) ); - tess.addVertexWithUV( face,offsetX + ax * ub + bx * va, offsetY + ay * ub + by * va, offsetZ + az * ub + bz * va, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( va * 16.0 ) ); + tess.addVertexWithUV( face, offsetX + ax * ua + bx * va, offsetY + ay * ua + by * va, offsetZ + az * ua + bz * va, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( va * 16.0 ) ); + tess.addVertexWithUV( face, offsetX + ax * ua + bx * vb, offsetY + ay * ua + by * vb, offsetZ + az * ua + bz * vb, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) ); + tess.addVertexWithUV( face, offsetX + ax * ub + bx * vb, offsetY + ay * ub + by * vb, offsetZ + az * ub + bz * vb, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) ); + tess.addVertexWithUV( face, offsetX + ax * ub + bx * va, offsetY + ay * ub + by * va, offsetZ + az * ub + bz * va, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( va * 16.0 ) ); } else { @@ -691,7 +691,7 @@ public class BaseBlockRender GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); final BlockPos pos = tile.getPos(); - renderer.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() ); + renderer.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() ); // note that this is a terrible approach... renderer.setRenderBoundsFromBlock( block ); @@ -753,9 +753,9 @@ public class BaseBlockRender GL11.glPushMatrix(); GL11.glTranslatef( 0, -0.14F, 0 ); - //RenderItem.renderInFrame = true; + // RenderItem.renderInFrame = true; Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw( entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F ); - //RenderItem.renderInFrame = false; + // RenderItem.renderInFrame = false; GL11.glPopMatrix(); } diff --git a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java index 0261903a5..a76c8c6e2 100644 --- a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java +++ b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java @@ -1,9 +1,12 @@ + package appeng.client.render; + import net.minecraft.block.Block; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; + public interface ISimpleBlockRenderingHandler { diff --git a/src/main/java/appeng/client/render/IconUnwrapper.java b/src/main/java/appeng/client/render/IconUnwrapper.java index c52d14cb2..750b17652 100644 --- a/src/main/java/appeng/client/render/IconUnwrapper.java +++ b/src/main/java/appeng/client/render/IconUnwrapper.java @@ -1,6 +1,7 @@ package appeng.client.render; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import appeng.client.texture.IAESprite; @@ -71,17 +72,17 @@ public class IconUnwrapper extends TextureAtlasSprite } @Override - public float getInterpolatedU( final double d) - { - final float f = this.max_u - this.min_u; - return this.min_u + f * (float)d / 16.0F; - } + public float getInterpolatedU( final double d ) + { + final float f = this.max_u - this.min_u; + return this.min_u + f * (float) d / 16.0F; + } @Override - public float getInterpolatedV( final double d) - { - final float f = this.max_v - this.min_v; - return this.min_v + f * ((float)d / 16.0F); - } + public float getInterpolatedV( final double d ) + { + final float f = this.max_v - this.min_v; + return this.min_v + f * ( (float) d / 16.0F ); + } } diff --git a/src/main/java/appeng/client/render/SMFace.java b/src/main/java/appeng/client/render/SMFace.java index bf59abd73..21cd1c474 100644 --- a/src/main/java/appeng/client/render/SMFace.java +++ b/src/main/java/appeng/client/render/SMFace.java @@ -1,10 +1,13 @@ + package appeng.client.render; + import javax.vecmath.Vector3f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; + public class SMFace { @@ -21,7 +24,7 @@ public class SMFace private final int color; public SMFace( - final EnumFacing face , final boolean isEdge, + final EnumFacing face, final boolean isEdge, final int color, final Vector3f to, final Vector3f from, @@ -29,10 +32,10 @@ public class SMFace final TextureAtlasSprite iconUnwrapper ) { this.color = color; - this.face=face; + this.face = face; this.isEdge = isEdge; - this.to=to; - this.from=from; + this.to = to; + this.from = from; this.uv = defUVs2; this.spite = iconUnwrapper; } diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index fbf4dfa4a..546c46abb 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -76,7 +76,7 @@ public class SpatialSkyRender extends IRenderHandler GL11.glDepthMask( false ); GL11.glColor4f( 0.0f, 0.0f, 0.0f, 1.0f ); final Tessellator tessellator = Tessellator.getInstance(); - final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); for( int i = 0; i < 6; ++i ) { @@ -145,8 +145,8 @@ public class SpatialSkyRender extends IRenderHandler private void renderTwinkles() { final Tessellator tessellator = Tessellator.getInstance(); - final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.startDrawingQuads(); + final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.startDrawingQuads(); for( int i = 0; i < 50; ++i ) { diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java index e0dd9f64c..195579074 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java @@ -63,20 +63,20 @@ public class RenderBlockCharger extends BaseBlockRender GL11.glScalef( -1, 1, 1 ); GL11.glTranslated( -0.5, 0, -0.5 ); - //tess.setTranslation( -tc.getPos().getX(), -tc.getPos().getY(), -tc.getPos().getZ() ); - //tess.startDrawingQuads(); + // tess.setTranslation( -tc.getPos().getX(), -tc.getPos().getY(), -tc.getPos().getZ() ); + // tess.startDrawingQuads(); final RenderItem ri = Minecraft.getMinecraft().getRenderItem(); final ItemStack stack = new ItemStack( blk ); final IBakedModel model = ri.getItemModelMesher().getItemModel( stack ); - Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F ); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F ); /* - renderBlocks.renderAllFaces = true; - renderBlocks.blockAccess = tc.getWorld(); + * renderBlocks.renderAllFaces = true; + * renderBlocks.blockAccess = tc.getWorld(); + * renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 ); + * renderBlocks.renderStandardBlock( blk, tc.getPos()); + * renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D + + * 0.05 ); + * renderBlocks.renderStandardBlock( blk, tc.getPos() ); + */ - renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 ); - - renderBlocks.renderStandardBlock( blk, tc.getPos()); - renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D + 0.05 ); - - renderBlocks.renderStandardBlock( blk, tc.getPos() ); - */ - - //Tessellator.getInstance().draw(); - //tess.setTranslation( 0, 0, 0 ); + // Tessellator.getInstance().draw(); + // tess.setTranslation( 0, 0, 0 ); RenderHelper.enableStandardItemLighting(); } } diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index 397693b52..72bc25e52 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -74,19 +74,19 @@ public class RenderBlockInscriber extends BaseBlockRender break; } - double u1 = ico.getInterpolatedU( ( spin % 4 < 2 ) ? 1 : 6 ); double u2 = ico.getInterpolatedU( ( ( spin + 1 ) % 4 < 2 ) ? 1 : 6 ); double u3 = ico.getInterpolatedU( ( ( spin + 2 ) % 4 < 2 ) ? 1 : 6 ); @@ -210,49 +209,49 @@ public class RenderDrive extends BaseBlockRender double v3 = ico.getInterpolatedV( ( ( spin + 3 ) % 4 < 2 ) ? m : mx ); double v4 = ico.getInterpolatedV( ( ( spin ) % 4 < 2 ) ? m : mx ); - final int x= pos.getX(); - final int y= pos.getY(); - final int z= pos.getZ(); - + final int x = pos.getX(); + final int y = pos.getY(); + final int z = pos.getZ(); + renderer.setBrightness( b ); renderer.setColorOpaque_I( 0xffffff ); switch( forward.getFrontOffsetX() + forward.getFrontOffsetY() * 2 + forward.getFrontOffsetZ() * 3 ) { case 1: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case -1: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case -2: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case 2: - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case 3: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); break; case -3: - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); break; } @@ -304,39 +303,39 @@ public class RenderDrive extends BaseBlockRender { case 1: renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case -1: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case -2: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case 2: - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 ); break; case 3: - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); break; case -3: - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); - renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 ); + renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 ); break; } } diff --git a/src/main/java/appeng/client/render/blocks/RenderQNB.java b/src/main/java/appeng/client/render/blocks/RenderQNB.java index ed6f2bae8..ca757219b 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQNB.java +++ b/src/main/java/appeng/client/render/blocks/RenderQNB.java @@ -79,7 +79,7 @@ public class RenderQNB extends BaseBlockRender sides = tqb.getConnections(); - this.renderCableAt( 0.11D, world, pos, block, renderer, renderer.getIcon( parts.cableGlass().stack( AEColor.Transparent, 1 ) ), 0.141D, sides ); + this.renderCableAt( 0.11D, world, pos, block, renderer, renderer.getIcon( parts.cableGlass().stack( AEColor.Transparent, 1 ) ), 0.141D, sides ); final Item transCoveredCable = parts.cableCovered().item( AEColor.Transparent ); this.renderCableAt( 0.188D, world, pos, block, renderer, renderer.getIcon( parts.cableCovered().stack( AEColor.Transparent, 1 ) ), 0.1875D, sides ); diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java index 037c0ab16..c3d36bfc4 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java @@ -78,7 +78,7 @@ public class RenderQuartzGlass extends BaseBlockRender final float Point2 = 6.0f / 16.0f; renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff ); - this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer ); + this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer ); renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point12 + zOff, Point13 + xOff, top + yOff, Point13 + zOff ); this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer ); @@ -154,7 +154,7 @@ public class RenderQuartzTorch extends BaseBlockRender if( te != null ) { - final AEPartLocation forward = AEPartLocation.fromFacing( te.getUp()); + final AEPartLocation forward = AEPartLocation.fromFacing( te.getUp() ); switch( forward ) { case EAST: diff --git a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java index a08db6e48..5ba5f687d 100644 --- a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java +++ b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java @@ -56,13 +56,13 @@ public class RenderSpatialPylon extends BaseBlockRender @Override public void renderInventory( final BlockTinyTNT block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj ) { - renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) ); + renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() ) ) ); renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); super.renderInventory( block, is, renderer, type, obj ); } @@ -51,7 +51,7 @@ public class RenderTinyTNT extends BaseBlockRender @Override public boolean renderInWorld( final BlockTinyTNT imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer ) { - renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) ); + renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() ) ) ); renderer.setRenderAllFaces( true ); renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); final boolean out = super.renderInWorld( imb, world, pos, renderer ); diff --git a/src/main/java/appeng/client/render/effects/AssemblerFX.java b/src/main/java/appeng/client/render/effects/AssemblerFX.java index b83a97785..6a55619b2 100644 --- a/src/main/java/appeng/client/render/effects/AssemblerFX.java +++ b/src/main/java/appeng/client/render/effects/AssemblerFX.java @@ -73,8 +73,8 @@ public class AssemblerFX extends EntityFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) - { + public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) + { this.time += l; if( this.time > 4.0 ) { diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 1daeea8d4..f2abc8487 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -68,8 +68,8 @@ public class CraftingFx extends EntityBreakingFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz) - { + public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz ) + { if( partialTick < 0 || partialTick > 1 ) { return; diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 543b1934e..af8b3b0fa 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -67,8 +67,8 @@ public class EnergyFx extends EntityBreakingFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7) - { + public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) + { final float f6 = this.particleTextureIndex.getMinU(); final float f7 = this.particleTextureIndex.getMaxU(); final float f8 = this.particleTextureIndex.getMinV(); diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 1fca5bfd5..7ad475bcb 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -84,8 +84,8 @@ public class LightningFX extends EntityFX } @Override - public void renderParticle( final WorldRenderer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) - { + public void renderParticle( final WorldRenderer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) + { final float j = 1.0f; tess.setColorRGBA_F( this.particleRed * j * 0.9f, this.particleGreen * j * 0.95f, this.particleBlue * j, this.particleAlpha ); if( this.particleAge == 3 ) diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index b23f11e9b..3f5a7e4b3 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -70,8 +70,8 @@ public class MatterCannonFX extends EntityBreakingFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) - { + public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) + { final float f6 = this.particleTextureIndex.getMinU(); final float f7 = this.particleTextureIndex.getMaxU(); final float f8 = this.particleTextureIndex.getMinV(); diff --git a/src/main/java/appeng/client/render/items/PaintBallRender.java b/src/main/java/appeng/client/render/items/PaintBallRender.java index 0132b2ad0..6a69c88c9 100644 --- a/src/main/java/appeng/client/render/items/PaintBallRender.java +++ b/src/main/java/appeng/client/render/items/PaintBallRender.java @@ -124,4 +124,4 @@ package appeng.client.render.items; // GL11.glPopAttrib(); // GL11.glPopMatrix(); // } -//} +// } diff --git a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java index 699c75956..a2973316b 100644 --- a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java +++ b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java @@ -42,108 +42,95 @@ public class ToolBiometricCardRender implements IItemRenderer // TileEntityItemS public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data ) { /* - TextureAtlasSprite par2Icon = item.getIconIndex(); - - float f4 = par2Icon.getMinU(); - float f5 = par2Icon.getMaxU(); - float f6 = par2Icon.getMinV(); - float f7 = par2Icon.getMaxV(); - float f12 = 0.0625F; - - Tessellator tessellator = Tessellator.instance; - GL11.glPushMatrix(); - GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); - - if( type == ItemRenderType.INVENTORY ) - { - GL11.glColor4f( 1, 1, 1, 1.0F ); - GL11.glScalef( 16F, 16F, 10F ); - GL11.glTranslatef( 0.0F, 1.0F, 0.0F ); - GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); - GL11.glEnable( GL11.GL_ALPHA_TEST ); - - tessellator.startDrawingQuads(); - tessellator.setNormal( 0.0F, 1.0F, 0.0F ); - tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); - tessellator.addVertexWithUV( 1, 0, 0, f5, f7 ); - tessellator.addVertexWithUV( 1, 1, 0, f5, f6 ); - tessellator.addVertexWithUV( 0, 1, 0, f4, f6 ); - tessellator.draw(); - } - else - { - GL11.glTranslatef( -0.5F, -0.3F, 0.01F ); - ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 ); - - GL11.glDisable( GL11.GL_CULL_FACE ); - GL11.glColor4f( 1, 1, 1, 1.0F ); - GL11.glScalef( 1F, 1.1F, 1F ); - GL11.glTranslatef( 0.0F, 1.07F, f12 / -2.0f ); - GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); - } - - float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 ); - float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 ); - - String username = ""; - if( item.getItem() instanceof IBiometricCard ) - { - GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item ); - if( gp != null ) - { - username = gp.getName(); - } - } - int hash = username.length() > 0 ? username.hashCode() : 0; - - GL11.glScalef( 1F / 16F, 1F / 16F, 1F ); - GL11.glTranslatef( 4, 6, 0 ); - GL11.glDisable( GL11.GL_LIGHTING ); - - tessellator.startDrawingQuads(); - float z = 0; - - AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length]; - if( hash == 0 ) - { - col = AEColor.Black; - } - - for( int x = 0; x < 8; x++ )// 8 - { - for( int y = 0; y < 6; y++ )// 6 - { - boolean isLit = false; - float scale = 0.3f / 255.0f; - - if( x == 0 || y == 0 || x == 7 || y == 5 ) - { - isLit = false; - } - else - { - isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0; - } - - if( isLit ) - { - tessellator.setColorOpaque_I( col.mediumVariant ); - } - else - { - tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale ); - } - - tessellator.addVertexWithUV( x, y, z, u, v ); - tessellator.addVertexWithUV( x + 1, y, z, u, v ); - tessellator.addVertexWithUV( x + 1, y + 1, z, u, v ); - tessellator.addVertexWithUV( x, y + 1, z, u, v ); - } - } - tessellator.draw(); - - GL11.glPopAttrib(); - GL11.glPopMatrix(); - */ + * TextureAtlasSprite par2Icon = item.getIconIndex(); + * float f4 = par2Icon.getMinU(); + * float f5 = par2Icon.getMaxU(); + * float f6 = par2Icon.getMinV(); + * float f7 = par2Icon.getMaxV(); + * float f12 = 0.0625F; + * Tessellator tessellator = Tessellator.instance; + * GL11.glPushMatrix(); + * GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); + * if( type == ItemRenderType.INVENTORY ) + * { + * GL11.glColor4f( 1, 1, 1, 1.0F ); + * GL11.glScalef( 16F, 16F, 10F ); + * GL11.glTranslatef( 0.0F, 1.0F, 0.0F ); + * GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); + * GL11.glEnable( GL11.GL_ALPHA_TEST ); + * tessellator.startDrawingQuads(); + * tessellator.setNormal( 0.0F, 1.0F, 0.0F ); + * tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); + * tessellator.addVertexWithUV( 1, 0, 0, f5, f7 ); + * tessellator.addVertexWithUV( 1, 1, 0, f5, f6 ); + * tessellator.addVertexWithUV( 0, 1, 0, f4, f6 ); + * tessellator.draw(); + * } + * else + * { + * GL11.glTranslatef( -0.5F, -0.3F, 0.01F ); + * ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), + * f12 ); + * GL11.glDisable( GL11.GL_CULL_FACE ); + * GL11.glColor4f( 1, 1, 1, 1.0F ); + * GL11.glScalef( 1F, 1.1F, 1F ); + * GL11.glTranslatef( 0.0F, 1.07F, f12 / -2.0f ); + * GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); + * } + * float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 ); + * float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 ); + * String username = ""; + * if( item.getItem() instanceof IBiometricCard ) + * { + * GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item ); + * if( gp != null ) + * { + * username = gp.getName(); + * } + * } + * int hash = username.length() > 0 ? username.hashCode() : 0; + * GL11.glScalef( 1F / 16F, 1F / 16F, 1F ); + * GL11.glTranslatef( 4, 6, 0 ); + * GL11.glDisable( GL11.GL_LIGHTING ); + * tessellator.startDrawingQuads(); + * float z = 0; + * AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length]; + * if( hash == 0 ) + * { + * col = AEColor.Black; + * } + * for( int x = 0; x < 8; x++ )// 8 + * { + * for( int y = 0; y < 6; y++ )// 6 + * { + * boolean isLit = false; + * float scale = 0.3f / 255.0f; + * if( x == 0 || y == 0 || x == 7 || y == 5 ) + * { + * isLit = false; + * } + * else + * { + * isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0; + * } + * if( isLit ) + * { + * tessellator.setColorOpaque_I( col.mediumVariant ); + * } + * else + * { + * tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & + * 0xff ) * scale, ( col.blackVariant & 0xff ) * scale ); + * } + * tessellator.addVertexWithUV( x, y, z, u, v ); + * tessellator.addVertexWithUV( x + 1, y, z, u, v ); + * tessellator.addVertexWithUV( x + 1, y + 1, z, u, v ); + * tessellator.addVertexWithUV( x, y + 1, z, u, v ); + * } + * } + * tessellator.draw(); + * GL11.glPopAttrib(); + * GL11.glPopMatrix(); + */ } } diff --git a/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java b/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java index dadd33d53..d00a99580 100644 --- a/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java +++ b/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java @@ -42,114 +42,97 @@ public class ToolColorApplicatorRender implements IItemRenderer public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data ) { /* - TextureAtlasSprite par2Icon = item.getIconIndex(); - - float f4 = par2Icon.getMinU(); - float f5 = par2Icon.getMaxU(); - float f6 = par2Icon.getMinV(); - float f7 = par2Icon.getMaxV(); - float f12 = 0.0625F; - - Tessellator tessellator = Tessellator.instance; - GL11.glPushMatrix(); - GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); - - if( type == ItemRenderType.INVENTORY ) - { - GL11.glColor4f( 1, 1, 1, 1.0F ); - GL11.glScalef( 16F, 16F, 10F ); - GL11.glTranslatef( 0.0F, 1.0F, 0.0F ); - GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); - GL11.glEnable( GL11.GL_ALPHA_TEST ); - - tessellator.startDrawingQuads(); - tessellator.setNormal( 0.0F, 1.0F, 0.0F ); - tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); - tessellator.addVertexWithUV( 1, 0, 0, f5, f7 ); - tessellator.addVertexWithUV( 1, 1, 0, f5, f6 ); - tessellator.addVertexWithUV( 0, 1, 0, f4, f6 ); - tessellator.draw(); - } - else - { - if( type == ItemRenderType.EQUIPPED_FIRST_PERSON ) - { - GL11.glTranslatef( 0.0F, 0.0F, 0.0F ); - } - else if( type == ItemRenderType.EQUIPPED ) - { - GL11.glTranslatef( 0.0F, 0.0F, 0.0F ); - } - else - { - GL11.glTranslatef( -0.5F, -0.3F, 0.01F ); - } - ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 ); - - GL11.glDisable( GL11.GL_CULL_FACE ); - GL11.glColor4f( 1, 1, 1, 1.0F ); - GL11.glScalef( -1F, -1F, 1F ); - GL11.glTranslatef( -1.125F, 0.0f, f12 / -2.0f ); - GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); - } - - TextureAtlasSprite dark = ExtraItemTextures.ToolColorApplicatorTip_Dark.getIcon(); - TextureAtlasSprite med = ExtraItemTextures.ToolColorApplicatorTip_Medium.getIcon(); - TextureAtlasSprite light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon(); - - GL11.glScalef( 1F / 16F, 1F / 16F, 1F ); - if( type != ItemRenderType.INVENTORY ) - { - GL11.glTranslatef( 2, 0, 0 ); - } - GL11.glDisable( GL11.GL_LIGHTING ); - - AEColor col = null; - - col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item ); - - if( col != null ) - { - tessellator.startDrawingQuads(); - - f4 = dark.getMinU(); - f5 = dark.getMaxU(); - f6 = dark.getMinV(); - f7 = dark.getMaxV(); - - tessellator.setColorOpaque_I( col.blackVariant ); - tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); - tessellator.addVertexWithUV( 16, 0, 0, f5, f7 ); - tessellator.addVertexWithUV( 16, 16, 0, f5, f6 ); - tessellator.addVertexWithUV( 0, 16, 0, f4, f6 ); - - f4 = light.getMinU(); - f5 = light.getMaxU(); - f6 = light.getMinV(); - f7 = light.getMaxV(); - - tessellator.setColorOpaque_I( col.whiteVariant ); - tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); - tessellator.addVertexWithUV( 16, 0, 0, f5, f7 ); - tessellator.addVertexWithUV( 16, 16, 0, f5, f6 ); - tessellator.addVertexWithUV( 0, 16, 0, f4, f6 ); - - f4 = med.getMinU(); - f5 = med.getMaxU(); - f6 = med.getMinV(); - f7 = med.getMaxV(); - - tessellator.setColorOpaque_I( col.mediumVariant ); - tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); - tessellator.addVertexWithUV( 16, 0, 0, f5, f7 ); - tessellator.addVertexWithUV( 16, 16, 0, f5, f6 ); - tessellator.addVertexWithUV( 0, 16, 0, f4, f6 ); - - tessellator.draw(); - } - - GL11.glPopAttrib(); - GL11.glPopMatrix(); - */ + * TextureAtlasSprite par2Icon = item.getIconIndex(); + * float f4 = par2Icon.getMinU(); + * float f5 = par2Icon.getMaxU(); + * float f6 = par2Icon.getMinV(); + * float f7 = par2Icon.getMaxV(); + * float f12 = 0.0625F; + * Tessellator tessellator = Tessellator.instance; + * GL11.glPushMatrix(); + * GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); + * if( type == ItemRenderType.INVENTORY ) + * { + * GL11.glColor4f( 1, 1, 1, 1.0F ); + * GL11.glScalef( 16F, 16F, 10F ); + * GL11.glTranslatef( 0.0F, 1.0F, 0.0F ); + * GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); + * GL11.glEnable( GL11.GL_ALPHA_TEST ); + * tessellator.startDrawingQuads(); + * tessellator.setNormal( 0.0F, 1.0F, 0.0F ); + * tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); + * tessellator.addVertexWithUV( 1, 0, 0, f5, f7 ); + * tessellator.addVertexWithUV( 1, 1, 0, f5, f6 ); + * tessellator.addVertexWithUV( 0, 1, 0, f4, f6 ); + * tessellator.draw(); + * } + * else + * { + * if( type == ItemRenderType.EQUIPPED_FIRST_PERSON ) + * { + * GL11.glTranslatef( 0.0F, 0.0F, 0.0F ); + * } + * else if( type == ItemRenderType.EQUIPPED ) + * { + * GL11.glTranslatef( 0.0F, 0.0F, 0.0F ); + * } + * else + * { + * GL11.glTranslatef( -0.5F, -0.3F, 0.01F ); + * } + * ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), + * f12 ); + * GL11.glDisable( GL11.GL_CULL_FACE ); + * GL11.glColor4f( 1, 1, 1, 1.0F ); + * GL11.glScalef( -1F, -1F, 1F ); + * GL11.glTranslatef( -1.125F, 0.0f, f12 / -2.0f ); + * GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F ); + * } + * TextureAtlasSprite dark = ExtraItemTextures.ToolColorApplicatorTip_Dark.getIcon(); + * TextureAtlasSprite med = ExtraItemTextures.ToolColorApplicatorTip_Medium.getIcon(); + * TextureAtlasSprite light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon(); + * GL11.glScalef( 1F / 16F, 1F / 16F, 1F ); + * if( type != ItemRenderType.INVENTORY ) + * { + * GL11.glTranslatef( 2, 0, 0 ); + * } + * GL11.glDisable( GL11.GL_LIGHTING ); + * AEColor col = null; + * col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item ); + * if( col != null ) + * { + * tessellator.startDrawingQuads(); + * f4 = dark.getMinU(); + * f5 = dark.getMaxU(); + * f6 = dark.getMinV(); + * f7 = dark.getMaxV(); + * tessellator.setColorOpaque_I( col.blackVariant ); + * tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); + * tessellator.addVertexWithUV( 16, 0, 0, f5, f7 ); + * tessellator.addVertexWithUV( 16, 16, 0, f5, f6 ); + * tessellator.addVertexWithUV( 0, 16, 0, f4, f6 ); + * f4 = light.getMinU(); + * f5 = light.getMaxU(); + * f6 = light.getMinV(); + * f7 = light.getMaxV(); + * tessellator.setColorOpaque_I( col.whiteVariant ); + * tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); + * tessellator.addVertexWithUV( 16, 0, 0, f5, f7 ); + * tessellator.addVertexWithUV( 16, 16, 0, f5, f6 ); + * tessellator.addVertexWithUV( 0, 16, 0, f4, f6 ); + * f4 = med.getMinU(); + * f5 = med.getMaxU(); + * f6 = med.getMinV(); + * f7 = med.getMaxV(); + * tessellator.setColorOpaque_I( col.mediumVariant ); + * tessellator.addVertexWithUV( 0, 0, 0, f4, f7 ); + * tessellator.addVertexWithUV( 16, 0, 0, f5, f7 ); + * tessellator.addVertexWithUV( 16, 16, 0, f5, f6 ); + * tessellator.addVertexWithUV( 0, 16, 0, f4, f6 ); + * tessellator.draw(); + * } + * GL11.glPopAttrib(); + * GL11.glPopMatrix(); + */ } } diff --git a/src/main/java/appeng/client/texture/BaseIcon.java b/src/main/java/appeng/client/texture/BaseIcon.java index 9f76ea0f1..11b4a62c2 100644 --- a/src/main/java/appeng/client/texture/BaseIcon.java +++ b/src/main/java/appeng/client/texture/BaseIcon.java @@ -1,11 +1,14 @@ + package appeng.client.texture; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; + public class BaseIcon implements IAESprite { private final TextureAtlasSprite spite; - + public BaseIcon( final TextureAtlasSprite src ) { this.spite = src; diff --git a/src/main/java/appeng/client/texture/FullIcon.java b/src/main/java/appeng/client/texture/FullIcon.java index c1bc666cd..bf03ea66b 100644 --- a/src/main/java/appeng/client/texture/FullIcon.java +++ b/src/main/java/appeng/client/texture/FullIcon.java @@ -44,7 +44,7 @@ public class FullIcon implements IAESprite { return this.p; } - + @Override public int getIconWidth() { diff --git a/src/main/java/appeng/client/texture/IAESprite.java b/src/main/java/appeng/client/texture/IAESprite.java index 9b19a448e..6fd211dbf 100644 --- a/src/main/java/appeng/client/texture/IAESprite.java +++ b/src/main/java/appeng/client/texture/IAESprite.java @@ -1,7 +1,10 @@ + package appeng.client.texture; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; + public interface IAESprite { diff --git a/src/main/java/appeng/client/texture/MissingIcon.java b/src/main/java/appeng/client/texture/MissingIcon.java index 048137fa7..724da4dd3 100644 --- a/src/main/java/appeng/client/texture/MissingIcon.java +++ b/src/main/java/appeng/client/texture/MissingIcon.java @@ -42,8 +42,7 @@ public class MissingIcon implements IAESprite } @SideOnly( Side.CLIENT ) - public - static TextureAtlasSprite getMissing() + public static TextureAtlasSprite getMissing() { return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" ); } diff --git a/src/main/java/appeng/client/texture/TaughtIcon.java b/src/main/java/appeng/client/texture/TaughtIcon.java index 53c847d4a..711d8aa6c 100644 --- a/src/main/java/appeng/client/texture/TaughtIcon.java +++ b/src/main/java/appeng/client/texture/TaughtIcon.java @@ -36,7 +36,7 @@ public class TaughtIcon implements IAESprite { return this.icon.getAtlas(); } - + public TaughtIcon( final IAESprite iIcon, final float tightness ) { if( iIcon == null ) diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index a8a1e4ffa..38c5b1bd5 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -75,7 +75,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres @Override /** * Overridden super.setupConfig to prevent setting up the fake slots - */ protected void setupConfig() + */protected void setupConfig() { this.setupUpgrades(); } @@ -126,10 +126,10 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() ) { final boolean matchA = ( top == null && !recipe.getTopOptional().isPresent() ) || ( Platform.isSameItemPrecise( top, recipe.getTopOptional().orNull() ) ) && // and... - ( bot == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( bot, recipe.getBottomOptional().orNull() ) ); + ( bot == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( bot, recipe.getBottomOptional().orNull() ) ); final boolean matchB = ( bot == null && !recipe.getTopOptional().isPresent() ) || ( Platform.isSameItemPrecise( bot, recipe.getTopOptional().orNull() ) ) && // and... - ( top == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( top, recipe.getBottomOptional().orNull() ) ); + ( top == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( top, recipe.getBottomOptional().orNull() ) ); if( matchA || matchB ) { diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index 5ec1329e6..9164f45e2 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -230,16 +230,16 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn public void openInventory( final EntityPlayer player ) { - + } - + @Override public void closeInventory( final EntityPlayer player ) { - + } - + @Override public boolean isItemValidForSlot( final int var1, final ItemStack var2 ) { @@ -264,7 +264,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn final int id, final int value ) { - + } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerSkyChest.java b/src/main/java/appeng/container/implementations/ContainerSkyChest.java index 48b503090..a94178703 100644 --- a/src/main/java/appeng/container/implementations/ContainerSkyChest.java +++ b/src/main/java/appeng/container/implementations/ContainerSkyChest.java @@ -46,7 +46,7 @@ public class ContainerSkyChest extends AEBaseContainer } } - this.chest.openInventory(ip.player); + this.chest.openInventory( ip.player ); this.bindPlayerInventory( ip, 0, 195 - /* height of player inventory */82 ); } @@ -55,6 +55,6 @@ public class ContainerSkyChest extends AEBaseContainer public void onContainerClosed( final EntityPlayer par1EntityPlayer ) { super.onContainerClosed( par1EntityPlayer ); - this.chest.closeInventory(par1EntityPlayer); + this.chest.closeInventory( par1EntityPlayer ); } } diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index a312185eb..3d2efa150 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -142,43 +142,43 @@ public class AppEngCraftingSlot extends AppEngSlot @Override public void onPickupFromSlot( final EntityPlayer playerIn, final ItemStack stack ) { - net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(playerIn, stack, this.craftMatrix ); - this.onCrafting(stack); - net.minecraftforge.common.ForgeHooks.setCraftingPlayer(playerIn); - final InventoryCrafting ic = new InventoryCrafting( this.getContainer(), 3, 3 ); + net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent( playerIn, stack, this.craftMatrix ); + this.onCrafting( stack ); + net.minecraftforge.common.ForgeHooks.setCraftingPlayer( playerIn ); + final InventoryCrafting ic = new InventoryCrafting( this.getContainer(), 3, 3 ); - for ( int x=0; x < this.craftMatrix.getSizeInventory(); x++ ) - ic.setInventorySlotContents( x, this.craftMatrix.getStackInSlot( x ) ); + for( int x = 0; x < this.craftMatrix.getSizeInventory(); x++ ) + ic.setInventorySlotContents( x, this.craftMatrix.getStackInSlot( x ) ); - final ItemStack[] aitemstack = CraftingManager.getInstance().func_180303_b(ic, playerIn.worldObj); + final ItemStack[] aitemstack = CraftingManager.getInstance().func_180303_b( ic, playerIn.worldObj ); - for ( int x=0; x < this.craftMatrix.getSizeInventory(); x++ ) + for( int x = 0; x < this.craftMatrix.getSizeInventory(); x++ ) this.craftMatrix.setInventorySlotContents( x, ic.getStackInSlot( x ) ); - net.minecraftforge.common.ForgeHooks.setCraftingPlayer(null); + net.minecraftforge.common.ForgeHooks.setCraftingPlayer( null ); - for (int i = 0; i < aitemstack.length; ++i) - { - final ItemStack itemstack1 = this.craftMatrix.getStackInSlot(i); - final ItemStack itemstack2 = aitemstack[i]; + for( int i = 0; i < aitemstack.length; ++i ) + { + final ItemStack itemstack1 = this.craftMatrix.getStackInSlot( i ); + final ItemStack itemstack2 = aitemstack[i]; - if (itemstack1 != null) - { - this.craftMatrix.decrStackSize(i, 1); - } + if( itemstack1 != null ) + { + this.craftMatrix.decrStackSize( i, 1 ); + } - if (itemstack2 != null) - { - if (this.craftMatrix.getStackInSlot(i) == null) - { - this.craftMatrix.setInventorySlotContents(i, itemstack2); - } - else if (!this.thePlayer.inventory.addItemStackToInventory(itemstack2)) - { - this.thePlayer.dropPlayerItemWithRandomChoice(itemstack2, false); - } - } - } + if( itemstack2 != null ) + { + if( this.craftMatrix.getStackInSlot( i ) == null ) + { + this.craftMatrix.setInventorySlotContents( i, itemstack2 ); + } + else if( !this.thePlayer.inventory.addItemStackToInventory( itemstack2 ) ) + { + this.thePlayer.dropPlayerItemWithRandomChoice( itemstack2, false ); + } + } + } } /** diff --git a/src/main/java/appeng/container/slot/SlotPlayerInv.java b/src/main/java/appeng/container/slot/SlotPlayerInv.java index a30f3766c..5c5d3494d 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerInv.java +++ b/src/main/java/appeng/container/slot/SlotPlayerInv.java @@ -21,8 +21,8 @@ package appeng.container.slot; import net.minecraft.inventory.IInventory; -// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. +// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. public class SlotPlayerInv extends AppEngSlot { diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 6a9c8aba9..771f54473 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -144,7 +144,8 @@ public class SlotRestrictedInput extends AppEngSlot { return true; } - // ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem ? ((ICraftingPatternItem) + // ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem ? + // ((ICraftingPatternItem) // i.getItem()).getPatternForItem( i ) : null; return false;// pattern != null; } @@ -178,8 +179,8 @@ public class SlotRestrictedInput extends AppEngSlot case INSCRIBER_INPUT: return true;/* - * for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return true; - * + * for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return + * true; * return false; */ diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index 73bbf77c0..e065c55fd 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -81,7 +81,7 @@ public final class Api implements IAppEngApi @Override public IGridNode createGridNode( final IGridBlock blk ) { - if ( Platform.isClient() ) + if( Platform.isClient() ) { throw new IllegalStateException( "Grid features for " + blk + " are server side only." ); } diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/main/java/appeng/core/CommonHelper.java index 0332687f4..21030868f 100644 --- a/src/main/java/appeng/core/CommonHelper.java +++ b/src/main/java/appeng/core/CommonHelper.java @@ -48,7 +48,7 @@ public abstract class CommonHelper public abstract World getWorld(); - public abstract void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ); + public abstract void bindTileEntitySpecialRenderer( Class tile, AEBaseBlock blk ); public abstract List getPlayers(); @@ -71,8 +71,8 @@ public abstract class CommonHelper public abstract void updateRenderMode( EntityPlayer player ); public abstract void missingCoreMod(); - - public abstract void configureIcon(Object item, String name ); + + public abstract void configureIcon( Object item, String name ); public abstract ResourceLocation addIcon( String string ); diff --git a/src/main/java/appeng/core/IMCHandler.java b/src/main/java/appeng/core/IMCHandler.java index 1c4fa5c4e..c40f69738 100644 --- a/src/main/java/appeng/core/IMCHandler.java +++ b/src/main/java/appeng/core/IMCHandler.java @@ -70,7 +70,8 @@ public class IMCHandler } /** - * Tries to find every message matching the internal IMC keys. When found the corresponding handler will process the attached message. + * Tries to find every message matching the internal IMC keys. When found the corresponding handler will process the + * attached message. * * @param event Event carrying the identifier and message for the handlers */ diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index bae6ef978..436d05fb4 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -144,15 +144,15 @@ public final class ApiBlocks implements IBlocks private final IBlockDefinition chiseledQuartzStair; private final IBlockDefinition quartzPillarStair; /* - private final IBlockDefinition skyStoneSlab; - private final IBlockDefinition skyStoneBlockSlab; - private final IBlockDefinition skyStoneBrickSlab; - private final IBlockDefinition skyStoneSmallBrickSlab; - private final IBlockDefinition fluixSlab; - private final IBlockDefinition quartzSlab; - private final IBlockDefinition chiseledQuartzSlab; - private final IBlockDefinition quartzPillarSlab; - */ + * private final IBlockDefinition skyStoneSlab; + * private final IBlockDefinition skyStoneBlockSlab; + * private final IBlockDefinition skyStoneBrickSlab; + * private final IBlockDefinition skyStoneSmallBrickSlab; + * private final IBlockDefinition fluixSlab; + * private final IBlockDefinition quartzSlab; + * private final IBlockDefinition chiseledQuartzSlab; + * private final IBlockDefinition quartzPillarSlab; + */ private final IBlockDefinition itemGen; private final IBlockDefinition chunkLoader; @@ -161,7 +161,7 @@ public final class ApiBlocks implements IBlocks public ApiBlocks( final DefinitionConstructor constructor ) { -// this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() ); + // this.quartzOre = new BlockDefinition( "ore.quartz", new OreQuartz() ); this.quartzOre = constructor.registerBlockDefinition( new QuartzOreBlock() ); this.quartzOreCharged = constructor.registerBlockDefinition( new ChargedQuartzOreBlock() ); this.matrixFrame = constructor.registerBlockDefinition( new BlockMatrixFrame() ); @@ -226,15 +226,23 @@ public final class ApiBlocks implements IBlocks // TODO Re-Add Slabs... /* - this.skyStoneSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_stone, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSlabBlock" ) ); - this.skyStoneBlockSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_block, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBlockSlabBlock" ) ); - this.skyStoneBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_brick, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBrickSlabBlock" ) ); - this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_smallbrick, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSmallBrickSlabBlock" ) ); - this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "FluixSlabBlock" ) ); - this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzSlabBlock" ) ); - this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) );; - this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzPillarSlabBlock" ) ) - */ + * this.skyStoneSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_stone, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSlabBlock" ) ); + * this.skyStoneBlockSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_block, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBlockSlabBlock" ) ); + * this.skyStoneBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_brick, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBrickSlabBlock" ) ); + * this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone_smallbrick, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSmallBrickSlabBlock" ) ); + * this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "FluixSlabBlock" ) ); + * this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzSlabBlock" ) ); + * this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) );; + * this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, + * EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzPillarSlabBlock" ) ) + */ this.itemGen = constructor.registerBlockDefinition( new BlockItemGen() ); this.chunkLoader = constructor.registerBlockDefinition( new BlockChunkloader() ); @@ -403,54 +411,47 @@ public final class ApiBlocks implements IBlocks } /* - @Override - public IBlockDefinition skyStoneSlab() - { - return this.skyStoneSlab; - } - - @Override - public IBlockDefinition skyStoneBlockSlab() - { - return this.skyStoneBlockSlab; - } - - @Override - public IBlockDefinition skyStoneBrickSlab() - { - return this.skyStoneBrickSlab; - } - - @Override - public IBlockDefinition skyStoneSmallBrickSlab() - { - return this.skyStoneSmallBrickSlab; - } - - @Override - public IBlockDefinition fluixSlab() - { - return this.fluixSlab; - } - - @Override - public IBlockDefinition quartzSlab() - { - return this.quartzSlab; - } - - @Override - public IBlockDefinition chiseledQuartzSlab() - { - return this.chiseledQuartzSlab; - } - - @Override - public IBlockDefinition quartzPillarSlab() - { - return this.quartzPillarSlab; - } -*/ + * @Override + * public IBlockDefinition skyStoneSlab() + * { + * return this.skyStoneSlab; + * } + * @Override + * public IBlockDefinition skyStoneBlockSlab() + * { + * return this.skyStoneBlockSlab; + * } + * @Override + * public IBlockDefinition skyStoneBrickSlab() + * { + * return this.skyStoneBrickSlab; + * } + * @Override + * public IBlockDefinition skyStoneSmallBrickSlab() + * { + * return this.skyStoneSmallBrickSlab; + * } + * @Override + * public IBlockDefinition fluixSlab() + * { + * return this.fluixSlab; + * } + * @Override + * public IBlockDefinition quartzSlab() + * { + * return this.quartzSlab; + * } + * @Override + * public IBlockDefinition chiseledQuartzSlab() + * { + * return this.chiseledQuartzSlab; + * } + * @Override + * public IBlockDefinition quartzPillarSlab() + * { + * return this.quartzPillarSlab; + * } + */ @Override public ITileDefinition grindStone() diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index a56710756..a773524f6 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -126,7 +126,6 @@ public final class ApiMaterials implements IMaterials this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LogicProcessorPrint ) ); this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SiliconPrint ) ); - this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LogicProcessor ) ); this.calcProcessor = new DamagedItemDefinition( "material.processor.calculation", materials.createMaterial( MaterialType.CalcProcessor ) ); this.engProcessor = new DamagedItemDefinition( "material.processor.engineering", materials.createMaterial( MaterialType.EngProcessor ) ); diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 5548b77ec..4d54a82bf 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -57,11 +57,11 @@ public final class ApiParts implements IParts private final IItemDefinition p2PTunnelRedstone; private final IItemDefinition p2PTunnelItems; private final IItemDefinition p2PTunnelLiquids; - //private final IItemDefinition p2PTunnelEU; - //private final IItemDefinition p2PTunnelRF; + // private final IItemDefinition p2PTunnelEU; + // private final IItemDefinition p2PTunnelRF; private final IItemDefinition p2PTunnelLight; -// private final IItemDefinition p2PTunnelOpenComputers; -// private final IItemDefinition p2PTunnelPneumaticCraft; + // private final IItemDefinition p2PTunnelOpenComputers; + // private final IItemDefinition p2PTunnelPneumaticCraft; private final IItemDefinition cableAnchor; private final IItemDefinition monitor; private final IItemDefinition semiDarkMonitor; @@ -101,11 +101,13 @@ public final class ApiParts implements IParts this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemMultiPart.createPart( PartType.P2PTunnelRedstone ) ); this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemMultiPart.createPart( PartType.P2PTunnelItems ) ); this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemMultiPart.createPart( PartType.P2PTunnelLiquids ) ); - //this.p2PTunnelEU = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelEU ) ); - //this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) ); + // this.p2PTunnelEU = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelEU ) ); + // this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) ); this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemMultiPart.createPart( PartType.P2PTunnelLight ) ); - //this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelOpenComputers ) ); -// this.p2PTunnelPneumaticCraft = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelPressure ) ); + // this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart( + // PartType.P2PTunnelOpenComputers ) ); + // this.p2PTunnelPneumaticCraft = new DamagedItemDefinition( itemMultiPart.createPart( + // PartType.P2PTunnelPressure ) ); this.cableAnchor = new DamagedItemDefinition( "part.cable_anchor", itemMultiPart.createPart( PartType.CableAnchor ) ); this.monitor = new DamagedItemDefinition( "part.monitor", itemMultiPart.createPart( PartType.Monitor ) ); this.semiDarkMonitor = new DamagedItemDefinition( "part.monitor.semi_dark", itemMultiPart.createPart( PartType.SemiDarkMonitor ) ); @@ -259,41 +261,39 @@ public final class ApiParts implements IParts { return this.p2PTunnelLiquids; } - -/* - @Override - public IItemDefinition p2PTunnelEU() - { - return this.p2PTunnelEU; - } - @Override - public IItemDefinition p2PTunnelRF() - { - return this.p2PTunnelRF; - } -*/ - + /* + * @Override + * public IItemDefinition p2PTunnelEU() + * { + * return this.p2PTunnelEU; + * } + * @Override + * public IItemDefinition p2PTunnelRF() + * { + * return this.p2PTunnelRF; + * } + */ + @Override public IItemDefinition p2PTunnelLight() { return this.p2PTunnelLight; } - -/* - @Override - public IItemDefinition p2PTunnelOpenComputers() - { - return this.p2PTunnelOpenComputers; - } - @Override - public IItemDefinition p2PTunnelPneumaticCraft() - { - return this.p2PTunnelPneumaticCraft; - } -*/ - + /* + * @Override + * public IItemDefinition p2PTunnelOpenComputers() + * { + * return this.p2PTunnelOpenComputers; + * } + * @Override + * public IItemDefinition p2PTunnelPneumaticCraft() + * { + * return this.p2PTunnelPneumaticCraft; + * } + */ + @Override public IItemDefinition cableAnchor() { diff --git a/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java b/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java index 4d8691753..94376c296 100644 --- a/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java +++ b/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java @@ -53,7 +53,7 @@ public class DefinitionConstructor if( definition instanceof ITileDefinition ) { - return ( (ITileDefinition) definition ); + return( (ITileDefinition) definition ); } throw new IllegalStateException( "No tile definition for " + feature ); @@ -65,7 +65,7 @@ public class DefinitionConstructor if( definition instanceof IBlockDefinition ) { - return ( (IBlockDefinition) definition ); + return( (IBlockDefinition) definition ); } throw new IllegalStateException( "No block definition for " + feature ); diff --git a/src/main/java/appeng/core/api/imc/IMCGrinder.java b/src/main/java/appeng/core/api/imc/IMCGrinder.java index 135f4ef3e..294fcbeaa 100644 --- a/src/main/java/appeng/core/api/imc/IMCGrinder.java +++ b/src/main/java/appeng/core/api/imc/IMCGrinder.java @@ -18,35 +18,35 @@ /* Example: -NBTTagCompound msg = new NBTTagCompound(); -NBTTagCompound in = new NBTTagCompound(); -NBTTagCompound out = new NBTTagCompound(); + NBTTagCompound msg = new NBTTagCompound(); + NBTTagCompound in = new NBTTagCompound(); + NBTTagCompound out = new NBTTagCompound(); -new ItemStack( Blocks.iron_ore ).writeToNBT( in ); -new ItemStack( Items.iron_ingot ).writeToNBT( out ); -msg.setTag( "in", in ); -msg.setTag( "out", out ); -msg.setInteger( "turns", 8 ); + new ItemStack( Blocks.iron_ore ).writeToNBT( in ); + new ItemStack( Items.iron_ingot ).writeToNBT( out ); + msg.setTag( "in", in ); + msg.setTag( "out", out ); + msg.setInteger( "turns", 8 ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); -- or -- -NBTTagCompound msg = new NBTTagCompound(); -NBTTagCompound in = new NBTTagCompound(); -NBTTagCompound out = new NBTTagCompound(); -NBTTagCompound optional = new NBTTagCompound(); + NBTTagCompound msg = new NBTTagCompound(); + NBTTagCompound in = new NBTTagCompound(); + NBTTagCompound out = new NBTTagCompound(); + NBTTagCompound optional = new NBTTagCompound(); -new ItemStack( Blocks.iron_ore ).writeToNBT( in ); -new ItemStack( Items.iron_ingot ).writeToNBT( out ); -new ItemStack( Blocks.gravel ).writeToNBT( optional ); -msg.setTag( "in", in ); -msg.setTag( "out", out ); -msg.setTag( "optional", optional ); -msg.setFloat( "chance", 0.5 ); -msg.setInteger( "turns", 8 ); + new ItemStack( Blocks.iron_ore ).writeToNBT( in ); + new ItemStack( Items.iron_ingot ).writeToNBT( out ); + new ItemStack( Blocks.gravel ).writeToNBT( optional ); + msg.setTag( "in", in ); + msg.setTag( "out", out ); + msg.setTag( "optional", optional ); + msg.setFloat( "chance", 0.5 ); + msg.setInteger( "turns", 8 ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); */ diff --git a/src/main/java/appeng/core/api/imc/IMCMatterCannon.java b/src/main/java/appeng/core/api/imc/IMCMatterCannon.java index 34d04b9e5..a33c41f8f 100644 --- a/src/main/java/appeng/core/api/imc/IMCMatterCannon.java +++ b/src/main/java/appeng/core/api/imc/IMCMatterCannon.java @@ -18,14 +18,14 @@ /* Example: -NBTTagCompound msg = new NBTTagCompound(); -NBTTagCompound item = new NBTTagCompound(); + NBTTagCompound msg = new NBTTagCompound(); + NBTTagCompound item = new NBTTagCompound(); -new ItemStack( Blocks.anvil ).writeToNBT( item ); -msg.setTag( "item", item ); -msg.setDouble( "weight", 32.0 ); + new ItemStack( Blocks.anvil ).writeToNBT( item ); + msg.setTag( "item", item ); + msg.setDouble( "weight", 32.0 ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-mattercannon-ammo", msg ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-mattercannon-ammo", msg ); */ diff --git a/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java b/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java index 8241b6216..4bb15d783 100644 --- a/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java +++ b/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java @@ -18,12 +18,12 @@ /* Example: -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-me", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-bc-power", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-ic2-power", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-redstone", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-fluid", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-item", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-me", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-bc-power", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-ic2-power", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-redstone", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-fluid", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-item", new ItemStack( myBlockOrItem ) ); */ diff --git a/src/main/java/appeng/core/api/imc/IMCSpatial.java b/src/main/java/appeng/core/api/imc/IMCSpatial.java index 24f9ec69a..851b86172 100644 --- a/src/main/java/appeng/core/api/imc/IMCSpatial.java +++ b/src/main/java/appeng/core/api/imc/IMCSpatial.java @@ -18,7 +18,7 @@ /* Example: -FMLInterModComms.sendMessage( "appliedenergistics2", "whitelist-spatial", "mymod.tileentities.MyTileEntity" ); + FMLInterModComms.sendMessage( "appliedenergistics2", "whitelist-spatial", "mymod.tileentities.MyTileEntity" ); */ diff --git a/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java b/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java index 72cbde527..0abec3e32 100644 --- a/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java +++ b/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java @@ -1,3 +1,4 @@ + package appeng.core.crash; diff --git a/src/main/java/appeng/core/crash/ModCrashEnhancement.java b/src/main/java/appeng/core/crash/ModCrashEnhancement.java index 43abe7830..74e509932 100644 --- a/src/main/java/appeng/core/crash/ModCrashEnhancement.java +++ b/src/main/java/appeng/core/crash/ModCrashEnhancement.java @@ -1,3 +1,4 @@ + package appeng.core.crash; @@ -7,7 +8,7 @@ import appeng.core.AEConfig; public class ModCrashEnhancement extends BaseCrashEnhancement { private static final String MOD_VERSION = AEConfig.CHANNEL + ' ' + AEConfig.VERSION + " for Forge " + // WHAT? - net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion + net.minecraftforge.common.ForgeVersion.buildVersion; diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index 47644f35b..bd6bc2160 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -69,7 +69,7 @@ public final class AECableBusFeatureHandler implements IFeatureHandler * Registration of the {@link TileEntity} will actually be handled by {@link BlockCableBus#setupTile()}. */ @Override - public void register( final Side side) + public void register( final Side side ) { if( this.enabled ) { @@ -88,13 +88,13 @@ public final class AECableBusFeatureHandler implements IFeatureHandler // Bypass the forge magic with null to register our own itemblock later. GameRegistry.registerBlock( this.featured, null, registryName ); GameRegistry.registerItem( this.definition.maybeItem().get(), registryName ); - - // register the block/item conversion... - if ( this.featured != null && this.definition.maybeItem().isPresent() ) - GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); - if ( side == Side.CLIENT) - CommonHelper.proxy.configureIcon( this.featured, name ); + // register the block/item conversion... + if( this.featured != null && this.definition.maybeItem().isPresent() ) + GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); + + if( side == Side.CLIENT ) + CommonHelper.proxy.configureIcon( this.featured, name ); } } } diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java index 4168be8c2..29b5faae0 100644 --- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java @@ -85,7 +85,7 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler GameRegistry.registerBlock( this.featured, null, registryName ); GameRegistry.registerItem( this.definition.maybeItem().get(), registryName ); AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) ); - + // register the block/item conversion... if( this.definition.maybeItem().isPresent() ) { diff --git a/src/main/java/appeng/core/features/FeatureNameExtractor.java b/src/main/java/appeng/core/features/FeatureNameExtractor.java index ebe22db63..bad846e3e 100644 --- a/src/main/java/appeng/core/features/FeatureNameExtractor.java +++ b/src/main/java/appeng/core/features/FeatureNameExtractor.java @@ -51,11 +51,11 @@ public class FeatureNameExtractor { name = PATTERN_ITEM_MULTI_MATERIAL.matcher( name ).replaceAll( "ItemMaterial" ); } - else if ( name.startsWith( "BlockStairCommon" ) ) + else if( name.startsWith( "BlockStairCommon" ) ) { name = "stair"; } - else if ( name.startsWith( "BlockFluix" ) ) + else if( name.startsWith( "BlockFluix" ) ) { name = "fluix"; } diff --git a/src/main/java/appeng/core/features/IFeatureHandler.java b/src/main/java/appeng/core/features/IFeatureHandler.java index 832454fd2..43f14315a 100644 --- a/src/main/java/appeng/core/features/IFeatureHandler.java +++ b/src/main/java/appeng/core/features/IFeatureHandler.java @@ -29,5 +29,5 @@ public interface IFeatureHandler IItemDefinition getDefinition(); - void register(Side side ); + void register( Side side ); } diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index 924d7009e..f30b6dc94 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -71,7 +71,7 @@ public final class ItemFeatureHandler implements IFeatureHandler String name = this.extractor.get(); final String itemPhysicalName = name; - //this.item.setTextureName( "appliedenergistics2:" + name ); + // this.item.setTextureName( "appliedenergistics2:" + name ); this.item.setUnlocalizedName( "appliedenergistics2." + name ); if( this.item instanceof ItemFacade ) @@ -92,7 +92,7 @@ public final class ItemFeatureHandler implements IFeatureHandler name = "ItemMultiPart"; } - // "item." + + // "item." + GameRegistry.registerItem( this.item, name ); if( side == Side.CLIENT ) diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index be7a7f7d3..dd3dcdd9a 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -164,8 +164,8 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { return null; } - - final ItemStack myItemStack = new ItemStack( item, 1, meta ); + + final ItemStack myItemStack = new ItemStack( item, 1, meta ); return myItemStack; } diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java index 265f018e5..3daf1eb4d 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java @@ -1,3 +1,4 @@ + package appeng.core.features.registries.entries; diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java index b9db8a64a..c9004fad9 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java @@ -1,3 +1,4 @@ + package appeng.core.features.registries.entries; @@ -93,7 +94,7 @@ public class InscriberRecipe implements IInscriberRecipe { return true; } - if( !(o instanceof IInscriberRecipe) ) + if( !( o instanceof IInscriberRecipe ) ) { return false; } @@ -112,7 +113,7 @@ public class InscriberRecipe implements IInscriberRecipe { return false; } - if( !this.maybeBot.equals( that.getBottomOptional()) ) + if( !this.maybeBot.equals( that.getBottomOptional() ) ) { return false; } diff --git a/src/main/java/appeng/core/localization/PlayerMessages.java b/src/main/java/appeng/core/localization/PlayerMessages.java index 412a8e61e..0f685678f 100644 --- a/src/main/java/appeng/core/localization/PlayerMessages.java +++ b/src/main/java/appeng/core/localization/PlayerMessages.java @@ -30,7 +30,7 @@ public enum PlayerMessages isNowLocked, isNowUnlocked, AmmoDepleted, CommunicationError, OutOfRange, DeviceNotPowered, DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated, - SettingCleared,; + SettingCleared, ; public IChatComponent get() { diff --git a/src/main/java/appeng/core/stats/PlayerDifferentiator.java b/src/main/java/appeng/core/stats/PlayerDifferentiator.java index 8e81ba1e4..42c82bb7b 100644 --- a/src/main/java/appeng/core/stats/PlayerDifferentiator.java +++ b/src/main/java/appeng/core/stats/PlayerDifferentiator.java @@ -33,14 +33,17 @@ public class PlayerDifferentiator { /** * Can determine if an {@link net.minecraft.entity.player.EntityPlayer} is not a real player. - * This is based on if the {@param player} is: + * This is based on if the + * + * @param player is: * - null * - dead * - fake * * @param player to be checked player * - * @return true if {@param player} is not a real player + * @return true if + * @param player is not a real player */ boolean isNoPlayer( final EntityPlayer player ) { diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index bce10f27f..935a7b776 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -36,20 +36,25 @@ import appeng.core.features.AEFeature; public class PlayerStatsRegistration { /** - * {@link net.minecraftforge.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending if the feature is enabled + * {@link net.minecraftforge.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending + * if the feature is enabled */ private final EventBus bus; /** - * is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the {@param config} + * is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the + * + * @param config} */ private final boolean isAchievementFeatureEnabled; /** - * Constructs this with an {@link net.minecraftforge.fml.common.eventhandler.EventBus} and {@link appeng.core.AEConfig}. + * Constructs this with an {@link net.minecraftforge.fml.common.eventhandler.EventBus} and + * {@link appeng.core.AEConfig}. * - * @param bus {@see #bus} - * @param config {@link appeng.core.AEConfig} which is used to determine if the {@link appeng.core.features.AEFeature#Achievements} is enabled + * @param bus {@see #bus} + * @param config {@link appeng.core.AEConfig} which is used to determine if the + * {@link appeng.core.features.AEFeature#Achievements} is enabled */ public PlayerStatsRegistration( final EventBus bus, final AEConfig config ) { @@ -58,7 +63,9 @@ public class PlayerStatsRegistration } /** - * Registers the {@link appeng.core.stats.AchievementCraftingHandler} and {@link appeng.core.stats.AchievementPickupHandler} to the {@link #bus} if {@link #isAchievementFeatureEnabled} is true. + * Registers the {@link appeng.core.stats.AchievementCraftingHandler} and + * {@link appeng.core.stats.AchievementPickupHandler} to the {@link #bus} if {@link #isAchievementFeatureEnabled} is + * true. */ public void registerAchievementHandlers() { @@ -74,7 +81,8 @@ public class PlayerStatsRegistration } /** - * Registers the {@link appeng.core.stats.AchievementHierarchy} and adds all {@link appeng.core.stats.Achievements} to a new {@link net.minecraftforge.common.AchievementPage}. + * Registers the {@link appeng.core.stats.AchievementHierarchy} and adds all {@link appeng.core.stats.Achievements} + * to a new {@link net.minecraftforge.common.AchievementPage}. */ public void registerAchievements() { diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index 80024e268..bbf67378d 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -56,7 +56,6 @@ public class AppEngPacketHandlerBase { private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap, AppEngPacketHandlerBase.PacketTypes>(); - public enum PacketTypes { PACKET_COMPASS_REQUEST( PacketCompassRequest.class ), diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 7dc14a5dd..5bd7d7f1a 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -268,7 +268,7 @@ public enum GuiBridge implements IGuiHandler } if( ID.type.isTile() ) { - final TileEntity TE = w.getTileEntity( new BlockPos(x,y,z) ); + final TileEntity TE = w.getTileEntity( new BlockPos( x, y, z ) ); if( TE instanceof IPartHost ) { ( (IPartHost) TE ).getPart( side ); @@ -295,7 +295,7 @@ public enum GuiBridge implements IGuiHandler { if( it.getItem() instanceof IGuiItem ) { - return ( (IGuiItem) it.getItem() ).getGuiObject( it, w, new BlockPos(x,y,z) ); + return ( (IGuiItem) it.getItem() ).getGuiObject( it, w, new BlockPos( x, y, z ) ); } final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler( it ); @@ -450,7 +450,7 @@ public enum GuiBridge implements IGuiHandler } if( ID.type.isTile() ) { - final TileEntity TE = w.getTileEntity( new BlockPos(x,y,z) ); + final TileEntity TE = w.getTileEntity( new BlockPos( x, y, z ) ); if( TE instanceof IPartHost ) { ( (IPartHost) TE ).getPart( side ); @@ -499,7 +499,7 @@ public enum GuiBridge implements IGuiHandler public boolean hasPermissions( final TileEntity te, final int x, final int y, final int z, final AEPartLocation side, final EntityPlayer player ) { final World w = player.getEntityWorld(); - final BlockPos pos = new BlockPos(x,y,z); + final BlockPos pos = new BlockPos( x, y, z ); if( Platform.hasPermissions( te != null ? new DimensionalCoord( te ) : new DimensionalCoord( player.worldObj, pos ), player ) ) { diff --git a/src/main/java/appeng/core/sync/PacketCallState.java b/src/main/java/appeng/core/sync/PacketCallState.java index a7bfd452c..74a026283 100644 --- a/src/main/java/appeng/core/sync/PacketCallState.java +++ b/src/main/java/appeng/core/sync/PacketCallState.java @@ -1,9 +1,10 @@ + package appeng.core.sync; + public abstract class PacketCallState { public abstract void call( AppEngPacket appEngPacket ); - } diff --git a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java index be9c3345a..a93a70a53 100644 --- a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java @@ -52,17 +52,17 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream ); final PacketCallState callState = - new PacketCallState(){ - - @Override - public void call( - final AppEngPacket appEngPacket ) - { - appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer ); - } - }; - - pack.setCallParam(callState); + new PacketCallState(){ + + @Override + public void call( + final AppEngPacket appEngPacket ) + { + appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer ); + } + }; + + pack.setCallParam( callState ); PacketThreadUtil.checkThreadAndEnqueue( pack, handler, Minecraft.getMinecraft() ); callState.call( pack ); } diff --git a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java index a76f03ae6..ab7fd3302 100644 --- a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java @@ -46,20 +46,20 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp { final int packetType = stream.readInt(); final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream ); - + final PacketCallState callState = - new PacketCallState(){ - - @Override - public void call( - final AppEngPacket appEngPacket ) - { - appEngPacket.serverPacketData( manager, appEngPacket, player); - } - }; - - pack.setCallParam(callState); - PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ((EntityPlayerMP)player).getServerForPlayer() ); + new PacketCallState(){ + + @Override + public void call( + final AppEngPacket appEngPacket ) + { + appEngPacket.serverPacketData( manager, appEngPacket, player ); + } + }; + + pack.setCallParam( callState ); + PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ( (EntityPlayerMP) player ).getServerForPlayer() ); callState.call( pack ); } catch( final InstantiationException e ) diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 1a31fbd87..9cbfa9063 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -34,6 +34,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import appeng.core.sync.AppEngPacket; import appeng.core.worlddata.WorldData; + public class NetworkHandler { public static NetworkHandler instance; @@ -103,9 +104,9 @@ public class NetworkHandler { this.serveHandler.onPacketData( null, ev.handler, ev.packet, srv.playerEntity ); } - catch ( final ThreadQuickExitException ignored ) + catch( final ThreadQuickExitException ignored ) { - + } } } @@ -119,9 +120,9 @@ public class NetworkHandler { this.clientHandler.onPacketData( null, ev.handler, ev.packet, null ); } - catch ( final ThreadQuickExitException ignored ) + catch( final ThreadQuickExitException ignored ) { - + } } } diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/PacketClick.java index fc35edf02..c87c37d7a 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/PacketClick.java @@ -90,7 +90,7 @@ public class PacketClick extends AppEngPacket if( is.getItem() instanceof ToolNetworkTool ) { final ToolNetworkTool tnt = (ToolNetworkTool) is.getItem(); - tnt.serverSideToolLogic( is, player, player.worldObj, new BlockPos( this.x, this.y, this.z), EnumFacing.VALUES[ this.side ], this.hitX, this.hitY, this.hitZ ); + tnt.serverSideToolLogic( is, player, player.worldObj, new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.side], this.hitX, this.hitY, this.hitZ ); } else if( maybeMemoryCard.isSameAs( is ) ) diff --git a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java index ec2a5eb14..2f80e4e30 100644 --- a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java +++ b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java @@ -65,7 +65,7 @@ public final class PacketConfigButton extends AppEngPacket public void serverPacketData( final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player ) { final EntityPlayerMP sender = (EntityPlayerMP) player; - if ( sender.openContainer instanceof AEBaseContainer ) + if( sender.openContainer instanceof AEBaseContainer ) { final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer; if( baseContainer.getTarget() instanceof IConfigurableObject ) diff --git a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java index 53b35cd97..b755fc867 100644 --- a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java @@ -48,7 +48,7 @@ public interface IWorldPlayerMapping /** * Put in new players when they join the server * - * @param id id of new player + * @param id id of new player * @param uuid UUID of new player */ void put( int id, @Nonnull UUID uuid ); diff --git a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java index 8caef8e2e..0f4847098 100644 --- a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java +++ b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java @@ -65,10 +65,11 @@ public class MeteorDataNameEncoder /** * @param dimension ID of the processed dimension. Can be any integer - * @param chunkX X coordinate of the chunk. Can be any integer - * @param chunkZ Z coordinate of the chunk. Can be any integer + * @param chunkX X coordinate of the chunk. Can be any integer + * @param chunkZ Z coordinate of the chunk. Can be any integer * - * @return encoded file name suggestion in form of dim_x_y.dat where x and y will be shifted to stay conform with the vanilla chunk system + * @return encoded file name suggestion in form of dim_x_y.dat where x and y will be + * shifted to stay conform with the vanilla chunk system * * @since rv3 05.06.2015 */ diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index 7564614b1..789d406d0 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -57,7 +57,8 @@ final class SpawnData implements IWorldSpawnData } @Override - public void setGenerated( final int dim, final int chunkX, final int chunkZ ) { + public void setGenerated( final int dim, final int chunkX, final int chunkZ ) + { synchronized( SpawnData.class ) { final NBTTagCompound data = this.loadSpawnData( dim, chunkX, chunkZ ); diff --git a/src/main/java/appeng/debug/BlockCubeGenerator.java b/src/main/java/appeng/debug/BlockCubeGenerator.java index 501d7c5df..6283c48be 100644 --- a/src/main/java/appeng/debug/BlockCubeGenerator.java +++ b/src/main/java/appeng/debug/BlockCubeGenerator.java @@ -39,7 +39,7 @@ public class BlockCubeGenerator extends AEBaseTileBlock this.setTileEntity( TileCubeGenerator.class ); this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } - + @Override public boolean onActivated( final World w, @@ -58,5 +58,5 @@ public class BlockCubeGenerator extends AEBaseTileBlock return true; } - + } diff --git a/src/main/java/appeng/debug/BlockItemGen.java b/src/main/java/appeng/debug/BlockItemGen.java index 62cdb879d..1a980ab36 100644 --- a/src/main/java/appeng/debug/BlockItemGen.java +++ b/src/main/java/appeng/debug/BlockItemGen.java @@ -35,5 +35,5 @@ public class BlockItemGen extends AEBaseTileBlock this.setTileEntity( TileItemGen.class ); this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } - + } diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index 494b3f22b..e6e5b125d 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -131,16 +131,16 @@ public class TileItemGen extends AEBaseTile implements IInventory public void openInventory( final EntityPlayer player ) { - + } - + @Override public void closeInventory( final EntityPlayer player ) { - + } - + @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { @@ -165,7 +165,7 @@ public class TileItemGen extends AEBaseTile implements IInventory final int id, final int value ) { - + } @Override @@ -177,6 +177,6 @@ public class TileItemGen extends AEBaseTile implements IInventory @Override public void clear() { - + } } diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index 97e89655e..a2234eacb 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -44,7 +44,7 @@ public class ToolEraser extends AEBaseItem { this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } - + @Override public boolean onItemUseFirst( final ItemStack stack, diff --git a/src/main/java/appeng/debug/ToolMeteoritePlacer.java b/src/main/java/appeng/debug/ToolMeteoritePlacer.java index 25f59e2fe..f4d0d911c 100644 --- a/src/main/java/appeng/debug/ToolMeteoritePlacer.java +++ b/src/main/java/appeng/debug/ToolMeteoritePlacer.java @@ -58,7 +58,7 @@ public class ToolMeteoritePlacer extends AEBaseItem } final MeteoritePlacer mp = new MeteoritePlacer(); - final boolean worked = mp.spawnMeteorite( new StandardWorld( world ), pos.getX(),pos.getY(),pos.getZ() ); + final boolean worked = mp.spawnMeteorite( new StandardWorld( world ), pos.getX(), pos.getY(), pos.getZ() ); if( !worked ) { diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 195f3d219..128cc4a9a 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -50,7 +50,7 @@ public class ToolReplicatorCard extends AEBaseItem { this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } - + @Override public boolean onItemUseFirst( final ItemStack stack, @@ -70,7 +70,7 @@ public class ToolReplicatorCard extends AEBaseItem int x = pos.getX(); int y = pos.getY(); int z = pos.getZ(); - + if( player.isSneaking() ) { if( world.getTileEntity( pos ) instanceof IGridHost ) @@ -140,11 +140,11 @@ public class ToolReplicatorCard extends AEBaseItem { for( int k = 1; k < scale_z; k++ ) { - final BlockPos p = new BlockPos( min_x + i, min_y + j, min_z + k ); + final BlockPos p = new BlockPos( min_x + i, min_y + j, min_z + k ); final BlockPos d = new BlockPos( i + rel_x, j + rel_y, k + rel_z ); final IBlockState state = src_w.getBlockState( p ); final Block blk = state.getBlock(); - + world.setBlockState( d, state ); if( blk != null && blk.hasTileEntity( state ) ) { diff --git a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java index e55ab8067..2310eb57b 100644 --- a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java @@ -42,7 +42,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock this.setBoostBrightnessLow( 2 ); this.setBoostBrightnessHigh( 5 ); } - + @Override public Item getItemDropped( final IBlockState state, @@ -61,7 +61,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock public int damageDropped( final IBlockState state ) { - for ( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() ) + for( final ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() ) { return crystalStack.getItemDamage(); } @@ -76,7 +76,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock final IBlockState state, final Random r ) { - if ( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance.enableEffects ) { return; } diff --git a/src/main/java/appeng/decorative/solid/FluixIdentifier.java b/src/main/java/appeng/decorative/solid/FluixIdentifier.java index 3aae6acd2..d32d728cb 100644 --- a/src/main/java/appeng/decorative/solid/FluixIdentifier.java +++ b/src/main/java/appeng/decorative/solid/FluixIdentifier.java @@ -1,3 +1,4 @@ + package appeng.decorative.solid; diff --git a/src/main/java/appeng/decorative/solid/Identifier.java b/src/main/java/appeng/decorative/solid/Identifier.java index a252ee5b6..c833b6f8e 100644 --- a/src/main/java/appeng/decorative/solid/Identifier.java +++ b/src/main/java/appeng/decorative/solid/Identifier.java @@ -1,3 +1,4 @@ + package appeng.decorative.solid; diff --git a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java index 2d29dfcbf..11f34277b 100644 --- a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java @@ -44,7 +44,7 @@ public class QuartzGlassBlock extends AEBaseBlock this.setOpaque( false ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } - + @Override public EnumWorldBlockLayer getBlockLayer() { diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java index c60f2f87a..f47d0e475 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -58,7 +58,7 @@ public class QuartzOreBlock extends AEBaseBlock this.enhanceBrightness = false; this.setFeature( EnumSet.of( AEFeature.Core ) ); } - + @Override public EnumWorldBlockLayer getBlockLayer() { @@ -110,7 +110,7 @@ public class QuartzOreBlock extends AEBaseBlock { return 1 + rand.nextInt( 2 ); } - + @Override public Item getItemDropped( final IBlockState state, /* is null */ diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index fc0bd5ad8..2cc054830 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -49,18 +49,18 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock { return 0; } - + @Override public IBlockState getStateFromMeta( final int meta ) { return this.getDefaultState(); } - + @Override protected IProperty[] getAEStates() { - return new IProperty[]{ AXIS_ORIENTATION }; + return new IProperty[] { AXIS_ORIENTATION }; } @Override @@ -72,7 +72,7 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock @Override public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos ) { - return new MetaRotation( w, pos,false ); + return new MetaRotation( w, pos, false ); } - + } diff --git a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java b/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java index 7872bd5cb..ff1deba2c 100644 --- a/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java +++ b/src/main/java/appeng/decorative/stair/DecorativeStairIdentifier.java @@ -1,3 +1,4 @@ + package appeng.decorative.stair; @@ -23,14 +24,14 @@ import appeng.decorative.solid.Identifier; */ public enum DecorativeStairIdentifier implements Identifier { - FLUIX("stair.fluix"), - CHISELED_CERTUS_QUARTZ("stair.quartz.certus.chiseled"), - CERTUS_QUARTZ("stair.quartz.certus"), - CERTUS_QUARTZ_PILLAR("stair.quartz.certus.pillar"), - SKYSTONE("stair.skystone"), - SKYSTONE_BLOCK("stair.skystone.block"), - SKYSTONE_BRICK("stair.skystone.brick"), - SKYSTONE_SMALL_BRICK("stair.skystone.brick.small"); + FLUIX( "stair.fluix" ), + CHISELED_CERTUS_QUARTZ( "stair.quartz.certus.chiseled" ), + CERTUS_QUARTZ( "stair.quartz.certus" ), + CERTUS_QUARTZ_PILLAR( "stair.quartz.certus.pillar" ), + SKYSTONE( "stair.skystone" ), + SKYSTONE_BLOCK( "stair.skystone.block" ), + SKYSTONE_BRICK( "stair.skystone.brick" ), + SKYSTONE_SMALL_BRICK( "stair.skystone.brick.small" ); private final String name; diff --git a/src/main/java/appeng/decorative/stair/FluixStairBlock.java b/src/main/java/appeng/decorative/stair/FluixStairBlock.java index 46cd3fc97..800a6321a 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairBlock.java +++ b/src/main/java/appeng/decorative/stair/FluixStairBlock.java @@ -1,3 +1,4 @@ + package appeng.decorative.stair; diff --git a/src/main/java/appeng/decorative/stair/FluixStairComponent.java b/src/main/java/appeng/decorative/stair/FluixStairComponent.java index 078ad9451..4fa45f738 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairComponent.java +++ b/src/main/java/appeng/decorative/stair/FluixStairComponent.java @@ -1,3 +1,4 @@ + package appeng.decorative.stair; diff --git a/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java b/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java index e9fb79412..9d762359a 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java +++ b/src/main/java/appeng/decorative/stair/FluixStairIdentifier.java @@ -1,3 +1,4 @@ + package appeng.decorative.stair; diff --git a/src/main/java/appeng/decorative/stair/FluixStairSupplier.java b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java index ee2120e5d..d2f00e73f 100644 --- a/src/main/java/appeng/decorative/stair/FluixStairSupplier.java +++ b/src/main/java/appeng/decorative/stair/FluixStairSupplier.java @@ -1,3 +1,4 @@ + package appeng.decorative.stair; diff --git a/src/main/java/appeng/decorative/stair/StairBlockDefinition.java b/src/main/java/appeng/decorative/stair/StairBlockDefinition.java index 1edb36987..bb5e3e8e9 100644 --- a/src/main/java/appeng/decorative/stair/StairBlockDefinition.java +++ b/src/main/java/appeng/decorative/stair/StairBlockDefinition.java @@ -1,3 +1,4 @@ + package appeng.decorative.stair; diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/EntityGrowingCrystal.java index 16f3e3139..c2cfdab6c 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/EntityGrowingCrystal.java @@ -62,7 +62,7 @@ public final class EntityGrowingCrystal extends EntityItem { return; } - + final ItemStack is = this.getEntityItem(); final Item gc = is.getItem(); diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index 30bc483fe..847adee26 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -57,7 +57,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit { super( w, x, y, z, igniter ); this.setSize( 0.55F, 0.55F ); - //this.yOffset = this.height / 2.0F; + // this.yOffset = this.height / 2.0F; } /** @@ -147,7 +147,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit { for( int z = (int) ( this.posZ - 2 ); z <= this.posZ + 2; z++ ) { - final BlockPos point = new BlockPos( x,y,z); + final BlockPos point = new BlockPos( x, y, z ); final IBlockState state = this.worldObj.getBlockState( point ); final Block block = state.getBlock(); if( block != null && !block.isAir( this.worldObj, point ) ) diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index aa38b24a9..59ee5072c 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -147,8 +147,7 @@ public class FacadeContainer implements IFacadeContainer this.storage.setFacade( x, created ); } - else - if( !isBC ) + else if( !isBC ) { for( final Item facadeItem : AEApi.instance().definitions().items().facade().maybeItem().asSet() ) { diff --git a/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java index 01244afab..5933be7ed 100644 --- a/src/main/java/appeng/helpers/AEGlassMaterial.java +++ b/src/main/java/appeng/helpers/AEGlassMaterial.java @@ -32,13 +32,13 @@ public class AEGlassMaterial extends Material { super( color ); } - + @Override public boolean isSolid() { return false; } - + @Override public boolean isOpaque() { diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 05cad774b..1d9e31411 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -1269,7 +1269,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - private class InterfaceInventory extends MEMonitorIInventory { diff --git a/src/main/java/appeng/helpers/LocationRotation.java b/src/main/java/appeng/helpers/LocationRotation.java index 9a8cc8f0e..9d85ca181 100644 --- a/src/main/java/appeng/helpers/LocationRotation.java +++ b/src/main/java/appeng/helpers/LocationRotation.java @@ -60,7 +60,7 @@ public class LocationRotation implements IOrientable public EnumFacing getUp() { final int num = Math.abs( this.x + this.y + this.z ) % 6; - return EnumFacing.VALUES[ num ]; + return EnumFacing.VALUES[num]; } @Override diff --git a/src/main/java/appeng/helpers/Reflected.java b/src/main/java/appeng/helpers/Reflected.java index 6e0c84da8..c07432ad7 100644 --- a/src/main/java/appeng/helpers/Reflected.java +++ b/src/main/java/appeng/helpers/Reflected.java @@ -1,3 +1,4 @@ + package appeng.helpers; diff --git a/src/main/java/appeng/hooks/AETrading.java b/src/main/java/appeng/hooks/AETrading.java index e907e8ebe..20ba43120 100644 --- a/src/main/java/appeng/hooks/AETrading.java +++ b/src/main/java/appeng/hooks/AETrading.java @@ -18,97 +18,82 @@ package appeng.hooks; + // TODO Villager Trading!??!?! public class AETrading { /* - @Override - public void manipulateTradesForVillager( EntityVillager villager, MerchantRecipeList recipeList, Random random ) - { - final IMaterials materials = AEApi.instance().definitions().materials(); + * @Override + * public void manipulateTradesForVillager( EntityVillager villager, MerchantRecipeList recipeList, Random random ) + * { + * final IMaterials materials = AEApi.instance().definitions().materials(); + * this.addMerchant( recipeList, materials.silicon(), 1, random, 2 ); + * this.addMerchant( recipeList, materials.certusQuartzCrystal(), 2, random, 4 ); + * this.addMerchant( recipeList, materials.certusQuartzDust(), 1, random, 3 ); + * this.addTrade( recipeList, materials.certusQuartzDust(), materials.certusQuartzCrystal(), random, 2 ); + * } + * private void addMerchant( MerchantRecipeList list, IItemDefinition item, int emera, Random rand, int greed ) + * { + * for( ItemStack itemStack : item.maybeStack( 1 ).asSet() ) + * { + * // Sell + * ItemStack from = itemStack.copy(); + * ItemStack to = new ItemStack( Items.emerald ); + * int multiplier = ( Math.abs( rand.nextInt() ) % 6 ); + * final int emeraldCost = emera + ( Math.abs( rand.nextInt() ) % greed ) - multiplier; + * int mood = rand.nextInt() % 2; + * from.stackSize = multiplier + mood; + * to.stackSize = multiplier * emeraldCost - mood; + * if( to.stackSize < 0 ) + * { + * from.stackSize -= to.stackSize; + * to.stackSize -= to.stackSize; + * } + * this.addToList( list, from, to ); + * // Buy + * ItemStack reverseTo = from.copy(); + * ItemStack reverseFrom = to.copy(); + * reverseFrom.stackSize *= rand.nextFloat() * 3.0f + 1.0f; + * this.addToList( list, reverseFrom, reverseTo ); + * } + * } + * private void addTrade( MerchantRecipeList list, IItemDefinition inputDefinition, IItemDefinition + * outputDefinition, Random rand, int conversionVariance ) + * { + * final Optional maybeInputStack = inputDefinition.maybeStack( 1 ); + * final Optional maybeOutputStack = outputDefinition.maybeStack( 1 ); + * if( maybeInputStack.isPresent() && maybeOutputStack.isPresent() ) + * { + * // Sell + * ItemStack inputStack = maybeInputStack.get().copy(); + * ItemStack outputStack = maybeOutputStack.get().copy(); + * inputStack.stackSize = 1 + ( Math.abs( rand.nextInt() ) % ( 1 + conversionVariance ) ); + * outputStack.stackSize = 1; + * this.addToList( list, inputStack, outputStack ); + * } + * } + * private void addToList( MerchantRecipeList l, ItemStack a, ItemStack b ) + * { + * if( a.stackSize < 1 ) + * { + * a.stackSize = 1; + * } + * if( b.stackSize < 1 ) + * { + * b.stackSize = 1; + * } + * if( a.stackSize > a.getMaxStackSize() ) + * { + * a.stackSize = a.getMaxStackSize(); + * } + * if( b.stackSize > b.getMaxStackSize() ) + * { + * b.stackSize = b.getMaxStackSize(); + * } + * l.add( new MerchantRecipe( a, b ) ); + * } + */ - this.addMerchant( recipeList, materials.silicon(), 1, random, 2 ); - this.addMerchant( recipeList, materials.certusQuartzCrystal(), 2, random, 4 ); - this.addMerchant( recipeList, materials.certusQuartzDust(), 1, random, 3 ); - - this.addTrade( recipeList, materials.certusQuartzDust(), materials.certusQuartzCrystal(), random, 2 ); - } - - private void addMerchant( MerchantRecipeList list, IItemDefinition item, int emera, Random rand, int greed ) - { - for( ItemStack itemStack : item.maybeStack( 1 ).asSet() ) - { - // Sell - ItemStack from = itemStack.copy(); - ItemStack to = new ItemStack( Items.emerald ); - - int multiplier = ( Math.abs( rand.nextInt() ) % 6 ); - final int emeraldCost = emera + ( Math.abs( rand.nextInt() ) % greed ) - multiplier; - int mood = rand.nextInt() % 2; - - from.stackSize = multiplier + mood; - to.stackSize = multiplier * emeraldCost - mood; - - if( to.stackSize < 0 ) - { - from.stackSize -= to.stackSize; - to.stackSize -= to.stackSize; - } - - this.addToList( list, from, to ); - - // Buy - ItemStack reverseTo = from.copy(); - ItemStack reverseFrom = to.copy(); - - reverseFrom.stackSize *= rand.nextFloat() * 3.0f + 1.0f; - - this.addToList( list, reverseFrom, reverseTo ); - } - } - - private void addTrade( MerchantRecipeList list, IItemDefinition inputDefinition, IItemDefinition outputDefinition, Random rand, int conversionVariance ) - { - final Optional maybeInputStack = inputDefinition.maybeStack( 1 ); - final Optional maybeOutputStack = outputDefinition.maybeStack( 1 ); - - if( maybeInputStack.isPresent() && maybeOutputStack.isPresent() ) - { - // Sell - ItemStack inputStack = maybeInputStack.get().copy(); - ItemStack outputStack = maybeOutputStack.get().copy(); - - inputStack.stackSize = 1 + ( Math.abs( rand.nextInt() ) % ( 1 + conversionVariance ) ); - outputStack.stackSize = 1; - - this.addToList( list, inputStack, outputStack ); - } - } - - private void addToList( MerchantRecipeList l, ItemStack a, ItemStack b ) - { - if( a.stackSize < 1 ) - { - a.stackSize = 1; - } - if( b.stackSize < 1 ) - { - b.stackSize = 1; - } - - if( a.stackSize > a.getMaxStackSize() ) - { - a.stackSize = a.getMaxStackSize(); - } - if( b.stackSize > b.getMaxStackSize() ) - { - b.stackSize = b.getMaxStackSize(); - } - - l.add( new MerchantRecipe( a, b ) ); - } - */ - } diff --git a/src/main/java/appeng/hooks/IBlockTool.java b/src/main/java/appeng/hooks/IBlockTool.java index f7ea7bcc8..f0c514dbc 100644 --- a/src/main/java/appeng/hooks/IBlockTool.java +++ b/src/main/java/appeng/hooks/IBlockTool.java @@ -38,5 +38,5 @@ public interface IBlockTool float hitX, float hitY, float hitZ ); - + } diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index b75ad6f6e..7e66933ae 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -316,7 +316,6 @@ public class TickHandler } } - public static class PlayerColor { diff --git a/src/main/java/appeng/integration/IntegrationType.java b/src/main/java/appeng/integration/IntegrationType.java index 3207a2437..583a5506f 100644 --- a/src/main/java/appeng/integration/IntegrationType.java +++ b/src/main/java/appeng/integration/IntegrationType.java @@ -29,9 +29,9 @@ public enum IntegrationType BuildCraftCore( IntegrationSide.BOTH, "BuildCraft Core", "BuildCraft|Core" ), - BuildCraftTransport( IntegrationSide.BOTH, "BuildCraft Transport", "BuildCraft|Transport"), + BuildCraftTransport( IntegrationSide.BOTH, "BuildCraft Transport", "BuildCraft|Transport" ), - BuildCraftBuilder( IntegrationSide.BOTH, "BuildCraft Builders", "BuildCraft|Builders"), + BuildCraftBuilder( IntegrationSide.BOTH, "BuildCraft Builders", "BuildCraft|Builders" ), RF( IntegrationSide.BOTH, "RedstoneFlux Power - Tiles", "CoFHAPI" ), diff --git a/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java b/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java index f75b562cd..3fd581b7c 100644 --- a/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java +++ b/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java @@ -30,7 +30,8 @@ import net.minecraft.util.BlockPos; /** * Contains wrench behaviour * - * and registers the engines as P2P attunements for RF tunnels (since BC 7, they are part of BC Core) The attunement is currently not public anymore, because it + * and registers the engines as P2P attunements for RF tunnels (since BC 7, they are part of BC Core) The attunement is + * currently not public anymore, because it * was only used internally * * @author AlgorithmX2 @@ -54,7 +55,7 @@ public interface IBuildCraftCore * @return {@code true} if player can wrench with that {@code wrench} * * @throws NullPointerException if {@code wrench} is {@code null} - * @throws ClassCastException if {@code wrench} is not an {@link buildcraft.api.tools.IToolWrench} + * @throws ClassCastException if {@code wrench} is not an {@link buildcraft.api.tools.IToolWrench} */ boolean canWrench( @Nonnull Item wrench, EntityPlayer wrencher, BlockPos pos ); @@ -64,7 +65,7 @@ public interface IBuildCraftCore * @param pos pos * * @throws NullPointerException if {@code wrench} is {@code null} - * @throws ClassCastException if {@code wrench} is not an {@link buildcraft.api.tools.IToolWrench} + * @throws ClassCastException if {@code wrench} is not an {@link buildcraft.api.tools.IToolWrench} */ void wrenchUsed( @Nonnull Item wrench, EntityPlayer wrencher, BlockPos pos ); } diff --git a/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java b/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java index 1fa6ba885..cad64b423 100644 --- a/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java +++ b/src/main/java/appeng/integration/abstraction/IBuildCraftTransport.java @@ -86,12 +86,13 @@ public interface IBuildCraftTransport /** * @return texture of buildcraft cobblestone structure pipe or null if something bad happens -// */ + * // + */ @Nullable IAESprite getCobbleStructurePipeTexture(); /** - * @param te the to be checked {@link TileEntity} + * @param te the to be checked {@link TileEntity} * @param dir direction of the {@link TileEntity} * * @return {@code true} if {@code te} is a buildcraft pipe, but not plugged diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index e124f5845..0d009131f 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -108,10 +108,10 @@ public abstract class AEBaseItem extends Item implements IAEFeature super.addInformation( stack, player, lines, displayMoreInfo ); } - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) protected IAESprite myIcon = null; - - @SideOnly(Side.CLIENT) + + @SideOnly( Side.CLIENT ) public void registerIcons( final ClientHelper proxy, final String name ) { @@ -124,11 +124,11 @@ public abstract class AEBaseItem extends Item implements IAEFeature return this.myIcon; } - @SideOnly(Side.CLIENT) - public void registerCustomIcon( + @SideOnly( Side.CLIENT ) + public void registerCustomIcon( final TextureMap map ) { - + } protected void getCheckedSubItems( final Item sameItem, final CreativeTabs creativeTab, final List itemStacks ) diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index 0f9f33c29..982a2895e 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -109,15 +109,15 @@ public class NetworkToolViewer implements INetworkTool } @Override - public void openInventory( final EntityPlayer player) + public void openInventory( final EntityPlayer player ) { - this.inv.openInventory(player); + this.inv.openInventory( player ); } @Override - public void closeInventory( final EntityPlayer player) + public void closeInventory( final EntityPlayer player ) { - this.inv.closeInventory(player); + this.inv.closeInventory( player ); } @Override diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 83c4f7313..bd2b1c280 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -49,27 +49,26 @@ public class ItemPaintBall extends AEBaseItem } @Override - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) public void registerIcons( final ClientHelper ir, final String name ) { final ModelResourceLocation sloc = ir.setIcon( this, name + "Shimmer" ); final ModelResourceLocation loc = ir.setIcon( this, name ); - - + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){ - + @Override public ModelResourceLocation getModelLocation( final ItemStack stack ) { - if ( ItemPaintBall.this.isLumen(stack) ) + if( ItemPaintBall.this.isLumen( stack ) ) return sloc; - + return loc; } - }); + } ); } - + @Override public String getItemStackDisplayName( final ItemStack is ) { @@ -80,14 +79,14 @@ public class ItemPaintBall extends AEBaseItem { return ( is.getItemDamage() >= DAMAGE_THRESHOLD ? GuiText.Lumen.getLocal() + ' ' : "" ) + this.getColor( is ); } - + @Override public int getColorFromItemStack( final ItemStack stack, final int renderPass ) { - final AEColor col = this.getColor(stack); - + final AEColor col = this.getColor( stack ); + final int colorValue = stack.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant; final int r = ( colorValue >> 16 ) & 0xff; final int g = ( colorValue >> 8 ) & 0xff; @@ -97,11 +96,11 @@ public class ItemPaintBall extends AEBaseItem { final float fail = 0.7f; final int full = (int) ( 255 * 0.3 ); - return (int)( full + r * fail ) << 16 | (int)( full + g * fail ) << 8 | (int)( full + b * fail ) | 0xff << 24; + return (int) ( full + r * fail ) << 16 | (int) ( full + g * fail ) << 8 | (int) ( full + b * fail ) | 0xff << 24; } else { - return r << 16 | g << 8 | b | 0xff << 24 ; + return r << 16 | g << 8 | b | 0xff << 24; } } diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 83d2919c7..172c694b5 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -229,9 +229,9 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte { if( data.hasKey( "modid" ) && data.hasKey( "itemname" ) ) { - if ( data.getString( "modid" ).equals( "minecraft" ) ) + if( data.getString( "modid" ).equals( "minecraft" ) ) return Block.getBlockFromName( data.getString( "itemname" ) ); - + return GameRegistry.findBlock( data.getString( "modid" ), data.getString( "itemname" ) ); } else @@ -294,11 +294,11 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte return false; } - + @Override - public void registerCustomIcon( + public void registerCustomIcon( final TextureMap map ) { - this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) )); + this.myIcon = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/ItemFacade" ) ) ); } } diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index a1dd99717..b4e597ebb 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -182,7 +182,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG { return false; } - + return AEApi.instance().partHelper().placeBus( is, pos, side, player, w ); } @@ -192,15 +192,14 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG return "item.appliedenergistics2." + this.getName( is ); } - @Override - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) public void registerCustomIcon( final TextureMap map ) { for( final Entry part : this.registered.entrySet() ) { - part.getValue().texture= new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + this.getName( new ItemStack( this, 1, part.getKey() ) ) )) ); + part.getValue().texture = new BaseIcon( map.registerSprite( new ResourceLocation( AppEng.MOD_ID, "blocks/" + this.getName( new ItemStack( this, 1, part.getKey() ) ) ) ) ); } } @@ -213,10 +212,10 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG { return registeredType.texture; } - + return new MissingIcon( this ); } - + @Override public String getItemStackDisplayName( final ItemStack is ) { @@ -376,9 +375,9 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG private final PartType part; private final int variant; - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) public IAESprite texture = null; - + private PartTypeWithVariant( final PartType part, final int variant ) { assert part != null; diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index 52d51383c..c7564b39e 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -148,15 +148,19 @@ public enum PartType P2PTunnelLiquids( 463, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ), - //P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ), + // P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ), + // PartP2PIC2Power.class, GuiText.EUTunnel ), - //P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ), PartP2PRFPower.class, GuiText.RFTunnel ), + // P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ), + // PartP2PRFPower.class, GuiText.RFTunnel ), P2PTunnelLight( 467, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ), -// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ), + // P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( + // IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ), -// P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of( IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ), + // P2PTunnelPressure( 469, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelPressure ), EnumSet.of( + // IntegrationType.PneumaticCraft ), PartP2PPressure.class, GuiText.PressureTunnel ), InterfaceTerminal( 480, EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index e2fba5878..7c1c5e4f3 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -161,7 +161,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard return super.onItemUse( is, player, w, pos, side, hx, hy, hz ); } } - + @Override public boolean doesSneakBypassUse( final World world, diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 297bf392e..84d4acdc1 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -53,9 +53,10 @@ import appeng.util.Platform; import com.google.common.base.Optional; + // TODO BC Integration //@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore ) -public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /*, IToolWrench */ +public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench /* , IToolWrench */ { public ToolNetworkTool() @@ -83,20 +84,20 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / if( mop == null ) { - this.onItemUseFirst( it, p, w, new BlockPos(0,0,0), null, 0,0,0 ); // eh? + this.onItemUseFirst( it, p, w, new BlockPos( 0, 0, 0 ), null, 0, 0, 0 ); // eh? } else { if( w.getBlockState( mop.getBlockPos() ).getBlock().isAir( w, mop.getBlockPos() ) ) { - this.onItemUseFirst( it, p, w, new BlockPos(0,0,0), null, 0,0,0 ); // eh? + this.onItemUseFirst( it, p, w, new BlockPos( 0, 0, 0 ), null, 0, 0, 0 ); // eh? } } } return it; } - + @Override public boolean onItemUseFirst( final ItemStack stack, @@ -209,5 +210,5 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } // TODO: BC WRENCH INTEGRATION - + } diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 170e3c053..b940a0b2f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -175,7 +175,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe } // clean paint balls.. - final Block testBlk = w.getBlockState( pos.offset( side ) ).getBlock(); + 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 ) { @@ -368,50 +368,50 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe private boolean recolourBlock( final Block blk, final EnumFacing side, final World w, final BlockPos pos, final EnumFacing orientation, final AEColor newColor, final EntityPlayer p ) { final IBlockState state = w.getBlockState( pos ); - + if( blk instanceof BlockColored ) { - final EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockColored.COLOR ); - + final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockColored.COLOR ); + if( newColor.dye == color ) { return false; } - + return w.setBlockState( pos, state.withProperty( BlockColored.COLOR, newColor.dye ) ); } if( blk == Blocks.glass ) { - return w.setBlockState( pos, Blocks.stained_glass.getDefaultState().withProperty( BlockStainedGlass.COLOR, newColor.dye) ); + return w.setBlockState( pos, Blocks.stained_glass.getDefaultState().withProperty( BlockStainedGlass.COLOR, newColor.dye ) ); } if( blk == Blocks.stained_glass ) { - final EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockStainedGlass.COLOR ); - + final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockStainedGlass.COLOR ); + if( newColor.dye == color ) { return false; } - + return w.setBlockState( pos, state.withProperty( BlockStainedGlass.COLOR, newColor.dye ) ); } if( blk == Blocks.glass_pane ) { - return w.setBlockState( pos, Blocks.stained_glass_pane.getDefaultState().withProperty( BlockStainedGlassPane.COLOR, newColor.dye) ); + return w.setBlockState( pos, Blocks.stained_glass_pane.getDefaultState().withProperty( BlockStainedGlassPane.COLOR, newColor.dye ) ); } if( blk == Blocks.stained_glass_pane ) { - final EnumDyeColor color = ( EnumDyeColor ) state.getValue( BlockStainedGlassPane.COLOR ); - + final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockStainedGlassPane.COLOR ); + if( newColor.dye == color ) { return false; } - + return w.setBlockState( pos, state.withProperty( BlockStainedGlassPane.COLOR, newColor.dye ) ); } diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index d1bc07364..9c05dce5b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -303,8 +303,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final TileEntity te = w.getTileEntity( hitPos ); if( te instanceof TilePaint ) { - final Vec3 hp = pos.hitVec.subtract( hitPos.getX(), hitPos.getY(), hitPos.getZ() ); - ( (TilePaint) te ).addBlot( type, side.getOpposite(), hp ); + final Vec3 hp = pos.hitVec.subtract( hitPos.getX(), hitPos.getY(), hitPos.getZ() ); + ( (TilePaint) te ).addBlot( type, side.getOpposite(), hp ); } } } diff --git a/src/main/java/appeng/items/tools/powered/powersink/IC2.java b/src/main/java/appeng/items/tools/powered/powersink/IC2.java index d6d3c1cb9..eea80ebde 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/IC2.java +++ b/src/main/java/appeng/items/tools/powered/powersink/IC2.java @@ -141,4 +141,4 @@ package appeng.items.tools.powered.powersink; // { // return this; // } -//} +// } diff --git a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java index ef8fce724..bebd8b1b9 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java @@ -61,4 +61,4 @@ package appeng.items.tools.powered.powersink; // { // return (int) PowerUnits.AE.convertTo( PowerUnits.RF, this.getAEMaxPower( is ) ); // } -//} +// } diff --git a/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java b/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java index 632655844..53e4b3371 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java +++ b/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java @@ -18,6 +18,7 @@ package appeng.items.tools.powered.powersink; + /* @Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2") public class UniversalElectricity extends ThermalExpansion implements IItemElectric diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index 0182b2f6f..c4dbc3afd 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -36,9 +36,10 @@ import appeng.util.Platform; import com.google.common.base.Optional; + // TODO BC Integration //@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore ) -public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /*, IToolWrench */ +public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , IToolWrench */ { public ToolQuartzWrench( final AEFeature type ) @@ -99,16 +100,15 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /*, IToolW // TODO: BC Wrench Integration /* - @Override - public boolean canWrench( EntityPlayer player, int x, int y, int z ) - { - return true; - } - - @Override - public void wrenchUsed( EntityPlayer player, int x, int y, int z ) - { - player.swingItem(); - } - */ + * @Override + * public boolean canWrench( EntityPlayer player, int x, int y, int z ) + * { + * return true; + * } + * @Override + * public void wrenchUsed( EntityPlayer player, int x, int y, int z ) + * { + * player.swingItem(); + * } + */ } diff --git a/src/main/java/appeng/me/GridNodeIterator.java b/src/main/java/appeng/me/GridNodeIterator.java index 5a460ab72..e441aeb09 100644 --- a/src/main/java/appeng/me/GridNodeIterator.java +++ b/src/main/java/appeng/me/GridNodeIterator.java @@ -29,8 +29,8 @@ import appeng.api.networking.IGridNode; /** * Nested iterator for {@link appeng.me.MachineSet} * - * Traverses first over the {@link appeng.me.MachineSet} - * and then over every containing {@link appeng.api.networking.IGridNode} + * Traverses first over the {@link appeng.me.MachineSet} and then over every containing + * {@link appeng.api.networking.IGridNode} */ public class GridNodeIterator implements Iterator { diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 318e72a13..e9e983568 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -41,12 +41,13 @@ public class GridStorage implements IGridStorage private final GridStorageSearch mySearchEntry; // keep myself in the list until I'm private final WeakHashMap divided = new WeakHashMap(); private WeakReference internalGrid = null; + // lost... /** * for use with world settings * - * @param id ID of grid storage + * @param id ID of grid storage * @param gss grid storage search */ public GridStorage( final long id, final GridStorageSearch gss ) @@ -60,8 +61,8 @@ public class GridStorage implements IGridStorage * for use with world settings * * @param input array of bytes string - * @param id ID of grid storage - * @param gss grid storage search + * @param id ID of grid storage + * @param gss grid storage search */ public GridStorage( final String input, final long id, final GridStorageSearch gss ) { diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index b96c5f792..a640c4257 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -390,7 +390,6 @@ public class GridStorageCache implements IStorageGrid } } - private class CellChangeTracker { diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 1c08d9cfd..5f9b099fa 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -140,14 +140,14 @@ public class SecurityCache implements ISecurityGrid public void populateGridStorage( final IGridStorage destinationStorage ) { - } @Override + } + + @Override public boolean isAvailable() { return this.securityProvider.size() == 1 && this.securityProvider.get( 0 ).isSecurityEnabled(); } - - @Override public boolean hasPermission( final EntityPlayer player, final SecurityPermissions perm ) { diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index 041626ce3..5ad73e986 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -55,7 +55,7 @@ public class TickTracker implements Comparable public long getAvgNanos() { - return ( this.LastFiveTicksTime / 5 ); + return( this.LastFiveTicksTime / 5 ); } public void setRate( final int rate ) diff --git a/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java index 9fd2b78de..d1f549e24 100644 --- a/src/main/java/appeng/me/pathfinding/ControllerValidator.java +++ b/src/main/java/appeng/me/pathfinding/ControllerValidator.java @@ -57,7 +57,7 @@ public class ControllerValidator implements IGridVisitor final TileController c = (TileController) host; final BlockPos pos = c.getPos(); - + this.minX = Math.min( pos.getX(), this.minX ); this.maxX = Math.max( pos.getX(), this.maxX ); this.minY = Math.min( pos.getY(), this.minY ); diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index fffaf7f1e..c5a83796e 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -69,7 +69,9 @@ public class NetworkInventoryHandler> implements IMEInvent { this.myChannel = chan; this.security = security; - this.priorityInventory = new TreeMap>>( PRIORITY_SORTER ); // TreeMultimap.create( prioritySorter, hashSorter ); + this.priorityInventory = new TreeMap>>( PRIORITY_SORTER ); // TreeMultimap.create( + // prioritySorter, + // hashSorter ); } public void addNewStorage( final IMEInventoryHandler h ) diff --git a/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java index 95518c85a..8a555f1e1 100644 --- a/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java @@ -1,3 +1,4 @@ + package appeng.parts.automation; diff --git a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java b/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java index ab62b7ccc..1d7ea6f3f 100644 --- a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java @@ -1,3 +1,4 @@ + package appeng.parts.automation; diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index d454d14e1..7ba7f1bed 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -83,7 +83,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane { final FakePlayer fakePlayer = FakePlayerFactory.getMinecraft( w ); final IBlockState state = w.getBlockState( pos ); - + if( state.getBlock().canSilkHarvest( w, pos, state, fakePlayer ) ) { final List out = new ArrayList( 1 ); diff --git a/src/main/java/appeng/parts/automation/StackUpgradeInventory.java b/src/main/java/appeng/parts/automation/StackUpgradeInventory.java index 8a3a858a0..766a168f2 100644 --- a/src/main/java/appeng/parts/automation/StackUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/StackUpgradeInventory.java @@ -1,3 +1,4 @@ + package appeng.parts.automation; diff --git a/src/main/java/appeng/parts/layers/LayerPressure.java b/src/main/java/appeng/parts/layers/LayerPressure.java index 0b7816291..542065c31 100644 --- a/src/main/java/appeng/parts/layers/LayerPressure.java +++ b/src/main/java/appeng/parts/layers/LayerPressure.java @@ -46,4 +46,4 @@ package appeng.parts.layers; // return null; // } // -//} +// } diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index e0e4313e9..1d8a154d1 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -274,4 +274,4 @@ package appeng.parts.p2p; // { // return true; // } -//} +// } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 45d4eccb4..24d12e28d 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -317,7 +317,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements final AEPartLocation d = this.getSide(); GL11.glTranslated( d.xOffset * 0.77, d.yOffset * 0.77, d.zOffset * 0.77 ); - switch( d ) { + switch( d ) + { case UP: GL11.glScalef( 1.0f, -1.0f, 1.0f ); GL11.glRotatef( 90.0f, 1.0f, 0.0f, 0.0f ); diff --git a/src/main/java/appeng/recipes/Ingredient.java b/src/main/java/appeng/recipes/Ingredient.java index dced342b9..810ff2abe 100644 --- a/src/main/java/appeng/recipes/Ingredient.java +++ b/src/main/java/appeng/recipes/Ingredient.java @@ -187,12 +187,9 @@ public class Ingredient implements IIngredient /* * Object o = Item.itemRegistry.getObject( nameSpace + ":" + itemName ); if ( o instanceof Item ) return new * ItemStack( (Item) o, qty, meta ); - * * if ( o instanceof Block ) return new ItemStack( (Block) o, qty, meta ); - * * o = Item.itemRegistry.getObject( nameSpace + ":item." + itemName ); if ( o instanceof Item ) return new * ItemStack( (Item) o, qty, meta ); - * * o = Block.blockRegistry.getObject( nameSpace + ":tile." + itemName ); if ( o instanceof Block && (!(o * instanceof BlockAir)) ) return new ItemStack( (Block) o, qty, meta ); */ diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index c01e46eb1..2c1560f35 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -178,6 +178,6 @@ public final class DisassembleRecipe implements IRecipe public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); + return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } } \ No newline at end of file diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index 78fe36821..ac13e24b0 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -96,12 +96,12 @@ public final class FacadeRecipe implements IRecipe { return null; } - + @Override public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); + return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } - + } \ No newline at end of file diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index eb9d354e2..ad009ac35 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -105,7 +105,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable final Map itemMap = new HashMap(); - for(; idx < recipe.length; idx += 2 ) + for( ; idx < recipe.length; idx += 2 ) { final Character chr = (Character) recipe[idx]; final Object in = recipe[idx + 1]; @@ -270,7 +270,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable { return false; } - return ( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); + return( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); } public ShapedRecipe setMirrored( final boolean mirror ) @@ -324,12 +324,12 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable this.disable = true; } } - + @Override public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); + return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } - + } \ No newline at end of file diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index bbd8ba394..6ce53d60a 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -146,7 +146,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable private boolean checkItemEquals( final ItemStack target, final ItemStack input ) { - return ( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); + return( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); } /** @@ -179,12 +179,12 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable this.disable = true; } } - + @Override public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); + return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } - + } \ No newline at end of file diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 920e8a249..fbd1fd551 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -45,11 +45,11 @@ public final class Inscribe extends InscriberProcess @Override public void register() throws RegistrationError, MissingIngredientError { - if ( this.getImprintable() == null ) + if( this.getImprintable() == null ) { return; } - if ( this.getOutput() == null ) + if( this.getOutput() == null ) { return; } @@ -57,8 +57,8 @@ public final class Inscribe extends InscriberProcess final ItemStack[] realInput = this.getImprintable().getItemStackSet(); final List inputs = new ArrayList( realInput.length ); Collections.addAll( inputs, realInput ); - final ItemStack top = (this.getTopOptional() == null) ? null : this.getTopOptional().getItemStack(); - final ItemStack bot = (this.getBotOptional() == null) ? null : this.getBotOptional().getItemStack(); + final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack(); + final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack(); final ItemStack output = this.getOutput().getItemStack(); final InscriberProcessType type = InscriberProcessType.Inscribe; diff --git a/src/main/java/appeng/recipes/handlers/InscriberProcess.java b/src/main/java/appeng/recipes/handlers/InscriberProcess.java index 6303e4bf1..6f631c0a1 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberProcess.java +++ b/src/main/java/appeng/recipes/handlers/InscriberProcess.java @@ -1,3 +1,4 @@ + package appeng.recipes.handlers; @@ -77,7 +78,7 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali { String pattern = "inscriber "; - if ( this.output != null ) + if( this.output != null ) { pattern += this.output.getQty() + '\n'; pattern += handler.getName( this.output ) + '\n'; @@ -88,7 +89,7 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali pattern += handler.getName( this.topOptional ) + '\n'; } - if ( this.imprintable != null ) + if( this.imprintable != null ) { pattern += handler.getName( this.imprintable ); } diff --git a/src/main/java/appeng/recipes/handlers/Press.java b/src/main/java/appeng/recipes/handlers/Press.java index 462b6a401..9fa5a2d2a 100644 --- a/src/main/java/appeng/recipes/handlers/Press.java +++ b/src/main/java/appeng/recipes/handlers/Press.java @@ -45,11 +45,11 @@ public final class Press extends InscriberProcess @Override public void register() throws RegistrationError, MissingIngredientError { - if ( this.getImprintable() == null ) + if( this.getImprintable() == null ) { return; } - if ( this.getOutput() == null ) + if( this.getOutput() == null ) { return; } diff --git a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java index 8ea526d9c..96f467eea 100644 --- a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java +++ b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java @@ -230,7 +230,8 @@ public class RecipeResourceCopier try { final Enumeration entries = jar.entries(); // gives ALL entries in jar - final Collection result = new HashSet( INITIAL_RESOURCE_CAPACITY ); // avoid duplicates + final Collection result = new HashSet( INITIAL_RESOURCE_CAPACITY ); // avoid + // duplicates // in case it is a // subdirectory diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index eaac76463..9315d56ac 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -51,7 +51,7 @@ public final class AECommand extends CommandBase { return 1; } - + @Override public String getCommandName() { diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index 309d4519c..df2d29917 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -69,7 +69,7 @@ public class ServerHelper extends CommonHelper } @Override - public void bindTileEntitySpecialRenderer( final Class tile, final AEBaseBlock blk ) + public void bindTileEntitySpecialRenderer( final Class tile, final AEBaseBlock blk ) { throw new UnsupportedOperationException( "This is a server..." ); } diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 75f4246b7..44a6f7603 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -238,7 +238,6 @@ public final class CompassService } } - private class CMDirectionRequest implements Runnable { diff --git a/src/main/java/appeng/services/VersionChecker.java b/src/main/java/appeng/services/VersionChecker.java index 1904072f8..e30739253 100644 --- a/src/main/java/appeng/services/VersionChecker.java +++ b/src/main/java/appeng/services/VersionChecker.java @@ -109,7 +109,7 @@ public final class VersionChecker implements Runnable /** * checks if enough time since last check has expired * - * @param nowInMs now in milli seconds + * @param nowInMs now in milli seconds * @param lastAfterInterval last version check including the interval defined in the config */ private void processInterval( final long nowInMs, final long lastAfterInterval ) @@ -136,7 +136,7 @@ public final class VersionChecker implements Runnable * Checks if the retrieved version is newer as the current mod version. * Will notify player if config is enabled. * - * @param modVersion version of mod + * @param modVersion version of mod * @param githubRelease release retrieved through github */ private void processVersions( @Nonnull final Version modVersion, @Nonnull final FormattedRelease githubRelease ) @@ -171,8 +171,8 @@ public final class VersionChecker implements Runnable * Checks if the version checker mod is installed and handles it depending on that information * * @param modFormatted mod version formatted as rv2-beta-8 - * @param ghFormatted retrieved github version formatted as rv2-beta-8 - * @param changelog retrieved github changelog + * @param ghFormatted retrieved github version formatted as rv2-beta-8 + * @param changelog retrieved github changelog */ private void interactWithVersionCheckerMod( @Nonnull final String modFormatted, @Nonnull final String ghFormatted, @Nonnull final String changelog ) { diff --git a/src/main/java/appeng/services/compass/ICompassCallback.java b/src/main/java/appeng/services/compass/ICompassCallback.java index 8eb5d1500..06cf52d38 100644 --- a/src/main/java/appeng/services/compass/ICompassCallback.java +++ b/src/main/java/appeng/services/compass/ICompassCallback.java @@ -26,9 +26,9 @@ public interface ICompassCallback * Called from another thread. * * @param hasResult true if found a target - * @param spin true if should spin - * @param radians radians - * @param dist distance + * @param spin true if should spin + * @param radians radians + * @param dist distance */ void calculatedDirection( boolean hasResult, boolean spin, double radians, double dist ); } diff --git a/src/main/java/appeng/services/export/ForgeExportConfig.java b/src/main/java/appeng/services/export/ForgeExportConfig.java index bcf448ba2..accddbe76 100644 --- a/src/main/java/appeng/services/export/ForgeExportConfig.java +++ b/src/main/java/appeng/services/export/ForgeExportConfig.java @@ -67,7 +67,8 @@ public final class ForgeExportConfig implements ExportConfig private final Configuration config; /** - * Constructor using the configuration. Apparently there are some race conditions if constructing configurations on multiple file accesses + * Constructor using the configuration. Apparently there are some race conditions if constructing configurations on + * multiple file accesses * * @param config to be wrapped configuration. */ diff --git a/src/main/java/appeng/services/export/ModListChecker.java b/src/main/java/appeng/services/export/ModListChecker.java index 24219fe96..2fff4921b 100644 --- a/src/main/java/appeng/services/export/ModListChecker.java +++ b/src/main/java/appeng/services/export/ModListChecker.java @@ -55,10 +55,12 @@ final class ModListChecker implements Checker> } /** - * Compiles a list of all mods and their versions to a digest which is updated, if it differs from the config. This is used to elevate the need to export + * Compiles a list of all mods and their versions to a digest which is updated, if it differs from the config. This + * is used to elevate the need to export * the csv once again, if no change was detected. * - * @param modContainers all mods and their versions to check if a difference exists between the current instance and the previous instance + * @param modContainers all mods and their versions to check if a difference exists between the current instance and + * the previous instance * * @return CheckType.EQUAL if no change was detected */ diff --git a/src/main/java/appeng/spatial/ISpatialVisitor.java b/src/main/java/appeng/spatial/ISpatialVisitor.java index 75dc1041b..c11ee8351 100644 --- a/src/main/java/appeng/spatial/ISpatialVisitor.java +++ b/src/main/java/appeng/spatial/ISpatialVisitor.java @@ -18,6 +18,7 @@ package appeng.spatial; + import net.minecraft.util.BlockPos; diff --git a/src/main/java/appeng/spatial/StorageWorldProvider.java b/src/main/java/appeng/spatial/StorageWorldProvider.java index 1fe95a4a9..0015dd9e0 100644 --- a/src/main/java/appeng/spatial/StorageWorldProvider.java +++ b/src/main/java/appeng/spatial/StorageWorldProvider.java @@ -138,11 +138,11 @@ public class StorageWorldProvider extends WorldProvider { return false; } - + @Override public BlockPos getSpawnCoordinate() { - return new BlockPos(0,0,0); + return new BlockPos( 0, 0, 0 ); } @Override diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index c189b39cf..5d554b2dd 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -80,7 +80,7 @@ public class TileCraftingStorageTile extends TileCraftingTile return 0; } - final BlockCraftingUnit unit = (BlockCraftingUnit)this.worldObj.getBlockState( this.pos ).getBlock(); + final BlockCraftingUnit unit = (BlockCraftingUnit) this.worldObj.getBlockState( this.pos ).getBlock(); switch( unit.type ) { default: diff --git a/src/main/java/appeng/tile/events/TileEventType.java b/src/main/java/appeng/tile/events/TileEventType.java index 0f0e869a9..495072891 100644 --- a/src/main/java/appeng/tile/events/TileEventType.java +++ b/src/main/java/appeng/tile/events/TileEventType.java @@ -25,7 +25,7 @@ public enum TileEventType * Requires IUpdatePlayerListBox, this makes the tile entity tick in 1.8 */ TICK, - + WORLD_NBT_READ, WORLD_NBT_WRITE, /** diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index 12e6ebbdf..bfa215955 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -164,7 +164,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePl final double zOff = -0.15 * this.getUp().getFrontOffsetZ(); return Collections.singletonList( AxisAlignedBB.fromBounds( xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85 ) ); } - + @Override public void addCollidingBlockToList( final World w, diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index a87701ec7..25d00d76b 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -277,14 +277,14 @@ public class AppEngInternalAEInventory implements IInventory, Iterable 0; this.markForUpdate(); - if ( this.hasWorldObj() ) + if( this.hasWorldObj() ) { Platform.notifyBlocksOfNeighbors( this.worldObj, this.pos ); } diff --git a/src/main/java/appeng/tile/powersink/IC2.java b/src/main/java/appeng/tile/powersink/IC2.java index 4dc371e60..7d980b663 100644 --- a/src/main/java/appeng/tile/powersink/IC2.java +++ b/src/main/java/appeng/tile/powersink/IC2.java @@ -122,4 +122,4 @@ package appeng.tile.powersink; // this.removeFromENet(); // this.addToENet(); // } -//} +// } diff --git a/src/main/java/appeng/tile/powersink/RedstoneFlux.java b/src/main/java/appeng/tile/powersink/RedstoneFlux.java index 0756b8f4e..730731d2f 100644 --- a/src/main/java/appeng/tile/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/tile/powersink/RedstoneFlux.java @@ -62,4 +62,4 @@ package appeng.tile.powersink; // { // return this.getPowerSides().contains( from ); // } -//} +// } diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index 5178a5daf..c61b5e409 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -182,4 +182,4 @@ package appeng.tile.powersink; // messages.add( out ); // return messages; // } -//} +// } diff --git a/src/main/java/appeng/tile/powersink/UniversalElectricity.java b/src/main/java/appeng/tile/powersink/UniversalElectricity.java index dff3e3a14..3a586b65b 100644 --- a/src/main/java/appeng/tile/powersink/UniversalElectricity.java +++ b/src/main/java/appeng/tile/powersink/UniversalElectricity.java @@ -18,66 +18,57 @@ package appeng.tile.powersink; + /* -import net.minecraftforge.common.util.ForgeDirection; -import universalelectricity.core.block.IElectrical; -import universalelectricity.core.electricity.ElectricityPack; -import appeng.api.config.PowerUnits; - -public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical -{ - - @Override - public final boolean canConnect(AEPartLocation direction) - { - return internalCanAcceptPower && getPowerSides().contains( direction ); - } - - @Override - public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive) - { - float accepted = 0; - double receivedPower = receive.getWatts(); - - if ( doReceive ) - { - accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower )); - } - else - { - double whatIWant = getExternalPowerDemand( PowerUnits.KJ ); - if ( whatIWant > receivedPower ) - accepted = (float) receivedPower; - else - accepted = (float) whatIWant; - } - - return accepted; - } - - @Override - public final float getRequest(AEPartLocation direction) - { - return (float) getExternalPowerDemand( PowerUnits.KJ ); - } - - @Override - public final float getVoltage() - { - return 120; - } - - @Override - public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide) - { - return null; // cannot be dis-charged - } - - @Override - public final float getProvide(AEPartLocation direction) - { - return 0; - } - -} -*/ \ No newline at end of file + * import net.minecraftforge.common.util.ForgeDirection; + * import universalelectricity.core.block.IElectrical; + * import universalelectricity.core.electricity.ElectricityPack; + * import appeng.api.config.PowerUnits; + * public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical + * { + * @Override + * public final boolean canConnect(AEPartLocation direction) + * { + * return internalCanAcceptPower && getPowerSides().contains( direction ); + * } + * @Override + * public final float receiveElectricity(AEPartLocation from, ElectricityPack receive, boolean doReceive) + * { + * float accepted = 0; + * double receivedPower = receive.getWatts(); + * if ( doReceive ) + * { + * accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower )); + * } + * else + * { + * double whatIWant = getExternalPowerDemand( PowerUnits.KJ ); + * if ( whatIWant > receivedPower ) + * accepted = (float) receivedPower; + * else + * accepted = (float) whatIWant; + * } + * return accepted; + * } + * @Override + * public final float getRequest(AEPartLocation direction) + * { + * return (float) getExternalPowerDemand( PowerUnits.KJ ); + * } + * @Override + * public final float getVoltage() + * { + * return 120; + * } + * @Override + * public final ElectricityPack provideElectricity(AEPartLocation from, ElectricityPack request, boolean doProvide) + * { + * return null; // cannot be dis-charged + * } + * @Override + * public final float getProvide(AEPartLocation direction) + * { + * return 0; + * } + * } + */ \ No newline at end of file diff --git a/src/main/java/appeng/transformer/AppEngCore.java b/src/main/java/appeng/transformer/AppEngCore.java index 0237c58be..2b598badd 100644 --- a/src/main/java/appeng/transformer/AppEngCore.java +++ b/src/main/java/appeng/transformer/AppEngCore.java @@ -127,5 +127,4 @@ public final class AppEngCore extends DummyModContainer implements IFMLLoadingPl return this.getVersion(); } - } diff --git a/src/main/java/appeng/transformer/annotations/Integration.java b/src/main/java/appeng/transformer/annotations/Integration.java index 880184f93..1cbfaf05c 100644 --- a/src/main/java/appeng/transformer/annotations/Integration.java +++ b/src/main/java/appeng/transformer/annotations/Integration.java @@ -36,7 +36,6 @@ public @interface Integration Interface[] value(); } - @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) @interface Interface @@ -46,7 +45,6 @@ public @interface Integration IntegrationType iname(); } - @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.METHOD ) @interface Method diff --git a/src/main/java/appeng/util/ISlimReadableNumberConverter.java b/src/main/java/appeng/util/ISlimReadableNumberConverter.java index 8c9a75d9a..6db905727 100644 --- a/src/main/java/appeng/util/ISlimReadableNumberConverter.java +++ b/src/main/java/appeng/util/ISlimReadableNumberConverter.java @@ -1,3 +1,4 @@ + package appeng.util; diff --git a/src/main/java/appeng/util/IWideReadableNumberConverter.java b/src/main/java/appeng/util/IWideReadableNumberConverter.java index b3fae6c2e..1ca7fd3fd 100644 --- a/src/main/java/appeng/util/IWideReadableNumberConverter.java +++ b/src/main/java/appeng/util/IWideReadableNumberConverter.java @@ -1,3 +1,4 @@ + package appeng.util; diff --git a/src/main/java/appeng/util/IWorldCallable.java b/src/main/java/appeng/util/IWorldCallable.java index 266f06254..2e8057913 100644 --- a/src/main/java/appeng/util/IWorldCallable.java +++ b/src/main/java/appeng/util/IWorldCallable.java @@ -39,8 +39,8 @@ public interface IWorldCallable /** * Similar to {@link Callable#call()} * - * @param world this param is given to not hold a reference to the world but let the caller handle it. Do not expect a world here thus can be - * null. + * @param world this param is given to not hold a reference to the world but let the caller handle it. Do not expect + * a world here thus can be null. * * @return result of call on the world. Can be null. * diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 9d09b49ce..5dc0cba0d 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -175,7 +175,7 @@ public class Platform /** * This displays the value for encoded longs ( double *100 ) * - * @param n to be formatted long value + * @param n to be formatted long value * @param isRate if true it adds a /t to the formatted string * * @return formatted long value @@ -264,7 +264,7 @@ public class Platform return EnumFacing.NORTH; } - //something is better then nothing? + // something is better then nothing? return EnumFacing.NORTH; } @@ -385,7 +385,7 @@ public class Platform z = tile.getPos().getZ(); } - if( ( type.getType().isItem() && tile == null ) || type.hasPermissions( tile, x,y,z, side, p ) ) + if( ( type.getType().isItem() && tile == null ) || type.hasPermissions( tile, x, y, z, side, p ) ) { if( tile == null && type.getType() == GuiHostType.ITEM ) { @@ -820,7 +820,7 @@ public class Platform final BlockPos posX = teA.getPos().offset( EnumFacing.EAST ); final BlockPos negX = teA.getPos().offset( EnumFacing.WEST ); - + if( teA.getWorld().getBlockState( posX ) == myBlockID ) { teB = teA.getWorld().getTileEntity( posX ); @@ -850,12 +850,12 @@ public class Platform final BlockPos posY = teA.getPos().offset( EnumFacing.SOUTH ); final BlockPos negY = teA.getPos().offset( EnumFacing.NORTH ); - + if( teB == null ) { if( teA.getWorld().getBlockState( posY ) == myBlockID ) { - teB = teA.getWorld().getTileEntity(posY); + teB = teA.getWorld().getTileEntity( posY ); if( !( teB instanceof TileEntityChest ) ) { teB = null; @@ -1038,12 +1038,12 @@ public class Platform { // TODO: Build Craft Wrench? /* - if( eq.getItem() instanceof IToolWrench ) - { - IToolWrench wrench = (IToolWrench) eq.getItem(); - return wrench.canWrench( player, x, y, z ); - } - */ + * if( eq.getItem() instanceof IToolWrench ) + * { + * IToolWrench wrench = (IToolWrench) eq.getItem(); + * return wrench.canWrench( player, x, y, z ); + * } + */ } catch( final Throwable ignore ) { // explodes without BC @@ -1407,16 +1407,16 @@ public class Platform { final Item ai = a.getItem(); final Item bi = b.getItem(); - - return ( ai.getDurabilityForDisplay(a) > 1 ) == ( bi.getDurabilityForDisplay(b) > 1 ); + + return ( ai.getDurabilityForDisplay( a ) > 1 ) == ( bi.getDurabilityForDisplay( b ) > 1 ); } else { final Item ai = a.getItem(); final Item bi = b.getItem(); - - final float percentDamagedOfA = 1.0f - (float) ai.getDurabilityForDisplay(a); - final float percentDamagedOfB = 1.0f - (float) bi.getDurabilityForDisplay(b); + + final float percentDamagedOfA = 1.0f - (float) ai.getDurabilityForDisplay( a ); + final float percentDamagedOfB = 1.0f - (float) bi.getDurabilityForDisplay( b ); return ( percentDamagedOfA > mode.breakPoint ) == ( percentDamagedOfB > mode.breakPoint ); } @@ -1451,13 +1451,10 @@ public class Platform /* * // test ore dictionary.. int OreID = getOreID( a ); if ( OreID != -1 ) return OreID == getOreID( b ); - * * if ( Mode != FuzzyMode.IGNORE_ALL ) { if ( a.hasTagCompound() && !isShared( a.getTagCompound() ) ) { a = * Platform.getSharedItemStack( AEItemStack.create( a ) ); } - * * if ( b.hasTagCompound() && !isShared( b.getTagCompound() ) ) { b = Platform.getSharedItemStack( * AEItemStack.create( b ) ); } - * * // test regular items with damage values and what not... if ( isShared( a.getTagCompound() ) && isShared( * b.getTagCompound() ) && a.itemID == b.itemID ) { return ((AppEngSharedNBTTagCompound) * a.getTagCompound()).compareFuzzyWithRegistry( (AppEngSharedNBTTagCompound) b.getTagCompound() ); } } @@ -1477,17 +1474,17 @@ public class Platform final float playerPitch = playerIn.prevRotationPitch + ( playerIn.rotationPitch - playerIn.prevRotationPitch ); final float playerYaw = playerIn.prevRotationYaw + ( playerIn.rotationYaw - playerIn.prevRotationYaw ); - final float yawRayX = MathHelper.sin( -playerYaw * 0.017453292f - ( float ) Math.PI ); - final float yawRayZ = MathHelper.cos( -playerYaw * 0.017453292f - ( float ) Math.PI ); + final float yawRayX = MathHelper.sin( -playerYaw * 0.017453292f - (float) Math.PI ); + final float yawRayZ = MathHelper.cos( -playerYaw * 0.017453292f - (float) Math.PI ); final float pitchMultiplier = -MathHelper.cos( -playerPitch * 0.017453292F ); final float eyeRayY = MathHelper.sin( -playerPitch * 0.017453292F ); final float eyeRayX = yawRayX * pitchMultiplier; final float eyeRayZ = yawRayZ * pitchMultiplier; - if ( playerIn instanceof EntityPlayerMP ) + if( playerIn instanceof EntityPlayerMP ) { - reachDistance = ( ( EntityPlayerMP ) playerIn ).theItemInWorldManager.getBlockReachDistance(); + reachDistance = ( (EntityPlayerMP) playerIn ).theItemInWorldManager.getBlockReachDistance(); } final Vec3 from = new Vec3( x, y, z ); diff --git a/src/main/java/appeng/util/ReadableNumberConverter.java b/src/main/java/appeng/util/ReadableNumberConverter.java index be239165b..f5bf77db9 100644 --- a/src/main/java/appeng/util/ReadableNumberConverter.java +++ b/src/main/java/appeng/util/ReadableNumberConverter.java @@ -1,3 +1,4 @@ + package appeng.util; @@ -54,7 +55,7 @@ public enum ReadableNumberConverter implements ISlimReadableNumberConverter, IWi * restricts a string representation of a number to a specific width * * @param number to be formatted number - * @param width width limitation of the resulting number + * @param width width limitation of the resulting number * * @return formatted number restricted by the width limitation */ diff --git a/src/main/java/appeng/util/inv/AdaptorBCPipe.java b/src/main/java/appeng/util/inv/AdaptorBCPipe.java index 265bb66f8..da4763969 100644 --- a/src/main/java/appeng/util/inv/AdaptorBCPipe.java +++ b/src/main/java/appeng/util/inv/AdaptorBCPipe.java @@ -109,4 +109,4 @@ package appeng.util.inv; // { // return new NullIterator(); // } -//} +// } diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index 635ba2c7b..c7469e6f2 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -253,7 +253,7 @@ public class AdaptorIInventory extends InventoryAdaptor * than the limit. * * @param itemsToAdd itemStack to add to the inventory - * @param modulate true to modulate, false for simulate + * @param modulate true to modulate, false for simulate * * @return the left itemstack, which could not be added */ diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java index bd40e0f68..b7bfdbe79 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java @@ -74,13 +74,13 @@ public class AdaptorPlayerInventory implements IInventory { this.src.setInventorySlotContents( var1 + this.min, var2 ); } - + @Override public IChatComponent getDisplayName() { return this.src.getDisplayName(); } - + @Override public boolean hasCustomName() { @@ -104,19 +104,20 @@ public class AdaptorPlayerInventory implements IInventory { return this.src.isUseableByPlayer( var1 ); } - + @Override public void openInventory( final EntityPlayer player ) { - this.src.openInventory(player); - + this.src.openInventory( player ); + } + @Override public void closeInventory( final EntityPlayer player ) { - this.src.closeInventory(player); + this.src.closeInventory( player ); } @Override diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index d8ef269ff..aa60afd21 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -206,13 +206,13 @@ public class WrapperChainedInventory implements IInventory { return false; } - + @Override public void openInventory( final EntityPlayer player ) { } - + @Override public void closeInventory( final EntityPlayer player ) @@ -256,7 +256,7 @@ public class WrapperChainedInventory implements IInventory final int id, final int value ) { - + } @Override @@ -268,6 +268,6 @@ public class WrapperChainedInventory implements IInventory @Override public void clear() { - + } } diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index d1f879aed..66cd13612 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/src/main/java/appeng/util/inv/WrapperInvSlot.java @@ -121,14 +121,14 @@ public class WrapperInvSlot public void openInventory( final EntityPlayer player ) { - this.inv.openInventory(player); + this.inv.openInventory( player ); } - + @Override public void closeInventory( final EntityPlayer player ) { - this.inv.closeInventory(player); + this.inv.closeInventory( player ); } @Override @@ -136,20 +136,20 @@ public class WrapperInvSlot { this.inv.clear(); } - + @Override public int getField( final int id ) { return this.inv.getField( id ); } - + @Override public int getFieldCount() { return this.inv.getFieldCount(); } - + @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { diff --git a/src/main/java/appeng/util/inv/WrapperInventoryRange.java b/src/main/java/appeng/util/inv/WrapperInventoryRange.java index fc5f0a1ed..e3c7c5284 100644 --- a/src/main/java/appeng/util/inv/WrapperInventoryRange.java +++ b/src/main/java/appeng/util/inv/WrapperInventoryRange.java @@ -138,14 +138,14 @@ public class WrapperInventoryRange implements IInventory public void openInventory( final EntityPlayer player ) { - this.src.openInventory(player); + this.src.openInventory( player ); } - + @Override public void closeInventory( final EntityPlayer player ) { - this.src.closeInventory(player); + this.src.closeInventory( player ); } @Override @@ -153,14 +153,14 @@ public class WrapperInventoryRange implements IInventory { this.src.clear(); } - + @Override public int getField( final int id ) { return this.src.getField( id ); } - + @Override public int getFieldCount() { @@ -180,6 +180,7 @@ public class WrapperInventoryRange implements IInventory { this.src.setField( id, value ); } + @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { diff --git a/src/main/java/appeng/util/inv/WrapperTEPipe.java b/src/main/java/appeng/util/inv/WrapperTEPipe.java index 0858bdcbe..ccf8ec42e 100644 --- a/src/main/java/appeng/util/inv/WrapperTEPipe.java +++ b/src/main/java/appeng/util/inv/WrapperTEPipe.java @@ -108,4 +108,4 @@ package appeng.util.inv; // { // return false; // } -//} +// } diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index a2b1b82ce..5a5b0f962 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -405,7 +405,7 @@ public final class MeteoritePlacer final double dist = dx * dx + dy * dy + dz * dz; final Block xf = w.getBlock( i, j - 1, k ); - if( !xf.isReplaceable( w.getWorld(), new BlockPos(i, j - 1, k) ) ) + if( !xf.isReplaceable( w.getWorld(), new BlockPos( i, j - 1, k ) ) ) { final double extraRange = Math.random() * 0.6; final double height = this.crater * ( extraRange + 0.2 ) - Math.abs( dist - this.crater * 1.7 ); diff --git a/src/main/java/appeng/worldgen/meteorite/Fallout.java b/src/main/java/appeng/worldgen/meteorite/Fallout.java index 13850b61f..dbec05702 100644 --- a/src/main/java/appeng/worldgen/meteorite/Fallout.java +++ b/src/main/java/appeng/worldgen/meteorite/Fallout.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java index c33fa7f6b..1615ea9b4 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java index d9e435c79..09f06fb4f 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java index 4a8a5a399..19803218a 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java index d513d0a9e..90c96dc44 100644 --- a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/invtweaks/api/container/ChestContainer.java b/src/main/java/invtweaks/api/container/ChestContainer.java index 6898df295..dc95eeb7f 100644 --- a/src/main/java/invtweaks/api/container/ChestContainer.java +++ b/src/main/java/invtweaks/api/container/ChestContainer.java @@ -1,5 +1,7 @@ + package invtweaks.api.container; + public @interface ChestContainer {