From f84b9a7e1dad1a976e466e334f07cad770af30df Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 1 Jan 2016 02:02:05 +0100 Subject: [PATCH] All parameters on one line (for now) Easier picking of 1.7 changes --- src/api/java/appeng/api/config/FuzzyMode.java | 6 +- .../appeng/api/movable/IMovableHandler.java | 6 +- .../java/appeng/api/util/AEAxisAlignedBB.java | 18 +- src/api/java/appeng/api/util/WorldCoord.java | 3 +- src/main/java/appeng/block/AEBaseBlock.java | 49 +---- .../java/appeng/block/AEBaseItemBlock.java | 11 +- .../java/appeng/block/AEBaseTileBlock.java | 39 +--- .../appeng/block/UnlistedBlockAccess.java | 6 +- .../java/appeng/block/UnlistedBlockPos.java | 6 +- .../block/crafting/BlockCraftingMonitor.java | 4 +- .../block/crafting/BlockCraftingStorage.java | 16 +- .../block/crafting/BlockCraftingUnit.java | 5 +- .../crafting/BlockMolecularAssembler.java | 10 +- .../appeng/block/grindstone/BlockCrank.java | 28 +-- .../appeng/block/grindstone/BlockGrinder.java | 19 +- .../appeng/block/misc/BlockCellWorkbench.java | 9 +- .../java/appeng/block/misc/BlockCharger.java | 28 +-- .../appeng/block/misc/BlockCondenser.java | 9 +- .../appeng/block/misc/BlockInscriber.java | 9 +- .../appeng/block/misc/BlockInterface.java | 9 +- .../appeng/block/misc/BlockLightDetector.java | 65 ++----- .../java/appeng/block/misc/BlockPaint.java | 43 +---- .../misc/BlockQuartzGrowthAccelerator.java | 6 +- .../appeng/block/misc/BlockQuartzTorch.java | 18 +- .../java/appeng/block/misc/BlockSecurity.java | 9 +- .../appeng/block/misc/BlockSkyCompass.java | 23 +-- .../block/misc/BlockVibrationChamber.java | 15 +- .../block/networking/BlockCableBus.java | 133 +++---------- .../block/networking/BlockController.java | 9 +- .../block/networking/BlockEnergyCell.java | 3 +- .../block/networking/BlockWireless.java | 23 +-- .../appeng/block/qnb/BlockQuantumBase.java | 11 +- .../block/qnb/BlockQuantumLinkChamber.java | 28 +-- .../appeng/block/qnb/BlockQuantumRing.java | 13 +- .../block/spatial/BlockMatrixFrame.java | 27 +-- .../block/spatial/BlockSpatialIOPort.java | 15 +- .../block/spatial/BlockSpatialPylon.java | 10 +- .../java/appeng/block/storage/BlockChest.java | 9 +- .../java/appeng/block/storage/BlockDrive.java | 9 +- .../appeng/block/storage/BlockIOPort.java | 15 +- .../appeng/block/storage/BlockSkyChest.java | 22 +-- src/main/java/appeng/client/ClientHelper.java | 3 +- src/main/java/appeng/client/SmartModel.java | 12 +- .../client/render/AppEngRenderItem.java | 11 +- .../appeng/client/render/BaseBlockRender.java | 38 ++-- .../appeng/client/render/BusRenderer.java | 3 +- .../render/ISimpleBlockRenderingHandler.java | 13 +- .../appeng/client/render/IconUnwrapper.java | 3 +- .../appeng/client/render/ModelGenerator.java | 176 ++++-------------- .../client/render/RenderBlocksWorkaround.java | 3 +- .../java/appeng/client/render/SMFace.java | 8 +- .../render/blocks/RenderBlockSkyChest.java | 5 +- .../java/appeng/client/texture/BaseIcon.java | 6 +- .../client/texture/CableBusTextures.java | 133 +++++++++++-- .../client/texture/ExtraBlockTextures.java | 95 +++++++--- .../java/appeng/client/texture/IAESprite.java | 6 +- .../ContainerCellWorkbench.java | 13 +- .../implementations/ContainerQuartzKnife.java | 13 +- .../container/slot/SlotRestrictedInput.java | 29 ++- src/main/java/appeng/core/AEConfig.java | 8 +- src/main/java/appeng/core/AppEng.java | 18 +- src/main/java/appeng/core/CommonHelper.java | 3 +- .../java/appeng/core/features/AEFeature.java | 3 +- .../appeng/core/features/ActivityState.java | 3 +- .../core/localization/ButtonToolTips.java | 114 ++++++++++-- .../appeng/core/localization/GuiText.java | 137 +++++++++++--- .../core/localization/PlayerMessages.java | 16 +- .../network/AppEngClientPacketHandler.java | 22 +-- .../network/AppEngServerPacketHandler.java | 16 +- .../sync/packets/PacketCompressedNBT.java | 6 +- .../sync/packets/PacketMEInventoryUpdate.java | 6 +- .../java/appeng/debug/BlockCubeGenerator.java | 9 +- .../java/appeng/debug/BlockPhantomNode.java | 9 +- src/main/java/appeng/debug/TileItemGen.java | 13 +- src/main/java/appeng/debug/ToolDebugCard.java | 10 +- src/main/java/appeng/debug/ToolEraser.java | 10 +- .../appeng/debug/ToolMeteoritePlacer.java | 10 +- .../java/appeng/debug/ToolReplicatorCard.java | 10 +- .../solid/ChargedQuartzOreBlock.java | 14 +- .../decorative/solid/QuartzGlassBlock.java | 5 +- .../decorative/solid/QuartzLampBlock.java | 6 +- .../decorative/solid/QuartzOreBlock.java | 20 +- .../decorative/solid/QuartzPillarBlock.java | 6 +- .../appeng/entity/RenderFloatingItem.java | 8 +- .../java/appeng/helpers/DualityInterface.java | 3 +- .../java/appeng/helpers/InventoryAction.java | 17 +- src/main/java/appeng/hooks/IBlockTool.java | 10 +- src/main/java/appeng/items/AEBaseItem.java | 9 +- .../items/contents/NetworkToolViewer.java | 10 +- .../items/contents/PortableCellViewer.java | 3 +- .../appeng/items/materials/MaterialType.java | 3 +- .../appeng/items/materials/MultiItem.java | 3 +- .../appeng/items/misc/ItemCrystalSeed.java | 3 +- .../appeng/items/misc/ItemEncodedPattern.java | 17 +- .../java/appeng/items/misc/ItemPaintBall.java | 7 +- .../java/appeng/items/parts/ItemFacade.java | 13 +- .../appeng/items/parts/ItemMultiPart.java | 8 +- .../items/storage/ItemBasicStorageCell.java | 10 +- .../appeng/items/tools/ToolMemoryCard.java | 15 +- .../appeng/items/tools/ToolNetworkTool.java | 20 +- .../tools/powered/ToolColorApplicator.java | 13 +- .../tools/powered/ToolEntropyManipulator.java | 14 +- .../tools/powered/ToolWirelessTerminal.java | 3 +- .../tools/quartz/ToolQuartzCuttingKnife.java | 10 +- .../items/tools/quartz/ToolQuartzWrench.java | 20 +- .../appeng/me/cache/CraftingGridCache.java | 9 +- .../me/storage/NetworkInventoryHandler.java | 3 +- .../parts/automation/PartLevelEmitter.java | 5 +- .../parts/layers/LayerISidedInventory.java | 7 +- .../appeng/parts/misc/PartCableAnchor.java | 5 +- .../java/appeng/parts/misc/PartInterface.java | 7 +- .../appeng/parts/networking/PartCable.java | 3 +- .../java/appeng/parts/p2p/PartP2PItems.java | 7 +- .../appeng/parts/p2p/PartP2PTunnelME.java | 4 +- .../recipes/game/DisassembleRecipe.java | 3 +- .../appeng/recipes/game/FacadeRecipe.java | 3 +- .../appeng/recipes/game/ShapedRecipe.java | 3 +- .../appeng/recipes/game/ShapelessRecipe.java | 3 +- .../java/appeng/recipes/handlers/Grind.java | 4 +- .../java/appeng/recipes/handlers/Smelt.java | 4 +- src/main/java/appeng/server/AECommand.java | 4 +- src/main/java/appeng/server/Commands.java | 3 +- .../appeng/services/version/BaseVersion.java | 6 +- .../java/appeng/services/version/Channel.java | 4 +- .../java/appeng/spatial/StorageHelper.java | 8 +- src/main/java/appeng/tile/AEBaseTile.java | 6 +- .../tile/crafting/TileMolecularAssembler.java | 5 +- .../appeng/tile/grid/AENetworkInvTile.java | 3 +- .../appeng/tile/grindstone/TileCrank.java | 13 +- .../inventory/AppEngInternalAEInventory.java | 13 +- .../inventory/AppEngInternalInventory.java | 13 +- .../tile/inventory/AppEngNullInventory.java | 13 +- .../appeng/tile/misc/TileCellWorkbench.java | 5 +- .../java/appeng/tile/misc/TileInscriber.java | 5 +- .../java/appeng/tile/misc/TileInterface.java | 5 +- .../java/appeng/tile/misc/TileSecurity.java | 5 +- .../appeng/tile/networking/TileCableBus.java | 12 +- .../java/appeng/tile/storage/TileChest.java | 5 +- .../java/appeng/tile/storage/TileIOPort.java | 5 +- src/main/java/appeng/util/ItemSorters.java | 12 +- .../util/inv/AdaptorPlayerInventory.java | 13 +- .../util/inv/WrapperChainedInventory.java | 13 +- .../java/appeng/util/inv/WrapperInvSlot.java | 13 +- .../util/inv/WrapperInventoryRange.java | 13 +- src/main/java/appeng/util/item/OreHelper.java | 3 +- .../worldgen/meteorite/IMeteoriteWorld.java | 5 +- .../worldgen/meteorite/StandardWorld.java | 12 +- 147 files changed, 840 insertions(+), 1506 deletions(-) diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java index 665dd551..84c36c78 100644 --- a/src/api/java/appeng/api/config/FuzzyMode.java +++ b/src/api/java/appeng/api/config/FuzzyMode.java @@ -27,7 +27,11 @@ package appeng.api.config; public enum FuzzyMode { // Note that percentage damaged, is the inverse of percentage durability. - IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 ); + IGNORE_ALL( -1 ), + PERCENT_99( 0 ), + PERCENT_75( 25 ), + PERCENT_50( 50 ), + PERCENT_25( 75 ); public final float breakPoint; public final float percentage; diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java index dbd587f7..0f811ce5 100644 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ b/src/api/java/appeng/api/movable/IMovableHandler.java @@ -54,14 +54,12 @@ public interface IMovableHandler * { * @code * Chunk c = world.getChunkFromBlockCoords( x, z ); - * c.setChunkBlockTileEntity( x - * & 0xF, y + y, z & 0xF, tile ); + * c.setChunkBlockTileEntity( x & 0xF, y + y, z & 0xF, tile ); * * if( c.isChunkLoaded ) * { * world.addTileEntity( tile ); - * world.markBlockForUpdate( x, - * y, z ); + * world.markBlockForUpdate( x, y, z ); * } * } * diff --git a/src/api/java/appeng/api/util/AEAxisAlignedBB.java b/src/api/java/appeng/api/util/AEAxisAlignedBB.java index 70b13583..9d2db27a 100644 --- a/src/api/java/appeng/api/util/AEAxisAlignedBB.java +++ b/src/api/java/appeng/api/util/AEAxisAlignedBB.java @@ -32,25 +32,13 @@ public class AEAxisAlignedBB this.maxZ = f; } - public static AEAxisAlignedBB fromBounds( - final double a, - final double b, - final double c, - final double d, - final double e, - final double f ) + public static AEAxisAlignedBB fromBounds( final double a, final double b, final double c, final double d, final double e, final double f ) { return new AEAxisAlignedBB( a, b, c, d, e, f ); } - public static AEAxisAlignedBB fromBounds( - final AxisAlignedBB bb ) + public static AEAxisAlignedBB fromBounds( final AxisAlignedBB bb ) { - return new AEAxisAlignedBB( bb.minX, - bb.minY, - bb.minZ, - bb.maxX, - bb.maxY, - bb.maxZ ); + return new AEAxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ ); } } diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java index 555813f9..30191841 100644 --- a/src/api/java/appeng/api/util/WorldCoord.java +++ b/src/api/java/appeng/api/util/WorldCoord.java @@ -51,8 +51,7 @@ public class WorldCoord this.z = _z; } - public WorldCoord( - final BlockPos pos ) + public WorldCoord( final BlockPos pos ) { this.x = pos.getX(); this.y = pos.getY(); diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index f1ca9b1b..aa9e7211 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -144,10 +144,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public final IBlockState getExtendedState( - final IBlockState state, - final IBlockAccess world, - final BlockPos pos ) + public final IBlockState getExtendedState( final IBlockState state, final IBlockAccess world, final BlockPos pos ) { return ( (IExtendedBlockState) super.getExtendedState( state, world, pos ) ).withProperty( AE_BLOCK_POS, pos ).withProperty( AE_BLOCK_ACCESS, world ); } @@ -188,10 +185,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public int colorMultiplier( - final IBlockAccess worldIn, - final BlockPos pos, - final int colorTint ) + public int colorMultiplier( final IBlockAccess worldIn, final BlockPos pos, final int colorTint ) { return colorTint; } @@ -266,13 +260,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public void addCollisionBoxesToList( - final World w, - final BlockPos pos, - final IBlockState state, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollisionBoxesToList( final World w, final BlockPos pos, final IBlockState state, final AxisAlignedBB bb, final List out, final Entity e ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); @@ -297,9 +285,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature @Override @SideOnly( Side.CLIENT ) - public AxisAlignedBB getSelectedBoundingBox( - final World w, - final BlockPos pos ) + public AxisAlignedBB getSelectedBoundingBox( final World w, final BlockPos pos ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); @@ -388,11 +374,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public MovingObjectPosition collisionRayTrace( - final World w, - final BlockPos pos, - final Vec3 a, - final Vec3 b ) + public MovingObjectPosition collisionRayTrace( final World w, final BlockPos pos, final Vec3 a, final Vec3 b ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); @@ -458,17 +440,13 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public int getComparatorInputOverride( - final World worldIn, - final BlockPos pos ) + public int getComparatorInputOverride( final World worldIn, final BlockPos pos ) { return 0; } @Override - public boolean isNormalCube( - final IBlockAccess world, - final BlockPos pos ) + public boolean isNormalCube( final IBlockAccess world, final BlockPos pos ) { return this.isFullSize(); } @@ -483,10 +461,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public boolean rotateBlock( - final World w, - final BlockPos pos, - final EnumFacing axis ) + public boolean rotateBlock( final World w, final BlockPos pos, final EnumFacing axis ) { final IOrientable rotatable = this.getOrientable( w, pos ); @@ -572,9 +547,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature return this.hasSubtypes; } - public EnumFacing mapRotation( - final IOrientable ori, - final EnumFacing dir ) + public EnumFacing mapRotation( final IOrientable ori, final EnumFacing dir ) { // case DOWN: return bottomIcon; // case UP: return blockIcon; @@ -640,9 +613,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @SideOnly( Side.CLIENT ) - public void registerBlockIcons( - final TextureMap clientHelper, - final String name ) + public void registerBlockIcons( final TextureMap clientHelper, final String name ) { final BlockRenderInfo info = this.getRendererInstance(); final FlippableIcon topIcon; diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java index 0508f620..e01039e8 100644 --- a/src/main/java/appeng/block/AEBaseItemBlock.java +++ b/src/main/java/appeng/block/AEBaseItemBlock.java @@ -91,16 +91,7 @@ public class AEBaseItemBlock extends ItemBlock } @Override - public boolean placeBlockAt( - final ItemStack stack, - final EntityPlayer player, - final World w, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ, - final IBlockState newState ) + public boolean placeBlockAt( final ItemStack stack, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final IBlockState newState ) { EnumFacing up = null; EnumFacing forward = null; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 20ac2999..7b31a7eb 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -156,10 +156,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public void breakBlock( - final World w, - final BlockPos pos, - final IBlockState state ) + public void breakBlock( final World w, final BlockPos pos, final IBlockState state ) { final AEBaseTile te = this.getTileEntity( w, pos ); if( te != null ) @@ -195,11 +192,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public boolean recolorBlock( - final World world, - final BlockPos pos, - final EnumFacing side, - final EnumDyeColor color ) + public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color ) { final TileEntity te = this.getTileEntity( world, pos ); @@ -221,9 +214,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public int getComparatorInputOverride( - final World w, - final BlockPos pos ) + public int getComparatorInputOverride( final World w, final BlockPos pos ) { final TileEntity te = this.getTileEntity( w, pos ); if( te instanceof IInventory ) @@ -234,12 +225,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public boolean onBlockEventReceived( - final World worldIn, - final BlockPos pos, - final IBlockState state, - final int eventID, - final int eventParam ) + public boolean onBlockEventReceived( final World worldIn, final BlockPos pos, final IBlockState state, final int eventID, final int eventParam ) { super.onBlockEventReceived( worldIn, pos, state, eventID, eventParam ); final TileEntity tileentity = worldIn.getTileEntity( pos ); @@ -247,12 +233,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public void onBlockPlacedBy( - final World w, - final BlockPos pos, - final IBlockState state, - final EntityLivingBase placer, - final ItemStack is ) + public void onBlockPlacedBy( final World w, final BlockPos pos, final IBlockState state, final EntityLivingBase placer, final ItemStack is ) { if( is.hasDisplayName() ) { @@ -265,15 +246,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public boolean onBlockActivated( - final World w, - final BlockPos pos, - final IBlockState state, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player != null ) { diff --git a/src/main/java/appeng/block/UnlistedBlockAccess.java b/src/main/java/appeng/block/UnlistedBlockAccess.java index afeec12d..aef0df44 100644 --- a/src/main/java/appeng/block/UnlistedBlockAccess.java +++ b/src/main/java/appeng/block/UnlistedBlockAccess.java @@ -15,8 +15,7 @@ public final class UnlistedBlockAccess implements IUnlistedProperty } @Override - public boolean isValid( - final BlockPos value ) + public boolean isValid( final BlockPos value ) { return true; } @@ -28,8 +27,7 @@ public final class UnlistedBlockPos implements IUnlistedProperty } @Override - public String valueToString( - final BlockPos value ) + public String valueToString( final BlockPos value ) { return null; } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index 7706c57d..2b207260 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -53,9 +53,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit } @Override - public IAESprite getIcon( - final EnumFacing side, - final IBlockState state ) + public IAESprite getIcon( final EnumFacing side, final IBlockState state ) { if( side != EnumFacing.SOUTH ) { diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java index 6c8c6443..ecce70af 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java @@ -54,21 +54,13 @@ public class BlockCraftingStorage extends BlockCraftingUnit { 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/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index a7d7968a..576bcff7 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -138,10 +138,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock @Override protected IProperty[] getAEStates() { - return new IProperty[] { - POWERED, - FORMED - }; + return new IProperty[] { POWERED, FORMED }; } @Override diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 52bbd749..8d5fc531 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -68,15 +68,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock } @Override - public boolean onBlockActivated( - final World w, - final BlockPos pos, - final IBlockState state, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileMolecularAssembler tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() ) diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index dad41178..fec8e952 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -64,14 +64,7 @@ public class BlockCrank extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player instanceof FakePlayer || player == null ) { @@ -98,12 +91,7 @@ public class BlockCrank extends AEBaseTileBlock } @Override - public void onBlockPlacedBy( - final World world, - final BlockPos pos, - final IBlockState state, - final EntityLivingBase placer, - final ItemStack stack ) + public void onBlockPlacedBy( final World world, final BlockPos pos, final IBlockState state, final EntityLivingBase placer, final ItemStack stack ) { final AEBaseTile tile = this.getTileEntity( world, pos ); if( tile != null ) @@ -123,11 +111,7 @@ public class BlockCrank extends AEBaseTileBlock } @Override - public boolean isValidOrientation( - final World w, - final BlockPos pos, - final EnumFacing forward, - final EnumFacing up ) + public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up ) { final TileEntity te = w.getTileEntity( pos ); return !( te instanceof TileCrank ) || this.isCrankable( w, pos, up.getOpposite() ); @@ -154,11 +138,7 @@ public class BlockCrank extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( - final World world, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World world, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final AEBaseTile tile = this.getTileEntity( world, pos ); diff --git a/src/main/java/appeng/block/grindstone/BlockGrinder.java b/src/main/java/appeng/block/grindstone/BlockGrinder.java index 9c1e3bfc..f13478c5 100644 --- a/src/main/java/appeng/block/grindstone/BlockGrinder.java +++ b/src/main/java/appeng/block/grindstone/BlockGrinder.java @@ -49,29 +49,14 @@ public class BlockGrinder extends AEBaseTileBlock } @Override - public boolean onBlockActivated( - final World worldIn, - final BlockPos pos, - final IBlockState state, - final EntityPlayer playerIn, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onBlockActivated( final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer playerIn, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { // TODO Auto-generated method stub return super.onBlockActivated( worldIn, pos, state, playerIn, side, hitX, hitY, hitZ ); } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileGrinder tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() ) diff --git a/src/main/java/appeng/block/misc/BlockCellWorkbench.java b/src/main/java/appeng/block/misc/BlockCellWorkbench.java index 5f4c6221..2ef3d7d8 100644 --- a/src/main/java/appeng/block/misc/BlockCellWorkbench.java +++ b/src/main/java/appeng/block/misc/BlockCellWorkbench.java @@ -47,14 +47,7 @@ public class BlockCellWorkbench extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index 216ee1f6..a927afb0 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -71,14 +71,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { @@ -99,11 +92,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision @Override @SideOnly( Side.CLIENT ) - public void randomDisplayTick( - final World w, - final BlockPos pos, - final IBlockState state, - final Random r ) + public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) { if( !AEConfig.instance.enableEffects ) { @@ -139,11 +128,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final TileCharger tile = this.getTileEntity( w, pos ); if( tile != null ) @@ -199,12 +184,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); } diff --git a/src/main/java/appeng/block/misc/BlockCondenser.java b/src/main/java/appeng/block/misc/BlockCondenser.java index aeac4f15..20523dae 100644 --- a/src/main/java/appeng/block/misc/BlockCondenser.java +++ b/src/main/java/appeng/block/misc/BlockCondenser.java @@ -47,14 +47,7 @@ public class BlockCondenser extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index da6366b4..d8e16638 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -58,14 +58,7 @@ public class BlockInscriber extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockInterface.java b/src/main/java/appeng/block/misc/BlockInterface.java index 401eb691..027f6a7e 100644 --- a/src/main/java/appeng/block/misc/BlockInterface.java +++ b/src/main/java/appeng/block/misc/BlockInterface.java @@ -56,14 +56,7 @@ public class BlockInterface extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index 2be07d2d..ec789fc8 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -62,15 +62,13 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public int getMetaFromState( - final IBlockState state ) + public int getMetaFromState( final IBlockState state ) { return 0; } @Override - public IBlockState getStateFromMeta( - final int meta ) + public IBlockState getStateFromMeta( final int meta ) { return this.getDefaultState(); } @@ -82,11 +80,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public int getWeakPower( - final IBlockAccess w, - final BlockPos pos, - final IBlockState state, - final EnumFacing side ) + public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side ) { if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() ) { @@ -97,10 +91,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public void onNeighborChange( - final IBlockAccess world, - final BlockPos pos, - final BlockPos neighbor ) + public void onNeighborChange( final IBlockAccess world, final BlockPos pos, final BlockPos neighbor ) { super.onNeighborChange( world, pos, neighbor ); @@ -112,11 +103,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public void randomDisplayTick( - final World worldIn, - final BlockPos pos, - final IBlockState state, - final Random rand ) + public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand ) { // cancel out lightning } @@ -128,29 +115,18 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public boolean isValidOrientation( - final World w, - final BlockPos pos, - final EnumFacing forward, - final EnumFacing up ) + public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up ) { return this.canPlaceAt( w, pos, up.getOpposite() ); } - private boolean canPlaceAt( - final World w, - final BlockPos pos, - final EnumFacing dir ) + private boolean canPlaceAt( final World w, final BlockPos pos, final EnumFacing dir ) { return w.isSideSolid( pos.offset( dir ), dir.getOpposite(), false ); } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final EnumFacing up = this.getOrientable( w, pos ).getUp(); final double xOff = -0.3 * up.getFrontOffsetX(); @@ -160,12 +136,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) {/* * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add( @@ -176,11 +147,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final EnumFacing up = this.getOrientable( w, pos ).getUp(); if( !this.canPlaceAt( w, pos, up.getOpposite() ) ) @@ -189,18 +156,14 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } } - private void dropTorch( - final World w, - final BlockPos pos ) + private void dropTorch( final World w, final BlockPos pos ) { w.destroyBlock( pos, true ); w.markBlockForUpdate( pos ); } @Override - public boolean canPlaceBlockAt( - final World w, - final BlockPos pos ) + public boolean canPlaceBlockAt( final World w, final BlockPos pos ) { for( final EnumFacing dir : EnumFacing.VALUES ) { @@ -219,9 +182,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public IOrientable getOrientable( - final IBlockAccess w, - final BlockPos pos ) + public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos ) { 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 4eb8ece8..ff43ce3d 100644 --- a/src/main/java/appeng/block/misc/BlockPaint.java +++ b/src/main/java/appeng/block/misc/BlockPaint.java @@ -80,28 +80,19 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public AxisAlignedBB getCollisionBoundingBox( - final World worldIn, - final BlockPos pos, - final IBlockState state ) + public AxisAlignedBB getCollisionBoundingBox( final World worldIn, final BlockPos pos, final IBlockState state ) { return null; } @Override - public boolean canCollideCheck( - final IBlockState state, - final boolean hitIfLiquid ) + public boolean canCollideCheck( final IBlockState state, final boolean hitIfLiquid ) { return false; } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TilePaint tp = this.getTileEntity( w, pos ); @@ -112,29 +103,19 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public Item getItemDropped( - final IBlockState state, - final Random rand, - final int fortune ) + public Item getItemDropped( final IBlockState state, final Random rand, final int fortune ) { return null; } @Override - public void dropBlockAsItemWithChance( - final World worldIn, - final BlockPos pos, - final IBlockState state, - final float chance, - final int fortune ) + public void dropBlockAsItemWithChance( final World worldIn, final BlockPos pos, final IBlockState state, final float chance, final int fortune ) { } @Override - public void fillWithRain( - final World w, - final BlockPos pos ) + public void fillWithRain( final World w, final BlockPos pos ) { if( Platform.isServer() ) { @@ -143,9 +124,7 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public int getLightValue( - final IBlockAccess w, - final BlockPos pos ) + public int getLightValue( final IBlockAccess w, final BlockPos pos ) { final TilePaint tp = this.getTileEntity( w, pos ); @@ -158,17 +137,13 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public boolean isAir( - final IBlockAccess world, - final BlockPos pos ) + public boolean isAir( final IBlockAccess world, final BlockPos pos ) { return true; } @Override - public boolean isReplaceable( - final World worldIn, - final BlockPos pos ) + public boolean isReplaceable( final World worldIn, final BlockPos pos ) { return true; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 18b37b3d..c6baed1a 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -58,11 +58,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock } @Override - public void randomDisplayTick( - final World w, - final BlockPos pos, - final IBlockState state, - final Random r ) + public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) { if( !AEConfig.instance.enableEffects ) { diff --git a/src/main/java/appeng/block/misc/BlockQuartzTorch.java b/src/main/java/appeng/block/misc/BlockQuartzTorch.java index 6b8f64de..7562ec3e 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzTorch.java +++ b/src/main/java/appeng/block/misc/BlockQuartzTorch.java @@ -66,15 +66,13 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I } @Override - public int getMetaFromState( - final IBlockState state ) + public int getMetaFromState( final IBlockState state ) { return 0; } @Override - public IBlockState getStateFromMeta( - final int meta ) + public IBlockState getStateFromMeta( final int meta ) { return this.getDefaultState(); } @@ -124,11 +122,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I @Override @SideOnly( Side.CLIENT ) - public void randomDisplayTick( - final World w, - final BlockPos pos, - final IBlockState state, - final Random r ) + public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) { if( !AEConfig.instance.enableEffects ) { @@ -156,11 +150,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final EnumFacing up = this.getOrientable( w, pos ).getUp(); if( !this.canPlaceAt( w, pos, up.getOpposite() ) ) diff --git a/src/main/java/appeng/block/misc/BlockSecurity.java b/src/main/java/appeng/block/misc/BlockSecurity.java index de63b2f4..42a6d646 100644 --- a/src/main/java/appeng/block/misc/BlockSecurity.java +++ b/src/main/java/appeng/block/misc/BlockSecurity.java @@ -62,14 +62,7 @@ public class BlockSecurity extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/BlockSkyCompass.java index 7ef5fac4..3295cdd0 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/BlockSkyCompass.java @@ -75,11 +75,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TileSkyCompass sc = this.getTileEntity( w, pos ); final EnumFacing up = sc.getForward(); @@ -96,9 +92,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision } @Override - public boolean canPlaceBlockAt( - final World w, - final BlockPos pos ) + public boolean canPlaceBlockAt( final World w, final BlockPos pos ) { for( final EnumFacing dir : EnumFacing.VALUES ) { @@ -111,11 +105,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final TileSkyCompass tile = this.getTileEntity( w, pos ); if( tile != null ) @@ -177,12 +167,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, 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 0ecdc7da..668a48e6 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -69,14 +69,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { @@ -97,11 +90,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock } @Override - public void randomDisplayTick( - final World w, - final BlockPos pos, - final IBlockState state, - final Random r ) + public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) { if( !AEConfig.instance.enableEffects ) { diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index a503358a..a74f7b74 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -104,43 +104,29 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public void randomDisplayTick( - final World worldIn, - final BlockPos pos, - final IBlockState state, - final Random rand ) + public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand ) { this.cb( worldIn, pos ).randomDisplayTick( worldIn, pos, rand ); } @Override - public void onNeighborChange( - final IBlockAccess w, - final BlockPos pos, - final BlockPos neighbor ) + public void onNeighborChange( final IBlockAccess w, final BlockPos pos, final BlockPos neighbor ) { this.cb( w, pos ).onNeighborChanged(); } @Override - public Item getItemDropped( - final IBlockState state, - final Random rand, - final int fortune ) + public Item getItemDropped( final IBlockState state, final Random rand, final int fortune ) { return null; } @Override - public int getWeakPower( - final IBlockAccess w, - final BlockPos pos, - final IBlockState state, - final EnumFacing side ) + public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side ) { return this.cb( w, pos ).isProvidingWeakPower( side.getOpposite() ); // TODO: - // IS - // OPPOSITE!? + // IS + // OPPOSITE!? } @Override @@ -150,31 +136,21 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public void onEntityCollidedWithBlock( - final World w, - final BlockPos pos, - final IBlockState state, - final Entity entityIn ) + public void onEntityCollidedWithBlock( final World w, final BlockPos pos, final IBlockState state, final Entity entityIn ) { this.cb( w, pos ).onEntityCollision( entityIn ); } @Override - public int getStrongPower( - final IBlockAccess w, - final BlockPos pos, - final IBlockState state, - final EnumFacing side ) + public int getStrongPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side ) { return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() ); // TODO: - // IS - // OPPOSITE!? + // IS + // OPPOSITE!? } @Override - public int getLightValue( - final IBlockAccess world, - final BlockPos pos ) + public int getLightValue( final IBlockAccess world, final BlockPos pos ) { final IBlockState block = world.getBlockState( pos ); if( block != null && block.getBlock() != this ) @@ -189,37 +165,25 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean isLadder( - final IBlockAccess world, - final BlockPos pos, - final EntityLivingBase entity ) + public boolean isLadder( final IBlockAccess world, final BlockPos pos, final EntityLivingBase entity ) { return this.cb( world, pos ).isLadder( entity ); } @Override - public boolean isSideSolid( - final IBlockAccess w, - final BlockPos pos, - final EnumFacing side ) + public boolean isSideSolid( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { return this.cb( w, pos ).isSolidOnSide( side ); } @Override - public boolean isReplaceable( - final World w, - final BlockPos pos ) + public boolean isReplaceable( final World w, final BlockPos pos ) { return this.cb( w, pos ).isEmpty(); } @Override - public boolean removedByPlayer( - final World world, - final BlockPos pos, - final EntityPlayer player, - final boolean willHarvest ) + public boolean removedByPlayer( final World world, final BlockPos pos, final EntityPlayer player, final boolean willHarvest ) { if( player.capabilities.isCreativeMode ) { @@ -234,10 +198,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean canConnectRedstone( - final IBlockAccess w, - final BlockPos pos, - EnumFacing side ) + public boolean canConnectRedstone( final IBlockAccess w, final BlockPos pos, EnumFacing side ) { if( side == null ) { @@ -248,8 +209,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean canRenderInLayer( - final EnumWorldBlockLayer layer ) + public boolean canRenderInLayer( final EnumWorldBlockLayer layer ) { if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) { @@ -260,10 +220,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public ItemStack getPickBlock( - final MovingObjectPosition target, - final World world, - final BlockPos pos ) + public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final BlockPos pos ) { final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ); final SelectedPart sp = this.cb( world, pos ).selectPart( v3 ); @@ -282,10 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements @Override @SideOnly( Side.CLIENT ) - public boolean addHitEffects( - final World world, - final MovingObjectPosition target, - final EffectRenderer effectRenderer ) + public boolean addHitEffects( final World world, final MovingObjectPosition target, final EffectRenderer effectRenderer ) { final Object object = this.cb( world, target.getBlockPos() ); if( object instanceof IPartHost ) @@ -316,10 +270,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean addDestroyEffects( - final World world, - final BlockPos pos, - final EffectRenderer effectRenderer ) + public boolean addDestroyEffects( final World world, final BlockPos pos, final EffectRenderer effectRenderer ) { final Object object = this.cb( world, pos ); if( object instanceof IPartHost ) @@ -345,11 +296,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { if( Platform.isServer() ) { @@ -357,9 +304,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } } - private ICableBusContainer cb( - final IBlockAccess w, - final BlockPos pos ) + private ICableBusContainer cb( final IBlockAccess w, final BlockPos pos ) { final TileEntity te = w.getTileEntity( pos ); ICableBusContainer out = null; @@ -383,34 +328,18 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { return this.cb( w, pos ).activate( player, new Vec3( hitX, hitY, hitZ ) ); } @Override - public boolean recolorBlock( - final World world, - final BlockPos pos, - final EnumFacing side, - final EnumDyeColor color ) + public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color ) { return this.recolorBlock( world, pos, side, color, null ); } - public boolean recolorBlock( - final World world, - final BlockPos pos, - final EnumFacing side, - final EnumDyeColor color, - final EntityPlayer who ) + public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color, final EntityPlayer who ) { try { @@ -424,18 +353,13 @@ public class BlockCableBus extends AEBaseTileBlock // implements @Override @SideOnly( Side.CLIENT ) - public void getCheckedSubBlocks( - final Item item, - final CreativeTabs tabs, - final List itemStacks ) + public void getCheckedSubBlocks( final Item item, final CreativeTabs tabs, final List itemStacks ) { // do nothing } @Override - public T getTileEntity( - final IBlockAccess w, - final BlockPos pos ) + public T getTileEntity( final IBlockAccess w, final BlockPos pos ) { final TileEntity te = w.getTileEntity( pos ); @@ -453,8 +377,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - protected void setFeature( - final EnumSet f ) + protected void setFeature( final EnumSet f ) { final AECableBusFeatureHandler featureHandler = new AECableBusFeatureHandler( f, this, this.getFeatureSubName() ); this.setHandler( featureHandler ); diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 3dbf1487..760459dd 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -62,8 +62,7 @@ public class BlockController extends AEBaseTileBlock } @Override - public int getMetaFromState( - final IBlockState state ) + public int getMetaFromState( final IBlockState state ) { return ( (ControllerBlockState) state.getValue( CONTROLLER_STATE ) ).ordinal(); } @@ -89,11 +88,7 @@ public class BlockController extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TileController tc = this.getTileEntity( w, pos ); if( tc != null ) diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index 4837cbb4..94cd4f71 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -50,8 +50,7 @@ public class BlockEnergyCell extends AEBaseTileBlock public static final PropertyInteger ENERGY_STORAGE = PropertyInteger.create( "fullness", 0, 8 ); @Override - public int getMetaFromState( - final IBlockState state ) + public int getMetaFromState( final IBlockState state ) { return (int) state.getValue( ENERGY_STORAGE ); } diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index a046fefd..7c609aa2 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -70,15 +70,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision } @Override - public boolean onBlockActivated( - final World w, - final BlockPos pos, - final IBlockState state, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { @@ -98,11 +90,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final TileWireless tile = this.getTileEntity( w, pos ); if( tile != null ) @@ -164,12 +152,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { final TileWireless tile = this.getTileEntity( w, pos ); if( tile != null ) diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index 277f13d1..ae72254a 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -56,11 +56,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TileQuantumBridge bridge = this.getTileEntity( w, pos ); if( bridge != null ) @@ -70,10 +66,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto } @Override - public void breakBlock( - final World w, - final BlockPos pos, - final IBlockState state ) + public void breakBlock( final World w, final BlockPos pos, final IBlockState state ) { final TileQuantumBridge bridge = this.getTileEntity( w, pos ); if( bridge != null ) diff --git a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java index 39a7010f..505dd86d 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java @@ -49,11 +49,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase } @Override - public void randomDisplayTick( - final World w, - final BlockPos pos, - final IBlockState state, - final Random rand ) + public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random rand ) { final TileQuantumBridge bridge = this.getTileEntity( w, pos ); if( bridge != null ) @@ -69,14 +65,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { @@ -96,23 +85,14 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { 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, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { final double onePixel = 2.0 / 16.0; out.add( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); diff --git a/src/main/java/appeng/block/qnb/BlockQuantumRing.java b/src/main/java/appeng/block/qnb/BlockQuantumRing.java index 5493e2b4..56457393 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumRing.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumRing.java @@ -40,11 +40,7 @@ public class BlockQuantumRing extends BlockQuantumBase } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { double onePixel = 2.0 / 16.0; final TileQuantumBridge bridge = this.getTileEntity( w, pos ); @@ -60,12 +56,7 @@ public class BlockQuantumRing extends BlockQuantumBase } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { double onePixel = 2.0 / 16.0; final TileQuantumBridge bridge = this.getTileEntity( w, pos ); diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index da7aa387..80a69e17 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -70,49 +70,32 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { 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, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); } @Override - public boolean canPlaceBlockAt( - final World worldIn, - final BlockPos pos ) + public boolean canPlaceBlockAt( final World worldIn, final BlockPos pos ) { return false; } @Override - public void onBlockExploded( - final World world, - final BlockPos pos, - final Explosion explosion ) + public void onBlockExploded( final World world, final BlockPos pos, final Explosion explosion ) { // Don't explode. } @Override - public boolean canEntityDestroy( - final IBlockAccess world, - final BlockPos pos, - final Entity entity ) + public boolean canEntityDestroy( final IBlockAccess world, final BlockPos pos, final Entity entity ) { return false; } diff --git a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java index 6770bc11..1f7f42fa 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java @@ -48,11 +48,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TileSpatialIOPort te = this.getTileEntity( w, pos ); if( te != null ) @@ -62,14 +58,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java index f47044f2..76904f7e 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java @@ -46,11 +46,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TileSpatialPylon tsp = this.getTileEntity( w, pos ); if( tsp != null ) @@ -60,9 +56,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock } @Override - public int getLightValue( - final IBlockAccess w, - final BlockPos pos ) + public int getLightValue( final IBlockAccess w, final BlockPos pos ) { final TileSpatialPylon tsp = this.getTileEntity( w, pos ); if( tsp != null ) diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index 66eb1583..c4436b5c 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -65,14 +65,7 @@ public class BlockChest extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileChest tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() ) diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index ff1a5f0e..716543ac 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -61,14 +61,7 @@ public class BlockDrive extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/storage/BlockIOPort.java b/src/main/java/appeng/block/storage/BlockIOPort.java index 43355da0..171990bd 100644 --- a/src/main/java/appeng/block/storage/BlockIOPort.java +++ b/src/main/java/appeng/block/storage/BlockIOPort.java @@ -48,11 +48,7 @@ public class BlockIOPort extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( - final World w, - final BlockPos pos, - final IBlockState state, - final Block neighborBlock ) + public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) { final TileIOPort te = this.getTileEntity( w, pos ); if( te != null ) @@ -62,14 +58,7 @@ public class BlockIOPort extends AEBaseTileBlock } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer p, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index 78ae0bdc..efbc0bdc 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -74,14 +74,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision } @Override - public boolean onActivated( - final World w, - final BlockPos pos, - final EntityPlayer player, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( Platform.isServer() ) { @@ -92,11 +85,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final TileSkyChest sk = this.getTileEntity( w, pos ); EnumFacing o = EnumFacing.UP; @@ -115,12 +104,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { out.add( AxisAlignedBB.fromBounds( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) ); } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index f4f41957..3b29c97f 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -262,8 +262,7 @@ public class ClientHelper extends ServerHelper inst.entityRenderMap.put( EntityFloatingItem.class, new RenderFloatingItem( inst ) ); final ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); - final ItemMeshDefinition imd = new ItemMeshDefinition() - { + final ItemMeshDefinition imd = new ItemMeshDefinition(){ @Override public ModelResourceLocation getModelLocation( final ItemStack stack ) diff --git a/src/main/java/appeng/client/SmartModel.java b/src/main/java/appeng/client/SmartModel.java index f0339de0..491ee810 100644 --- a/src/main/java/appeng/client/SmartModel.java +++ b/src/main/java/appeng/client/SmartModel.java @@ -31,15 +31,13 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode private final BlockRenderInfo aeRenderer; - public SmartModel( - final BlockRenderInfo rendererInstance ) + public SmartModel( final BlockRenderInfo rendererInstance ) { this.aeRenderer = rendererInstance; } @Override - public List getFaceQuads( - final EnumFacing p_177551_1_ ) + public List getFaceQuads( final EnumFacing p_177551_1_ ) { return Collections.emptyList(); } @@ -81,8 +79,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode } @Override - public IBakedModel handleItemState( - final ItemStack stack ) + public IBakedModel handleItemState( final ItemStack stack ) { final ModelGenerator helper = new ModelGenerator(); final Block blk = Block.getBlockFromItem( stack.getItem() ); @@ -93,8 +90,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode } @Override - public IBakedModel handleBlockState( - final IBlockState state ) + public IBakedModel handleBlockState( final IBlockState state ) { final ModelGenerator helper = new ModelGenerator(); final Block blk = state.getBlock(); diff --git a/src/main/java/appeng/client/render/AppEngRenderItem.java b/src/main/java/appeng/client/render/AppEngRenderItem.java index 3a2fcfbf..083d2a3c 100644 --- a/src/main/java/appeng/client/render/AppEngRenderItem.java +++ b/src/main/java/appeng/client/render/AppEngRenderItem.java @@ -48,9 +48,7 @@ import appeng.util.ReadableNumberConverter; */ public class AppEngRenderItem extends RenderItem { - public AppEngRenderItem( - final TextureManager textureManager, - final ModelManager modelManager ) + public AppEngRenderItem( final TextureManager textureManager, final ModelManager modelManager ) { super( textureManager, modelManager ); } @@ -61,12 +59,7 @@ public class AppEngRenderItem extends RenderItem private IAEItemStack aeStack = null; @Override - public void renderItemOverlayIntoGUI( - final FontRenderer fontRenderer, - final ItemStack is, - final int xPos, - final int yPos, - final String text ) + public void renderItemOverlayIntoGUI( final FontRenderer fontRenderer, final ItemStack is, final int xPos, final int yPos, final String text ) { if( is != null ) { diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index e34f9a98..610d2316 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -443,11 +443,11 @@ public class BaseBlockRender protected void renderBlockBounds( final ModelGenerator renderer, - double minX, double minY, double minZ, + double minX, double minY, double minZ, - double maxX, double maxY, double maxZ, + double maxX, double maxY, double maxZ, - final EnumFacing x, final EnumFacing y, final EnumFacing z ) + final EnumFacing x, final EnumFacing y, final EnumFacing z ) { minX /= 16.0; minY /= 16.0; @@ -557,28 +557,28 @@ 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, - // u -> u - 0, 1.0, - // v -> v - 0, edgeThickness, ico, flip ); + // u -> u + 0, 1.0, + // v -> v + 0, edgeThickness, ico, flip ); 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 ); + // 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, - // u -> u - 1.0 - edgeThickness, 1.0, - // v -> v - edgeThickness, 1.0 - edgeThickness, ico, flip ); + // 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, - // u -> u - 0, 1.0, - // v -> v - 1.0 - edgeThickness, 1.0, ico, flip ); + // u -> u + 0, 1.0, + // v -> v + 1.0 - edgeThickness, 1.0, ico, flip ); } @SideOnly( Side.CLIENT ) diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index c78c5ea3..8adafc22 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -31,8 +31,7 @@ public class BusRenderer return this.mg; } - public void setRenderer( - ModelGenerator renderer ) + public void setRenderer( ModelGenerator renderer ) { this.mg = renderer; } diff --git a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java index a76c8c6e..c9c33243 100644 --- a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java +++ b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java @@ -10,17 +10,8 @@ import net.minecraft.world.IBlockAccess; public interface ISimpleBlockRenderingHandler { - void renderInventoryBlock( - Block block, - int metadata, - int modelID, - ModelGenerator renderer ); + void renderInventoryBlock( Block block, int metadata, int modelID, ModelGenerator renderer ); - boolean renderWorldBlock( - IBlockAccess world, - BlockPos pos, - Block block, - int modelId, - ModelGenerator renderer ); + boolean renderWorldBlock( IBlockAccess world, BlockPos pos, Block block, int modelId, ModelGenerator renderer ); } diff --git a/src/main/java/appeng/client/render/IconUnwrapper.java b/src/main/java/appeng/client/render/IconUnwrapper.java index 4b339c99..5ecf021b 100644 --- a/src/main/java/appeng/client/render/IconUnwrapper.java +++ b/src/main/java/appeng/client/render/IconUnwrapper.java @@ -18,8 +18,7 @@ public class IconUnwrapper extends TextureAtlasSprite private final float min_v; private final float max_v; - protected IconUnwrapper( - final IAESprite src ) + protected IconUnwrapper( final IAESprite src ) { super( src.getIconName() ); this.width = src.getIconWidth(); diff --git a/src/main/java/appeng/client/render/ModelGenerator.java b/src/main/java/appeng/client/render/ModelGenerator.java index c22afaa3..aeca45b4 100644 --- a/src/main/java/appeng/client/render/ModelGenerator.java +++ b/src/main/java/appeng/client/render/ModelGenerator.java @@ -90,8 +90,7 @@ public class ModelGenerator } @Override - public List getFaceQuads( - final EnumFacing p_177551_1_ ) + public List getFaceQuads( final EnumFacing p_177551_1_ ) { return this.faces[p_177551_1_.ordinal()]; } @@ -125,16 +124,7 @@ public class ModelGenerator private float tx = 0, ty = 0, tz = 0; private final float[] defUVs = { 0, 0, 1, 1 }; - private final float[] quadsUV = { - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1 - }; + private final float[] quadsUV = { 0, 0, 1, 1, 0, 0, 1, 1 }; private EnumSet renderFaces = EnumSet.allOf( EnumFacing.class ); private boolean flipTexture = false; private final List faces = new ArrayList(); @@ -145,8 +135,7 @@ public class ModelGenerator private EnumFacing currentFace = EnumFacing.UP; private int color = -1; - public void setRenderBoundsFromBlock( - final Block block ) + public void setRenderBoundsFromBlock( final Block block ) { if( block == null ) { @@ -161,13 +150,7 @@ public class ModelGenerator this.setRenderMaxZ( block.getBlockBoundsMaxZ() ); } - public void setRenderBounds( - final double d, - final double e, - final double f, - final double g, - final double h, - final double i ) + public void setRenderBounds( final double d, final double e, final double f, final double g, final double h, final double i ) { this.setRenderMinX( d ); this.setRenderMinY( e ); @@ -177,74 +160,49 @@ public class ModelGenerator this.setRenderMaxZ( i ); } - public void setBrightness( - final int i ) + public void setBrightness( final int i ) { this.brightness = i; } - public void setColorRGBA_F( - final int r, - final int g, - final int b, - final float a ) + public void setColorRGBA_F( final int r, final int g, final int b, final float a ) { final int alpha = (int) ( a * 0xff ); - this.color = alpha << 24 | - r << 16 | - b << 8 | - b; + this.color = alpha << 24 | r << 16 | b << 8 | b; } - public void setColorOpaque_I( - final int whiteVariant ) + public void setColorOpaque_I( final int whiteVariant ) { final int alpha = 0xff; this.color = // alpha << 24 | whiteVariant; } - public void setColorOpaque( - final int r, - final int g, - final int b ) + public void setColorOpaque( final int r, final int g, final int b ) { final int alpha = 0xff; this.color = // alpha << 24 | - r << 16 | - g << 8 | - b; + r << 16 | g << 8 | b; } - public void setColorOpaque_F( - final int r, - final int g, - final int b ) + public void setColorOpaque_F( final int r, final int g, final int b ) { final int alpha = 0xff; this.color = // alpha << 24 | - Math.min( 0xff, Math.max( 0, r ) ) << 16 | - Math.min( 0xff, Math.max( 0, g ) ) << 8 | - Math.min( 0xff, Math.max( 0, b ) ); + Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); } - public void setColorOpaque_F( - final float rf, - final float bf, - final float gf ) + public void setColorOpaque_F( final float rf, final float bf, final float gf ) { final int r = (int) ( rf * 0xff ); final int g = (int) ( gf * 0xff ); final int b = (int) ( bf * 0xff ); final int alpha = 0xff; this.color = // alpha << 24 | - Math.min( 0xff, Math.max( 0, r ) ) << 16 | - Math.min( 0xff, Math.max( 0, g ) ) << 8 | - Math.min( 0xff, Math.max( 0, b ) ); + Math.min( 0xff, Math.max( 0, r ) ) << 16 | Math.min( 0xff, Math.max( 0, g ) ) << 8 | Math.min( 0xff, Math.max( 0, b ) ); } - public IAESprite getIcon( - final ItemStack is ) + public IAESprite getIcon( final ItemStack is ) { final Item it = is.getItem(); @@ -272,8 +230,7 @@ public class ModelGenerator return new MissingIcon( is ); } - public IAESprite[] getIcon( - final IBlockState state ) + public IAESprite[] getIcon( final IBlockState state ) { final IAESprite[] out = new IAESprite[6]; @@ -334,52 +291,20 @@ public class ModelGenerator return this.getIcon( state ); } - public void addVertexWithUV( - final EnumFacing face, - final double x, - final double y, - final double z, - final double u, - final double v ) + public void addVertexWithUV( final EnumFacing face, final double x, final double y, final double z, final double u, final double v ) { this.points[this.point++] = new float[] { (float) x + this.tx, (float) y + this.ty, (float) z + this.tz, (float) u, (float) v }; if( this.point == 4 ) { this.brightness = -1; - final int[] vertData = { - Float.floatToRawIntBits( this.points[0][0] ), - Float.floatToRawIntBits( this.points[0][1] ), - Float.floatToRawIntBits( this.points[0][2] ), - this.brightness, - Float.floatToRawIntBits( this.points[0][3] ), - Float.floatToRawIntBits( this.points[0][4] ), - 0, + final int[] vertData = { Float.floatToRawIntBits( this.points[0][0] ), Float.floatToRawIntBits( this.points[0][1] ), Float.floatToRawIntBits( this.points[0][2] ), this.brightness, Float.floatToRawIntBits( this.points[0][3] ), Float.floatToRawIntBits( this.points[0][4] ), 0, - Float.floatToRawIntBits( this.points[1][0] ), - Float.floatToRawIntBits( this.points[1][1] ), - Float.floatToRawIntBits( this.points[1][2] ), - this.brightness, - Float.floatToRawIntBits( this.points[1][3] ), - Float.floatToRawIntBits( this.points[1][4] ), - 0, + Float.floatToRawIntBits( this.points[1][0] ), Float.floatToRawIntBits( this.points[1][1] ), Float.floatToRawIntBits( this.points[1][2] ), this.brightness, Float.floatToRawIntBits( this.points[1][3] ), Float.floatToRawIntBits( this.points[1][4] ), 0, - Float.floatToRawIntBits( this.points[2][0] ), - Float.floatToRawIntBits( this.points[2][1] ), - Float.floatToRawIntBits( this.points[2][2] ), - this.brightness, - Float.floatToRawIntBits( this.points[2][3] ), - Float.floatToRawIntBits( this.points[2][4] ), - 0, + Float.floatToRawIntBits( this.points[2][0] ), Float.floatToRawIntBits( this.points[2][1] ), Float.floatToRawIntBits( this.points[2][2] ), this.brightness, Float.floatToRawIntBits( this.points[2][3] ), Float.floatToRawIntBits( this.points[2][4] ), 0, - Float.floatToRawIntBits( this.points[3][0] ), - Float.floatToRawIntBits( this.points[3][1] ), - Float.floatToRawIntBits( this.points[3][2] ), - this.brightness, - Float.floatToRawIntBits( this.points[3][3] ), - Float.floatToRawIntBits( this.points[3][4] ), - 0, - }; + Float.floatToRawIntBits( this.points[3][0] ), Float.floatToRawIntBits( this.points[3][1] ), Float.floatToRawIntBits( this.points[3][2] ), this.brightness, Float.floatToRawIntBits( this.points[3][3] ), Float.floatToRawIntBits( this.points[3][4] ), 0, }; this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) ); @@ -387,9 +312,7 @@ public class ModelGenerator } } - public boolean renderStandardBlock( - final Block block, - final BlockPos pos ) + public boolean renderStandardBlock( final Block block, final BlockPos pos ) { // setRenderBoundsFromBlock( block ); @@ -406,10 +329,7 @@ public class ModelGenerator return false; } - public void setTranslation( - final int x, - final int y, - final int z ) + public void setTranslation( final int x, final int y, final int z ) { this.tx = x; this.ty = y; @@ -421,10 +341,7 @@ public class ModelGenerator return MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT; } - private float[] getFaceUvs( - final EnumFacing face, - final Vector3f to_16, - final Vector3f from_16 ) + private float[] getFaceUvs( final EnumFacing face, final Vector3f to_16, final Vector3f from_16 ) { float from_a = 0; float from_b = 0; @@ -494,10 +411,7 @@ public class ModelGenerator return afloat; } - public void renderFaceXNeg( - final Block blk, - final BlockPos pos, - final IAESprite lights ) + public void renderFaceXNeg( final Block blk, final BlockPos pos, final IAESprite lights ) { final boolean isEdge = this.getRenderMinX() < 0.0001; final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f ); @@ -507,10 +421,7 @@ public class ModelGenerator this.addFace( myFace, isEdge, to, from, this.defUVs, lights ); } - public void renderFaceYNeg( - final Block blk, - final BlockPos pos, - final IAESprite lights ) + public void renderFaceYNeg( final Block blk, final BlockPos pos, final IAESprite lights ) { final boolean isEdge = this.getRenderMinY() < 0.0001; final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f ); @@ -520,10 +431,7 @@ public class ModelGenerator this.addFace( myFace, isEdge, to, from, this.defUVs, lights ); } - public void renderFaceZNeg( - final Block blk, - final BlockPos pos, - final IAESprite lights ) + public void renderFaceZNeg( final Block blk, final BlockPos pos, final IAESprite lights ) { final boolean isEdge = this.getRenderMinZ() < 0.0001; final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f ); @@ -533,10 +441,7 @@ public class ModelGenerator this.addFace( myFace, isEdge, to, from, this.defUVs, lights ); } - public void renderFaceYPos( - final Block blk, - final BlockPos pos, - final IAESprite lights ) + public void renderFaceYPos( final Block blk, final BlockPos pos, final IAESprite lights ) { final boolean isEdge = this.getRenderMaxY() > 0.9999; final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMinZ() * 16.0f ); @@ -546,10 +451,7 @@ public class ModelGenerator this.addFace( myFace, isEdge, to, from, this.defUVs, lights ); } - public void renderFaceZPos( - final Block blk, - final BlockPos pos, - final IAESprite lights ) + public void renderFaceZPos( final Block blk, final BlockPos pos, final IAESprite lights ) { final boolean isEdge = this.getRenderMaxZ() > 0.9999; final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f ); @@ -559,10 +461,7 @@ public class ModelGenerator this.addFace( myFace, isEdge, to, from, this.defUVs, lights ); } - public void renderFaceXPos( - final Block blk, - final BlockPos pos, - final IAESprite lights ) + public void renderFaceXPos( final Block blk, final BlockPos pos, final IAESprite lights ) { final boolean isEdge = this.getRenderMaxX() > 0.9999; final Vector3f to = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f ); @@ -572,12 +471,7 @@ public class ModelGenerator this.addFace( myFace, isEdge, to, from, this.defUVs, lights ); } - private void addFace( - final EnumFacing face, final boolean isEdge, - final Vector3f to, - final Vector3f from, - final float[] defUVs2, - IAESprite texture ) + private void addFace( final EnumFacing face, final boolean isEdge, final Vector3f to, final Vector3f from, final float[] defUVs2, IAESprite texture ) { if( this.getOverrideBlockTexture() != null ) { @@ -587,10 +481,7 @@ public class ModelGenerator this.faces.add( new SMFace( face, isEdge, this.color, to, from, defUVs2, new IconUnwrapper( texture ) ) ); } - public void setNormal( - final float x, - final float y, - final float z ) + public void setNormal( final float x, final float y, final float z ) { if( x > 0.5 ) { @@ -618,8 +509,7 @@ public class ModelGenerator } } - public void setOverrideBlockTexture( - final IAESprite object ) + public void setOverrideBlockTexture( final IAESprite object ) { this.overrideBlockTexture = object; } diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index f8367716..1a30983b 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -36,8 +36,7 @@ public class RenderBlocksWorkaround extends ModelGenerator private EnumSet renderFaces; private float opacity; - public void setTexture( - final Object object ) + public void setTexture( final Object object ) { // TODO Auto-generated method stub } diff --git a/src/main/java/appeng/client/render/SMFace.java b/src/main/java/appeng/client/render/SMFace.java index 51d963f0..e9536c7d 100644 --- a/src/main/java/appeng/client/render/SMFace.java +++ b/src/main/java/appeng/client/render/SMFace.java @@ -23,13 +23,7 @@ public class SMFace private final int color; - public SMFace( - final EnumFacing face, final boolean isEdge, - final int color, - final Vector3f to, - final Vector3f from, - final float[] defUVs2, - final TextureAtlasSprite iconUnwrapper ) + public SMFace( final EnumFacing face, final boolean isEdge, final int color, final Vector3f to, final Vector3f from, final float[] defUVs2, final TextureAtlasSprite iconUnwrapper ) { this.color = color; this.face = face; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java index 76074f4b..2c494c92 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java @@ -44,10 +44,7 @@ public class RenderBlockSkyChest extends BaseBlockRender getItemInventory() diff --git a/src/main/java/appeng/helpers/InventoryAction.java b/src/main/java/appeng/helpers/InventoryAction.java index 5076b85e..ec239b22 100644 --- a/src/main/java/appeng/helpers/InventoryAction.java +++ b/src/main/java/appeng/helpers/InventoryAction.java @@ -22,11 +22,22 @@ package appeng.helpers; public enum InventoryAction { // standard vanilla mechanics. - PICKUP_OR_SET_DOWN, SPLIT_OR_PLACE_SINGLE, CREATIVE_DUPLICATE, SHIFT_CLICK, + PICKUP_OR_SET_DOWN, + SPLIT_OR_PLACE_SINGLE, + CREATIVE_DUPLICATE, + SHIFT_CLICK, // crafting term - CRAFT_STACK, CRAFT_ITEM, CRAFT_SHIFT, + CRAFT_STACK, + CRAFT_ITEM, + CRAFT_SHIFT, // extra... - MOVE_REGION, PICKUP_SINGLE, UPDATE_HAND, ROLL_UP, ROLL_DOWN, AUTO_CRAFT, PLACE_SINGLE + MOVE_REGION, + PICKUP_SINGLE, + UPDATE_HAND, + ROLL_UP, + ROLL_DOWN, + AUTO_CRAFT, + PLACE_SINGLE } diff --git a/src/main/java/appeng/hooks/IBlockTool.java b/src/main/java/appeng/hooks/IBlockTool.java index f0c514db..0c1192d4 100644 --- a/src/main/java/appeng/hooks/IBlockTool.java +++ b/src/main/java/appeng/hooks/IBlockTool.java @@ -29,14 +29,6 @@ import net.minecraft.world.World; public interface IBlockTool { - public boolean onItemUse( - ItemStack item, - EntityPlayer p, - World w, - BlockPos pos, - EnumFacing side, - float hitX, - float hitY, - float hitZ ); + public boolean onItemUse( ItemStack item, EntityPlayer p, World w, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ ); } diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 9cda3511..7af415e7 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -111,21 +111,18 @@ public abstract class AEBaseItem extends Item implements IAEFeature protected IAESprite myIcon = null; @SideOnly( Side.CLIENT ) - public void registerIcons( - final ClientHelper proxy, final String name ) + public void registerIcons( final ClientHelper proxy, final String name ) { proxy.setIcon( this, 0, name ); } - public IAESprite getIcon( - final ItemStack is ) + public IAESprite getIcon( final ItemStack is ) { return this.myIcon; } @SideOnly( Side.CLIENT ) - public void registerCustomIcon( - final TextureMap map ) + public void registerCustomIcon( final TextureMap map ) { } diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index 15fd5478..ada67811 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -67,8 +67,7 @@ public class NetworkToolViewer implements INetworkTool } @Override - public ItemStack removeStackFromSlot( - int i ) + public ItemStack removeStackFromSlot( int i ) { return this.inv.removeStackFromSlot( i ); } @@ -141,16 +140,13 @@ public class NetworkToolViewer implements INetworkTool } @Override - public int getField( - final int id ) + public int getField( final int id ) { return this.inv.getField( id ); } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { this.inv.setField( id, value ); } diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index 9c31e72e..a87f5253 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -97,8 +97,7 @@ public class PortableCellViewer extends MEMonitorHandler implement @Override public IConfigManager getConfigManager() { - final ConfigManager out = new ConfigManager( new IConfigManagerHost() - { + final ConfigManager out = new ConfigManager( new IConfigManagerHost(){ @Override public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue ) diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index 21a0550d..5caa5694 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -86,7 +86,8 @@ public enum MaterialType // Adv Cards AdvCard( 28 ), - CardFuzzy( 29 ), CardSpeed( 30 ), + CardFuzzy( 29 ), + CardSpeed( 30 ), CardInverter( 31 ), Cell2SpatialPart( 32, AEFeature.SpatialIO ), diff --git a/src/main/java/appeng/items/materials/MultiItem.java b/src/main/java/appeng/items/materials/MultiItem.java index 1d2985c8..d2f69e8c 100644 --- a/src/main/java/appeng/items/materials/MultiItem.java +++ b/src/main/java/appeng/items/materials/MultiItem.java @@ -279,8 +279,7 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU protected void getCheckedSubItems( final Item sameItem, final CreativeTabs creativeTab, final List itemStacks ) { final List types = Arrays.asList( MaterialType.values() ); - Collections.sort( types, new Comparator() - { + Collections.sort( types, new Comparator(){ @Override public int compare( final MaterialType o1, final MaterialType o2 ) diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 90b0dd33..18ef9e5f 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -99,8 +99,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){ @Override - public ModelResourceLocation getModelLocation( - final ItemStack stack ) + public ModelResourceLocation getModelLocation( final ItemStack stack ) { ModelResourceLocation[] list = null; diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 4cd07113..818037fa 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -68,9 +68,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt } @Override - public void registerIcons( - final ClientHelper proxy, - final String name ) + public void registerIcons( final ClientHelper proxy, final String name ) { this.encodedPatternModel = this.res = proxy.setIcon( this, name ); @@ -79,8 +77,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt boolean recursive = false; @Override - public ModelResourceLocation getModelLocation( - final ItemStack stack ) + public ModelResourceLocation getModelLocation( final ItemStack stack ) { if( this.recursive == false ) { @@ -112,15 +109,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt } @Override - public boolean onItemUseFirst( - final ItemStack stack, - final EntityPlayer player, - final World world, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { return this.clearPattern( stack, player ); } diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 7eaab0b9..38b3da28 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -59,8 +59,7 @@ public class ItemPaintBall extends AEBaseItem Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this, new ItemMeshDefinition(){ @Override - public ModelResourceLocation getModelLocation( - final ItemStack stack ) + public ModelResourceLocation getModelLocation( final ItemStack stack ) { if( ItemPaintBall.this.isLumen( stack ) ) { @@ -84,9 +83,7 @@ public class ItemPaintBall extends AEBaseItem } @Override - public int getColorFromItemStack( - final ItemStack stack, - final int renderPass ) + public int getColorFromItemStack( final ItemStack stack, final int renderPass ) { final AEColor col = this.getColor( stack ); diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index b8c308a7..1de8104f 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -68,15 +68,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } @Override - public boolean onItemUseFirst( - final ItemStack is, - final EntityPlayer player, - final World world, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { return AEApi.instance().partHelper().placeBus( is, pos, side, player, world ); } @@ -299,8 +291,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } @Override - public void registerCustomIcon( - final TextureMap map ) + public void registerCustomIcon( final TextureMap map ) { 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 749298ce..77883332 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -195,8 +195,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG @Override @SideOnly( Side.CLIENT ) - public void registerCustomIcon( - final TextureMap map ) + public void registerCustomIcon( final TextureMap map ) { for( final Entry part : this.registered.entrySet() ) { @@ -391,10 +390,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG @Override public String toString() { - return "PartTypeWithVariant{" + - "part=" + this.part + - ", variant=" + this.variant + - '}'; + return "PartTypeWithVariant{" + "part=" + this.part + ", variant=" + this.variant + '}'; } } diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index 75cf881c..59d1669d 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -284,15 +284,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe } @Override - public boolean onItemUseFirst( - final ItemStack stack, - final EntityPlayer player, - final World world, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { return this.disassembleDrive( stack, world, player ); } diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index 5008e32b..c531ad38 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -140,15 +140,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard } @Override - public boolean onItemUse( - final ItemStack is, - final EntityPlayer player, - final World w, - final BlockPos pos, - final EnumFacing side, - final float hx, - final float hy, - final float hz ) + public boolean onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hx, final float hy, final float hz ) { if( player.isSneaking() && !w.isRemote ) { @@ -164,10 +156,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard } @Override - public boolean doesSneakBypassUse( - final World world, - final BlockPos pos, - final EntityPlayer player ) + public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player ) { return true; } diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 0965b96b..d7eed81d 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -98,15 +98,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } @Override - public boolean onItemUseFirst( - final ItemStack stack, - final EntityPlayer player, - final World world, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final MovingObjectPosition mop = new MovingObjectPosition( new Vec3( hitX, hitY, hitZ ), side, pos ); final TileEntity te = world.getTileEntity( pos ); @@ -134,10 +126,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } @Override - public boolean doesSneakBypassUse( - final World world, - final BlockPos pos, - final EntityPlayer player ) + public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player ) { return true; } @@ -200,10 +189,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } @Override - public boolean canWrench( - final ItemStack wrench, - final EntityPlayer player, - final BlockPos pos ) + public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos ) { return true; } diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 0cb1f409..a98f5226 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -121,15 +121,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe } @Override - public boolean onItemUse( - final ItemStack is, - final EntityPlayer p, - final World w, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUse( final ItemStack is, final EntityPlayer p, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final Block blk = w.getBlockState( pos ).getBlock(); @@ -302,8 +294,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe list.add( i ); } - Collections.sort( list, new Comparator() - { + Collections.sort( list, new Comparator(){ @Override public int compare( final IAEItemStack a, final IAEItemStack b ) diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 1bb2854d..3c48f37f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -105,9 +105,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT this.blockOnly = false; } - public InWorldToolOperationIngredient( - final Block blk, - final boolean b ) + public InWorldToolOperationIngredient( final Block blk, final boolean b ) { this.state = blk.getDefaultState(); this.blockOnly = b; @@ -248,15 +246,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } @Override - public boolean onItemUse( - final ItemStack item, - final EntityPlayer p, - final World w, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUse( final ItemStack item, final EntityPlayer p, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( this.getAECurrentPower( item ) > 1600 ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 866867e5..7b14a3a1 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -120,8 +120,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public IConfigManager getConfigManager( final ItemStack target ) { - final ConfigManager out = new ConfigManager( new IConfigManagerHost() - { + final ConfigManager out = new ConfigManager( new IConfigManagerHost(){ @Override public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue ) diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index 04863101..35d0f1dd 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -54,15 +54,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem } @Override - public boolean onItemUse( - final ItemStack stack, - final EntityPlayer p, - final World worldIn, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUse( final ItemStack stack, final EntityPlayer p, final World worldIn, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( Platform.isServer() ) { diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index bea2e20e..0f2a26b4 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -52,15 +52,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool } @Override - public boolean onItemUseFirst( - final ItemStack stack, - final EntityPlayer player, - final World world, - final BlockPos pos, - final EnumFacing side, - final float hitX, - final float hitY, - final float hitZ ) + public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final Block b = world.getBlockState( pos ).getBlock(); if( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) ) @@ -81,19 +73,13 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool } @Override - public boolean doesSneakBypassUse( - final World world, - final BlockPos pos, - final EntityPlayer player ) + public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player ) { return true; } @Override - public boolean canWrench( - final ItemStack wrench, - final EntityPlayer player, - final BlockPos pos ) + public boolean canWrench( final ItemStack wrench, final EntityPlayer player, final BlockPos pos ) { return true; } diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index e5b3883d..f9dc2370 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -90,8 +90,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper { private static final ExecutorService CRAFTING_POOL; - private static final Comparator COMPARATOR = new Comparator() - { + private static final Comparator COMPARATOR = new Comparator(){ @Override public int compare( final ICraftingPatternDetails firstDetail, final ICraftingPatternDetails nextDetail ) { @@ -101,8 +100,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper static { - final ThreadFactory factory = new ThreadFactory() - { + final ThreadFactory factory = new ThreadFactory(){ @Override public Thread newThread( final Runnable ar ) @@ -535,8 +533,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper } } - Collections.sort( validCpusClusters, new Comparator() - { + Collections.sort( validCpusClusters, new Comparator(){ @Override public int compare( final CraftingCPUCluster firstCluster, final CraftingCPUCluster nextCluster ) { diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index c5a83796..82246cc5 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -49,8 +49,7 @@ public class NetworkInventoryHandler> implements IMEInvent private static final ThreadLocal DEPTH_MOD = new ThreadLocal(); private static final ThreadLocal DEPTH_SIM = new ThreadLocal(); - private static final Comparator PRIORITY_SORTER = new Comparator() - { + private static final Comparator PRIORITY_SORTER = new Comparator(){ @Override public int compare( final Integer o1, final Integer o2 ) diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 5f33da95..003d7b1a 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -621,10 +621,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } @Override - public void randomDisplayTick( - final World world, - final BlockPos pos, - final Random r ) + public void randomDisplayTick( final World world, final BlockPos pos, final Random r ) { if( this.isLevelEmitterOn() ) { diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index 35f40304..06633bf3 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -269,16 +269,13 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory } @Override - public int getField( - final int id ) + public int getField( final int id ) { return 0; } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { } diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index 27f6f7f7..64b9fb0c 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -256,10 +256,7 @@ public class PartCableAnchor implements IPart } @Override - public void randomDisplayTick( - final World world, - final BlockPos pos, - final Random r ) + public void randomDisplayTick( final World world, final BlockPos pos, final Random r ) { } diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index a53f6400..b153fc18 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -426,16 +426,13 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto } @Override - public int getField( - final int id ) + public int getField( final int id ) { return 0; } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { } diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 53510f2f..d3ae5959 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -153,8 +153,7 @@ public class PartCable extends AEBasePart implements IPartCable } @Override - public void setValidSides( - final EnumSet sides ) + public void setValidSides( final EnumSet sides ) { this.getProxy().setValidSides( sides ); } diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 97107f88..8b4a2d27 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -265,8 +265,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip } @Override - public int[] getSlotsForFace( - final EnumFacing side ) + public int[] getSlotsForFace( final EnumFacing side ) { final int[] slots = new int[this.getSizeInventory()]; for( int x = 0; x < this.getSizeInventory(); x++ ) @@ -383,9 +382,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip // } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 6bb2f678..2c4120dc 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -233,9 +233,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I { final TileEntity start = this.getTile(); final TileEntity end = me.getTile(); - AELog.warning( "Failed to establish a ME P2P Tunnel between the tunnels at [x=%d, y=%d, z=%d] and [x=%d, y=%d, z=%d]", - start.getPos().getX(), start.getPos().getY(), start.getPos().getZ(), - end.getPos().getX(), end.getPos().getY(), end.getPos().getZ() ); + AELog.warning( "Failed to establish a ME P2P Tunnel between the tunnels at [x=%d, y=%d, z=%d] and [x=%d, y=%d, z=%d]", start.getPos().getX(), start.getPos().getY(), start.getPos().getZ(), end.getPos().getX(), end.getPos().getY(), end.getPos().getZ() ); // :( } } diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 2fc2a7b0..4c37d501 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -176,8 +176,7 @@ public final class DisassembleRecipe implements IRecipe } @Override - public ItemStack[] getRemainingItems( - final InventoryCrafting inv ) + public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index f9d2fae6..63a744cd 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -99,8 +99,7 @@ public final class FacadeRecipe implements IRecipe } @Override - public ItemStack[] getRemainingItems( - final InventoryCrafting inv ) + public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index b0d00f86..2e7a4f0e 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -327,8 +327,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable } @Override - public ItemStack[] getRemainingItems( - final InventoryCrafting inv ) + public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index 24269537..2e2a5a6f 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -182,8 +182,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable } @Override - public ItemStack[] getRemainingItems( - final InventoryCrafting inv ) + public ItemStack[] getRemainingItems( final InventoryCrafting inv ) { return ForgeHooks.defaultRecipeGetRemainingItems( inv ); } diff --git a/src/main/java/appeng/recipes/handlers/Grind.java b/src/main/java/appeng/recipes/handlers/Grind.java index 2408d89f..fe1c2fc3 100644 --- a/src/main/java/appeng/recipes/handlers/Grind.java +++ b/src/main/java/appeng/recipes/handlers/Grind.java @@ -67,9 +67,7 @@ public class Grind implements ICraftHandler, IWebsiteSerializer @Override public String getPattern( final RecipeHandler h ) { - return "grind\n" + - h.getName( this.pro_input ) + '\n' + - h.getName( this.pro_output[0] ); + return "grind\n" + h.getName( this.pro_input ) + '\n' + h.getName( this.pro_output[0] ); } @Override diff --git a/src/main/java/appeng/recipes/handlers/Smelt.java b/src/main/java/appeng/recipes/handlers/Smelt.java index 53279de1..8f62ee9a 100644 --- a/src/main/java/appeng/recipes/handlers/Smelt.java +++ b/src/main/java/appeng/recipes/handlers/Smelt.java @@ -75,9 +75,7 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer @Override public String getPattern( final RecipeHandler h ) { - return "smelt " + this.out.getQty() + '\n' + - h.getName( this.out ) + '\n' + - h.getName( this.in ); + return "smelt " + this.out.getQty() + '\n' + h.getName( this.out ) + '\n' + h.getName( this.in ); } @Override diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index b1c331bc..138327e7 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -56,9 +56,7 @@ public final class AECommand extends CommandBase } @Override - public void processCommand( - final ICommandSender sender, - final String[] args ) throws CommandException + public void processCommand( final ICommandSender sender, final String[] args ) throws CommandException { if( args.length == 0 ) { diff --git a/src/main/java/appeng/server/Commands.java b/src/main/java/appeng/server/Commands.java index a07589c7..c80e8881 100644 --- a/src/main/java/appeng/server/Commands.java +++ b/src/main/java/appeng/server/Commands.java @@ -25,8 +25,7 @@ import appeng.server.subcommands.Supporters; public enum Commands { - Chunklogger( 4, new ChunkLogger() ), - Supporters( 0, new Supporters() ); + Chunklogger( 4, new ChunkLogger() ), Supporters( 0, new Supporters() ); public final int level; public final ISubCommand command; diff --git a/src/main/java/appeng/services/version/BaseVersion.java b/src/main/java/appeng/services/version/BaseVersion.java index d998a868..c5f5fbb6 100644 --- a/src/main/java/appeng/services/version/BaseVersion.java +++ b/src/main/java/appeng/services/version/BaseVersion.java @@ -118,10 +118,6 @@ public abstract class BaseVersion implements Version @Override public final String toString() { - return "Version{" + - "revision=" + this.revision + - ", channel=" + this.channel + - ", build=" + this.build + - '}'; + return "Version{" + "revision=" + this.revision + ", channel=" + this.channel + ", build=" + this.build + '}'; } } diff --git a/src/main/java/appeng/services/version/Channel.java b/src/main/java/appeng/services/version/Channel.java index 397ed836..7a97cd3e 100644 --- a/src/main/java/appeng/services/version/Channel.java +++ b/src/main/java/appeng/services/version/Channel.java @@ -25,7 +25,5 @@ package appeng.services.version; */ public enum Channel { - Alpha, - Beta, - Stable + Alpha, Beta, Stable } diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 89758058..47fec6e5 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -334,18 +334,14 @@ public class StorageHelper } @Override - public void placeInPortal( - final Entity par1Entity, - final float rotationYaw ) + public void placeInPortal( final Entity par1Entity, final float rotationYaw ) { par1Entity.setLocationAndAngles( this.destination.x, this.destination.y, this.destination.z, par1Entity.rotationYaw, 0.0F ); par1Entity.motionX = par1Entity.motionY = par1Entity.motionZ = 0.0D; } @Override - public boolean placeInExistingPortal( - final Entity entityIn, - final float p_180620_2_ ) + public boolean placeInExistingPortal( final Entity entityIn, final float p_180620_2_ ) { return false; } diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 5c5dae21..3e654d1c 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -76,11 +76,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, private EnumFacing up = null; @Override - public boolean shouldRefresh( - final World world, - final BlockPos pos, - final IBlockState oldState, - final IBlockState newSate ) + public boolean shouldRefresh( final World world, final BlockPos pos, final IBlockState oldState, final IBlockState newSate ) { return newSate.getBlock() != oldState.getBlock(); // state dosn't change tile entities in AE2. } diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index fcde6fbe..d7e601d9 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -397,10 +397,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade } @Override - public void getDrops( - final World w, - final BlockPos pos, - final List drops ) + public void getDrops( final World w, final BlockPos pos, final List drops ) { super.getDrops( w, pos, drops ); diff --git a/src/main/java/appeng/tile/grid/AENetworkInvTile.java b/src/main/java/appeng/tile/grid/AENetworkInvTile.java index 7bd0897c..6dc0c7c2 100644 --- a/src/main/java/appeng/tile/grid/AENetworkInvTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkInvTile.java @@ -101,8 +101,7 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH } @Override - public int getField( - final int id ) + public int getField( final int id ) { return 0; } diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index 86ee2564..6ae1762c 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -154,11 +154,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable } @Override - public Iterable getSelectedBoundingBoxesFromPool( - final World w, - final BlockPos pos, - final Entity thePlayer, - final boolean b ) + public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final double xOff = -0.15 * this.getUp().getFrontOffsetX(); final double yOff = -0.15 * this.getUp().getFrontOffsetY(); @@ -167,12 +163,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { final double xOff = -0.15 * this.getUp().getFrontOffsetX(); final double yOff = -0.15 * this.getUp().getFrontOffsetY(); diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 945fb696..47ed591f 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -275,30 +275,25 @@ public class AppEngInternalAEInventory implements IInventory, Iterable } @Override - public void openInventory( - final EntityPlayer player ) + public void openInventory( final EntityPlayer player ) { } @Override - public void closeInventory( - final EntityPlayer player ) + public void closeInventory( final EntityPlayer player ) { } @Override - public int getField( - final int id ) + public int getField( final int id ) { return 0; } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { } diff --git a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java index 7c4c26e2..3b6f545e 100644 --- a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java @@ -110,30 +110,25 @@ public class AppEngNullInventory implements IInventory } @Override - public void openInventory( - final EntityPlayer player ) + public void openInventory( final EntityPlayer player ) { } @Override - public void closeInventory( - final EntityPlayer player ) + public void closeInventory( final EntityPlayer player ) { } @Override - public int getField( - final int id ) + public int getField( final int id ) { return 0; } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { } diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/TileCellWorkbench.java index 4f65bda6..fe0c67c1 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/TileCellWorkbench.java @@ -236,10 +236,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I } @Override - public void getDrops( - final World w, - final BlockPos pos, - final List drops ) + public void getDrops( final World w, final BlockPos pos, final List drops ) { super.getDrops( w, pos, drops ); diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index e7aa7016..7e059a7f 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -196,10 +196,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, } @Override - public void getDrops( - final World w, - final BlockPos pos, - final List drops ) + public void getDrops( final World w, final BlockPos pos, final List drops ) { super.getDrops( w, pos, drops ); diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index f69577af..07079d8d 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -141,10 +141,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT } @Override - public void getDrops( - final World w, - final BlockPos pos, - final List drops ) + public void getDrops( final World w, final BlockPos pos, final List drops ) { this.duality.addDrops( drops ); } diff --git a/src/main/java/appeng/tile/misc/TileSecurity.java b/src/main/java/appeng/tile/misc/TileSecurity.java index 54022bbb..3fefe6f0 100644 --- a/src/main/java/appeng/tile/misc/TileSecurity.java +++ b/src/main/java/appeng/tile/misc/TileSecurity.java @@ -116,10 +116,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp } @Override - public void getDrops( - final World w, - final BlockPos pos, - final List drops ) + public void getDrops( final World w, final BlockPos pos, final List drops ) { if( !this.getConfigSlot().isEmpty() ) { diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index 92f9a7b9..743abaeb 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -345,12 +345,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public void addCollidingBlockToList( - final World w, - final BlockPos pos, - final AxisAlignedBB bb, - final List out, - final Entity e ) + public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { for( final AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, pos, e, false ) ) { @@ -384,10 +379,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public boolean recolourBlock( - final EnumFacing side, - final AEColor colour, - final EntityPlayer who ) + public boolean recolourBlock( final EnumFacing side, final AEColor colour, final EntityPlayer who ) { return this.getCableBus().recolourBlock( side, colour, who ); } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index c033cd03..65ff6a11 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -842,10 +842,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan } @Override - public boolean recolourBlock( - final EnumFacing side, - final AEColor newPaintedColor, - final EntityPlayer who ) + public boolean recolourBlock( final EnumFacing side, final AEColor newPaintedColor, final EntityPlayer who ) { if( this.paintedColor == newPaintedColor ) { diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index fac5b98c..81e51a02 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -564,10 +564,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC * @param drops drops of tile entity */ @Override - public void getDrops( - final World w, - final BlockPos pos, - final List drops ) + public void getDrops( final World w, final BlockPos pos, final List drops ) { super.getDrops( w, pos, drops ); diff --git a/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java index 1de1a82d..3106f299 100644 --- a/src/main/java/appeng/util/ItemSorters.java +++ b/src/main/java/appeng/util/ItemSorters.java @@ -34,8 +34,7 @@ public class ItemSorters private static SortDir Direction = SortDir.ASCENDING; - public static final Comparator CONFIG_BASED_SORT_BY_NAME = new Comparator() - { + public static final Comparator CONFIG_BASED_SORT_BY_NAME = new Comparator(){ @Override public int compare( final IAEItemStack o1, final IAEItemStack o2 ) @@ -47,8 +46,7 @@ public class ItemSorters return Platform.getItemDisplayName( o2 ).compareToIgnoreCase( Platform.getItemDisplayName( o1 ) ); } }; - public static final Comparator CONFIG_BASED_SORT_BY_MOD = new Comparator() - { + public static final Comparator CONFIG_BASED_SORT_BY_MOD = new Comparator(){ @Override public int compare( final IAEItemStack o1, final IAEItemStack o2 ) @@ -73,8 +71,7 @@ public class ItemSorters return compareToIgnoreCase; } }; - public static final Comparator CONFIG_BASED_SORT_BY_SIZE = new Comparator() - { + public static final Comparator CONFIG_BASED_SORT_BY_SIZE = new Comparator(){ @Override public int compare( final IAEItemStack o1, final IAEItemStack o2 ) @@ -87,8 +84,7 @@ public class ItemSorters } }; private static IInvTweaks api; - public static final Comparator CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator() - { + public static final Comparator CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator(){ @Override public int compare( final IAEItemStack o1, final IAEItemStack o2 ) diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java index 1ee4182b..72bae7ea 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java @@ -106,16 +106,14 @@ public class AdaptorPlayerInventory implements IInventory } @Override - public void openInventory( - final EntityPlayer player ) + public void openInventory( final EntityPlayer player ) { this.src.openInventory( player ); } @Override - public void closeInventory( - final EntityPlayer player ) + public void closeInventory( final EntityPlayer player ) { this.src.closeInventory( player ); } @@ -133,16 +131,13 @@ public class AdaptorPlayerInventory implements IInventory } @Override - public int getField( - final int id ) + public int getField( final int id ) { return this.src.getField( id ); } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { this.src.setField( id, value ); } diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index b49666ba..e3b231e8 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -208,14 +208,12 @@ public class WrapperChainedInventory implements IInventory } @Override - public void openInventory( - final EntityPlayer player ) + public void openInventory( final EntityPlayer player ) { } @Override - public void closeInventory( - final EntityPlayer player ) + public void closeInventory( final EntityPlayer player ) { } @@ -245,16 +243,13 @@ public class WrapperChainedInventory implements IInventory } @Override - public int getField( - final int id ) + public int getField( final int id ) { return 0; } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { } diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index c682462a..3dd5fa40 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/src/main/java/appeng/util/inv/WrapperInvSlot.java @@ -118,15 +118,13 @@ public class WrapperInvSlot } @Override - public void openInventory( - final EntityPlayer player ) + public void openInventory( final EntityPlayer player ) { this.inv.openInventory( player ); } @Override - public void closeInventory( - final EntityPlayer player ) + public void closeInventory( final EntityPlayer player ) { this.inv.closeInventory( player ); } @@ -138,8 +136,7 @@ public class WrapperInvSlot } @Override - public int getField( - final int id ) + public int getField( final int id ) { return this.inv.getField( id ); } @@ -163,9 +160,7 @@ public class WrapperInvSlot } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { this.inv.setField( id, value ); } diff --git a/src/main/java/appeng/util/inv/WrapperInventoryRange.java b/src/main/java/appeng/util/inv/WrapperInventoryRange.java index df75ff5b..63278070 100644 --- a/src/main/java/appeng/util/inv/WrapperInventoryRange.java +++ b/src/main/java/appeng/util/inv/WrapperInventoryRange.java @@ -135,15 +135,13 @@ public class WrapperInventoryRange implements IInventory } @Override - public void openInventory( - final EntityPlayer player ) + public void openInventory( final EntityPlayer player ) { this.src.openInventory( player ); } @Override - public void closeInventory( - final EntityPlayer player ) + public void closeInventory( final EntityPlayer player ) { this.src.closeInventory( player ); } @@ -155,8 +153,7 @@ public class WrapperInventoryRange implements IInventory } @Override - public int getField( - final int id ) + public int getField( final int id ) { return this.src.getField( id ); } @@ -174,9 +171,7 @@ public class WrapperInventoryRange implements IInventory } @Override - public void setField( - final int id, - final int value ) + public void setField( final int id, final int value ) { this.src.setField( id, value ); } diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 6a3282b2..5b19ceb6 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -45,8 +45,7 @@ public class OreHelper /** * A local cache to speed up OreDictionary lookups. */ - private final LoadingCache> oreDictCache = CacheBuilder.newBuilder().build( new CacheLoader>() - { + private final LoadingCache> oreDictCache = CacheBuilder.newBuilder().build( new CacheLoader>(){ @Override public List load( final String oreName ) { diff --git a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java index 90c96dc4..cd1aa716 100644 --- a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java @@ -34,8 +34,5 @@ public interface IMeteoriteWorld void done(); - IBlockState getBlockState( - int x, - int y, - int z ); + IBlockState getBlockState( int x, int y, int z ); } \ No newline at end of file diff --git a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java index ca92c738..1d0502a0 100644 --- a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java @@ -109,12 +109,7 @@ public class StandardWorld implements IMeteoriteWorld } @Override - public void setBlock( - final int x, - final int y, - final int z, - final IBlockState state, - final int l ) + public void setBlock( final int x, final int y, final int z, final IBlockState state, final int l ) { if( this.range( x, y, z ) ) { @@ -123,10 +118,7 @@ public class StandardWorld implements IMeteoriteWorld } @Override - public IBlockState getBlockState( - final int x, - final int y, - final int z ) + public IBlockState getBlockState( final int x, final int y, final int z ) { if( this.range( x, y, z ) ) {