diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index b691eb3ee..7fab3017f 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -116,7 +116,7 @@ public abstract class AEBaseBlock extends Block @SuppressWarnings( "deprecation" ) @Override - public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, @Nullable final Entity e, boolean p_185477_7_) + public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, @Nullable final Entity e, boolean p_185477_7_ ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); @@ -341,7 +341,7 @@ public abstract class AEBaseBlock extends Block return new EnumFacing[0]; } - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) @Override public void addInformation( final ItemStack is, final World world, final List lines, final ITooltipFlag advancedItemTooltips ) { diff --git a/src/main/java/appeng/block/AEBaseItemBlockChargeable.java b/src/main/java/appeng/block/AEBaseItemBlockChargeable.java index 8519af681..abc8d1370 100644 --- a/src/main/java/appeng/block/AEBaseItemBlockChargeable.java +++ b/src/main/java/appeng/block/AEBaseItemBlockChargeable.java @@ -63,24 +63,25 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte final double percent = internalCurrentPower / internalMaxPower; - lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) ); + lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform + .gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) ); } private double getMaxEnergyCapacity() { final Block blockID = Block.getBlockFromItem( this ); final IBlockDefinition energyCell = Api.INSTANCE.definitions().blocks().energyCell(); - return energyCell.maybeBlock().map( block -> { - if( blockID == block ) - { - return 200000; - } - else - { - return 8 * 200000; - } - } - ).orElse( 0 ); + return energyCell.maybeBlock().map( block -> + { + if( blockID == block ) + { + return 200000; + } + else + { + return 8 * 200000; + } + } ).orElse( 0 ); } @Override diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 8042b2da8..2e163c463 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -274,10 +274,10 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity public boolean onBlockActivated( World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ ) { ItemStack heldItem; - if( player != null && !player.getHeldItem(hand).isEmpty() ) + if( player != null && !player.getHeldItem( hand ).isEmpty() ) { - heldItem = player.getHeldItem(hand); - + heldItem = player.getHeldItem( hand ); + if( Platform.isWrench( player, heldItem, pos ) && player.isSneaking() ) { final IBlockState blockState = world.getBlockState( pos ); @@ -366,7 +366,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity } } - return this.onActivated( world, pos, player, hand, player.getHeldItem(hand), facing, hitX, hitY, hitZ ); + return this.onActivated( world, pos, player, hand, player.getHeldItem( hand ), facing, hitX, hitY, hitZ ); } @Override diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 9ad8940b4..71ec2a114 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -104,7 +104,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_MAC ); return true; } - + return super.onBlockActivated( w, pos, state, p, hand, side, hitX, hitY, hitZ ); } } diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index 7a2b275de..2d60cf188 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -41,6 +41,7 @@ import appeng.core.stats.Stats; import appeng.tile.AEBaseTile; import appeng.tile.grindstone.TileCrank; + public class BlockCrank extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/grindstone/BlockGrinder.java b/src/main/java/appeng/block/grindstone/BlockGrinder.java index 5ba9037cf..f494ac9db 100644 --- a/src/main/java/appeng/block/grindstone/BlockGrinder.java +++ b/src/main/java/appeng/block/grindstone/BlockGrinder.java @@ -35,6 +35,7 @@ import appeng.core.sync.GuiBridge; import appeng.tile.grindstone.TileGrinder; import appeng.util.Platform; + public class BlockGrinder extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/misc/BlockCellWorkbench.java b/src/main/java/appeng/block/misc/BlockCellWorkbench.java index d4a87d046..8e2046631 100644 --- a/src/main/java/appeng/block/misc/BlockCellWorkbench.java +++ b/src/main/java/appeng/block/misc/BlockCellWorkbench.java @@ -35,6 +35,7 @@ import appeng.core.sync.GuiBridge; import appeng.tile.misc.TileCellWorkbench; import appeng.util.Platform; + public class BlockCellWorkbench extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index 2d5586adc..4cacad5e5 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -119,7 +119,8 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision { if( AppEng.proxy.shouldAddParticles( r ) ) { - final LightningFX fx = new LightningFX( w, xOff + 0.5 + pos.getX(), yOff + 0.5 + pos.getY(), zOff + 0.5 + pos.getZ(), 0.0D, 0.0D, 0.0D ); + final LightningFX fx = new LightningFX( w, xOff + 0.5 + pos.getX(), yOff + 0.5 + pos.getY(), zOff + 0.5 + pos + .getZ(), 0.0D, 0.0D, 0.0D ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } } diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index c23399ab1..f5f950c20 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -37,6 +37,7 @@ import appeng.core.sync.GuiBridge; import appeng.tile.misc.TileInscriber; import appeng.util.Platform; + public class BlockInscriber extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index 172140e6a..cde176d7d 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -46,6 +46,7 @@ import appeng.helpers.ICustomCollision; import appeng.helpers.MetaRotation; import appeng.tile.misc.TileLightDetector; + public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision { @@ -75,7 +76,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl public IBlockState getStateFromMeta( final int meta ) { EnumFacing facing = EnumFacing.values()[meta]; - return getDefaultState().withProperty(FACING, facing); + return getDefaultState().withProperty( FACING, facing ); } @Override @@ -137,16 +138,16 @@ 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 ) {/* - * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * - * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add( - * AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + - * (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x - * + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); - */ + * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * + * getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add( + * AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + + * (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x + * + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); + */ } - + @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos ) + public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos ) { final EnumFacing up = this.getOrientable( world, pos ).getUp(); if( !this.canPlaceAt( (World) world, pos, up.getOpposite() ) ) @@ -188,7 +189,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - @SideOnly( Side.CLIENT) + @SideOnly( Side.CLIENT ) public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java index eb090f543..0eda96f87 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -49,6 +49,7 @@ import appeng.core.AppEng; import appeng.helpers.ICustomCollision; import appeng.helpers.MetaRotation; + public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, ICustomCollision { @@ -75,7 +76,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, @Override public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos ) { - boolean oddPlacement = ((pos.getX() + pos.getY() + pos.getZ()) % 2) != 0; + boolean oddPlacement = ( ( pos.getX() + pos.getY() + pos.getZ() ) % 2 ) != 0; return super.getActualState( state, worldIn, pos ) .withProperty( ODD, oddPlacement ); @@ -91,7 +92,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, public IBlockState getStateFromMeta( final int meta ) { EnumFacing facing = EnumFacing.values()[meta]; - return getDefaultState().withProperty(FACING, facing); + return getDefaultState().withProperty( FACING, facing ); } @Override @@ -125,10 +126,11 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, @Override 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( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, zOff - * + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); - */ + * double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; double zOff = -0.15 * + * getUp().offsetZ; out.add( AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff + (double) y + 0.15, + * zOff + * + (double) z + 0.15,// ahh xOff + (double) x + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); + */ } @Override @@ -161,7 +163,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) + public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos ) { final EnumFacing up = this.getOrientable( world, pos ).getUp(); if( !this.canPlaceAt( world, pos, up.getOpposite() ) ) @@ -215,7 +217,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, } @Override - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.CUTOUT; diff --git a/src/main/java/appeng/block/misc/BlockSecurityStation.java b/src/main/java/appeng/block/misc/BlockSecurityStation.java index e0f1c560a..9b06c82f8 100644 --- a/src/main/java/appeng/block/misc/BlockSecurityStation.java +++ b/src/main/java/appeng/block/misc/BlockSecurityStation.java @@ -40,6 +40,7 @@ import appeng.core.sync.GuiBridge; import appeng.tile.misc.TileSecurityStation; import appeng.util.Platform; + public class BlockSecurityStation extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/BlockSkyCompass.java index 34503428a..783cbddc7 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/BlockSkyCompass.java @@ -40,6 +40,7 @@ import appeng.block.AEBaseTileBlock; import appeng.helpers.ICustomCollision; import appeng.tile.misc.TileSkyCompass; + public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision { diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 9f9b7b94f..8130cb50d 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -47,6 +47,7 @@ import appeng.block.AEBaseBlock; import appeng.entity.EntityTinyTNTPrimed; import appeng.helpers.ICustomCollision; + public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision { @@ -60,7 +61,8 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision this.setHardness( 0F ); // TODO: 1.11 - //EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.get( EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true ); + // EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.get( + // EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true ); } @Override @@ -85,7 +87,8 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision { final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, igniter ); w.spawnEntity( primedTinyTNTEntity ); - w.playSound( null, primedTinyTNTEntity.posX, primedTinyTNTEntity.posY, primedTinyTNTEntity.posZ, SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1, 1 ); + w.playSound( null, primedTinyTNTEntity.posX, primedTinyTNTEntity.posY, primedTinyTNTEntity.posZ, SoundEvents.ENTITY_TNT_PRIMED, + SoundCategory.BLOCKS, 1, 1 ); } } @@ -138,7 +141,8 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision super.onBlockExploded( w, pos, exp ); if( !w.isRemote ) { - final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy() ); + final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp + .getExplosivePlacedBy() ); primedTinyTNTEntity.setFuse( w.rand.nextInt( primedTinyTNTEntity.getFuse() / 4 ) + primedTinyTNTEntity.getFuse() / 8 ); w.spawnEntity( primedTinyTNTEntity ); } diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 4533098b0..6fb68872d 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -44,6 +44,7 @@ import appeng.tile.AEBaseTile; import appeng.tile.misc.TileVibrationChamber; import appeng.util.Platform; + public final class BlockVibrationChamber extends AEBaseTileBlock { @@ -70,7 +71,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock @Override protected IProperty[] getAEStates() { - return new IProperty[]{ ACTIVE }; + return new IProperty[] { ACTIVE }; } @Override @@ -93,7 +94,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock return true; } - + @Override public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { diff --git a/src/main/java/appeng/block/misc/InscriberRendering.java b/src/main/java/appeng/block/misc/InscriberRendering.java index a6e0e1d5e..4f5702b35 100644 --- a/src/main/java/appeng/block/misc/InscriberRendering.java +++ b/src/main/java/appeng/block/misc/InscriberRendering.java @@ -1,3 +1,4 @@ + package appeng.block.misc; diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 9063e9291..764528e31 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -319,7 +319,8 @@ public class BlockCableBus extends AEBaseTileBlock double d0 = (double) pos.getX() + ( (double) j + 0.5D ) / 4.0D; double d1 = (double) pos.getY() + ( (double) k + 0.5D ) / 4.0D; double d2 = (double) pos.getZ() + ( (double) l + 0.5D ) / 4.0D; - ParticleDigging particle = new DestroyFX( world, d0, d1, d2, d0 - (double) pos.getX() - 0.5D, d1 - (double) pos.getY() - 0.5D, d2 - (double) pos.getZ() - 0.5D, getDefaultState() ).setBlockPos( pos ); + ParticleDigging particle = new DestroyFX( world, d0, d1, d2, d0 - (double) pos.getX() - 0.5D, d1 - (double) pos + .getY() - 0.5D, d2 - (double) pos.getZ() - 0.5D, getDefaultState() ).setBlockPos( pos ); particle.setParticleTexture( texture ); effectRenderer.addEffect( particle ); } diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 1ad19f605..7465b6063 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -37,6 +37,7 @@ import appeng.tile.networking.TileController; import javax.annotation.Nonnull; import javax.annotation.Nullable; + public class BlockController extends AEBaseTileBlock { @@ -52,11 +53,11 @@ public class BlockController extends AEBaseTileBlock } - /** - * Controls the rendering of the controller block (connected texture style). - * inside_a and inside_b are alternating patterns for a controller that is enclosed by other controllers, - * and since they are always offline, they do not have the usual sub-states. - */ + /** + * Controls the rendering of the controller block (connected texture style). + * inside_a and inside_b are alternating patterns for a controller that is enclosed by other controllers, + * and since they are always offline, they do not have the usual sub-states. + */ public enum ControllerRenderType implements IStringSerializable { block, column_x, column_y, column_z, inside_a, inside_b; @@ -112,9 +113,12 @@ public class BlockController extends AEBaseTileBlock int z = pos.getZ(); // Detect whether controllers are on both sides of the x, y, and z axes - final boolean xx = this.getTileEntity( world, x - 1, y, z ) instanceof TileController && this.getTileEntity( world, x + 1, y, z ) instanceof TileController; - final boolean yy = this.getTileEntity( world, x, y - 1, z ) instanceof TileController && this.getTileEntity( world, x, y + 1, z ) instanceof TileController; - final boolean zz = this.getTileEntity( world, x, y, z - 1 ) instanceof TileController && this.getTileEntity( world, x, y, z + 1 ) instanceof TileController; + final boolean xx = this.getTileEntity( world, x - 1, y, z ) instanceof TileController && this.getTileEntity( world, x + 1, y, + z ) instanceof TileController; + final boolean yy = this.getTileEntity( world, x, y - 1, z ) instanceof TileController && this.getTileEntity( world, x, y + 1, + z ) instanceof TileController; + final boolean zz = this.getTileEntity( world, x, y, z - 1 ) instanceof TileController && this.getTileEntity( world, x, y, + z + 1 ) instanceof TileController; if( xx && !yy && !zz ) { diff --git a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java b/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java index 9ab255859..5f5a9daa1 100644 --- a/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockCreativeEnergyCell.java @@ -23,6 +23,7 @@ import appeng.block.AEBaseTileBlock; import appeng.helpers.AEGlassMaterial; import appeng.tile.networking.TileCreativeEnergyCell; + public class BlockCreativeEnergyCell extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java index 3a707642c..9191959bd 100644 --- a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java @@ -21,6 +21,7 @@ package appeng.block.networking; import appeng.tile.networking.TileDenseEnergyCell; + public class BlockDenseEnergyCell extends BlockEnergyCell { diff --git a/src/main/java/appeng/block/networking/WirelessRendering.java b/src/main/java/appeng/block/networking/WirelessRendering.java index aa3703c2d..cca9f4ea0 100644 --- a/src/main/java/appeng/block/networking/WirelessRendering.java +++ b/src/main/java/appeng/block/networking/WirelessRendering.java @@ -1,3 +1,4 @@ + package appeng.block.networking; diff --git a/src/main/java/appeng/block/paint/BlockPaint.java b/src/main/java/appeng/block/paint/BlockPaint.java index 6de631e8f..7659addd0 100644 --- a/src/main/java/appeng/block/paint/BlockPaint.java +++ b/src/main/java/appeng/block/paint/BlockPaint.java @@ -49,6 +49,7 @@ import appeng.helpers.Splotch; import appeng.tile.misc.TilePaint; import appeng.util.Platform; + public class BlockPaint extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/paint/PaintBakedModel.java b/src/main/java/appeng/block/paint/PaintBakedModel.java index d2bf084a6..3f0a54617 100644 --- a/src/main/java/appeng/block/paint/PaintBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintBakedModel.java @@ -1,3 +1,4 @@ + package appeng.block.paint; @@ -27,7 +28,8 @@ import appeng.helpers.Splotch; /** - * Renders paint blocks, which render multiple "splotches" that have been applied to the sides of adjacent blocks using a + * Renders paint blocks, which render multiple "splotches" that have been applied to the sides of adjacent blocks using + * a * matter cannon with paint balls. */ class PaintBakedModel implements IBakedModel @@ -82,7 +84,8 @@ class PaintBakedModel implements IBakedModel CubeBuilder builder = new CubeBuilder( vertexFormat ); float offsetConstant = 0.001f; - for( final Splotch s : splotches) { + for( final Splotch s : splotches ) + { if( s.isLumen() ) { @@ -191,7 +194,6 @@ class PaintBakedModel implements IBakedModel static List getRequiredTextures() { return ImmutableList.of( - TEXTURE_PAINT1, TEXTURE_PAINT2, TEXTURE_PAINT3 - ); + TEXTURE_PAINT1, TEXTURE_PAINT2, TEXTURE_PAINT3 ); } } diff --git a/src/main/java/appeng/block/paint/PaintModel.java b/src/main/java/appeng/block/paint/PaintModel.java index 70acc18cb..b5b4c49af 100644 --- a/src/main/java/appeng/block/paint/PaintModel.java +++ b/src/main/java/appeng/block/paint/PaintModel.java @@ -1,3 +1,4 @@ + package appeng.block.paint; diff --git a/src/main/java/appeng/block/paint/PaintRendering.java b/src/main/java/appeng/block/paint/PaintRendering.java index 8967bbed9..192116b53 100644 --- a/src/main/java/appeng/block/paint/PaintRendering.java +++ b/src/main/java/appeng/block/paint/PaintRendering.java @@ -1,3 +1,4 @@ + package appeng.block.paint; diff --git a/src/main/java/appeng/block/paint/PaintSplotches.java b/src/main/java/appeng/block/paint/PaintSplotches.java index 396645269..2d03f75e3 100644 --- a/src/main/java/appeng/block/paint/PaintSplotches.java +++ b/src/main/java/appeng/block/paint/PaintSplotches.java @@ -1,3 +1,4 @@ + package appeng.block.paint; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesProperty.java b/src/main/java/appeng/block/paint/PaintSplotchesProperty.java index 2f52cf50b..2fe61f9aa 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesProperty.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesProperty.java @@ -1,3 +1,4 @@ + package appeng.block.paint; diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index 1405153d7..c1d10ea63 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -38,6 +38,7 @@ import appeng.block.AEBaseTileBlock; import appeng.helpers.ICustomCollision; import appeng.tile.qnb.TileQuantumBridge; + public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICustomCollision { diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index 6b1fef5a8..8c0127f12 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -1,3 +1,4 @@ + package appeng.block.qnb; @@ -117,7 +118,8 @@ class QnbFormedBakedModel implements IBakedModel builder.setRenderFullBright( true ); for( EnumFacing facing : EnumFacing.values() ) { - // Offset the face by a slight amount so that it is drawn over the already drawn ring texture (avoids z-fighting) + // Offset the face by a slight amount so that it is drawn over the already drawn ring texture + // (avoids z-fighting) float xOffset = Math.abs( facing.getFrontOffsetX() * 0.01f ); float yOffset = Math.abs( facing.getFrontOffsetY() * 0.01f ); float zOffset = Math.abs( facing.getFrontOffsetZ() * 0.01f ); @@ -125,8 +127,7 @@ class QnbFormedBakedModel implements IBakedModel builder.setDrawFaces( EnumSet.of( facing ) ); builder.addCube( DEFAULT_RENDER_MIN - xOffset, DEFAULT_RENDER_MIN - yOffset, DEFAULT_RENDER_MIN - zOffset, - DEFAULT_RENDER_MAX + xOffset, DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset - ); + DEFAULT_RENDER_MAX + xOffset, DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset ); } } } @@ -146,7 +147,8 @@ class QnbFormedBakedModel implements IBakedModel builder.setRenderFullBright( true ); for( EnumFacing facing : EnumFacing.values() ) { - // Offset the face by a slight amount so that it is drawn over the already drawn ring texture (avoids z-fighting) + // Offset the face by a slight amount so that it is drawn over the already drawn ring texture + // (avoids z-fighting) float xOffset = Math.abs( facing.getFrontOffsetX() * 0.01f ); float yOffset = Math.abs( facing.getFrontOffsetY() * 0.01f ); float zOffset = Math.abs( facing.getFrontOffsetZ() * 0.01f ); @@ -154,8 +156,7 @@ class QnbFormedBakedModel implements IBakedModel builder.setDrawFaces( EnumSet.of( facing ) ); builder.addCube( -xOffset, -yOffset, -zOffset, - 16 + xOffset, 16 + yOffset, 16 + zOffset - ); + 16 + xOffset, 16 + yOffset, 16 + zOffset ); } } } @@ -238,7 +239,6 @@ class QnbFormedBakedModel implements IBakedModel public static List getRequiredTextures() { return ImmutableList.of( - TEXTURE_LINK, TEXTURE_RING, TEXTURE_CABLE_GLASS, TEXTURE_COVERED_CABLE, TEXTURE_RING_LIGHT, TEXTURE_RING_LIGHT_CORNER - ); + TEXTURE_LINK, TEXTURE_RING, TEXTURE_CABLE_GLASS, TEXTURE_COVERED_CABLE, TEXTURE_RING_LIGHT, TEXTURE_RING_LIGHT_CORNER ); } } diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/main/java/appeng/block/qnb/QnbFormedModel.java index ee9dca9a1..1c10ed95c 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedModel.java @@ -1,3 +1,4 @@ + package appeng.block.qnb; diff --git a/src/main/java/appeng/block/qnb/QnbFormedState.java b/src/main/java/appeng/block/qnb/QnbFormedState.java index 48bfb83d4..efd8da088 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedState.java +++ b/src/main/java/appeng/block/qnb/QnbFormedState.java @@ -1,3 +1,4 @@ + package appeng.block.qnb; diff --git a/src/main/java/appeng/block/qnb/QnbFormedStateProperty.java b/src/main/java/appeng/block/qnb/QnbFormedStateProperty.java index 54ec85b2f..7beb5a9ba 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedStateProperty.java +++ b/src/main/java/appeng/block/qnb/QnbFormedStateProperty.java @@ -1,3 +1,4 @@ + package appeng.block.qnb; diff --git a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java b/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java index 5f35c0e40..2dd02823e 100644 --- a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java +++ b/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java @@ -1,3 +1,4 @@ + package appeng.block.qnb; @@ -18,6 +19,6 @@ public class QuantumBridgeRendering extends BlockRenderingCustomizer { rendering.builtInModel( "models/block/qnb/qnb_formed", new QnbFormedModel() ); // Disable auto rotation - rendering.modelCustomizer( (location, model) -> model ); + rendering.modelCustomizer( ( location, model ) -> model ); } } diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index 910c519d6..ab1712f9f 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -40,6 +40,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import appeng.block.AEBaseBlock; import appeng.helpers.ICustomCollision; + public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision { diff --git a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java index 05add16ba..0199a3b3e 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java @@ -37,6 +37,7 @@ import appeng.core.sync.GuiBridge; import appeng.tile.spatial.TileSpatialIOPort; import appeng.util.Platform; + public class BlockSpatialIOPort extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index aa41ea956..bd8f4c868 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -47,7 +47,7 @@ import appeng.util.Platform; public class BlockDrive extends AEBaseTileBlock { - public static final UnlistedProperty SLOTS_STATE = new UnlistedProperty<>("drive_slots_state", DriveSlotsState.class); + public static final UnlistedProperty SLOTS_STATE = new UnlistedProperty<>( "drive_slots_state", DriveSlotsState.class ); public BlockDrive() { diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index af5fbc337..0332236f9 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -221,7 +221,8 @@ class BlockDefinitionBuilder implements IBlockBuilder } // Register the item and block with the game - factory.addPreInit( side -> { + factory.addPreInit( side -> + { Registration.addBlockToRegister( block ); if( item != null ) { @@ -231,16 +232,13 @@ class BlockDefinitionBuilder implements IBlockBuilder block.setCreativeTab( creativeTab ); - // Register all extra handlers preInitCallbacks.forEach( consumer -> factory.addPreInit( side -> consumer.accept( block, item ) ) ); initCallbacks.forEach( consumer -> factory.addInit( side -> consumer.accept( block, item ) ) ); - modelRegCallbacks.forEach(consumer -> factory.addModelReg(side -> consumer.accept( block, item ) ) ); + modelRegCallbacks.forEach( consumer -> factory.addModelReg( side -> consumer.accept( block, item ) ) ); postInitCallbacks.forEach( consumer -> factory.addPostInit( side -> consumer.accept( block, item ) ) ); - - - if ( tileEntityDefinition != null && block instanceof AEBaseTileBlock ) + if( tileEntityDefinition != null && block instanceof AEBaseTileBlock ) { ( (AEBaseTileBlock) block ).setTileEntity( tileEntityDefinition.getTileEntityClass() ); if( tileEntityDefinition.getName() == null ) @@ -270,8 +268,11 @@ class BlockDefinitionBuilder implements IBlockBuilder if( block instanceof AEBaseTileBlock ) { - factory.addPreInit( side -> { - AEBaseTile.registerTileItem( tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : tileEntityDefinition.getTileEntityClass(), new BlockStackSrc( block, 0, ActivityState.Enabled ) ); + factory.addPreInit( side -> + { + AEBaseTile.registerTileItem( + tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : tileEntityDefinition.getTileEntityClass(), + new BlockStackSrc( block, 0, ActivityState.Enabled ) ); } ); if( tileEntityDefinition != null ) diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index bd710afd4..67a42f836 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -99,7 +99,8 @@ public class FeatureFactory { ColoredItemDefinition definition = new ColoredItemDefinition(); - target.maybeItem().ifPresent( targetItem -> { + target.maybeItem().ifPresent( targetItem -> + { for( final AEColor color : AEColor.VALID_COLORS ) { final ActivityState state = ActivityState.from( target.isEnabled() ); diff --git a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java index c723c52de..19233cf73 100644 --- a/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java @@ -165,13 +165,14 @@ class ItemDefinitionBuilder implements IItemBuilder // Register all extra handlers preInitCallbacks.forEach( consumer -> factory.addPreInit( side -> consumer.accept( item ) ) ); initCallbacks.forEach( consumer -> factory.addInit( side -> consumer.accept( item ) ) ); - modelRegCallbacks.forEach(consumer -> factory.addModelReg(side -> consumer.accept( item ) ) ); + modelRegCallbacks.forEach( consumer -> factory.addModelReg( side -> consumer.accept( item ) ) ); postInitCallbacks.forEach( consumer -> factory.addPostInit( side -> consumer.accept( item ) ) ); // Register custom dispenser behavior if requested if( dispenserBehaviorSupplier != null ) { - factory.addPostInit( side -> { + factory.addPostInit( side -> + { IBehaviorDispenseItem behavior = dispenserBehaviorSupplier.get(); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, behavior ); } ); diff --git a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java index 207c342d9..0d3968359 100644 --- a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java +++ b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java @@ -52,7 +52,8 @@ public class ItemModelComponent implements InitComponent { ItemModelMesher itemMesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); - modelsByMeta.forEach( ( meta, model ) -> { + modelsByMeta.forEach( ( meta, model ) -> + { itemMesher.register( item, meta, model ); } ); } diff --git a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java index 50dfb702a..ff40a0ab0 100644 --- a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java +++ b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java @@ -63,7 +63,7 @@ public class ModelOverrideComponent implements PreInitComponent { IRegistry modelRegistry = event.getModelRegistry(); Set keys = Sets.newHashSet( modelRegistry.getKeys() ); -// IBakedModel missingModel = modelRegistry.getObject( MODEL_MISSING ); + // IBakedModel missingModel = modelRegistry.getObject( MODEL_MISSING ); IModel missingModel = ModelLoaderRegistry.getMissingModel(); for( ModelResourceLocation location : keys ) diff --git a/src/main/java/appeng/bootstrap/components/ModelRegComponent.java b/src/main/java/appeng/bootstrap/components/ModelRegComponent.java index b9f6827c8..42cff9fe1 100644 --- a/src/main/java/appeng/bootstrap/components/ModelRegComponent.java +++ b/src/main/java/appeng/bootstrap/components/ModelRegComponent.java @@ -1,15 +1,19 @@ + package appeng.bootstrap.components; + import appeng.bootstrap.IBootstrapComponent; import net.minecraftforge.fml.relauncher.Side; + /** * @author GuntherDW */ @FunctionalInterface -public interface ModelRegComponent extends IBootstrapComponent { +public interface ModelRegComponent extends IBootstrapComponent +{ - void modelReg(Side side); + void modelReg( Side side ); } diff --git a/src/main/java/appeng/bootstrap/components/StateMapperComponent.java b/src/main/java/appeng/bootstrap/components/StateMapperComponent.java index d19d85e17..5d872e767 100644 --- a/src/main/java/appeng/bootstrap/components/StateMapperComponent.java +++ b/src/main/java/appeng/bootstrap/components/StateMapperComponent.java @@ -50,7 +50,8 @@ public class StateMapperComponent implements ModelRegComponent ModelLoader.setCustomStateMapper( block, stateMapper ); if( stateMapper instanceof IResourceManagerReloadListener ) { - ( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() ).registerReloadListener( (IResourceManagerReloadListener) stateMapper ); + ( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() ) + .registerReloadListener( (IResourceManagerReloadListener) stateMapper ); } } } diff --git a/src/main/java/appeng/bootstrap/components/TesrComponent.java b/src/main/java/appeng/bootstrap/components/TesrComponent.java index 42301e7cb..1cadc9531 100644 --- a/src/main/java/appeng/bootstrap/components/TesrComponent.java +++ b/src/main/java/appeng/bootstrap/components/TesrComponent.java @@ -31,7 +31,7 @@ import appeng.tile.AEBaseTile; * * @param */ -//public class TesrComponent implements ModelRegComponent +// public class TesrComponent implements ModelRegComponent public class TesrComponent implements PreInitComponent { @@ -46,7 +46,7 @@ public class TesrComponent implements PreInitComponent } @Override -// public void modelReg( Side side ) + // public void modelReg( Side side ) public void preInitialize( Side side ) { ClientRegistry.bindTileEntitySpecialRenderer( tileEntityClass, tesr ); diff --git a/src/main/java/appeng/bootstrap/components/TileEntityComponent.java b/src/main/java/appeng/bootstrap/components/TileEntityComponent.java index 263c03531..a512988d5 100644 --- a/src/main/java/appeng/bootstrap/components/TileEntityComponent.java +++ b/src/main/java/appeng/bootstrap/components/TileEntityComponent.java @@ -1,5 +1,7 @@ + package appeng.bootstrap.components; + import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.core.AppEng; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -8,35 +10,36 @@ import net.minecraftforge.fml.relauncher.Side; import java.util.ArrayList; import java.util.List; + /** * @author GuntherDW */ public class TileEntityComponent implements PreInitComponent { - private List tileEntityDefinitions = new ArrayList<>(); + private List tileEntityDefinitions = new ArrayList<>(); - public TileEntityComponent() - { - } + public TileEntityComponent() + { + } - public void addTileEntity( TileEntityDefinition tileEntityDefinition ) - { - if( !tileEntityDefinitions.contains( tileEntityDefinition ) ) - { - tileEntityDefinitions.add( tileEntityDefinition ); - } - } + public void addTileEntity( TileEntityDefinition tileEntityDefinition ) + { + if( !tileEntityDefinitions.contains( tileEntityDefinition ) ) + { + tileEntityDefinitions.add( tileEntityDefinition ); + } + } - @Override - public void preInitialize( Side side ) - { - for( TileEntityDefinition tileEntityDefinition : tileEntityDefinitions ) - { - if ( !tileEntityDefinition.isRegistered() ) - { - GameRegistry.registerTileEntity( tileEntityDefinition.getTileEntityClass(), AppEng.MOD_ID + ":" + tileEntityDefinition.getName() ); - tileEntityDefinition.setRegistered( true ); - } - } - } + @Override + public void preInitialize( Side side ) + { + for( TileEntityDefinition tileEntityDefinition : tileEntityDefinitions ) + { + if( !tileEntityDefinition.isRegistered() ) + { + GameRegistry.registerTileEntity( tileEntityDefinition.getTileEntityClass(), AppEng.MOD_ID + ":" + tileEntityDefinition.getName() ); + tileEntityDefinition.setRegistered( true ); + } + } + } } diff --git a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java index b349c72c9..210510fc5 100644 --- a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java +++ b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java @@ -18,53 +18,55 @@ package appeng.bootstrap.definitions; + import appeng.tile.AEBaseTile; + /** * @author GuntherDW */ public class TileEntityDefinition { - private final Class tileEntityClass; - private String name; - private boolean isRegistered = false; + private final Class tileEntityClass; + private String name; + private boolean isRegistered = false; - // This signals the BlockDefinitionBuilder to set the name of the TE to the blockname. - public TileEntityDefinition( Class tileEntityClass ) - { - this.tileEntityClass = tileEntityClass; - this.name = null; - } + // This signals the BlockDefinitionBuilder to set the name of the TE to the blockname. + public TileEntityDefinition( Class tileEntityClass ) + { + this.tileEntityClass = tileEntityClass; + this.name = null; + } - public TileEntityDefinition( Class tileEntityClass, String optionalName ) - { - this.tileEntityClass = tileEntityClass; - this.name = optionalName; - } + public TileEntityDefinition( Class tileEntityClass, String optionalName ) + { + this.tileEntityClass = tileEntityClass; + this.name = optionalName; + } - public Class getTileEntityClass() - { - return tileEntityClass; - } + public Class getTileEntityClass() + { + return tileEntityClass; + } - public void setName( String name ) - { - this.name = name; - } + public void setName( String name ) + { + this.name = name; + } - public String getName() - { - return name; - } + public String getName() + { + return name; + } - public boolean isRegistered() - { - return isRegistered; - } + public boolean isRegistered() + { + return isRegistered; + } - public void setRegistered( boolean registered ) - { - isRegistered = registered; - } + public void setRegistered( boolean registered ) + { + isRegistered = registered; + } } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 474b9f4f4..6afa8b43b 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -160,7 +160,7 @@ public abstract class AEBaseGui extends GuiContainer { super.drawDefaultBackground(); super.drawScreen( mouseX, mouseY, btn ); - this.renderHoveredToolTip(mouseX, mouseY); + this.renderHoveredToolTip( mouseX, mouseY ); for( final Object c : this.buttonList ) { @@ -760,15 +760,27 @@ public abstract class AEBaseGui extends GuiContainer final float f1 = 0.00390625F; final float f = 0.00390625F; final float par6 = 16; - vb.pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).color( 1.0f, 1.0f, 1.0f, - aes.getOpacityOfIcon() ).endVertex(); + vb.pos( par1 + 0, par2 + par6, this.zLevel ) + .tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ) + .color( 1.0f, 1.0f, 1.0f, + aes.getOpacityOfIcon() ) + .endVertex(); final float par5 = 16; - vb.pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).color( 1.0f, 1.0f, 1.0f, - aes.getOpacityOfIcon() ).endVertex(); - vb.pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).color( 1.0f, 1.0f, 1.0f, - aes.getOpacityOfIcon() ).endVertex(); - vb.pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).color( 1.0f, 1.0f, 1.0f, - aes.getOpacityOfIcon() ).endVertex(); + vb.pos( par1 + par5, par2 + par6, this.zLevel ) + .tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ) + .color( 1.0f, 1.0f, 1.0f, + aes.getOpacityOfIcon() ) + .endVertex(); + vb.pos( par1 + par5, par2 + 0, this.zLevel ) + .tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ) + .color( 1.0f, 1.0f, 1.0f, + aes.getOpacityOfIcon() ) + .endVertex(); + vb.pos( par1 + 0, par2 + 0, this.zLevel ) + .tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ) + .color( 1.0f, 1.0f, 1.0f, + aes.getOpacityOfIcon() ) + .endVertex(); tessellator.draw(); } diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java index 1250ad90d..dcc26bfaa 100644 --- a/src/main/java/appeng/client/gui/Size1Slot.java +++ b/src/main/java/appeng/client/gui/Size1Slot.java @@ -1,3 +1,4 @@ + package appeng.client.gui; @@ -70,7 +71,7 @@ class Size1Slot extends Slot @Override @Nullable - @SideOnly( Side.CLIENT) + @SideOnly( Side.CLIENT ) public String getSlotTexture() { return delegate.getSlotTexture(); @@ -83,21 +84,21 @@ class Size1Slot extends Slot } @Override - @SideOnly( Side.CLIENT) + @SideOnly( Side.CLIENT ) public boolean isEnabled() { return delegate.isEnabled(); } @Override - @SideOnly( Side.CLIENT) + @SideOnly( Side.CLIENT ) public ResourceLocation getBackgroundLocation() { return delegate.getBackgroundLocation(); } @Override - @SideOnly( Side.CLIENT) + @SideOnly( Side.CLIENT ) public TextureAtlasSprite getBackgroundSprite() { return delegate.getBackgroundSprite(); diff --git a/src/main/java/appeng/client/gui/config/AEConfigGuiFactory.java b/src/main/java/appeng/client/gui/config/AEConfigGuiFactory.java index 84051cfcb..300491300 100644 --- a/src/main/java/appeng/client/gui/config/AEConfigGuiFactory.java +++ b/src/main/java/appeng/client/gui/config/AEConfigGuiFactory.java @@ -41,7 +41,8 @@ public class AEConfigGuiFactory implements IModGuiFactory * @return true if this object provides a config gui screen, false otherwise */ @Override - public boolean hasConfigGui() { + public boolean hasConfigGui() + { return false; } @@ -61,13 +62,14 @@ public class AEConfigGuiFactory implements IModGuiFactory * can be changed here. * * @param parentScreen The screen to which must be returned when closing the - * returned screen. + * returned screen. * @return A class that will be instantiated on clicks on the config button * or null if no GUI is desired. */ @Override - public GuiScreen createConfigGui(GuiScreen parentScreen) { - return new AEConfigGui(parentScreen); + public GuiScreen createConfigGui( GuiScreen parentScreen ) + { + return new AEConfigGui( parentScreen ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java index 63c218cc7..972f71ab0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java @@ -65,7 +65,8 @@ public class GuiCellWorkbench extends GuiUpgradeable { this.clear = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE ); this.partition = new GuiImgButton( this.guiLeft - 18, this.guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH ); - this.copyMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 48, 11 * 16 + 5, 12 * 16 + 5, GuiText.CopyMode.getLocal(), GuiText.CopyModeDesc.getLocal() ); + this.copyMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 48, 11 * 16 + 5, 12 * 16 + 5, GuiText.CopyMode.getLocal(), GuiText.CopyModeDesc + .getLocal() ); this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 68, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); this.buttonList.add( this.fuzzyMode ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java b/src/main/java/appeng/client/gui/implementations/GuiCondenser.java index 1fc581709..0d087f7b1 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCondenser.java @@ -70,7 +70,8 @@ public class GuiCondenser extends AEBaseGui { super.initGui(); - this.pb = new GuiProgressBar( this.cvc, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, 178, 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy.getLocal() ); + this.pb = new GuiProgressBar( this.cvc, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, 178, 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy + .getLocal() ); this.mode = new GuiImgButton( 128 + this.guiLeft, 52 + this.guiTop, Settings.CONDENSER_OUTPUT, this.cvc.getOutput() ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java index c624db87c..5babd6e4f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java @@ -173,7 +173,8 @@ public class GuiCraftAmount extends AEBaseGui { this.actionPerformed( this.next ); } - if( ( key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ) ) && this.amountToCraft.textboxKeyTyped( character, key ) ) + if( ( key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ) ) && this.amountToCraft + .textboxKeyTyped( character, key ) ) { try { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 217a25303..38aa0f17c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -120,7 +120,8 @@ public class GuiCraftConfirm extends AEBaseGui this.start.enabled = false; this.buttonList.add( this.start ); - this.selectCPU = new GuiButton( 0, this.guiLeft + ( 219 - 180 ) / 2, this.guiTop + this.ySize - 68, 180, 20, GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic ); + this.selectCPU = new GuiButton( 0, this.guiLeft + ( 219 - 180 ) / 2, this.guiTop + this.ySize - 68, 180, 20, GuiText.CraftingCPU + .getLocal() + ": " + GuiText.Automatic ); this.selectCPU.enabled = false; this.buttonList.add( this.selectCPU ); @@ -219,7 +220,8 @@ public class GuiCraftConfirm extends AEBaseGui } else { - dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; + dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors + .getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; } final int offset = ( 219 - this.fontRenderer.getStringWidth( dsp ) ) / 2; @@ -285,7 +287,8 @@ public class GuiCraftConfirm extends AEBaseGui str = GuiText.FromStorage.getLocal() + ": " + str; final int w = 4 + this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); + this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), + ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); if( this.tooltip == z - viewStart ) { @@ -310,7 +313,8 @@ public class GuiCraftConfirm extends AEBaseGui str = GuiText.Missing.getLocal() + ": " + str; final int w = 4 + this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); + this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), + ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); if( this.tooltip == z - viewStart ) { @@ -335,7 +339,8 @@ public class GuiCraftConfirm extends AEBaseGui str = GuiText.ToCraft.getLocal() + ": " + str; final int w = 4 + this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); + this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), + ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); if( this.tooltip == z - viewStart ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 60715611a..c39029e80 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -139,7 +139,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource { super.initGui(); this.setScrollBar(); - this.cancel = new GuiButton( 0, this.guiLeft + CANCEL_LEFT_OFFSET, this.guiTop + this.ySize - CANCEL_TOP_OFFSET, CANCEL_WIDTH, CANCEL_HEIGHT, GuiText.Cancel.getLocal() ); + this.cancel = new GuiButton( 0, this.guiLeft + CANCEL_LEFT_OFFSET, this.guiTop + this.ySize - CANCEL_TOP_OFFSET, CANCEL_WIDTH, CANCEL_HEIGHT, GuiText.Cancel + .getLocal() ); this.buttonList.add( this.cancel ); } @@ -263,7 +264,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource { final String str = GuiText.Stored.getLocal() + ": " + converter.toWideReadableForm( stored.getStackSize() ); final int w = 4 + this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR ); + this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), + ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR ); if( this.tooltip == z - viewStart ) { @@ -278,7 +280,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource final String str = GuiText.Crafting.getLocal() + ": " + converter.toWideReadableForm( activeStack.getStackSize() ); final int w = 4 + this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR ); + this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), + ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR ); if( this.tooltip == z - viewStart ) { @@ -293,7 +296,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource final String str = GuiText.Scheduled.getLocal() + ": " + converter.toWideReadableForm( pendingStack.getStackSize() ); final int w = 4 + this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR ); + this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), + ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR ); if( this.tooltip == z - viewStart ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index 4ac1edcd4..4e156b1fe 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -127,13 +127,15 @@ public class GuiCraftingStatus extends GuiCraftingCPU { super.initGui(); - this.selectCPU = new GuiButton( 0, this.guiLeft + 8, this.guiTop + this.ySize - 25, 150, 20, GuiText.CraftingCPU.getLocal() + ": " + GuiText.NoCraftingCPUs ); + this.selectCPU = new GuiButton( 0, this.guiLeft + 8, this.guiTop + this.ySize - 25, 150, 20, GuiText.CraftingCPU + .getLocal() + ": " + GuiText.NoCraftingCPUs ); // selectCPU.enabled = false; this.buttonList.add( this.selectCPU ); if( !this.myIcon.isEmpty() ) { - this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), this.itemRender ) ); + this.buttonList.add( + this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), this.itemRender ) ); this.originalGuiBtn.setHideEdge( 13 ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index 90df0905d..4b27ffd9b 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -62,7 +62,8 @@ public class GuiInterface extends GuiUpgradeable this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO ); this.buttonList.add( this.BlockMode ); - this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal.getLocal(), GuiText.InterfaceTerminalHint.getLocal() ); + this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal + .getLocal(), GuiText.InterfaceTerminalHint.getLocal() ); this.buttonList.add( this.interfaceMode ); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 17fa1cfa5..4aa00402c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -223,7 +223,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi Keyboard.enableRepeatEvents( true ); this.maxRows = this.getMaxRows(); - this.perRow = AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 ); + this.perRow = AEConfig.instance().getConfigManager().getSetting( + Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 ); final int magicNumber = 114 + 1; final int extraSpace = this.height - magicNumber - this.reservedSpace; @@ -271,25 +272,32 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( this.customSortOrder ) { - this.buttonList.add( this.SortByBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting( Settings.SORT_BY ) ) ); + this.buttonList + .add( this.SortByBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting( Settings.SORT_BY ) ) ); offset += 20; } if( this.viewCell || this instanceof GuiWirelessTerm ) { - this.buttonList.add( this.ViewBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.VIEW_MODE, this.configSrc.getSetting( Settings.VIEW_MODE ) ) ); + this.buttonList + .add( this.ViewBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.VIEW_MODE, this.configSrc.getSetting( Settings.VIEW_MODE ) ) ); offset += 20; } - this.buttonList.add( this.SortDirBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, this.configSrc.getSetting( Settings.SORT_DIRECTION ) ) ); + this.buttonList.add( this.SortDirBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, this.configSrc + .getSetting( Settings.SORT_DIRECTION ) ) ); offset += 20; - this.buttonList.add( this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE ) ) ); + this.buttonList.add( + this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, offset, Settings.SEARCH_MODE, AEConfig.instance().getConfigManager().getSetting( + Settings.SEARCH_MODE ) ) ); offset += 20; if( !( this instanceof GuiMEPortableCell ) || this instanceof GuiWirelessTerm ) { - this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) ) ); + this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance() + .getConfigManager() + .getSetting( Settings.TERMINAL_STYLE ) ) ); } this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 80, this.offsetX ), this.guiTop + 4, 90, 12 ); @@ -300,7 +308,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( this.viewCell || this instanceof GuiWirelessTerm ) { - this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), this.itemRender ) ); + this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus + .getLocal(), this.itemRender ) ); this.craftingStatusBtn.setHideEdge( 13 ); } @@ -398,7 +407,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.drawTexturedModalRect( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18 ); } - this.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, 99 + this.reservedSpace - this.lowerTextureOffset ); + this.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, + 99 + this.reservedSpace - this.lowerTextureOffset ); if( this.viewCell ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java index 6fa328f9f..cbabe62d4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java @@ -140,7 +140,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource this.fontRenderer.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( ns.getCurrentPower(), false ), 13, 16, 4210752 ); this.fontRenderer.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( ns.getMaxPower(), false ), 13, 26, 4210752 ); - this.fontRenderer.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.getAverageAddition(), true ), 13, 143 - 10, 4210752 ); + this.fontRenderer.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.getAverageAddition(), true ), 13, 143 - 10, + 4210752 ); this.fontRenderer.drawString( GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( ns.getPowerUsage(), true ), 13, 143 - 20, 4210752 ); final int sectionLength = 30; @@ -171,7 +172,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource } final int w = this.fontRenderer.getStringWidth( str ); - this.fontRenderer.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, 4210752 ); + this.fontRenderer.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, + 4210752 ); GlStateManager.popMatrix(); final int posX = x * sectionLength + xo + sectionLength - 18; diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java index 1c48e0792..9c3d726a0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java @@ -68,7 +68,8 @@ public class GuiNetworkTool extends AEBaseGui { super.initGui(); - this.tFacades = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 8, 23, 22, GuiText.TransparentFacades.getLocal(), GuiText.TransparentFacadesHint.getLocal() ); + this.tFacades = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 8, 23, 22, GuiText.TransparentFacades.getLocal(), GuiText.TransparentFacadesHint + .getLocal() ); this.buttonList.add( this.tFacades ); } diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 57671d179..548582a76 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -78,7 +78,8 @@ public class GuiPatternTerm extends GuiMEMonitorable if( this.tabCraftButton == btn || this.tabProcessButton == btn ) { - NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) ); + NetworkHandler.instance().sendToServer( + new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) ); } if( this.encodeBtn == btn ) @@ -93,7 +94,8 @@ public class GuiPatternTerm extends GuiMEMonitorable if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn ) { - NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) ); + NetworkHandler.instance().sendToServer( + new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) ); } } catch( final IOException e ) @@ -107,10 +109,12 @@ public class GuiPatternTerm extends GuiMEMonitorable { super.initGui(); - this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.CRAFTING_TABLE ), GuiText.CraftingPattern.getLocal(), this.itemRender ); + this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.CRAFTING_TABLE ), GuiText.CraftingPattern + .getLocal(), this.itemRender ); this.buttonList.add( this.tabCraftButton ); - this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.FURNACE ), GuiText.ProcessingPattern.getLocal(), this.itemRender ); + this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.FURNACE ), GuiText.ProcessingPattern + .getLocal(), this.itemRender ); this.buttonList.add( this.tabProcessButton ); this.substitutionsEnabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.ENABLED ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/GuiPriority.java index 3db5f18e7..212904150 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPriority.java @@ -228,7 +228,8 @@ public class GuiPriority extends AEBaseGui { if( !this.checkHotbarKeys( key ) ) { - if( ( key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ) ) && this.priority.textboxKeyTyped( character, key ) ) + if( ( key == 211 || key == 205 || key == 203 || key == 14 || character == '-' || Character.isDigit( character ) ) && this.priority + .textboxKeyTyped( character, key ) ) { try { diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java b/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java index 58e476d39..b2b2904a4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java @@ -101,15 +101,20 @@ public class GuiSecurityStation extends GuiMEMonitorable super.initGui(); final int top = this.guiTop + this.ySize - 116; - this.buttonList.add( this.inject = new GuiToggleButton( this.guiLeft + 56, top, 11 * 16, 12 * 16, SecurityPermissions.INJECT.getUnlocalizedName(), SecurityPermissions.INJECT.getUnlocalizedTip() ) ); + this.buttonList.add( this.inject = new GuiToggleButton( this.guiLeft + 56, top, 11 * 16, 12 * 16, SecurityPermissions.INJECT + .getUnlocalizedName(), SecurityPermissions.INJECT.getUnlocalizedTip() ) ); - this.buttonList.add( this.extract = new GuiToggleButton( this.guiLeft + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT.getUnlocalizedName(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) ); + this.buttonList.add( this.extract = new GuiToggleButton( this.guiLeft + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT + .getUnlocalizedName(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) ); - this.buttonList.add( this.craft = new GuiToggleButton( this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, SecurityPermissions.CRAFT.getUnlocalizedName(), SecurityPermissions.CRAFT.getUnlocalizedTip() ) ); + this.buttonList.add( this.craft = new GuiToggleButton( this.guiLeft + 56 + 18 * 2, top, 11 * 16 + 2, 12 * 16 + 2, SecurityPermissions.CRAFT + .getUnlocalizedName(), SecurityPermissions.CRAFT.getUnlocalizedTip() ) ); - this.buttonList.add( this.build = new GuiToggleButton( this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, SecurityPermissions.BUILD.getUnlocalizedName(), SecurityPermissions.BUILD.getUnlocalizedTip() ) ); + this.buttonList.add( this.build = new GuiToggleButton( this.guiLeft + 56 + 18 * 3, top, 11 * 16 + 3, 12 * 16 + 3, SecurityPermissions.BUILD + .getUnlocalizedName(), SecurityPermissions.BUILD.getUnlocalizedTip() ) ); - this.buttonList.add( this.security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY.getUnlocalizedName(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) ); + this.buttonList.add( this.security = new GuiToggleButton( this.guiLeft + 56 + 18 * 4, top, 11 * 16 + 4, 12 * 16 + 4, SecurityPermissions.SECURITY + .getUnlocalizedName(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java index 2ddc38a18..25b2ff9d7 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java @@ -75,9 +75,11 @@ public class GuiSpatialIOPort extends AEBaseGui @Override public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { - this.fontRenderer.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getCurrentPower(), false ), 13, 21, 4210752 ); + this.fontRenderer.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getCurrentPower(), false ), 13, 21, + 4210752 ); this.fontRenderer.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getMaxPower(), false ), 13, 31, 4210752 ); - this.fontRenderer.drawString( GuiText.RequiredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getRequiredPower(), false ), 13, 78, 4210752 ); + this.fontRenderer.drawString( GuiText.RequiredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getRequiredPower(), false ), 13, 78, + 4210752 ); this.fontRenderer.drawString( GuiText.Efficiency.getLocal() + ": " + ( ( (float) this.container.getEfficency() ) / 100 ) + '%', 13, 88, 4210752 ); this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.SpatialIOPort.getLocal() ), 8, 6, 4210752 ); diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 34a9bf1ba..1349a18d0 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -108,7 +108,8 @@ public class GuiImgButton extends GuiButton implements ITooltip this.registerApp( 16 * 2 + 3, Settings.SEARCH_MODE, SearchBoxMode.AUTOSEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_Auto ); this.registerApp( 16 * 2 + 4, Settings.SEARCH_MODE, SearchBoxMode.MANUAL_SEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_Standard ); this.registerApp( 16 * 2 + 5, Settings.SEARCH_MODE, SearchBoxMode.JEI_AUTOSEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIAuto ); - this.registerApp( 16 * 2 + 6, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH, ButtonToolTips.SearchMode, ButtonToolTips.SearchMode_JEIStandard ); + this.registerApp( 16 * 2 + 6, Settings.SEARCH_MODE, SearchBoxMode.JEI_MANUAL_SEARCH, ButtonToolTips.SearchMode, + ButtonToolTips.SearchMode_JEIStandard ); this.registerApp( 16 * 5 + 3, Settings.LEVEL_TYPE, LevelType.ENERGY_LEVEL, ButtonToolTips.LevelType, ButtonToolTips.LevelType_Energy ); this.registerApp( 16 * 4 + 3, Settings.LEVEL_TYPE, LevelType.ITEM_LEVEL, ButtonToolTips.LevelType, ButtonToolTips.LevelType_Item ); @@ -153,15 +154,19 @@ public class GuiImgButton extends GuiButton implements ITooltip this.registerApp( 16 * 11 + 2, Settings.CRAFT_VIA_REDSTONE, YesNo.YES, ButtonToolTips.EmitterMode, ButtonToolTips.CraftViaRedstone ); this.registerApp( 16 * 11 + 1, Settings.CRAFT_VIA_REDSTONE, YesNo.NO, ButtonToolTips.EmitterMode, ButtonToolTips.EmitWhenCrafting ); - this.registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsNo ); - this.registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsYes ); + this.registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, + ButtonToolTips.ReportInaccessibleItemsNo ); + this.registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems, + ButtonToolTips.ReportInaccessibleItemsYes ); this.registerApp( 16 * 14, Settings.PLACE_BLOCK, YesNo.YES, ButtonToolTips.BlockPlacement, ButtonToolTips.BlockPlacementYes ); this.registerApp( 16 * 14 + 1, Settings.PLACE_BLOCK, YesNo.NO, ButtonToolTips.BlockPlacement, ButtonToolTips.BlockPlacementNo ); this.registerApp( 16 * 15, Settings.SCHEDULING_MODE, SchedulingMode.DEFAULT, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeDefault ); - this.registerApp( 16 * 15 + 1, Settings.SCHEDULING_MODE, SchedulingMode.ROUNDROBIN, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeRoundRobin ); - this.registerApp( 16 * 15 + 2, Settings.SCHEDULING_MODE, SchedulingMode.RANDOM, ButtonToolTips.SchedulingMode, ButtonToolTips.SchedulingModeRandom ); + this.registerApp( 16 * 15 + 1, Settings.SCHEDULING_MODE, SchedulingMode.ROUNDROBIN, ButtonToolTips.SchedulingMode, + ButtonToolTips.SchedulingModeRoundRobin ); + this.registerApp( 16 * 15 + 2, Settings.SCHEDULING_MODE, SchedulingMode.RANDOM, ButtonToolTips.SchedulingMode, + ButtonToolTips.SchedulingModeRandom ); } } diff --git a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java b/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java index fadda1e67..0108e0add 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java @@ -95,7 +95,8 @@ public class GuiProgressBar extends GuiButton implements ITooltip return this.fullMsg; } - return ( this.titleName != null ? this.titleName : "" ) + '\n' + this.source.getCurrentProgress() + ' ' + GuiText.Of.getLocal() + ' ' + this.source.getMaxProgress(); + return ( this.titleName != null ? this.titleName : "" ) + '\n' + this.source.getCurrentProgress() + ' ' + GuiText.Of.getLocal() + ' ' + this.source + .getMaxProgress(); } @Override diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java index fdb70e209..d31377548 100644 --- a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java @@ -97,7 +97,8 @@ public class FacadeDispatcherBakedModel implements IBakedModel @Override public ItemOverrideList getOverrides() { - return new ItemOverrideList( Collections.emptyList() ){ + return new ItemOverrideList( Collections.emptyList() ) + { @Override public IBakedModel handleItemState( IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity ) { diff --git a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java index 53b03007e..92b5d46fd 100644 --- a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java @@ -75,7 +75,7 @@ public class FacadeWithBlockBakedModel implements IBakedModel List quads = new ArrayList<>( 1 ); CubeBuilder builder = new CubeBuilder( format, quads ); FacadeBuilder.TextureAtlasAndTint sprite = FacadeBuilder.getSprite( textureModel, blockState, side, rand ); - if ( sprite != null && sprite.getSprite() != null ) + if( sprite != null && sprite.getSprite() != null ) { if( sprite.getTint() != -1 ) { diff --git a/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java index 5120f54e4..5ebac1d4c 100644 --- a/src/main/java/appeng/client/render/FacingToRotation.java +++ b/src/main/java/appeng/client/render/FacingToRotation.java @@ -15,6 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Applied Energistics 2. If not, see . */ + package appeng.client.render; @@ -25,6 +26,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.model.TRSRTransformation; + /** * TODO: Removed useless stuff. */ @@ -32,44 +34,44 @@ public enum FacingToRotation { // DUNSWE - //@formatter:off - DOWN_DOWN ( new Vector3f( 0, 0, 0 ) ), //NOOP - DOWN_UP ( new Vector3f( 0, 0, 0 ) ), //NOOP - DOWN_NORTH ( new Vector3f( -90, 0, 0 ) ), - DOWN_SOUTH ( new Vector3f( -90, 0, 180 ) ), - DOWN_WEST ( new Vector3f( -90, 0, 90 ) ), - DOWN_EAST ( new Vector3f( -90, 0, -90 ) ), - UP_DOWN ( new Vector3f( 0, 0, 0 ) ), //NOOP - UP_UP ( new Vector3f( 0, 0, 0 ) ), //NOOP - UP_NORTH ( new Vector3f( 90, 0, 180 ) ), - UP_SOUTH ( new Vector3f( 90, 0, 0 ) ), - UP_WEST ( new Vector3f( 90, 0, 90 ) ), - UP_EAST ( new Vector3f( 90, 0, -90 ) ), - NORTH_DOWN ( new Vector3f( 0, 0, 180 ) ), - NORTH_UP ( new Vector3f( 0, 0, 0 ) ), - NORTH_NORTH ( new Vector3f( 0, 0, 0 ) ), //NOOP - NORTH_SOUTH ( new Vector3f( 0, 0, 0 ) ), //NOOP - NORTH_WEST ( new Vector3f( 0, 0, 90 ) ), - NORTH_EAST ( new Vector3f( 0, 0, -90 ) ), - SOUTH_DOWN ( new Vector3f( 0, 180, 180 ) ), - SOUTH_UP ( new Vector3f( 0, 180, 0 ) ), - SOUTH_NORTH ( new Vector3f( 0, 0, 0 ) ), //NOOP - SOUTH_SOUTH ( new Vector3f( 0, 0, 0 ) ), //NOOP - SOUTH_WEST ( new Vector3f( 0, 180, -90 ) ), - SOUTH_EAST ( new Vector3f( 0, 180, 90 ) ), - WEST_DOWN ( new Vector3f( 0, 90, 180 ) ), - WEST_UP ( new Vector3f( 0, 90, 0 ) ), - WEST_NORTH ( new Vector3f( 0, 90, -90 ) ), - WEST_SOUTH ( new Vector3f( 0, 90, 90 ) ), - WEST_WEST ( new Vector3f( 0, 0, 0 ) ), //NOOP - WEST_EAST ( new Vector3f( 0, 0, 0 ) ), //NOOP - EAST_DOWN ( new Vector3f( 0, -90, 180 ) ), - EAST_UP ( new Vector3f( 0, -90, 0 ) ), - EAST_NORTH ( new Vector3f( 0, -90, 90 ) ), - EAST_SOUTH ( new Vector3f( 0, -90, -90 ) ), - EAST_WEST ( new Vector3f( 0, 0, 0 ) ), //NOOP - EAST_EAST ( new Vector3f( 0, 0, 0 ) ); //NOOP - //@formatter:on + // @formatter:off + DOWN_DOWN( new Vector3f( 0, 0, 0 ) ), // NOOP + DOWN_UP( new Vector3f( 0, 0, 0 ) ), // NOOP + DOWN_NORTH( new Vector3f( -90, 0, 0 ) ), + DOWN_SOUTH( new Vector3f( -90, 0, 180 ) ), + DOWN_WEST( new Vector3f( -90, 0, 90 ) ), + DOWN_EAST( new Vector3f( -90, 0, -90 ) ), + UP_DOWN( new Vector3f( 0, 0, 0 ) ), // NOOP + UP_UP( new Vector3f( 0, 0, 0 ) ), // NOOP + UP_NORTH( new Vector3f( 90, 0, 180 ) ), + UP_SOUTH( new Vector3f( 90, 0, 0 ) ), + UP_WEST( new Vector3f( 90, 0, 90 ) ), + UP_EAST( new Vector3f( 90, 0, -90 ) ), + NORTH_DOWN( new Vector3f( 0, 0, 180 ) ), + NORTH_UP( new Vector3f( 0, 0, 0 ) ), + NORTH_NORTH( new Vector3f( 0, 0, 0 ) ), // NOOP + NORTH_SOUTH( new Vector3f( 0, 0, 0 ) ), // NOOP + NORTH_WEST( new Vector3f( 0, 0, 90 ) ), + NORTH_EAST( new Vector3f( 0, 0, -90 ) ), + SOUTH_DOWN( new Vector3f( 0, 180, 180 ) ), + SOUTH_UP( new Vector3f( 0, 180, 0 ) ), + SOUTH_NORTH( new Vector3f( 0, 0, 0 ) ), // NOOP + SOUTH_SOUTH( new Vector3f( 0, 0, 0 ) ), // NOOP + SOUTH_WEST( new Vector3f( 0, 180, -90 ) ), + SOUTH_EAST( new Vector3f( 0, 180, 90 ) ), + WEST_DOWN( new Vector3f( 0, 90, 180 ) ), + WEST_UP( new Vector3f( 0, 90, 0 ) ), + WEST_NORTH( new Vector3f( 0, 90, -90 ) ), + WEST_SOUTH( new Vector3f( 0, 90, 90 ) ), + WEST_WEST( new Vector3f( 0, 0, 0 ) ), // NOOP + WEST_EAST( new Vector3f( 0, 0, 0 ) ), // NOOP + EAST_DOWN( new Vector3f( 0, -90, 180 ) ), + EAST_UP( new Vector3f( 0, -90, 0 ) ), + EAST_NORTH( new Vector3f( 0, -90, 90 ) ), + EAST_SOUTH( new Vector3f( 0, -90, -90 ) ), + EAST_WEST( new Vector3f( 0, 0, 0 ) ), // NOOP + EAST_EAST( new Vector3f( 0, 0, 0 ) ); // NOOP + // @formatter:on private final Vector3f rot; private final Matrix4f mat; @@ -77,7 +79,10 @@ public enum FacingToRotation private FacingToRotation( Vector3f rot ) { this.rot = rot; - this.mat = TRSRTransformation.toVecmath( new org.lwjgl.util.vector.Matrix4f().rotate( (float) Math.toRadians( rot.x ), new org.lwjgl.util.vector.Vector3f( 1, 0, 0 ) ).rotate( (float) Math.toRadians( rot.y ), new org.lwjgl.util.vector.Vector3f( 0, 1, 0 ) ).rotate( (float) Math.toRadians( rot.z ), new org.lwjgl.util.vector.Vector3f( 0, 0, 1 ) ) ); + this.mat = TRSRTransformation + .toVecmath( new org.lwjgl.util.vector.Matrix4f().rotate( (float) Math.toRadians( rot.x ), new org.lwjgl.util.vector.Vector3f( 1, 0, 0 ) ) + .rotate( (float) Math.toRadians( rot.y ), new org.lwjgl.util.vector.Vector3f( 0, 1, 0 ) ) + .rotate( (float) Math.toRadians( rot.z ), new org.lwjgl.util.vector.Vector3f( 0, 0, 1 ) ) ); } public Vector3f getRot() diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index 9f256bb32..b6754dd0a 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -130,7 +130,7 @@ public class SpatialSkyRender extends IRenderHandler GlStateManager.enableBlend(); GlStateManager.disableTexture2D(); GlStateManager.depthMask( false ); - OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + OpenGlHelper.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0 ); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index d13a149c1..9e349b730 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -55,7 +55,8 @@ public class StackSizeRenderer if( aeStack.getShowCraftingLabel() ) { - final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft.getLocal(); + final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft + .getLocal(); GlStateManager.disableLighting(); GlStateManager.disableDepth(); GlStateManager.disableBlend(); diff --git a/src/main/java/appeng/client/render/VertexFormats.java b/src/main/java/appeng/client/render/VertexFormats.java index 36334da1e..063286d51 100644 --- a/src/main/java/appeng/client/render/VertexFormats.java +++ b/src/main/java/appeng/client/render/VertexFormats.java @@ -34,7 +34,8 @@ public final class VertexFormats // Standard item format extended with lightmap coordinates private static final VertexFormat itemFormatWithLightMap = new VertexFormat( DefaultVertexFormats.ITEM ).addElement( DefaultVertexFormats.TEX_2S ); - private VertexFormats() { + private VertexFormats() + { } public static VertexFormat getFormatWithLightMap( VertexFormat format ) diff --git a/src/main/java/appeng/client/render/cablebus/CableBusModel.java b/src/main/java/appeng/client/render/cablebus/CableBusModel.java index ad3f8863a..34396562d 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusModel.java @@ -77,7 +77,8 @@ public class CableBusModel implements IModel CableBuilder cableBuilder = new CableBuilder( format, bakedTextureGetter ); FacadeBuilder facadeBuilder = new FacadeBuilder( format, bakedTextureGetter ); - // This should normally not be used, but we *have* to provide a particle texture or otherwise damage models will crash + // This should normally not be used, but we *have* to provide a particle texture or otherwise damage models will + // crash TextureAtlasSprite particleTexture = cableBuilder.getCoreTexture( CableCoreType.GLASS, AEColor.TRANSPARENT ); return new CableBusBakedModel( cableBuilder, facadeBuilder, partModels, particleTexture ); diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index 4f5846652..e563eb729 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -99,7 +99,7 @@ public class FacadeBuilder } ); } - public static TextureAtlasAndTint getSprite( IBakedModel blockModel, IBlockState state, EnumFacing facing, long rand) + public static TextureAtlasAndTint getSprite( IBakedModel blockModel, IBlockState state, EnumFacing facing, long rand ) { TextureAtlasAndTint firstFound = null; @@ -107,7 +107,8 @@ public class FacadeBuilder try { - // Some other mods also distinguish between layers, so we're doing this in a loop from most likely to least likely + // Some other mods also distinguish between layers, so we're doing this in a loop from most likely to least + // likely for( BlockRenderLayer layer : BlockRenderLayer.values() ) { @@ -258,16 +259,8 @@ public class FacadeBuilder AxisAlignedBB primaryBox = getFacadeBox( side, thinFacades ); - Vector3f min = new Vector3f( - (float) primaryBox.minX * 16, - (float) primaryBox.minY * 16, - (float) primaryBox.minZ * 16 - ); - Vector3f max = new Vector3f( - (float) primaryBox.maxX * 16, - (float) primaryBox.maxY * 16, - (float) primaryBox.maxZ * 16 - ); + Vector3f min = new Vector3f( (float) primaryBox.minX * 16, (float) primaryBox.minY * 16, (float) primaryBox.minZ * 16 ); + Vector3f max = new Vector3f( (float) primaryBox.maxX * 16, (float) primaryBox.maxY * 16, (float) primaryBox.maxZ * 16 ); if( busBounds == null ) { @@ -311,8 +304,8 @@ public class FacadeBuilder } else { - Vector3f busMin = new Vector3f( (float) busBounds.minX * 16, (float) busBounds.minY * 16, (float) busBounds.minZ * 16 ); - Vector3f busMax = new Vector3f( (float) busBounds.maxX * 16, (float) busBounds.maxY * 16, (float) busBounds.maxZ * 16 ); + Vector3f busMin = new Vector3f( (float) busBounds.minX * 16, (float) busBounds.minY * 16, (float) busBounds.minZ * 16 ); + Vector3f busMax = new Vector3f( (float) busBounds.maxX * 16, (float) busBounds.maxY * 16, (float) busBounds.maxZ * 16 ); if( side == EnumFacing.UP || side == EnumFacing.DOWN ) { @@ -368,8 +361,7 @@ public class FacadeBuilder } } - private void renderSegmentBlockCurrentBounds( CubeBuilder builder, Vector3f min, Vector3f max, - float minX, float minY, float minZ, float maxX, float maxY, float maxZ ) + private void renderSegmentBlockCurrentBounds( CubeBuilder builder, Vector3f min, Vector3f max, float minX, float minY, float minZ, float maxX, float maxY, float maxZ ) { minX = Math.max( min.x, minX ); minY = Math.max( min.y, minY ); @@ -379,7 +371,7 @@ public class FacadeBuilder maxZ = Math.min( max.z, maxZ ); // don't draw it if its not at least a pixel wide... - if( maxX - minX >= 1.0 && maxY - minY >= 1.0 && maxZ - minZ >= 1.0 ) + if( maxX - minX >= 1.0 && maxY - minY >= 1.0 && maxZ - minZ >= 1.0 ) { builder.addCube( minX, minY, minZ, maxX, maxY, maxZ ); } @@ -387,7 +379,8 @@ public class FacadeBuilder } /** - * Given the actual facade bounding box, and the bounding boxes of all parts, determine the biggest union of AABB that intersect with the + * Given the actual facade bounding box, and the bounding boxes of all parts, determine the biggest union of AABB + * that intersect with the * facade's bounding box. This AABB will need to be "cut out" when the facade is rendered. */ @Nullable diff --git a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java index d4235281b..33491544c 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java @@ -1,3 +1,4 @@ + package appeng.client.render.cablebus; diff --git a/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java index fe75823c5..56357c562 100644 --- a/src/main/java/appeng/client/render/cablebus/QuadRotator.java +++ b/src/main/java/appeng/client/render/cablebus/QuadRotator.java @@ -101,7 +101,8 @@ public class QuadRotator for( int i = 0; i < 4; i++ ) { - Point3f pos = new Point3f( Float.intBitsToFloat( newData[i * stride + posIdx] ) - 0.5f, Float.intBitsToFloat( newData[i * stride + posIdx + 1] ) - 0.5f, Float.intBitsToFloat( newData[i * stride + posIdx + 2] ) - 0.5f ); + Point3f pos = new Point3f( Float.intBitsToFloat( newData[i * stride + posIdx] ) - 0.5f, Float + .intBitsToFloat( newData[i * stride + posIdx + 1] ) - 0.5f, Float.intBitsToFloat( newData[i * stride + posIdx + 2] ) - 0.5f ); // Rotate stuff around mat.transform( pos ); @@ -116,7 +117,8 @@ public class QuadRotator { if( normalType == VertexFormatElement.EnumType.FLOAT ) { - Vector3f normal = new Vector3f( Float.intBitsToFloat( newData[i * stride + normalIdx] ), Float.intBitsToFloat( newData[i * stride + normalIdx + 1] ), Float.intBitsToFloat( newData[i * stride + normalIdx + 2] ) ); + Vector3f normal = new Vector3f( Float.intBitsToFloat( newData[i * stride + normalIdx] ), Float + .intBitsToFloat( newData[i * stride + normalIdx + 1] ), Float.intBitsToFloat( newData[i * stride + normalIdx + 2] ) ); // Rotate stuff around mat.transform( normal ); @@ -129,7 +131,8 @@ public class QuadRotator else if( normalType == VertexFormatElement.EnumType.BYTE ) { int idx = i * stride * 4 + normalIdx; - Vector3f normal = new Vector3f( getByte( newData, idx ) / 127.0f, getByte( newData, idx + 1 ) / 127.0f, getByte( newData, idx + 2 ) / 127.0f ); + Vector3f normal = new Vector3f( getByte( newData, idx ) / 127.0f, getByte( newData, idx + 1 ) / 127.0f, getByte( newData, + idx + 2 ) / 127.0f ); // Rotate stuff around mat.transform( normal ); diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java index bd5ff8154..30abe4414 100644 --- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java +++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java @@ -34,7 +34,12 @@ import appeng.core.AppEng; public class SmartCableTextures { - public static final ResourceLocation[] SMART_CHANNELS_TEXTURES = { new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_00" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_01" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_02" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_03" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_04" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_10" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_11" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_12" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_13" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_14" ) + public static final ResourceLocation[] SMART_CHANNELS_TEXTURES = { new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_00" ), + new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_01" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_02" ), + new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_03" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_04" ), + new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_10" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_11" ), + new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_12" ), new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_13" ), + new ResourceLocation( AppEng.MOD_ID, "parts/cable/smart/channels_14" ) }; // Textures used to display channels on smart cables. There's two sets of 5 textures each, and diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index f246b9ffb..27ea8a4bd 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -74,7 +74,8 @@ class CraftingCubeModel implements IModel @Override public Collection getTextures() { - return ImmutableList.of( RING_CORNER, RING_SIDE_HOR, RING_SIDE_VER, UNIT_BASE, LIGHT_BASE, ACCELERATOR_LIGHT, STORAGE_1K_LIGHT, STORAGE_4K_LIGHT, STORAGE_16K_LIGHT, STORAGE_64K_LIGHT, MONITOR_BASE, MONITOR_LIGHT_DARK, MONITOR_LIGHT_MEDIUM, MONITOR_LIGHT_BRIGHT ); + return ImmutableList.of( RING_CORNER, RING_SIDE_HOR, RING_SIDE_VER, UNIT_BASE, LIGHT_BASE, ACCELERATOR_LIGHT, STORAGE_1K_LIGHT, STORAGE_4K_LIGHT, + STORAGE_16K_LIGHT, STORAGE_64K_LIGHT, MONITOR_BASE, MONITOR_LIGHT_DARK, MONITOR_LIGHT_MEDIUM, MONITOR_LIGHT_BRIGHT ); } @Override @@ -94,9 +95,12 @@ class CraftingCubeModel implements IModel case STORAGE_4K: case STORAGE_16K: case STORAGE_64K: - return new LightBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter.apply( LIGHT_BASE ), getLightTexture( bakedTextureGetter, type ) ); + return new LightBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter + .apply( LIGHT_BASE ), getLightTexture( bakedTextureGetter, type ) ); case MONITOR: - return new MonitorBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter.apply( UNIT_BASE ), bakedTextureGetter.apply( MONITOR_BASE ), bakedTextureGetter.apply( MONITOR_LIGHT_DARK ), bakedTextureGetter.apply( MONITOR_LIGHT_MEDIUM ), bakedTextureGetter.apply( MONITOR_LIGHT_BRIGHT ) ); + return new MonitorBakedModel( format, ringCorner, ringSideHor, ringSideVer, bakedTextureGetter.apply( UNIT_BASE ), bakedTextureGetter + .apply( MONITOR_BASE ), bakedTextureGetter.apply( + MONITOR_LIGHT_DARK ), bakedTextureGetter.apply( MONITOR_LIGHT_MEDIUM ), bakedTextureGetter.apply( MONITOR_LIGHT_BRIGHT ) ); default: throw new IllegalArgumentException( "Unsupported crafting unit type: " + type ); } diff --git a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java index 3124a6958..fc3db1530 100644 --- a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java @@ -1,3 +1,4 @@ + package appeng.client.render.crafting; @@ -31,8 +32,10 @@ import appeng.items.misc.ItemEncodedPattern; /** - * This special model handles switching between rendering the crafting output of an encoded pattern (when shift is being held), and - * showing the encoded pattern itself. Matters are further complicated by only wanting to show the crafting output when the pattern is being + * This special model handles switching between rendering the crafting output of an encoded pattern (when shift is being + * held), and + * showing the encoded pattern itself. Matters are further complicated by only wanting to show the crafting output when + * the pattern is being * rendered in the GUI, and not anywhere else. */ class ItemEncodedPatternBakedModel implements IBakedModel @@ -105,10 +108,14 @@ class ItemEncodedPatternBakedModel implements IBakedModel } /** - * Since the ItemOverrideList handling comes before handling the perspective awareness (which is the first place where we - * know how we are being rendered) we need to remember the model of the crafting output, and make the decision on which to render later on. - * Sadly, Forge is pretty inconsistent when it will call the handlePerspective method, so some methods are called even on this interim-model. - * Usually those methods only matter for rendering on the ground and other cases, where we wouldn't render the crafting output model anyway, + * Since the ItemOverrideList handling comes before handling the perspective awareness (which is the first place + * where we + * know how we are being rendered) we need to remember the model of the crafting output, and make the decision on + * which to render later on. + * Sadly, Forge is pretty inconsistent when it will call the handlePerspective method, so some methods are called + * even on this interim-model. + * Usually those methods only matter for rendering on the ground and other cases, where we wouldn't render the + * crafting output model anyway, * so in those cases we delegate to the model of the encoded pattern. */ private class ShiftHoldingModelWrapper implements IBakedModel @@ -199,10 +206,11 @@ class ItemEncodedPatternBakedModel implements IBakedModel } } - /** - * Item Override Lists are the only point during item rendering where we can access the item stack that is being rendered. - * So this is the point where we actually check if shift is being held, and if so, determine the crafting output model. + * Item Override Lists are the only point during item rendering where we can access the item stack that is being + * rendered. + * So this is the point where we actually check if shift is being held, and if so, determine the crafting output + * model. */ private class CustomOverrideList extends ItemOverrideList { diff --git a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternModel.java b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternModel.java index 88743692d..88ce1a1a7 100644 --- a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternModel.java +++ b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternModel.java @@ -1,3 +1,4 @@ + package appeng.client.render.crafting; @@ -54,7 +55,7 @@ class ItemEncodedPatternModel implements IModel throw new RuntimeException( e ); } - ImmutableMap transforms = PerspectiveMapWrapper.getTransforms(state); + ImmutableMap transforms = PerspectiveMapWrapper.getTransforms( state ); return new ItemEncodedPatternBakedModel( baseModel, transforms ); } diff --git a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternRendering.java b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternRendering.java index b1aeb5155..e7ed4997a 100644 --- a/src/main/java/appeng/client/render/crafting/ItemEncodedPatternRendering.java +++ b/src/main/java/appeng/client/render/crafting/ItemEncodedPatternRendering.java @@ -1,3 +1,4 @@ + package appeng.client.render.crafting; diff --git a/src/main/java/appeng/client/render/effects/AssemblerFX.java b/src/main/java/appeng/client/render/effects/AssemblerFX.java index 3881d6c1d..096b7af17 100644 --- a/src/main/java/appeng/client/render/effects/AssemblerFX.java +++ b/src/main/java/appeng/client/render/effects/AssemblerFX.java @@ -67,19 +67,19 @@ public class AssemblerFX extends Particle implements ICanDie public void onUpdate() { this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; - if (this.particleAge++ >= this.particleMaxAge) - { - this.setExpired(); - } + if( this.particleAge++ >= this.particleMaxAge ) + { + this.setExpired(); + } - this.motionY -= 0.04D * (double)this.particleGravity; - this.move(this.motionX, this.motionY, this.motionZ); - this.motionX *= 0.9800000190734863D; - this.motionY *= 0.9800000190734863D; - this.motionZ *= 0.9800000190734863D; + this.motionY -= 0.04D * (double) this.particleGravity; + this.move( this.motionX, this.motionY, this.motionZ ); + this.motionX *= 0.9800000190734863D; + this.motionY *= 0.9800000190734863D; + this.motionZ *= 0.9800000190734863D; if( this.isExpired ) { diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index ed65f5f87..e57c64ac6 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -93,16 +93,32 @@ public class CraftingFx extends ParticleBreaking offY -= interpPosY; offZ -= interpPosZ; - int i = this.getBrightnessForRender(partialTick); + int i = this.getBrightnessForRender( partialTick ); int j = i >> 16 & 65535; int k = i & 65535; // AELog.info( "" + partialTick ); final float f14 = 1.0F; - par1Tessellator.pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale ).tex( f7, f9 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale ).tex( f7, f8 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale ).tex( f6, f8 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale ).tex( f6, f9 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); + par1Tessellator.pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale ) + .tex( f7, f9 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale ) + .tex( f7, f8 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale ) + .tex( f6, f8 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale ) + .tex( f6, f9 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); } } diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 674da1a2c..b8afd672a 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -84,15 +84,31 @@ public class EnergyFx extends ParticleBreaking if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ ) { - int i = this.getBrightnessForRender(partialTicks); + int i = this.getBrightnessForRender( partialTicks ); int j = i >> 16 & 65535; int k = i & 65535; final float f14 = 1.0F; - par1Tessellator.pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); + par1Tessellator.pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ) + .tex( f7, f9 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ) + .tex( f7, f8 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ) + .tex( f6, f8 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ) + .tex( f6, f9 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); } } diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index a1b9ec227..8d6f0888f 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -80,19 +80,19 @@ public class LightningFX extends Particle public void onUpdate() { this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; - if (this.particleAge++ >= this.particleMaxAge) - { - this.setExpired(); - } + if( this.particleAge++ >= this.particleMaxAge ) + { + this.setExpired(); + } - this.motionY -= 0.04D * (double)this.particleGravity; - this.move(this.motionX, this.motionY, this.motionZ); - this.motionX *= 0.9800000190734863D; - this.motionY *= 0.9800000190734863D; - this.motionZ *= 0.9800000190734863D; + this.motionY -= 0.04D * (double) this.particleGravity; + this.move( this.motionX, this.motionY, this.motionZ ); + this.motionX *= 0.9800000190734863D; + this.motionY *= 0.9800000190734863D; + this.motionZ *= 0.9800000190734863D; } @Override @@ -190,7 +190,8 @@ public class LightningFX extends Particle oz = ( xD * 0 ) - ( 1 * yD ); } - final double ss = Math.sqrt( ox * ox + oy * oy + oz * oz ) / ( ( ( (double) LightningFX.STEPS - (double) s ) / LightningFX.STEPS ) * scale ); + final double ss = Math + .sqrt( ox * ox + oy * oy + oz * oz ) / ( ( ( (double) LightningFX.STEPS - (double) s ) / LightningFX.STEPS ) * scale ); ox /= ss; oy /= ss; oz /= ss; @@ -227,8 +228,16 @@ public class LightningFX extends Particle if( this.hasData ) { tess.pos( a[0], a[1], a[2] ).tex( f6, f8 ).color( red, green, blue, this.particleAlpha ).lightmap( BRIGHTNESS, BRIGHTNESS ).endVertex(); - tess.pos( this.vertices[0], this.vertices[1], this.vertices[2] ).tex( f6, f8 ).color( red, green, blue, this.particleAlpha ).lightmap( BRIGHTNESS, BRIGHTNESS ).endVertex(); - tess.pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ).tex( f6, f8 ).color( red, green, blue, this.particleAlpha ).lightmap( BRIGHTNESS, BRIGHTNESS ).endVertex(); + tess.pos( this.vertices[0], this.vertices[1], this.vertices[2] ) + .tex( f6, f8 ) + .color( red, green, blue, this.particleAlpha ) + .lightmap( BRIGHTNESS, BRIGHTNESS ) + .endVertex(); + tess.pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ) + .tex( f6, f8 ) + .color( red, green, blue, this.particleAlpha ) + .lightmap( BRIGHTNESS, BRIGHTNESS ) + .endVertex(); tess.pos( b[0], b[1], b[2] ).tex( f6, f8 ).color( red, green, blue, this.particleAlpha ).lightmap( BRIGHTNESS, BRIGHTNESS ).endVertex(); } this.hasData = true; diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index 444544bb9..f5774d6bb 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -97,13 +97,29 @@ public class MatterCannonFX extends ParticleBreaking final float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ ); final float f14 = 1.0F; - int i = this.getBrightnessForRender(par2); + int i = this.getBrightnessForRender( par2 ); int j = i >> 16 & 65535; int k = i & 65535; - par1Tessellator.pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); - par1Tessellator.pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 ).color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).lightmap( j, k ).endVertex(); + par1Tessellator.pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ) + .tex( f7, f9 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ) + .tex( f7, f8 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ) + .tex( f6, f8 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); + par1Tessellator.pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ) + .tex( f6, f9 ) + .color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ) + .lightmap( j, k ) + .endVertex(); } } diff --git a/src/main/java/appeng/client/render/model/AutoRotatingModel.java b/src/main/java/appeng/client/render/model/AutoRotatingModel.java index 74066cb78..ab06215fb 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingModel.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingModel.java @@ -59,7 +59,8 @@ public class AutoRotatingModel implements IBakedModel { this.parent = parent; // 6 (DUNSWE) * 6 (DUNSWE) * 7 (DUNSWE + null) = 252 - this.quadCache = CacheBuilder.newBuilder().maximumSize( 252 ).build( new CacheLoader>(){ + this.quadCache = CacheBuilder.newBuilder().maximumSize( 252 ).build( new CacheLoader>() + { @Override public List load( AutoRotatingCacheKey key ) throws Exception { @@ -98,13 +99,8 @@ public class AutoRotatingModel implements IBakedModel // Packing it back to the vanilla vertex format will fix this inconsistency because it converts // the normal back to a byte-based format, which then re-applies Forge's own bug when piping it // to the AO lighter, thus fixing our problem. - BakedQuad packedQuad = new BakedQuad( unpackedQuad.getVertexData(), - quad.getTintIndex(), - unpackedQuad.getFace(), - quad.getSprite(), - quad.shouldApplyDiffuseLighting(), - quad.getFormat() - ); + BakedQuad packedQuad = new BakedQuad( unpackedQuad.getVertexData(), quad.getTintIndex(), unpackedQuad.getFace(), quad.getSprite(), quad + .shouldApplyDiffuseLighting(), quad.getFormat() ); rotated.add( packedQuad ); } return rotated; diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java index 454d98715..47bb21841 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java @@ -1,3 +1,4 @@ + package appeng.client.render.model; @@ -66,7 +67,8 @@ class BiometricCardBakedModel implements IBakedModel this.modelCache = modelCache; } - private static Cache createCache() { + private static Cache createCache() + { return CacheBuilder.newBuilder() .maximumSize( 100 ) .build(); @@ -124,7 +126,8 @@ class BiometricCardBakedModel implements IBakedModel else { final float scale = 0.3f / 255.0f; - builder.setColorRGB( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale ); + builder.setColorRGB( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, + ( col.blackVariant & 0xff ) * scale ); } builder.addCube( 4 + x, 6 + y, 7.5f, 4 + x + 1, 6 + y + 1, 8.5f ); diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/main/java/appeng/client/render/model/BiometricCardModel.java index d473f356c..434440c76 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardModel.java @@ -1,3 +1,4 @@ + package appeng.client.render.model; @@ -18,7 +19,8 @@ import appeng.core.AppEng; /** - * Model wrapper for the biometric card item model, which combines a base card layer with a "visual hash" of the player name + * Model wrapper for the biometric card item model, which combines a base card layer with a "visual hash" of the player + * name */ public class BiometricCardModel implements IModel { diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java index d48b1045d..941f01895 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java @@ -1,3 +1,4 @@ + package appeng.client.render.model; @@ -34,8 +35,7 @@ class ColorApplicatorBakedModel implements IBakedModel private final List generalQuads; - ColorApplicatorBakedModel( IBakedModel baseModel, ImmutableMap map, - TextureAtlasSprite texDark, TextureAtlasSprite texMedium, TextureAtlasSprite texBright ) + ColorApplicatorBakedModel( IBakedModel baseModel, ImmutableMap map, TextureAtlasSprite texDark, TextureAtlasSprite texMedium, TextureAtlasSprite texBright ) { this.baseModel = baseModel; this.transforms = map; @@ -75,14 +75,8 @@ class ColorApplicatorBakedModel implements IBakedModel continue; } - BakedQuad newQuad = new BakedQuad( - quad.getVertexData(), - tint, - quad.getFace(), - quad.getSprite(), - quad.shouldApplyDiffuseLighting(), - quad.getFormat() - ); + BakedQuad newQuad = new BakedQuad( quad.getVertexData(), tint, quad.getFace(), quad.getSprite(), quad.shouldApplyDiffuseLighting(), quad + .getFormat() ); result.add( newQuad ); } diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java index edbbcfb6c..457e452ac 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java @@ -1,3 +1,4 @@ + package appeng.client.render.model; @@ -23,7 +24,8 @@ import appeng.core.AppEng; /** - * A color applicator uses the base model, and extends it with additional layers that are colored according to the selected color of the applicator. + * A color applicator uses the base model, and extends it with additional layers that are colored according to the + * selected color of the applicator. */ public class ColorApplicatorModel implements IModel { @@ -46,8 +48,7 @@ public class ColorApplicatorModel implements IModel return ImmutableList.of( TEXTURE_DARK, TEXTURE_MEDIUM, - TEXTURE_BRIGHT - ); + TEXTURE_BRIGHT ); } @Override diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index 24c9d21c3..083109478 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -15,6 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Applied Energistics 2. If not, see . */ + package appeng.client.render.model; diff --git a/src/main/java/appeng/client/render/model/DriveModel.java b/src/main/java/appeng/client/render/model/DriveModel.java index 8f59c3972..b9a253505 100644 --- a/src/main/java/appeng/client/render/model/DriveModel.java +++ b/src/main/java/appeng/client/render/model/DriveModel.java @@ -15,6 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Applied Energistics 2. If not, see . */ + package appeng.client.render.model; @@ -49,8 +50,7 @@ public class DriveModel implements IModel DriveSlotState.OFFLINE, new ResourceLocation( "appliedenergistics2:block/drive_cell_off" ), DriveSlotState.ONLINE, new ResourceLocation( "appliedenergistics2:block/drive_cell_on" ), DriveSlotState.TYPES_FULL, new ResourceLocation( "appliedenergistics2:block/drive_cell_types_full" ), - DriveSlotState.FULL, new ResourceLocation( "appliedenergistics2:block/drive_cell_full" ) - ); + DriveSlotState.FULL, new ResourceLocation( "appliedenergistics2:block/drive_cell_full" ) ); @Override public Collection getDependencies() diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java index 8d8b1ed5b..d71c83a99 100644 --- a/src/main/java/appeng/client/render/model/GlassBakedModel.java +++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java @@ -134,14 +134,14 @@ class GlassBakedModel implements IBakedModel quads.add( createQuad( side, corners, glassTexture, u, v ) ); /* - This needs some explanation: - The bit-field contains 4-bits, one for each direction that a frame may be drawn. - Converted to a number, the bit-field is then used as an index into the list of - frame textures, which have been created in such a way that their filenames - indicate, in which directions they contain borders. - i.e. bitmask = 0101 means a border should be drawn up and down (in terms of u,v space). - Converted to a number, this bitmask is 5. So the texture at index 5 is used. - That texture had "0101" in its filename to indicate this. + * This needs some explanation: + * The bit-field contains 4-bits, one for each direction that a frame may be drawn. + * Converted to a number, the bit-field is then used as an index into the list of + * frame textures, which have been created in such a way that their filenames + * indicate, in which directions they contain borders. + * i.e. bitmask = 0101 means a border should be drawn up and down (in terms of u,v space). + * Converted to a number, this bitmask is 5. So the texture at index 5 is used. + * That texture had "0101" in its filename to indicate this. */ int edgeBitmask = makeBitmask( glassState, side ); TextureAtlasSprite sideSprite = frameTextures[edgeBitmask]; @@ -227,8 +227,9 @@ class GlassBakedModel implements IBakedModel } /* - This method is as complicated as it is, because the order in which we push data into the vertexbuffer actually has to be precisely the order - in which the vertex elements had been declared in the vertex format. + * This method is as complicated as it is, because the order in which we push data into the vertexbuffer actually + * has to be precisely the order + * in which the vertex elements had been declared in the vertex format. */ private void putVertex( UnpackedBakedQuad.Builder builder, Vec3d normal, double x, double y, double z, TextureAtlasSprite sprite, float u, float v ) { diff --git a/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java b/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java index 6a8976d42..822c58de2 100644 --- a/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java +++ b/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java @@ -114,7 +114,8 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer case 4: Vector4f vecc = new Vector4f( fs[0], fs[1], fs[2], fs[3] ); // Otherwise all translation is lost - if (elemCount == 3) { + if( elemCount == 3 ) + { vecc.w = 1; } vecc.x -= 0.5f; diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index 103bb05e6..d1157ce5b 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -107,7 +107,8 @@ public class SkyCompassBakedModel implements IBakedModel transformer.setParent( builder ); transformer.setVertexFormat( builder.getVertexFormat() ); bakedQuad.pipe( transformer ); - builder.setQuadOrientation( null ); // After rotation, facing a specific side cannot be guaranteed anymore + builder.setQuadOrientation( null ); // After rotation, facing a specific side cannot be guaranteed + // anymore BakedQuad q = builder.build(); quads.add( q ); } @@ -150,8 +151,9 @@ public class SkyCompassBakedModel implements IBakedModel public ItemOverrideList getOverrides() { /* - This handles setting the rotation of the compass when being held in hand. If it's not held in hand, it'll animate using the - spinning animation. + * This handles setting the rotation of the compass when being held in hand. If it's not held in hand, it'll + * animate using the + * spinning animation. */ return new ItemOverrideList( Collections.emptyList() ) { @@ -188,7 +190,8 @@ public class SkyCompassBakedModel implements IBakedModel { CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, pos.getX(), pos.getY(), pos.getZ() ); - // Prefetch meteor positions from the server for adjacent blocks so they are available more quickly when we're moving + // Prefetch meteor positions from the server for adjacent blocks so they are available more quickly when + // we're moving if( prefetch ) { for( int i = 0; i < 3; i++ ) diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index e70455ec9..dc810ee44 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -106,7 +106,8 @@ public enum UVLModelLoader implements ICustomModelLoader modifiers.set( faceBakery, faceBakery.getModifiers() & ( ~Modifier.FINAL ) ); Class clas = Class.forName( ModelLoader.class.getName() + "$VanillaModelWrapper" ); - vanillaModelWrapper = clas.getDeclaredConstructor( ModelLoader.class, ResourceLocation.class, ModelBlock.class, boolean.class, ModelBlockAnimation.class ); + vanillaModelWrapper = clas.getDeclaredConstructor( ModelLoader.class, ResourceLocation.class, ModelBlock.class, boolean.class, + ModelBlockAnimation.class ); vanillaModelWrapper.setAccessible( true ); Class vanillaLoaderClass = Class.forName( ModelLoader.class.getName() + "$VanillaLoader" ); @@ -190,7 +191,10 @@ public enum UVLModelLoader implements ICustomModelLoader { modelPath = modelPath.substring( "models/".length() ); } - try( InputStreamReader io = new InputStreamReader( Minecraft.getMinecraft().getResourceManager().getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ).getInputStream() ) ) + try( InputStreamReader io = new InputStreamReader( Minecraft.getMinecraft() + .getResourceManager() + .getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ) + .getInputStream() ) ) { return gson.fromJson( io, UVLMarker.class ).uvlMarker; } @@ -209,7 +213,14 @@ public enum UVLModelLoader implements ICustomModelLoader public class UVLModelWrapper implements IModel { - final Gson UVLSERIALIZER = ( new GsonBuilder() ).registerTypeAdapter( ModelBlock.class, deserializer( ModelBlock.class ) ).registerTypeAdapter( BlockPart.class, deserializer( BlockPart.class ) ).registerTypeAdapter( BlockPartFace.class, new BlockPartFaceOverrideSerializer() ).registerTypeAdapter( BlockFaceUV.class, deserializer( BlockFaceUV.class ) ).registerTypeAdapter( ItemTransformVec3f.class, deserializer( ItemTransformVec3f.class ) ).registerTypeAdapter( ItemCameraTransforms.class, deserializer( ItemCameraTransforms.class ) ).registerTypeAdapter( ItemOverride.class, deserializer( ItemOverride.class ) ).create(); + final Gson UVLSERIALIZER = ( new GsonBuilder() ).registerTypeAdapter( ModelBlock.class, deserializer( ModelBlock.class ) ) + .registerTypeAdapter( BlockPart.class, deserializer( BlockPart.class ) ) + .registerTypeAdapter( BlockPartFace.class, new BlockPartFaceOverrideSerializer() ) + .registerTypeAdapter( BlockFaceUV.class, deserializer( BlockFaceUV.class ) ) + .registerTypeAdapter( ItemTransformVec3f.class, deserializer( ItemTransformVec3f.class ) ) + .registerTypeAdapter( ItemCameraTransforms.class, deserializer( ItemCameraTransforms.class ) ) + .registerTypeAdapter( ItemOverride.class, deserializer( ItemOverride.class ) ) + .create(); private Map> uvlightmap = new HashMap<>(); @@ -234,7 +245,8 @@ public enum UVLModelLoader implements ICustomModelLoader { String s = modelLocation.getResourcePath(); - iresource = Minecraft.getMinecraft().getResourceManager().getResource( new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ); + iresource = Minecraft.getMinecraft().getResourceManager().getResource( + new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ); reader = new InputStreamReader( iresource.getInputStream(), Charsets.UTF_8 ); lvt_5_1_ = JsonUtils.gsonDeserialize( UVLSERIALIZER, reader, ModelBlock.class, false ); @@ -339,7 +351,8 @@ public enum UVLModelLoader implements ICustomModelLoader { VertexFormat newFormat = VertexFormats.getFormatWithLightMap( quad.getFormat() ); UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( newFormat ); - VertexLighterFlat trans = new VertexLighterFlat( Minecraft.getMinecraft().getBlockColors() ){ + VertexLighterFlat trans = new VertexLighterFlat( Minecraft.getMinecraft().getBlockColors() ) + { @Override protected void updateLightmap( float[] normal, float[] lightmap, float x, float y, float z ) diff --git a/src/main/java/appeng/client/render/renderable/Renderable.java b/src/main/java/appeng/client/render/renderable/Renderable.java index ed01211f4..98ef927dd 100644 --- a/src/main/java/appeng/client/render/renderable/Renderable.java +++ b/src/main/java/appeng/client/render/renderable/Renderable.java @@ -18,6 +18,7 @@ package appeng.client.render.renderable; + import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index d2a89fa57..075f4b638 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -129,7 +129,12 @@ class SpatialPylonBakedModel implements IBakedModel } } - builder.setTextures( textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.UP ) ), textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.DOWN ) ), textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.NORTH ) ), textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.SOUTH ) ), textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.EAST ) ), textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.WEST ) ) ); + builder.setTextures( textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.UP ) ), + textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.DOWN ) ), + textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.NORTH ) ), + textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.SOUTH ) ), + textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.EAST ) ), + textures.get( getTextureTypeFromSideOutside( flags, ori, EnumFacing.WEST ) ) ); builder.addCube( 0, 0, 0, 16, 16, 16 ); if( ( flags & TileSpatialPylon.DISPLAY_POWERED_ENABLED ) == TileSpatialPylon.DISPLAY_POWERED_ENABLED ) @@ -137,7 +142,12 @@ class SpatialPylonBakedModel implements IBakedModel builder.setRenderFullBright( true ); } - builder.setTextures( textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.UP ) ), textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.DOWN ) ), textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.NORTH ) ), textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.SOUTH ) ), textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.EAST ) ), textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.WEST ) ) ); + builder.setTextures( textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.UP ) ), + textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.DOWN ) ), + textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.NORTH ) ), + textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.SOUTH ) ), + textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.EAST ) ), + textures.get( getTextureTypeFromSideInside( flags, ori, EnumFacing.WEST ) ) ); builder.addCube( 0, 0, 0, 16, 16, 16 ); } else diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/main/java/appeng/client/render/tesr/CrankTESR.java index 2f63dda4c..78678b164 100644 --- a/src/main/java/appeng/client/render/tesr/CrankTESR.java +++ b/src/main/java/appeng/client/render/tesr/CrankTESR.java @@ -40,7 +40,8 @@ import appeng.tile.grindstone.TileCrank; /** - * This FastTESR only handles the animated model of the turning crank. When the crank is at rest, it is rendered using a normal model. + * This FastTESR only handles the animated model of the turning crank. When the crank is at rest, it is rendered using a + * normal model. */ @SideOnly( Side.CLIENT ) public class CrankTESR extends TileEntitySpecialRenderer diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java index 0285f27dd..b0f2c3716 100644 --- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java +++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java @@ -1,3 +1,4 @@ + package appeng.client.render.tesr; diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index ba0c5dc81..616e2475b 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -77,7 +77,7 @@ public class SkyChestTESR extends TileEntitySpecialRenderer GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F ); GlStateManager.translate( (float) x, (float) y + 1.0F, (float) z + 1.0F ); GlStateManager.scale( 1.0F, -1.0F, -1.0F ); if( te != null ) diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java index 6576e44ac..e2a45cade 100644 --- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java @@ -78,8 +78,10 @@ public class SkyCompassTESR extends FastTESR // Flip forward/up for rendering, the base model is facing up without any rotation EnumFacing forward = exState.getValue( AEBaseTileBlock.FORWARD ); EnumFacing up = exState.getValue( AEBaseTileBlock.UP ); - // This ensures the needle isn't flipped by the model rotator. Since the model is symmetrical, this should not affect the appearance - if ( forward == EnumFacing.UP || forward == EnumFacing.DOWN ) { + // This ensures the needle isn't flipped by the model rotator. Since the model is symmetrical, this should + // not affect the appearance + if( forward == EnumFacing.UP || forward == EnumFacing.DOWN ) + { up = EnumFacing.NORTH; } exState = exState.withProperty( AEBaseTileBlock.FORWARD, up ) diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index a17af31d6..f62241a9a 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -797,7 +797,7 @@ public abstract class AEBaseContainer extends Container } else if( hand.isItemEqual( is ) ) { - is.setCount(Math.min( is.getMaxStackSize(), is.getCount() + 1 )); + is.setCount( Math.min( is.getMaxStackSize(), is.getCount() + 1 ) ); } else { @@ -1251,7 +1251,7 @@ public abstract class AEBaseContainer extends Container if( !testB.isEmpty() && testB.getCount() > b.getSlotStackLimit() ) { - if ( !testA.isEmpty() ) + if( !testA.isEmpty() ) { return; } @@ -1260,7 +1260,7 @@ public abstract class AEBaseContainer extends Container testB.setCount( b.getSlotStackLimit() ); testA = testB.copy(); - testA.setCount( totalB - testA.getCount() ); + testA.setCount( totalB - testA.getCount() ); } a.putStack( testA ); diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 380755b90..954bcb8c8 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -116,7 +116,9 @@ public class ContainerCellWorkbench extends ContainerUpgradeable for( int z = 0; z < 8; z++ ) { final int iSLot = zz * 8 + z; - this.addSlotToContainer( new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgradeInventory, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgradeInventory, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, this + .getInventoryPlayer() ) ); } } /* @@ -229,7 +231,8 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); - final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 ), null, StorageChannel.ITEMS ); + final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( + this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 ), null, StorageChannel.ITEMS ); Iterator i = new NullIterator(); if( cellInv != null ) diff --git a/src/main/java/appeng/container/implementations/ContainerChest.java b/src/main/java/appeng/container/implementations/ContainerChest.java index f20d891cf..b2a5a3e84 100644 --- a/src/main/java/appeng/container/implementations/ContainerChest.java +++ b/src/main/java/appeng/container/implementations/ContainerChest.java @@ -36,7 +36,8 @@ public class ContainerChest extends AEBaseContainer super( ip, chest, null ); this.chest = chest; - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, this.chest, 1, 80, 37, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, this.chest, 1, 80, 37, this.getInventoryPlayer() ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } diff --git a/src/main/java/appeng/container/implementations/ContainerCondenser.java b/src/main/java/appeng/container/implementations/ContainerCondenser.java index 8f7ec4e28..555f1cf77 100644 --- a/src/main/java/appeng/container/implementations/ContainerCondenser.java +++ b/src/main/java/appeng/container/implementations/ContainerCondenser.java @@ -50,7 +50,9 @@ public class ContainerCondenser extends AEBaseContainer implements IProgressProv this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.TRASH, condenser, 0, 51, 52, ip ) ); this.addSlotToContainer( new SlotOutput( condenser, 1, 105, 52, -1 ) ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_COMPONENT, condenser.getInternalInventory(), 2, 101, 26, ip ) ).setStackLimit( 1 ) ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_COMPONENT, condenser.getInternalInventory(), 2, 101, 26, ip ) ) + .setStackLimit( 1 ) ); this.bindPlayerInventory( ip, 0, 197 - /* height of player inventory */82 ); } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index ca242171c..4ca58454f 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -348,7 +348,8 @@ public class ContainerCraftConfirm extends AEBaseContainer if( this.result != null && !this.isSimulation() ) { final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class ); - final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() ); + final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, + this.getActionSrc() ); this.setAutoStart( false ); if( g != null && originalGui != null && this.getOpenContext() != null ) { diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java index fd734683d..2da47e172 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java @@ -59,7 +59,8 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE } } - this.addSlotToContainer( this.outputSlot = new SlotCraftingTerm( this.getPlayerInv().player, this.getActionSource(), this.getPowerSource(), monitorable, crafting, crafting, this.output, 131, -72 + 18, this ) ); + this.addSlotToContainer( this.outputSlot = new SlotCraftingTerm( this.getPlayerInv().player, this.getActionSource(), this + .getPowerSource(), monitorable, crafting, crafting, this.output, 131, -72 + 18, this ) ); this.bindPlayerInventory( ip, 0, 0 ); diff --git a/src/main/java/appeng/container/implementations/ContainerDrive.java b/src/main/java/appeng/container/implementations/ContainerDrive.java index 1e6e82fe6..4313a4d32 100644 --- a/src/main/java/appeng/container/implementations/ContainerDrive.java +++ b/src/main/java/appeng/container/implementations/ContainerDrive.java @@ -37,7 +37,9 @@ public class ContainerDrive extends AEBaseContainer { for( int x = 0; x < 2; x++ ) { - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, drive, x + y * 2, 71 + x * 18, 14 + y * 18, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, drive, x + y * 2, 71 + x * 18, 14 + y * 18, this + .getInventoryPlayer() ) ); } } diff --git a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java index e6e35a6bd..c2f1ae049 100644 --- a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java +++ b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java @@ -75,11 +75,20 @@ public class ContainerFormationPlane extends ContainerUpgradeable } final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerIOPort.java b/src/main/java/appeng/container/implementations/ContainerIOPort.java index 069ca1e70..787ff8ea0 100644 --- a/src/main/java/appeng/container/implementations/ContainerIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerIOPort.java @@ -65,7 +65,9 @@ public class ContainerIOPort extends ContainerUpgradeable { for( int x = 0; x < 2; x++ ) { - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this + .getInventoryPlayer() ) ); } } @@ -75,14 +77,20 @@ public class ContainerIOPort extends ContainerUpgradeable { for( int x = 0; x < 2; x++ ) { - this.addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offX + x * 18, offY + y * 18, SlotRestrictedInput.PlacableItemType.STORAGE_CELLS.IIcon ) ); + this.addSlotToContainer( + new SlotOutput( cells, 6 + x + y * 2, offX + x * 18, offY + y * 18, SlotRestrictedInput.PlacableItemType.STORAGE_CELLS.IIcon ) ); } } final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index 8b92bb9d5..04d119314 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -60,9 +60,12 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres super( ip, te ); this.ti = te; - this.addSlotToContainer( this.top = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 0, 45, 16, this.getInventoryPlayer() ) ); - this.addSlotToContainer( this.bottom = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 1, 45, 62, this.getInventoryPlayer() ) ); - this.addSlotToContainer( this.middle = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, this.ti, 2, 63, 39, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + this.top = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 0, 45, 16, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + this.bottom = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 1, 45, 62, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + this.middle = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, this.ti, 2, 63, 39, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotOutput( this.ti, 3, 113, 40, -1 ) ); } @@ -76,7 +79,8 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres @Override /** * Overridden super.setupConfig to prevent setting up the fake slots - */protected void setupConfig() + */ + protected void setupConfig() { this.setupUpgrades(); } @@ -126,11 +130,15 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres for( final IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() ) { - final boolean matchA = ( top.isEmpty() && !recipe.getTopOptional().isPresent() ) || ( Platform.itemComparisons().isSameItem( top, recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ) && // and... - ( bot.isEmpty() && !recipe.getBottomOptional().isPresent() ) | ( Platform.itemComparisons().isSameItem( bot, recipe.getBottomOptional().orElse( ItemStack.EMPTY ) ) ); + final boolean matchA = ( top.isEmpty() && !recipe.getTopOptional().isPresent() ) || ( Platform.itemComparisons().isSameItem( top, + recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ) && // and... + ( bot.isEmpty() && !recipe.getBottomOptional().isPresent() ) | ( Platform.itemComparisons().isSameItem( bot, + recipe.getBottomOptional().orElse( ItemStack.EMPTY ) ) ); - final boolean matchB = ( bot.isEmpty() && !recipe.getTopOptional().isPresent() ) || ( Platform.itemComparisons().isSameItem( bot, recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ) && // and... - ( top.isEmpty() && !recipe.getBottomOptional().isPresent() ) | ( Platform.itemComparisons().isSameItem( top, recipe.getBottomOptional().orElse( ItemStack.EMPTY ) ) ); + final boolean matchB = ( bot.isEmpty() && !recipe.getTopOptional().isPresent() ) || ( Platform.itemComparisons().isSameItem( bot, + recipe.getTopOptional().orElse( ItemStack.EMPTY ) ) ) && // and... + ( top.isEmpty() && !recipe.getBottomOptional().isPresent() ) | ( Platform.itemComparisons().isSameItem( top, + recipe.getBottomOptional().orElse( ItemStack.EMPTY ) ) ); if( matchA || matchB ) { diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index c70592e61..98d11e194 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -52,7 +52,8 @@ public class ContainerInterface extends ContainerUpgradeable for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ ) { - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality + .getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) ); } for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ ) diff --git a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java index 58843a3d4..ed24f869b 100644 --- a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java +++ b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java @@ -78,19 +78,27 @@ public class ContainerLevelEmitter extends ContainerUpgradeable final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); if( this.availableUpgrades() > 0 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } if( this.availableUpgrades() > 1 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } if( this.availableUpgrades() > 2 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } if( this.availableUpgrades() > 3 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); diff --git a/src/main/java/appeng/container/implementations/ContainerMAC.java b/src/main/java/appeng/container/implementations/ContainerMAC.java index c82894423..1e5fe6fd7 100644 --- a/src/main/java/appeng/container/implementations/ContainerMAC.java +++ b/src/main/java/appeng/container/implementations/ContainerMAC.java @@ -102,18 +102,28 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi offX = 126; offY = 16; - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offX, offY, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offX, offY, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotOutput( mac, 9, offX, offY + 32, -1 ) ); offX = 122; offY = 17; final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index f53cbb1ac..819761a5f 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -151,7 +151,8 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { for( int y = 0; y < 5; y++ ) { - this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ).getViewCellStorage(), y, 206, y * 18 + 8, this.getInventoryPlayer() ); + this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ) + .getViewCellStorage(), y, 206, y * 18 + 8, this.getInventoryPlayer() ); this.cellView[y].setAllowEdit( this.canAccessViewCells ); this.addSlotToContainer( this.cellView[y] ); } diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java b/src/main/java/appeng/container/implementations/ContainerNetworkTool.java index a81d7a499..592e00ed4 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkTool.java @@ -49,7 +49,9 @@ public class ContainerNetworkTool extends AEBaseContainer { for( int x = 0; x < 3; x++ ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, te, y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, this.getInventoryPlayer() ) ) ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, te, y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, this + .getInventoryPlayer() ) ) ); } } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 73e330418..66892bf9e 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -102,7 +102,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } } - this.addSlotToContainer( this.craftSlot = new SlotPatternTerm( ip.player, this.getActionSource(), this.getPowerSource(), monitorable, this.crafting, patternInv, this.cOut, 110, -76 + 18, this, 2, this ) ); + this.addSlotToContainer( this.craftSlot = new SlotPatternTerm( ip.player, this.getActionSource(), this + .getPowerSource(), monitorable, this.crafting, patternInv, this.cOut, 110, -76 + 18, this, 2, this ) ); this.craftSlot.setIIcon( -1 ); for( int y = 0; y < 3; y++ ) @@ -112,8 +113,12 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA this.outputSlots[y].setIIcon( -1 ); } - this.addSlotToContainer( this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.getInventoryPlayer() ) ); - this.addSlotToContainer( this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this + .getInventoryPlayer() ) ); + this.addSlotToContainer( + this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this + .getInventoryPlayer() ) ); this.patternSlotOUT.setStackLimit( 1 ); @@ -203,7 +208,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } // remove one, and clear the input slot. - output.setCount( output.getCount() - 1); + output.setCount( output.getCount() - 1 ); if( output.getCount() == 0 ) { this.patternSlotIN.putStack( ItemStack.EMPTY ); @@ -400,7 +405,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( !ic.getStackInSlot( x ).isEmpty() ) { - final ItemStack pulled = Platform.extractItemsByRecipe( this.getPowerSource(), this.getActionSource(), storage, p.world, r, is, ic, ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) ); + final ItemStack pulled = Platform.extractItemsByRecipe( this.getPowerSource(), this.getActionSource(), storage, p.world, r, is, ic, + ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) ); real.setInventorySlotContents( x, pulled ); } } @@ -436,7 +442,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA final ItemStack failed = real.getStackInSlot( x ); if( !failed.isEmpty() ) { - this.getCellInventory().injectItems( AEItemStack.create( failed ), Actionable.MODULATE, new MachineSource( this.getPatternTerminal() ) ); + this.getCellInventory().injectItems( AEItemStack.create( failed ), Actionable.MODULATE, + new MachineSource( this.getPatternTerminal() ) ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerQNB.java b/src/main/java/appeng/container/implementations/ContainerQNB.java index f2e5e6903..8386d8726 100644 --- a/src/main/java/appeng/container/implementations/ContainerQNB.java +++ b/src/main/java/appeng/container/implementations/ContainerQNB.java @@ -33,7 +33,9 @@ public class ContainerQNB extends AEBaseContainer { super( ip, quantumBridge, null ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.QE_SINGULARITY, quantumBridge, 0, 80, 37, this.getInventoryPlayer() ) ).setStackLimit( 1 ) ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.QE_SINGULARITY, quantumBridge, 0, 80, 37, this.getInventoryPlayer() ) ) + .setStackLimit( 1 ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } diff --git a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java index 58e4a7abc..49a35202a 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurityStation.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurityStation.java @@ -60,9 +60,11 @@ public class ContainerSecurityStation extends ContainerMEMonitorable implements this.securityBox = (TileSecurityStation) monitorable; - this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox.getConfigSlot(), 0, 37, -33, ip ) ); + this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox + .getConfigSlot(), 0, 37, -33, ip ) ); - this.addSlotToContainer( this.wirelessIn = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODABLE_ITEM, this.wirelessEncoder, 0, 212, 10, ip ) ); + this.addSlotToContainer( + this.wirelessIn = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODABLE_ITEM, this.wirelessEncoder, 0, 212, 10, ip ) ); this.addSlotToContainer( this.wirelessOut = new SlotOutput( this.wirelessEncoder, 1, 212, 68, -1 ) ); this.bindPlayerInventory( ip, 0, 0 ); diff --git a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java index 88deee900..b735693af 100644 --- a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java @@ -57,7 +57,8 @@ public class ContainerSpatialIOPort extends AEBaseContainer this.network = spatialIOPort.getGridNode( AEPartLocation.INTERNAL ).getGrid(); } - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS, spatialIOPort, 0, 52, 48, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS, spatialIOPort, 0, 52, 48, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotOutput( spatialIOPort, 1, 113, 48, SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS.IIcon ) ); this.bindPlayerInventory( ip, 0, 197 - /* height of player inventory */82 ); diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/ContainerStorageBus.java index 8ecb353fa..2cf53ad1c 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerStorageBus.java @@ -90,11 +90,20 @@ public class ContainerStorageBus extends ContainerUpgradeable } final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ) + .setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 8c9994aa2..4a0bdf425 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -112,7 +112,9 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl { for( int u = 0; u < 3; u++ ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, this.tbInventory, u + v * 3, 186 + u * 18, this.getHeight() - 82 + v * 18, this.getInventoryPlayer() ) ).setPlayerSide() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, this.tbInventory, u + v * 3, 186 + u * 18, this + .getHeight() - 82 + v * 18, this.getInventoryPlayer() ) ).setPlayerSide() ); } } } @@ -160,19 +162,27 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); if( this.availableUpgrades() > 0 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } if( this.availableUpgrades() > 1 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } if( this.availableUpgrades() > 2 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } if( this.availableUpgrades() > 3 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( + ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ) + .setNotDraggable() ); } } diff --git a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java index bfb1126e3..1636304f0 100644 --- a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java +++ b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java @@ -55,7 +55,8 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr { if( Platform.isServer() ) { - this.burnProgress = (int) ( this.vibrationChamber.getMaxBurnTime() <= 0 ? 0 : 12 * this.vibrationChamber.getBurnTime() / this.vibrationChamber.getMaxBurnTime() ); + this.burnProgress = (int) ( this.vibrationChamber.getMaxBurnTime() <= 0 ? 0 : 12 * this.vibrationChamber.getBurnTime() / this.vibrationChamber + .getMaxBurnTime() ); this.burnSpeed = this.vibrationChamber.getBurnSpeed(); } diff --git a/src/main/java/appeng/container/implementations/ContainerWireless.java b/src/main/java/appeng/container/implementations/ContainerWireless.java index 4a25ebfcb..a6afba832 100644 --- a/src/main/java/appeng/container/implementations/ContainerWireless.java +++ b/src/main/java/appeng/container/implementations/ContainerWireless.java @@ -43,7 +43,9 @@ public class ContainerWireless extends AEBaseContainer super( ip, te, null ); this.wirelessTerminal = te; - this.addSlotToContainer( this.boosterSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.RANGE_BOOSTER, this.wirelessTerminal, 0, 80, 47, this.getInventoryPlayer() ) ); + this.addSlotToContainer( + this.boosterSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.RANGE_BOOSTER, this.wirelessTerminal, 0, 80, 47, this + .getInventoryPlayer() ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index c56ff10c5..68da25871 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -88,55 +88,56 @@ public class AppEngCraftingSlot extends AppEngSlot par1ItemStack.onCrafting( this.thePlayer.world, this.thePlayer, this.amountCrafted ); this.amountCrafted = 0; -// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.CRAFTING_TABLE ) ) -// { -// this.thePlayer.addStat( AchievementList.BUILD_WORK_BENCH, 1 ); -// } -// -// if( par1ItemStack.getItem() instanceof ItemPickaxe ) -// { -// this.thePlayer.addStat( AchievementList.BUILD_PICKAXE, 1 ); -// } -// -// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.FURNACE ) ) -// { -// this.thePlayer.addStat( AchievementList.BUILD_FURNACE, 1 ); -// } -// -// if( par1ItemStack.getItem() instanceof ItemHoe ) -// { -// this.thePlayer.addStat( AchievementList.BUILD_HOE, 1 ); -// } -// -// if( par1ItemStack.getItem() == Items.BREAD ) -// { -// this.thePlayer.addStat( AchievementList.MAKE_BREAD, 1 ); -// } -// -// if( par1ItemStack.getItem() == Items.CAKE ) -// { -// this.thePlayer.addStat( AchievementList.BAKE_CAKE, 1 ); -// } -// -// if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemTool) par1ItemStack.getItem() ).getToolMaterial() != Item.ToolMaterial.WOOD ) -// { -// this.thePlayer.addStat( AchievementList.BUILD_BETTER_PICKAXE, 1 ); -// } -// -// if( par1ItemStack.getItem() instanceof ItemSword ) -// { -// this.thePlayer.addStat( AchievementList.BUILD_SWORD, 1 ); -// } -// -// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.ENCHANTING_TABLE ) ) -// { -// this.thePlayer.addStat( AchievementList.ENCHANTMENTS, 1 ); -// } -// -// if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.BOOKSHELF ) ) -// { -// this.thePlayer.addStat( AchievementList.BOOKCASE, 1 ); -// } + // if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.CRAFTING_TABLE ) ) + // { + // this.thePlayer.addStat( AchievementList.BUILD_WORK_BENCH, 1 ); + // } + // + // if( par1ItemStack.getItem() instanceof ItemPickaxe ) + // { + // this.thePlayer.addStat( AchievementList.BUILD_PICKAXE, 1 ); + // } + // + // if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.FURNACE ) ) + // { + // this.thePlayer.addStat( AchievementList.BUILD_FURNACE, 1 ); + // } + // + // if( par1ItemStack.getItem() instanceof ItemHoe ) + // { + // this.thePlayer.addStat( AchievementList.BUILD_HOE, 1 ); + // } + // + // if( par1ItemStack.getItem() == Items.BREAD ) + // { + // this.thePlayer.addStat( AchievementList.MAKE_BREAD, 1 ); + // } + // + // if( par1ItemStack.getItem() == Items.CAKE ) + // { + // this.thePlayer.addStat( AchievementList.BAKE_CAKE, 1 ); + // } + // + // if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemTool) par1ItemStack.getItem() + // ).getToolMaterial() != Item.ToolMaterial.WOOD ) + // { + // this.thePlayer.addStat( AchievementList.BUILD_BETTER_PICKAXE, 1 ); + // } + // + // if( par1ItemStack.getItem() instanceof ItemSword ) + // { + // this.thePlayer.addStat( AchievementList.BUILD_SWORD, 1 ); + // } + // + // if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.ENCHANTING_TABLE ) ) + // { + // this.thePlayer.addStat( AchievementList.ENCHANTMENTS, 1 ); + // } + // + // if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.BOOKSHELF ) ) + // { + // this.thePlayer.addStat( AchievementList.BOOKCASE, 1 ); + // } } @Override @@ -183,7 +184,7 @@ public class AppEngCraftingSlot extends AppEngSlot } } } - + return stack; } diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index 8e39ccf77..a4e7925d5 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -164,7 +164,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot { final ItemStack[] set = new ItemStack[this.getPattern().getSizeInventory()]; // Safeguard for empty slots in the inventory for now - Arrays.fill(set, ItemStack.EMPTY); + Arrays.fill( set, ItemStack.EMPTY ); // add one of each item to the items on the board... if( Platform.isServer() ) @@ -214,7 +214,8 @@ public class SlotCraftingTerm extends AppEngCraftingSlot { if( !this.getPattern().getStackInSlot( x ).isEmpty() ) { - set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.world, r, is, ic, this.getPattern().getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) ); + set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.world, r, is, ic, this.getPattern().getStackInSlot( x ), + x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) ); ic.setInventorySlotContents( x, set[x] ); } } diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 579cf9ec6..8539909ee 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -81,7 +81,8 @@ public class SlotRestrictedInput extends AppEngSlot { if( this.which == PlacableItemType.VALID_ENCODED_PATTERN_W_OUTPUT ) { - final ICraftingPatternDetails ap = is.getItem() instanceof ICraftingPatternItem ? ( (ICraftingPatternItem) is.getItem() ).getPatternForItem( is, theWorld ) : null; + final ICraftingPatternDetails ap = is.getItem() instanceof ICraftingPatternItem ? ( (ICraftingPatternItem) is.getItem() ).getPatternForItem( is, + theWorld ) : null; return ap != null; } return true; diff --git a/src/main/java/appeng/core/ApiDefinitions.java b/src/main/java/appeng/core/ApiDefinitions.java index 892eb6f23..b8d4cbf11 100644 --- a/src/main/java/appeng/core/ApiDefinitions.java +++ b/src/main/java/appeng/core/ApiDefinitions.java @@ -53,23 +53,22 @@ public final class ApiDefinitions implements IDefinitions this.materials = new ApiMaterials( registry ); this.parts = new ApiParts( registry, partModels ); } -// -// public void addBlocks( final PartModels partModels ) -// { -// this.blocks = new ApiBlocks( registry, partModels ); -// } -// -// public void addItems() -// { -// this.items = new ApiItems( registry ); -// } + // + // public void addBlocks( final PartModels partModels ) + // { + // this.blocks = new ApiBlocks( registry, partModels ); + // } + // + // public void addItems() + // { + // this.items = new ApiItems( registry ); + // } public FeatureFactory getRegistry() { return registry; } - @Override public ApiBlocks blocks() { diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index d1bf31f8b..522f4f489 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -65,12 +65,13 @@ import appeng.services.export.ForgeExportConfig; import appeng.services.version.VersionCheckerConfig; import appeng.util.Platform; + @Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.12]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" ) public final class AppEng { @SidedProxy( clientSide = "appeng.client.ClientHelper", serverSide = "appeng.server.ServerHelper", modId = AppEng.MOD_ID ) public static CommonHelper proxy; - + public static final String MOD_ID = "appliedenergistics2"; public static final String MOD_NAME = "Applied Energistics 2"; @@ -83,10 +84,10 @@ public final class AppEng // depend on version of forge used for build. "after:appliedenergistics2-core;";// + "required-after:Forge@[" // require forge. - //+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion - //+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion - //+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion - //+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion + // + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + // + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion + // + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion + // + net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion @Nonnull private static final AppEng INSTANCE = new AppEng(); @@ -141,7 +142,6 @@ public final class AppEng this.configDirectory = new File( event.getModConfigurationDirectory().getPath(), "AppliedEnergistics2" ); this.recipeDirectory = new File( this.configDirectory, "aerecipes" ); - final File configFile = new File( this.configDirectory, "AppliedEnergistics2.cfg" ); final File facadeFile = new File( this.configDirectory, "Facades.cfg" ); final File versionFile = new File( this.configDirectory, "VersionChecker.cfg" ); diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/main/java/appeng/core/CommonHelper.java index ccf3705b7..9002a4c39 100644 --- a/src/main/java/appeng/core/CommonHelper.java +++ b/src/main/java/appeng/core/CommonHelper.java @@ -36,7 +36,6 @@ import appeng.core.sync.AppEngPacket; public abstract class CommonHelper { - public abstract void preinit(); public abstract void init(); diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 09a0d0918..34fd4a036 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -61,7 +61,8 @@ public final class CreativeTab extends CreativeTabs final IItems items = definitions.items(); final IMaterials materials = definitions.materials(); - return this.findFirst( blocks.controller(), blocks.chest(), blocks.cellWorkbench(), blocks.fluixBlock(), items.cell1k(), items.networkTool(), materials.fluixCrystal(), materials.certusQuartzCrystal(), materials.skyDust() ); + return this.findFirst( blocks.controller(), blocks.chest(), blocks.cellWorkbench(), blocks.fluixBlock(), items.cell1k(), items.networkTool(), + materials.fluixCrystal(), materials.certusQuartzCrystal(), materials.skyDust() ); } private ItemStack findFirst( final IItemDefinition... choices ) diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 75937f21e..62f4515ad 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -117,6 +117,7 @@ import appeng.worldgen.QuartzWorldGen; import net.minecraftforge.registries.IForgeRegistry; import scala.App; + public final class Registration { private final RecipeHandler recipeHandler; @@ -130,7 +131,7 @@ public final class Registration private File recipeDirectory; private CustomRecipeConfig customRecipeConfig; - public void setRecipeInformation ( File f, CustomRecipeConfig f2) + public void setRecipeInformation( File f, CustomRecipeConfig f2 ) { this.recipeDirectory = f; this.customRecipeConfig = f2; @@ -174,7 +175,7 @@ public final class Registration void preInitialize( final FMLPreInitializationEvent event ) { -// this.registerSpatial( false ); + // this.registerSpatial( false ); Capabilities.register(); @@ -205,28 +206,31 @@ public final class Registration if( this.storageBiome == null ) { -// if( force && config.getStorageBiomeID() == -1 ) -// { -// config.setStorageBiomeID( Platform.findEmpty( Biome.REGISTRY, 0, 256 ) ); -// if( config.getStorageBiomeID() == -1 ) -// { -// throw new IllegalStateException( "Biome Array is full, please free up some Biome ID's or disable spatial." ); -// } -// -// this.storageBiome = new BiomeGenStorage(); -// Biome.registerBiome( config.getStorageBiomeID(), "appliedenergistics2:storage_biome", this.storageBiome ); -// config.save(); -// } -// -// if( !force && config.getStorageBiomeID() != -1 ) -// { -// this.storageBiome = new BiomeGenStorage(); -// Biome.registerBiome( config.getStorageBiomeID(), "appliedenergistics2:storage_biome", this.storageBiome ); -// } + // if( force && config.getStorageBiomeID() == -1 ) + // { + // config.setStorageBiomeID( Platform.findEmpty( Biome.REGISTRY, 0, 256 ) ); + // if( config.getStorageBiomeID() == -1 ) + // { + // throw new IllegalStateException( "Biome Array is full, please free up some Biome ID's or disable + // spatial." ); + // } + // + // this.storageBiome = new BiomeGenStorage(); + // Biome.registerBiome( config.getStorageBiomeID(), "appliedenergistics2:storage_biome", this.storageBiome + // ); + // config.save(); + // } + // + // if( !force && config.getStorageBiomeID() != -1 ) + // { + // this.storageBiome = new BiomeGenStorage(); + // Biome.registerBiome( config.getStorageBiomeID(), "appliedenergistics2:storage_biome", this.storageBiome + // ); + // } // TODO: 1.12, are modders allowed to even touch the ID's any more? this.storageBiome = new BiomeGenStorage(); - registry.register( this.storageBiome.setRegistryName("appliedenergistics2:storage_biome") ); + registry.register( this.storageBiome.setRegistryName( "appliedenergistics2:storage_biome" ) ); } @@ -289,12 +293,12 @@ public final class Registration ApiDefinitions definitions = api.definitions(); definitions.getRegistry().getBootstrapComponents().forEach( b -> b.initialize( event.getSide() ) ); -// -// // Perform ore camouflage! -// ItemMaterial.instance.makeUnique(); + // + // // Perform ore camouflage! + // ItemMaterial.instance.makeUnique(); -// final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler ); -// recipeLoader.run(); + // final Runnable recipeLoader = new RecipeLoader( recipeDirectory, customRecipeConfig, this.recipeHandler ); + // recipeLoader.run(); if( Integrations.ic2().isEnabled() ) { @@ -302,14 +306,15 @@ public final class Registration partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" ); } - if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.RF ) ) - { - partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.redstoneflux.api.IEnergyReceiver" ); - } + if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.RF ) ) + { + partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.redstoneflux.api.IEnergyReceiver" ); + } -// if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.RF)) { -// partHelper.registerNewLayer("appeng.parts.layers.LayerIEnergyStorager", "net.minecraftforge.common.capabilities.ICapabilityProvider"); -// } + // if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.RF)) { + // partHelper.registerNewLayer("appeng.parts.layers.LayerIEnergyStorager", + // "net.minecraftforge.common.capabilities.ICapabilityProvider"); + // } // // if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) // { @@ -339,14 +344,15 @@ public final class Registration registries.cell().addCellHandler( new BasicCellHandler() ); registries.cell().addCellHandler( new CreativeCellHandler() ); - api.definitions().materials().matterBall().maybeStack( 1 ).ifPresent( ammoStack -> { + api.definitions().materials().matterBall().maybeStack( 1 ).ifPresent( ammoStack -> + { final double weight = 32; registries.matterCannon().registerAmmo( ammoStack, weight ); } ); // TODO : 1.12 This is way too late for recipes -// this.recipeHandler.injectRecipes(); + // this.recipeHandler.injectRecipes(); final PlayerStatsRegistration registration = new PlayerStatsRegistration( MinecraftForge.EVENT_BUS, AEConfig.instance() ); registration.registerAchievementHandlers(); @@ -397,7 +403,7 @@ public final class Registration } @SubscribeEvent - public void registerRecipes(RegistryEvent.Register event) + public void registerRecipes( RegistryEvent.Register event ) { final IForgeRegistry registry = event.getRegistry(); @@ -417,16 +423,19 @@ public final class Registration DisassembleRecipe r = new DisassembleRecipe(); // TODO : 1.12 Improve addRecipeToRegister( r.setRegistryName( AppEng.MOD_ID.toLowerCase(), "disassemble" ) ); -// RecipeSorter.register( "appliedenergistics2:disassemble", DisassembleRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless" ); + // RecipeSorter.register( "appliedenergistics2:disassemble", DisassembleRecipe.class, Category.SHAPELESS, + // "after:minecraft:shapeless" ); } if( AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_FACADE_CRAFTING ) ) { - definitions.items().facade().maybeItem().ifPresent( facadeItem -> { + definitions.items().facade().maybeItem().ifPresent( facadeItem -> + { // TODO : 1.12 Improve FacadeRecipe f = new FacadeRecipe( (ItemFacade) facadeItem ); addRecipeToRegister( f.setRegistryName( AppEng.MOD_ID.toLowerCase(), "facade" ) ); -// RecipeSorter.register( "appliedenergistics2:facade", FacadeRecipe.class, Category.SHAPED, "after:minecraft:shaped" ); + // RecipeSorter.register( "appliedenergistics2:facade", FacadeRecipe.class, Category.SHAPED, + // "after:minecraft:shaped" ); } ); } @@ -438,7 +447,7 @@ public final class Registration // Move to json where possible? if( r.getRegistryName() == null ) { - r.setRegistryName( new ResourceLocation( AppEng.MOD_ID.toLowerCase(), "recipe_" + x )); + r.setRegistryName( new ResourceLocation( AppEng.MOD_ID.toLowerCase(), "recipe_" + x ) ); x++; } registry.register( r ); @@ -531,7 +540,8 @@ public final class Registration // Inscriber Upgrades.SPEED.registerItem( blocks.inscriber(), 3 ); - items.wirelessTerminal().maybeItem().ifPresent( terminal -> { + items.wirelessTerminal().maybeItem().ifPresent( terminal -> + { registries.wireless().registerWirelessHandler( (IWirelessTermHandler) terminal ); } ); diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 639d0b2de..527ebd280 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -64,28 +64,35 @@ import appeng.tile.networking.TileCableBus; public class ApiPart implements IPartHelper { - private final LoadingCache> cache = CacheBuilder.newBuilder().build( new CacheLoader>() - { - @Override - public Class load( CacheKey key ) throws Exception - { - return generateCombinedClass( key ); - } - } ); + private final LoadingCache> cache = CacheBuilder.newBuilder() + .build( new CacheLoader>() + { + @Override + public Class load( CacheKey key ) throws Exception + { + return generateCombinedClass( key ); + } + } ); private final Map, String> interfaces2Layer = new HashMap<>(); private final List desc = new LinkedList(); /** - * Conceptually this method will build a new class hierarchy that is rooted at the given base class, and includes a chain of all registered layers. + * Conceptually this method will build a new class hierarchy that is rooted at the given base class, and includes a + * chain of all registered layers. *

- * To accomplish this, it takes the first registered layer, replaces it's inheritance from LayerBase with an inheritance from the given baseClass, - * and uses the resulting class as the parent class for the next registered layer, for which it repeats this process. This process is then repeated - * until a class hierarchy of all layers is formed. While janking out the inheritance from LayerBase, it'll make also sure that calls to that + * To accomplish this, it takes the first registered layer, replaces it's inheritance from LayerBase with an + * inheritance from the given baseClass, + * and uses the resulting class as the parent class for the next registered layer, for which it repeats this + * process. This process is then repeated + * until a class hierarchy of all layers is formed. While janking out the inheritance from LayerBase, it'll make + * also sure that calls to that * classes method will instead be forwarded to the superclass that was inserted as part of the described process. *

- * Example: If layers A and B are registered, and TileCableBus is passed in as the baseClass, a synthetic class A_B_TileCableBus should be returned, - * which has A_B_TileCableBus -extends-> B_TileCableBus -extends-> TileCableBus as it's class hierarchy, where A_B_TileCableBus has been generated + * Example: If layers A and B are registered, and TileCableBus is passed in as the baseClass, a synthetic class + * A_B_TileCableBus should be returned, + * which has A_B_TileCableBus -extends-> B_TileCableBus -extends-> TileCableBus as it's class hierarchy, where + * A_B_TileCableBus has been generated * from A, and B_TileCableBus has been generated from B. */ public Class getCombinedInstance( final Class baseClass ) @@ -122,7 +129,8 @@ public class ApiPart implements IPartHelper try { - // This is the particular interface that this layer was registered for. Loading the class may fail if i.e. an API is broken or not present + // This is the particular interface that this layer was registered for. Loading the class may fail if i.e. + // an API is broken or not present // and in this case, the layer will be skipped! Class interfaceClass = Class.forName( interfaceName ); String layerImpl = this.interfaces2Layer.get( interfaceClass ); @@ -348,7 +356,6 @@ public class ApiPart implements IPartHelper } } - private static class CacheKey { private final Class baseClass; diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 3ca246df1..65a55b5f1 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -155,6 +155,7 @@ import appeng.decorative.solid.BlockSkyStone.SkystoneType; import appeng.decorative.stair.BlockStairCommon; import appeng.hooks.DispenserBehaviorTinyTNT; + /** * Internal implementation for the API blocks */ @@ -397,7 +398,7 @@ public final class ApiBlocks implements IBlocks .build(); this.condenser = registry.block( "condenser", BlockCondenser::new ) .features( AEFeature.CONDENSER ) - .tileEntity( new TileEntityDefinition( TileCondenser.class ) ) + .tileEntity( new TileEntityDefinition( TileCondenser.class ) ) .build(); this.energyAcceptor = registry.block( "energy_acceptor", BlockEnergyAcceptor::new ) .features( AEFeature.ENERGY_ACCEPTOR ) @@ -515,17 +516,17 @@ public final class ApiBlocks implements IBlocks this.itemGen = registry.block( "debug_item_gen", BlockItemGen::new ) .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) - .tileEntity( new TileEntityDefinition ( TileItemGen.class ) ) + .tileEntity( new TileEntityDefinition( TileItemGen.class ) ) .useCustomItemModel() .build(); this.chunkLoader = registry.block( "debug_chunk_loader", BlockChunkloader::new ) .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) - .tileEntity( new TileEntityDefinition ( TileChunkLoader.class ) ) + .tileEntity( new TileEntityDefinition( TileChunkLoader.class ) ) .useCustomItemModel() .build(); this.phantomNode = registry.block( "debug_phantom_node", BlockPhantomNode::new ) .features( AEFeature.UNSUPPORTED_DEVELOPER_TOOLS, AEFeature.CREATIVE ) - .tileEntity( new TileEntityDefinition ( TilePhantomNode.class ) ) + .tileEntity( new TileEntityDefinition( TilePhantomNode.class ) ) .useCustomItemModel() .build(); this.cubeGenerator = registry.block( "debug_cube_gen", BlockCubeGenerator::new ) diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 9e3265622..e5464e1d8 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -137,15 +137,21 @@ public final class ApiMaterials implements IMaterials this.silicon = new DamagedItemDefinition( "material.silicon", materials.createMaterial( MaterialType.SILICON ) ); this.skyDust = new DamagedItemDefinition( "material.dust.sky_stone", materials.createMaterial( MaterialType.SKY_DUST ) ); - this.calcProcessorPress = new DamagedItemDefinition( "material.press.processor.calculation", materials.createMaterial( MaterialType.CALCULATION_PROCESSOR_PRESS ) ); - this.engProcessorPress = new DamagedItemDefinition( "material.press.processor.engineering", materials.createMaterial( MaterialType.ENGINEERING_PROCESSOR_PRESS ) ); - this.logicProcessorPress = new DamagedItemDefinition( "material.press.processor.logic", materials.createMaterial( MaterialType.LOGIC_PROCESSOR_PRESS ) ); + this.calcProcessorPress = new DamagedItemDefinition( "material.press.processor.calculation", materials + .createMaterial( MaterialType.CALCULATION_PROCESSOR_PRESS ) ); + this.engProcessorPress = new DamagedItemDefinition( "material.press.processor.engineering", materials + .createMaterial( MaterialType.ENGINEERING_PROCESSOR_PRESS ) ); + this.logicProcessorPress = new DamagedItemDefinition( "material.press.processor.logic", materials + .createMaterial( MaterialType.LOGIC_PROCESSOR_PRESS ) ); this.siliconPress = new DamagedItemDefinition( "material.press.silicon", materials.createMaterial( MaterialType.SILICON_PRESS ) ); this.namePress = new DamagedItemDefinition( "material.press.name", materials.createMaterial( MaterialType.NAME_PRESS ) ); - this.calcProcessorPrint = new DamagedItemDefinition( "material.print.processor.calculation", materials.createMaterial( MaterialType.CALCULATION_PROCESSOR_PRINT ) ); - this.engProcessorPrint = new DamagedItemDefinition( "material.print.processor.engineering", materials.createMaterial( MaterialType.ENGINEERING_PROCESSOR_PRINT ) ); - this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials.createMaterial( MaterialType.LOGIC_PROCESSOR_PRINT ) ); + this.calcProcessorPrint = new DamagedItemDefinition( "material.print.processor.calculation", materials + .createMaterial( MaterialType.CALCULATION_PROCESSOR_PRINT ) ); + this.engProcessorPrint = new DamagedItemDefinition( "material.print.processor.engineering", materials + .createMaterial( MaterialType.ENGINEERING_PROCESSOR_PRINT ) ); + this.logicProcessorPrint = new DamagedItemDefinition( "material.print.processor.logic", materials + .createMaterial( MaterialType.LOGIC_PROCESSOR_PRINT ) ); this.siliconPrint = new DamagedItemDefinition( "material.print.silicon", materials.createMaterial( MaterialType.SILICON_PRINT ) ); this.logicProcessor = new DamagedItemDefinition( "material.processor.logic", materials.createMaterial( MaterialType.LOGIC_PROCESSOR ) ); @@ -155,9 +161,12 @@ public final class ApiMaterials implements IMaterials this.basicCard = new DamagedItemDefinition( "material.card.basic", materials.createMaterial( MaterialType.BASIC_CARD ) ); this.advCard = new DamagedItemDefinition( "material.card.advanced", materials.createMaterial( MaterialType.ADVANCED_CARD ) ); - this.purifiedCertusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus.purified", materials.createMaterial( MaterialType.PURIFIED_CERTUS_QUARTZ_CRYSTAL ) ); - this.purifiedNetherQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.nether.purified", materials.createMaterial( MaterialType.PURIFIED_NETHER_QUARTZ_CRYSTAL ) ); - this.purifiedFluixCrystal = new DamagedItemDefinition( "material.crystal.fluix.purified", materials.createMaterial( MaterialType.PURIFIED_FLUIX_CRYSTAL ) ); + this.purifiedCertusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus.purified", materials + .createMaterial( MaterialType.PURIFIED_CERTUS_QUARTZ_CRYSTAL ) ); + this.purifiedNetherQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.nether.purified", materials + .createMaterial( MaterialType.PURIFIED_NETHER_QUARTZ_CRYSTAL ) ); + this.purifiedFluixCrystal = new DamagedItemDefinition( "material.crystal.fluix.purified", materials + .createMaterial( MaterialType.PURIFIED_FLUIX_CRYSTAL ) ); this.cell1kPart = new DamagedItemDefinition( "material.cell.storage.1k", materials.createMaterial( MaterialType.CELL1K_PART ) ); this.cell4kPart = new DamagedItemDefinition( "material.cell.storage.4k", materials.createMaterial( MaterialType.CELL4K_PART ) ); @@ -182,8 +191,10 @@ public final class ApiMaterials implements IMaterials this.matterBall = new DamagedItemDefinition( "material.ammo.matter_ball", materials.createMaterial( MaterialType.MATTER_BALL ) ); - this.certusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus", materials.createMaterial( MaterialType.CERTUS_QUARTZ_CRYSTAL ) ); - this.certusQuartzCrystalCharged = new DamagedItemDefinition( "material.crystal.quartz.certus.charged", materials.createMaterial( MaterialType.CERTUS_QUARTZ_CRYSTAL_CHARGED ) ); + this.certusQuartzCrystal = new DamagedItemDefinition( "material.crystal.quartz.certus", materials + .createMaterial( MaterialType.CERTUS_QUARTZ_CRYSTAL ) ); + this.certusQuartzCrystalCharged = new DamagedItemDefinition( "material.crystal.quartz.certus.charged", materials + .createMaterial( MaterialType.CERTUS_QUARTZ_CRYSTAL_CHARGED ) ); this.fluixCrystal = new DamagedItemDefinition( "material.crystal.fluix", materials.createMaterial( MaterialType.FLUIX_CRYSTAL ) ); this.fluixPearl = new DamagedItemDefinition( "material.pearl.fluix", materials.createMaterial( MaterialType.FLUIX_PEARL ) ); @@ -196,7 +207,8 @@ public final class ApiMaterials implements IMaterials this.formationCore = new DamagedItemDefinition( "material.core.formation", materials.createMaterial( MaterialType.FORMATION_CORE ) ); this.singularity = new DamagedItemDefinition( "material.singularity", materials.createMaterial( MaterialType.SINGULARITY ) ); - this.qESingularity = new DamagedItemDefinition( "material.singularity.entangled.quantum", materials.createMaterial( MaterialType.QUANTUM_ENTANGLED_SINGULARITY ) ); + this.qESingularity = new DamagedItemDefinition( "material.singularity.entangled.quantum", materials + .createMaterial( MaterialType.QUANTUM_ENTANGLED_SINGULARITY ) ); this.blankPattern = new DamagedItemDefinition( "material.pattern.blank", materials.createMaterial( MaterialType.BLANK_PATTERN ) ); } diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 42e0cfa2d..b5f31289a 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -108,7 +108,8 @@ public final class ApiParts implements IParts this.iface = new DamagedItemDefinition( "part.interface", itemPart.createPart( PartType.INTERFACE ) ); this.levelEmitter = new DamagedItemDefinition( "part.level_emitter", itemPart.createPart( PartType.LEVEL_EMITTER ) ); this.annihilationPlane = new DamagedItemDefinition( "part.plane.annihilation", itemPart.createPart( PartType.ANNIHILATION_PLANE ) ); - this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart.createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) ); + this.identityAnnihilationPlane = new DamagedItemDefinition( "part.plane.annihiliation.identity", itemPart + .createPart( PartType.IDENTITY_ANNIHILATION_PLANE ) ); this.formationPlane = new DamagedItemDefinition( "part.plane.formation", itemPart.createPart( PartType.FORMATION_PLANE ) ); this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2P_TUNNEL_ME ) ); this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2P_TUNNEL_REDSTONE ) ); diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java index a61cdd42c..d025927ac 100644 --- a/src/main/java/appeng/core/features/DamagedItemDefinition.java +++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java @@ -67,7 +67,7 @@ public final class DamagedItemDefinition implements IItemDefinition @Override public Optional maybeStack( final int stackSize ) { - return this.source.map( input -> input.stack( stackSize )); + return this.source.map( input -> input.stack( stackSize ) ); } @Override diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 35a6a4444..06a550f78 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -77,12 +77,18 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry * RF tunnel items */ - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.RF_POWER ); // leadstone fluxduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.RF_POWER ); // hardened fluxduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.RF_POWER ); // redstone fluxduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.RF_POWER ); // signalum fluxduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.RF_POWER ); // resonant fluxduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.RF_POWER ); // cryo-stabilized fluxduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.RF_POWER ); // leadstone + // fluxduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.RF_POWER ); // hardened + // fluxduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.RF_POWER ); // redstone + // fluxduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.RF_POWER ); // signalum + // fluxduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.RF_POWER ); // resonant + // fluxduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.RF_POWER ); // cryo-stabilized + // fluxduct /** * EU tunnel items @@ -127,9 +133,13 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM ); this.addNewAttunement( this.getModItem( "enderio", "itemitemconduit", OreDictionary.WILDCARD_VALUE ), TunnelType.ITEM ); this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct (opaque) - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse itemduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse itemduct (opaque) + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct + // (opaque) + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse + // itemduct + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse + // itemduct + // (opaque) /** * attune based on lots of random item related stuff @@ -144,9 +154,13 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry this.addNewAttunement( this.getModItem( "extrautilities", "drum", OreDictionary.WILDCARD_VALUE ), TunnelType.FLUID ); this.addNewAttunement( this.getModItem( "enderio", "itemliquidconduit", OreDictionary.WILDCARD_VALUE ), TunnelType.FLUID ); this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct (opaque) - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct hardened - this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct hardened (opaque) + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct + // (opaque) + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct + // hardened + this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct + // hardened + // (opaque) for( final AEColor c : AEColor.values() ) { @@ -220,7 +234,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry // Try by ModId next for( final String modId : this.modIdTunnels.keySet() ) { - if( trigger.getItem().getRegistryName() != null && trigger.getItem().getRegistryName().getResourceDomain().equals( modId )) + if( trigger.getItem().getRegistryName() != null && trigger.getItem().getRegistryName().getResourceDomain().equals( modId ) ) { return this.modIdTunnels.get( modId ); } diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java index 5ec5ae569..a246a6a6b 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -18,8 +18,10 @@ package appeng.core.localization; + import net.minecraft.util.text.translation.I18n; + public enum ButtonToolTips { PowerUnits, diff --git a/src/main/java/appeng/core/localization/PlayerMessages.java b/src/main/java/appeng/core/localization/PlayerMessages.java index ae8c5356f..c02f6461a 100644 --- a/src/main/java/appeng/core/localization/PlayerMessages.java +++ b/src/main/java/appeng/core/localization/PlayerMessages.java @@ -40,7 +40,7 @@ public enum PlayerMessages DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated, - SettingCleared, ; + SettingCleared,; public ITextComponent get() { diff --git a/src/main/java/appeng/core/localization/WailaText.java b/src/main/java/appeng/core/localization/WailaText.java index be50896e3..c5378abcf 100644 --- a/src/main/java/appeng/core/localization/WailaText.java +++ b/src/main/java/appeng/core/localization/WailaText.java @@ -18,19 +18,29 @@ package appeng.core.localization; + import net.minecraft.util.text.translation.I18n; + public enum WailaText { Crafting, - DeviceOnline, DeviceOffline, DeviceMissingChannel, + DeviceOnline, + DeviceOffline, + DeviceMissingChannel, - P2PUnlinked, P2PInputOneOutput, P2PInputManyOutputs, P2POutput, + P2PUnlinked, + P2PInputOneOutput, + P2PInputManyOutputs, + P2POutput, - Locked, Unlocked, Showing, + Locked, + Unlocked, + Showing, - Contains, Channels; + Contains, + Channels; private final String root; diff --git a/src/main/java/appeng/core/settings/TickRates.java b/src/main/java/appeng/core/settings/TickRates.java index 5a37d4e3a..87137244c 100644 --- a/src/main/java/appeng/core/settings/TickRates.java +++ b/src/main/java/appeng/core/settings/TickRates.java @@ -64,7 +64,8 @@ public enum TickRates public void Load( final AEConfig config ) { - config.addCustomCategoryComment( "TickRates", " Min / Max Tickrates for dynamic ticking, most of these components also use sleeping, to prevent constant ticking, adjust with care, non standard rates are not supported or tested." ); + config.addCustomCategoryComment( "TickRates", + " Min / Max Tickrates for dynamic ticking, most of these components also use sleeping, to prevent constant ticking, adjust with care, non standard rates are not supported or tested." ); this.setMin( config.get( "TickRates", this.name() + ".min", this.getMin() ).getInt( this.getMin() ) ); this.setMax( config.get( "TickRates", this.name() + ".max", this.getMax() ).getInt( this.getMax() ) ); } diff --git a/src/main/java/appeng/core/stats/AchievementHierarchy.java b/src/main/java/appeng/core/stats/AchievementHierarchy.java index f68e22554..2f605c2b2 100644 --- a/src/main/java/appeng/core/stats/AchievementHierarchy.java +++ b/src/main/java/appeng/core/stats/AchievementHierarchy.java @@ -32,30 +32,30 @@ public class AchievementHierarchy */ void registerAchievementHierarchy() { -// Achievements.Presses.setParent( Achievements.Compass ); -// -// Achievements.Fluix.setParent( Achievements.ChargedQuartz ); -// -// Achievements.Charger.setParent( Achievements.Fluix ); -// -// Achievements.CrystalGrowthAccelerator.setParent( Achievements.Charger ); -// -// Achievements.GlassCable.setParent( Achievements.Charger ); -// -// Achievements.SpatialIOExplorer.setParent( Achievements.SpatialIO ); -// -// Achievements.IOPort.setParent( Achievements.StorageCell ); -// -// Achievements.PatternTerminal.setParent( Achievements.CraftingTerminal ); -// -// Achievements.Controller.setParent( Achievements.Networking1 ); -// -// Achievements.Networking2.setParent( Achievements.Controller ); -// -// Achievements.Networking3.setParent( Achievements.Networking2 ); -// -// Achievements.P2P.setParent( Achievements.Controller ); -// -// Achievements.Recursive.setParent( Achievements.Controller ); + // Achievements.Presses.setParent( Achievements.Compass ); + // + // Achievements.Fluix.setParent( Achievements.ChargedQuartz ); + // + // Achievements.Charger.setParent( Achievements.Fluix ); + // + // Achievements.CrystalGrowthAccelerator.setParent( Achievements.Charger ); + // + // Achievements.GlassCable.setParent( Achievements.Charger ); + // + // Achievements.SpatialIOExplorer.setParent( Achievements.SpatialIO ); + // + // Achievements.IOPort.setParent( Achievements.StorageCell ); + // + // Achievements.PatternTerminal.setParent( Achievements.CraftingTerminal ); + // + // Achievements.Controller.setParent( Achievements.Networking1 ); + // + // Achievements.Networking2.setParent( Achievements.Controller ); + // + // Achievements.Networking3.setParent( Achievements.Networking2 ); + // + // Achievements.P2P.setParent( Achievements.Controller ); + // + // Achievements.Recursive.setParent( Achievements.Controller ); } } diff --git a/src/main/java/appeng/core/stats/Achievements.java b/src/main/java/appeng/core/stats/Achievements.java index 3f93b0e82..9270f6a2d 100644 --- a/src/main/java/appeng/core/stats/Achievements.java +++ b/src/main/java/appeng/core/stats/Achievements.java @@ -145,11 +145,12 @@ public enum Achievements public Advancement getAchievement() { -// if( this.stat == null && !this.getStack().isEmpty() ) -// { -// this.stat = new Advancement( "achievement.ae2." + this.name(), "ae2." + this.name(), this.x, this.y, this.getStack(), this.parent ); -// this.stat.registerStat(); -// } + // if( this.stat == null && !this.getStack().isEmpty() ) + // { + // this.stat = new Advancement( "achievement.ae2." + this.name(), "ae2." + this.name(), this.x, this.y, + // this.getStack(), this.parent ); + // this.stat.registerStat(); + // } return this.stat; } diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index fb04e27e0..443b73d9c 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -97,19 +97,20 @@ public class PlayerStatsRegistration /** * register */ -// final ArrayList list = new ArrayList(); -// -// for( final Achievements a : Achievements.values() ) -// { -// final Achievement ach = a.getAchievement(); -// if( ach != null ) -// { -// list.add( ach ); -// } -// } -// -// final AchievementPage ae2AchievementPage = new AchievementPage( "Applied Energistics 2", list.toArray( new Achievement[list.size()] ) ); -// AchievementPage.registerAchievementPage( ae2AchievementPage ); + // final ArrayList list = new ArrayList(); + // + // for( final Achievements a : Achievements.values() ) + // { + // final Achievement ach = a.getAchievement(); + // if( ach != null ) + // { + // list.add( ach ); + // } + // } + // + // final AchievementPage ae2AchievementPage = new AchievementPage( "Applied Energistics 2", list.toArray( + // new Achievement[list.size()] ) ); + // AchievementPage.registerAchievementPage( ae2AchievementPage ); } } } diff --git a/src/main/java/appeng/core/sync/AppEngPacket.java b/src/main/java/appeng/core/sync/AppEngPacket.java index ed402dae8..d6a53c836 100644 --- a/src/main/java/appeng/core/sync/AppEngPacket.java +++ b/src/main/java/appeng/core/sync/AppEngPacket.java @@ -96,7 +96,7 @@ public abstract class AppEngPacket implements Packet // TODO: Figure out why Forge/Minecraft on the server sets the stream data buffer to PooledUnsafeDirectByteBuf - public ByteArrayInputStream getPacketByteArray ( ByteBuf stream, int readerIndex, int readableBytes ) + public ByteArrayInputStream getPacketByteArray( ByteBuf stream, int readerIndex, int readableBytes ) { final ByteArrayInputStream bytes; if( stream.hasArray() ) @@ -112,7 +112,7 @@ public abstract class AppEngPacket implements Packet return bytes; } - public ByteArrayInputStream getPacketByteArray ( ByteBuf stream ) + public ByteArrayInputStream getPacketByteArray( ByteBuf stream ) { return getPacketByteArray( stream, 0, stream.readableBytes() ); } diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index a672224ca..2cf9d1f29 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -352,7 +352,8 @@ public enum GuiBridge implements IGuiHandler if( target == null ) { - throw new IllegalStateException( "Cannot find " + this.containerClass.getName() + "( " + this.typeName( inventory ) + ", " + this.typeName( tE ) + " )" ); + throw new IllegalStateException( "Cannot find " + this.containerClass.getName() + "( " + this.typeName( inventory ) + ", " + this + .typeName( tE ) + " )" ); } final Object o = target.newInstance( inventory, tE ); @@ -489,7 +490,8 @@ public enum GuiBridge implements IGuiHandler if( target == null ) { - throw new IllegalStateException( "Cannot find " + this.containerClass.getName() + "( " + this.typeName( inventory ) + ", " + this.typeName( tE ) + " )" ); + throw new IllegalStateException( "Cannot find " + this.containerClass.getName() + "( " + this.typeName( inventory ) + ", " + this + .typeName( tE ) + " )" ); } return target.newInstance( inventory, tE ); diff --git a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java index c623a3122..193440e46 100644 --- a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java @@ -48,7 +48,8 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement final int packetType = stream.readInt(); final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream ); - final PacketCallState callState = new PacketCallState(){ + final PacketCallState callState = new PacketCallState() + { @Override public void call( final AppEngPacket appEngPacket ) diff --git a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java index cf489cf28..a7546bd6f 100644 --- a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java @@ -48,7 +48,8 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp final int packetType = stream.readInt(); final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream ); - final PacketCallState callState = new PacketCallState(){ + final PacketCallState callState = new PacketCallState() + { @Override public void call( final AppEngPacket appEngPacket ) diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/PacketClick.java index 2b6ebe614..f305b4eb6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/PacketClick.java @@ -69,7 +69,7 @@ public class PacketClick extends AppEngPacket this.hitX = stream.readFloat(); this.hitY = stream.readFloat(); this.hitZ = stream.readFloat(); - this.hand = EnumHand.values()[ stream.readByte() ]; + this.hand = EnumHand.values()[stream.readByte()]; } // api @@ -111,7 +111,8 @@ public class PacketClick extends AppEngPacket if( is.getItem() instanceof ToolNetworkTool ) { final ToolNetworkTool tnt = (ToolNetworkTool) is.getItem(); - tnt.serverSideToolLogic( is, player, this.hand, player.world, new BlockPos( this.x, this.y, this.z ), this.side, this.hitX, this.hitY, this.hitZ ); + tnt.serverSideToolLogic( is, player, this.hand, player.world, new BlockPos( this.x, this.y, this.z ), this.side, this.hitX, this.hitY, + this.hitZ ); } else if( maybeMemoryCard.isSameAs( is ) ) diff --git a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java b/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java index 4bcecfb86..5a547555b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java @@ -58,7 +58,8 @@ public class PacketCompressedNBT extends AppEngPacket this.data = null; this.compressFrame = null; - final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){ + final GZIPInputStream gzReader = new GZIPInputStream( new InputStream() + { @Override public int read() throws IOException @@ -86,7 +87,8 @@ public class PacketCompressedNBT extends AppEngPacket this.in = din; - this.compressFrame = new GZIPOutputStream( new OutputStream(){ + this.compressFrame = new GZIPOutputStream( new OutputStream() + { @Override public void write( final int value ) throws IOException diff --git a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java index 31d417893..7ce55bb2c 100644 --- a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java +++ b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java @@ -172,7 +172,8 @@ public class PacketJEIRecipe extends AppEngPacket final IAEItemStack in = AEItemStack.create( currentItem ); if( in != null ) { - final IAEItemStack out = realForFake == Actionable.SIMULATE ? null : Platform.poweredInsert( energy, storage, in, cct.getActionSource() ); + final IAEItemStack out = realForFake == Actionable.SIMULATE ? null : Platform.poweredInsert( energy, storage, in, + cct.getActionSource() ); if( out != null ) { craftMatrix.setInventorySlotContents( x, out.getItemStack() ); @@ -191,7 +192,8 @@ public class PacketJEIRecipe extends AppEngPacket if( !patternItem.isEmpty() && currentItem.isEmpty() ) { // Grab from network by recipe - ItemStack whichItem = Platform.extractItemsByRecipe( energy, cct.getActionSource(), storage, player.world, r, is, testInv, patternItem, x, all, realForFake, filter ); + ItemStack whichItem = Platform.extractItemsByRecipe( energy, cct.getActionSource(), storage, player.world, r, is, testInv, + patternItem, x, all, realForFake, filter ); // If that doesn't get it, grab exact items from network (?) // TODO see if this code is necessary @@ -246,7 +248,8 @@ public class PacketJEIRecipe extends AppEngPacket final InventoryAdaptor ia = InventoryAdaptor.getAdaptor( player, EnumFacing.UP ); final AEItemStack request = AEItemStack.create( patternItem ); final boolean isSimulated = mode == Actionable.SIMULATE; - final boolean checkFuzzy = request.isOre() || patternItem.getItemDamage() == OreDictionary.WILDCARD_VALUE || patternItem.hasTagCompound() || patternItem.isItemStackDamageable(); + final boolean checkFuzzy = request.isOre() || patternItem.getItemDamage() == OreDictionary.WILDCARD_VALUE || patternItem.hasTagCompound() || patternItem + .isItemStackDamageable(); if( !checkFuzzy ) { diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index 057050d33..b48e26541 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java @@ -82,7 +82,8 @@ public class PacketMEInventoryUpdate extends AppEngPacket // int originalBytes = stream.readableBytes(); - final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){ + final GZIPInputStream gzReader = new GZIPInputStream( new InputStream() + { @Override public int read() throws IOException { @@ -132,7 +133,8 @@ public class PacketMEInventoryUpdate extends AppEngPacket this.data.writeInt( this.getPacketID() ); this.data.writeByte( this.ref ); - this.compressFrame = new GZIPOutputStream( new OutputStream(){ + this.compressFrame = new GZIPOutputStream( new OutputStream() + { @Override public void write( final int value ) throws IOException { diff --git a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java index a44ccee3e..189809eae 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java +++ b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java @@ -52,7 +52,7 @@ public class PacketPartPlacement extends AppEngPacket this.z = stream.readInt(); this.face = stream.readByte(); this.eyeHeight = stream.readFloat(); - this.hand = EnumHand.values()[ stream.readByte() ]; + this.hand = EnumHand.values()[stream.readByte()]; } // api @@ -77,7 +77,8 @@ public class PacketPartPlacement extends AppEngPacket final EntityPlayerMP sender = (EntityPlayerMP) player; AppEng.proxy.updateRenderMode( sender ); PartPlacement.setEyeHeight( this.eyeHeight ); - PartPlacement.place( sender.getHeldItem( hand ), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, hand, sender.world, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 ); + PartPlacement.place( sender.getHeldItem( hand ), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, hand, sender.world, + PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 ); AppEng.proxy.updateRenderMode( null ); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java index 00de16162..41ef1f13e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java @@ -91,16 +91,19 @@ public class PacketTransitionEffect extends AppEngPacket { if( AppEng.proxy.shouldAddParticles( Platform.getRandom() ) ) { - final EnergyFx fx = new EnergyFx( world, this.x + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.y + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.z + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), Items.DIAMOND ); + final EnergyFx fx = new EnergyFx( world, this.x + ( this.mode ? ( Platform + .getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.y + ( this.mode ? ( Platform + .getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.z + ( this.mode ? ( Platform + .getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), Items.DIAMOND ); if( !this.mode ) { fx.fromItem( this.d ); } - fx.setMotionX( -0.1f * this.d.xOffset); - fx.setMotionY( -0.1f * this.d.yOffset); - fx.setMotionZ( -0.1f * this.d.zOffset); + fx.setMotionX( -0.1f * this.d.xOffset ); + fx.setMotionY( -0.1f * this.d.yOffset ); + fx.setMotionZ( -0.1f * this.d.zOffset ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } @@ -110,7 +113,11 @@ public class PacketTransitionEffect extends AppEngPacket { final Block block = world.getBlockState( new BlockPos( (int) this.x, (int) this.y, (int) this.z ) ).getBlock(); - Minecraft.getMinecraft().getSoundHandler().playSound( new PositionedSoundRecord( block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, ( block.getSoundType().getVolume() + 1.0F ) / 2.0F, block.getSoundType().getPitch() * 0.8F, (float) this.x + 0.5F, (float) this.y + 0.5F, (float) this.z + 0.5F ) ); + Minecraft.getMinecraft() + .getSoundHandler() + .playSound( new PositionedSoundRecord( block.getSoundType() + .getBreakSound(), SoundCategory.BLOCKS, ( block.getSoundType().getVolume() + 1.0F ) / 2.0F, block.getSoundType() + .getPitch() * 0.8F, (float) this.x + 0.5F, (float) this.y + 0.5F, (float) this.z + 0.5F ) ); } } } diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 67f8f9e87..c1da35cba 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -97,7 +97,9 @@ public class PacketValueConfig extends AppEngPacket { final Container c = player.openContainer; - if( this.Name.equals( "Item" ) && ( ( !player.getHeldItem( EnumHand.MAIN_HAND ).isEmpty() && player.getHeldItem(EnumHand.MAIN_HAND).getItem() instanceof IMouseWheelItem ) || ( !player.getHeldItem( EnumHand.OFF_HAND ).isEmpty() && player.getHeldItem(EnumHand.OFF_HAND).getItem() instanceof IMouseWheelItem ) ) ) + if( this.Name.equals( "Item" ) && ( ( !player.getHeldItem( EnumHand.MAIN_HAND ).isEmpty() && player.getHeldItem( EnumHand.MAIN_HAND ) + .getItem() instanceof IMouseWheelItem ) || ( !player.getHeldItem( EnumHand.OFF_HAND ) + .isEmpty() && player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem ) ) ) { final EnumHand hand; if( !player.getHeldItem( EnumHand.MAIN_HAND ).isEmpty() && player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem ) diff --git a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java index 0f4847098..0ba649dca 100644 --- a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java +++ b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java @@ -78,6 +78,7 @@ public class MeteorDataNameEncoder final int shiftedX = chunkX >> this.bitScale; final int shiftedZ = chunkZ >> this.bitScale; - return String.format( "%d%c%d%c%d%c%s", dimension, this.dataSeparator, shiftedX, this.dataSeparator, shiftedZ, this.baseExtSeparator, this.fileExtension ); + return String.format( "%d%c%d%c%d%c%s", dimension, this.dataSeparator, shiftedX, this.dataSeparator, shiftedZ, this.baseExtSeparator, + this.fileExtension ); } } diff --git a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java index e9c85b3dc..0abce24b2 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java +++ b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java @@ -75,7 +75,8 @@ class PlayerMappingsInitializer } else { - AELog.warn( "The configuration for players contained an outdated entry instead an expected UUID " + maybeUUID + " for the player " + id + ". Please clean this up." ); + AELog.warn( + "The configuration for players contained an outdated entry instead an expected UUID " + maybeUUID + " for the player " + id + ". Please clean this up." ); } } } diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index 65d3d9e79..143a162c4 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -122,7 +122,8 @@ public final class WorldData implements IWorldData * Requires to start up from external from here * * drawback of the singleton build style - * @param server + * + * @param server */ public static void onServerAboutToStart( MinecraftServer server ) { diff --git a/src/main/java/appeng/coremod/AppEngCore.java b/src/main/java/appeng/coremod/AppEngCore.java index e72a15fd0..91353b9dd 100644 --- a/src/main/java/appeng/coremod/AppEngCore.java +++ b/src/main/java/appeng/coremod/AppEngCore.java @@ -45,7 +45,7 @@ public final class AppEngCore extends DummyModContainer implements IFMLLoadingPl public AppEngCore() { - FMLLog.log("AE2-CORE", Level.INFO,"[AppEng] Core Init" ); + FMLLog.log( "AE2-CORE", Level.INFO, "[AppEng] Core Init" ); this.metadata.autogenerated = false; this.metadata.authorList.add( "AlgorithmX2" ); this.metadata.credits = "AlgorithmX2"; diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index ad23070f9..a87f1476a 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -81,7 +81,8 @@ public class TileItemGen extends AEBaseTile implements IInventory { // Safeguard for crash ItemStack testStack = POSSIBLE_ITEMS.peek(); - if( testStack.isEmpty() ) testStack = new ItemStack(Blocks.COBBLESTONE, 1); + if( testStack.isEmpty() ) + testStack = new ItemStack( Blocks.COBBLESTONE, 1 ); return testStack; } diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 95111eda5..040b8c393 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -67,7 +67,7 @@ public class ToolReplicatorCard extends AEBaseItem tag.setInteger( "z", z ); tag.setInteger( "side", side.ordinal() ); tag.setInteger( "dimid", world.provider.getDimension() ); - player.getHeldItem(hand).setTagCompound( tag ); + player.getHeldItem( hand ).setTagCompound( tag ); } else { @@ -76,7 +76,7 @@ public class ToolReplicatorCard extends AEBaseItem } else { - final NBTTagCompound ish = player.getHeldItem(hand).getTagCompound(); + final NBTTagCompound ish = player.getHeldItem( hand ).getTagCompound(); if( ish != null ) { final int src_x = ish.getInteger( "x" ); diff --git a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java index 4ce3827d4..62f6a76e2 100644 --- a/src/main/java/appeng/decorative/slab/BlockSlabCommon.java +++ b/src/main/java/appeng/decorative/slab/BlockSlabCommon.java @@ -1,3 +1,4 @@ + package appeng.decorative.slab; diff --git a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java index f243f6ecf..016cb23c6 100644 --- a/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java @@ -48,14 +48,22 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre @Override public Item getItemDropped( final IBlockState state, final Random rand, final int fortune ) { - return AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeItem() + return AEApi.instance() + .definitions() + .materials() + .certusQuartzCrystalCharged() + .maybeItem() .orElseThrow( () -> new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" ) ); } @Override public int damageDropped( final IBlockState state ) { - return AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ) + return AEApi.instance() + .definitions() + .materials() + .certusQuartzCrystalCharged() + .maybeStack( 1 ) .orElseThrow( () -> new MissingDefinition( "Tried to access charged certus quartz crystal, even though they are disabled" ) ) .getItemDamage(); } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java index 6daf91bc2..1cd05f2be 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzOre.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzOre.java @@ -93,7 +93,11 @@ public class BlockQuartzOre extends AEBaseBlock public Item getItemDropped( final IBlockState state, /* is null */ final Random rand, final int fortune ) { - return AEApi.instance().definitions().materials().certusQuartzCrystal().maybeItem() + return AEApi.instance() + .definitions() + .materials() + .certusQuartzCrystal() + .maybeItem() .orElseThrow( () -> new MissingDefinition( "Tried to access certus quartz crystal, even though they are disabled" ) ); } @@ -113,7 +117,11 @@ public class BlockQuartzOre extends AEBaseBlock @Override public int damageDropped( final IBlockState state ) { - return AEApi.instance().definitions().materials().certusQuartzCrystal().maybeStack( 1 ) + return AEApi.instance() + .definitions() + .materials() + .certusQuartzCrystal() + .maybeStack( 1 ) .orElseThrow( () -> new MissingDefinition( "Tried to access certus quartz crystal, even though they are disabled" ) ) .getItemDamage(); } diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java index 4cd509d5b..a1b223ae4 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzPillar.java @@ -32,6 +32,7 @@ import appeng.api.util.IOrientableBlock; import appeng.block.AEBaseBlock; import appeng.helpers.MetaRotation; + public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock { public static final PropertyEnum AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class ); diff --git a/src/main/java/appeng/decorative/solid/GlassState.java b/src/main/java/appeng/decorative/solid/GlassState.java index 831733119..1ef4ab862 100644 --- a/src/main/java/appeng/decorative/solid/GlassState.java +++ b/src/main/java/appeng/decorative/solid/GlassState.java @@ -15,6 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Applied Energistics 2. If not, see . */ + package appeng.decorative.solid; diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 3f7ba32fd..90af5ea4a 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -78,7 +78,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem this.delay++; final int j = MathHelper.floor( this.posX ); - final int i = MathHelper.floor( (this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY) / 2.0D ); + final int i = MathHelper.floor( ( this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY ) / 2.0D ); final int k = MathHelper.floor( this.posZ ); IBlockState state = this.world.getBlockState( new BlockPos( j, i, k ) ); diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/EntityGrowingCrystal.java index 40414df64..3b3bf13c5 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/EntityGrowingCrystal.java @@ -70,7 +70,7 @@ public final class EntityGrowingCrystal extends EntityItem if( gc instanceof IGrowableCrystal ) // if it changes this just stops being an issue... { final int j = MathHelper.floor( this.posX ); - final int i = MathHelper.floor( (this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY) / 2.0D ); + final int i = MathHelper.floor( ( this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY ) / 2.0D ); final int k = MathHelper.floor( this.posZ ); final IBlockState state = this.world.getBlockState( new BlockPos( j, i, k ) ); diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index 75cc7a504..6b66224c4 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -122,7 +122,8 @@ public final class EntitySingularity extends AEBaseEntityItem { while( item.getCount() > 0 && other.getCount() > 0 ) { - other.grow( -1 );; + other.grow( -1 ); + ; if( other.getCount() == 0 ) { e.setDead(); diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index 7bbf0506f..fc9560e7e 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -94,7 +94,8 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit if( this.isInWater() && Platform.isServer() ) // put out the fuse. { - AEApi.instance().definitions().blocks().tinyTNT().maybeStack( 1 ).ifPresent( tntStack -> { + AEApi.instance().definitions().blocks().tinyTNT().maybeStack( 1 ).ifPresent( tntStack -> + { final EntityItem item = new EntityItem( this.world, this.posX, this.posY, this.posZ, tntStack ); item.motionX = this.motionX; @@ -128,14 +129,16 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit // override :P void explode() { - this.world.playSound( null, this.posX, this.posY, this.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, ( 1.0F + ( this.world.rand.nextFloat() - this.world.rand.nextFloat() ) * 0.2F ) * 32.9F ); + this.world.playSound( null, this.posX, this.posY, this.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, + ( 1.0F + ( this.world.rand.nextFloat() - this.world.rand.nextFloat() ) * 0.2F ) * 32.9F ); if( this.isInWater() ) { return; } - for( final Object e : this.world.getEntitiesWithinAABBExcludingEntity( this, new AxisAlignedBB( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ) ) + for( final Object e : this.world.getEntitiesWithinAABBExcludingEntity( this, + new AxisAlignedBB( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ) ) { if( e instanceof Entity ) { diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index b7e30a7c8..0c7631a12 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -134,7 +134,8 @@ public class FacadeContainer implements IFacadeContainer ids[0] = Math.abs( ids[0] ); Optional maybeFacadeItem = AEApi.instance().definitions().items().facade().maybeItem(); - if (maybeFacadeItem.isPresent()) { + if( maybeFacadeItem.isPresent() ) + { final ItemFacade ifa = (ItemFacade) maybeFacadeItem.get(); final ItemStack facade = ifa.createFromIDs( ids ); if( facade != null ) diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 445bb451b..5574aa231 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -628,7 +628,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } else { - whatToSend.setCount( whatToSend.getCount() - (whatToSend.getCount() - result.getCount()) ); + whatToSend.setCount( whatToSend.getCount() - ( whatToSend.getCount() - result.getCount() ) ); } if( whatToSend.isEmpty() ) diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 2ab301d0c..a743dfdc3 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -71,7 +71,7 @@ public class MetaRotation implements IOrientable return state.getValue( facingProp ); } - //TODO 1.10.2-R - Temp + // TODO 1.10.2-R - Temp Axis a = state.getValue( BlockQuartzPillar.AXIS_ORIENTATION ); if( a == null ) @@ -102,7 +102,7 @@ public class MetaRotation implements IOrientable } else { - //TODO 1.10.2-R - Temp + // TODO 1.10.2-R - Temp ( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockQuartzPillar.AXIS_ORIENTATION, up.getAxis() ) ); } } diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index a19251ba2..fa31ca9ac 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -94,7 +94,8 @@ public class CompassManager this.cx = x >> 4; this.cdy = y >> 5; this.cz = z >> 4; - this.hash = ( (Integer) this.cx ).hashCode() ^ ( (Integer) this.cdy ).hashCode() ^ ( (Integer) this.cz ).hashCode() ^ ( (Long) attunement ).hashCode(); + this.hash = ( (Integer) this.cx ).hashCode() ^ ( (Integer) this.cdy ).hashCode() ^ ( (Integer) this.cz ).hashCode() ^ ( (Long) attunement ) + .hashCode(); } @Override diff --git a/src/main/java/appeng/hooks/DispenserBlockTool.java b/src/main/java/appeng/hooks/DispenserBlockTool.java index 298d0e4c1..65db383bf 100644 --- a/src/main/java/appeng/hooks/DispenserBlockTool.java +++ b/src/main/java/appeng/hooks/DispenserBlockTool.java @@ -47,7 +47,8 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem final World w = dispenser.getWorld(); if( w instanceof WorldServer ) { - tm.onItemUse( dispensedItem, Platform.getPlayer( (WorldServer) w ), w, dispenser.getBlockPos().offset( enumfacing ), EnumHand.MAIN_HAND, enumfacing, 0.5f, 0.5f, 0.5f ); + tm.onItemUse( dispensedItem, Platform.getPlayer( (WorldServer) w ), w, dispenser.getBlockPos().offset( enumfacing ), EnumHand.MAIN_HAND, + enumfacing, 0.5f, 0.5f, 0.5f ); } } return dispensedItem; diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index 3b328ab1d..4ecd7c276 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -79,7 +79,8 @@ final class IntegrationNode final ModAPIManager apiManager = ModAPIManager.INSTANCE; boolean enabled = this.modID == null || Loader.isModLoaded( this.modID ) || apiManager.hasAPI( this.modID ); - AEConfig.instance().addCustomCategoryComment( "ModIntegration", "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." ); + AEConfig.instance().addCustomCategoryComment( "ModIntegration", + "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." ); final String mode = AEConfig.instance().get( "ModIntegration", this.displayName.replace( " ", "" ), "AUTO" ).getString(); if( mode.toUpperCase().equals( "ON" ) ) diff --git a/src/main/java/appeng/integration/IntegrationStage.java b/src/main/java/appeng/integration/IntegrationStage.java index 51035bcf2..4b65d76d5 100644 --- a/src/main/java/appeng/integration/IntegrationStage.java +++ b/src/main/java/appeng/integration/IntegrationStage.java @@ -22,8 +22,11 @@ package appeng.integration; enum IntegrationStage { - PRE_INIT, INIT, POST_INIT, + PRE_INIT, + INIT, + POST_INIT, - FAILED, READY + FAILED, + READY } diff --git a/src/main/java/appeng/integration/abstraction/IIC2.java b/src/main/java/appeng/integration/abstraction/IIC2.java index 21b307bf2..c76784c87 100644 --- a/src/main/java/appeng/integration/abstraction/IIC2.java +++ b/src/main/java/appeng/integration/abstraction/IIC2.java @@ -37,7 +37,8 @@ public interface IIC2 extends IIntegrationModule /** * Create an IC2 power sink for the given external sink. */ - default IC2PowerSink createPowerSink( TileEntity tileEntity, IExternalPowerSink externalSink ) { + default IC2PowerSink createPowerSink( TileEntity tileEntity, IExternalPowerSink externalSink ) + { return IC2PowerSinkStub.INSTANCE; } diff --git a/src/main/java/appeng/integration/abstraction/IRC.java b/src/main/java/appeng/integration/abstraction/IRC.java index 3353650fa..74adda35b 100644 --- a/src/main/java/appeng/integration/abstraction/IRC.java +++ b/src/main/java/appeng/integration/abstraction/IRC.java @@ -27,10 +27,12 @@ import appeng.integration.IIntegrationModule; public interface IRC extends IIntegrationModule { - default void rockCrusher( ItemStack input, ItemStack output ) { + default void rockCrusher( ItemStack input, ItemStack output ) + { } - class Stub extends IIntegrationModule.Stub implements IRC { + class Stub extends IIntegrationModule.Stub implements IRC + { } } diff --git a/src/main/java/appeng/integration/abstraction/IRF.java b/src/main/java/appeng/integration/abstraction/IRF.java index 9860d314c..1a4b7bfde 100644 --- a/src/main/java/appeng/integration/abstraction/IRF.java +++ b/src/main/java/appeng/integration/abstraction/IRF.java @@ -18,15 +18,17 @@ package appeng.integration.abstraction; + import appeng.integration.IIntegrationModule; + /** * @author GuntherDW */ public interface IRF { - class Stub extends IIntegrationModule.Stub implements IRF - { + class Stub extends IIntegrationModule.Stub implements IRF + { - } + } } diff --git a/src/main/java/appeng/integration/modules/ic2/IC2Module.java b/src/main/java/appeng/integration/modules/ic2/IC2Module.java index 80d2beebc..4d701fda7 100644 --- a/src/main/java/appeng/integration/modules/ic2/IC2Module.java +++ b/src/main/java/appeng/integration/modules/ic2/IC2Module.java @@ -18,6 +18,7 @@ package appeng.integration.modules.ic2; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java index 6c26f97fe..b7c8b1233 100644 --- a/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java +++ b/src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java @@ -18,6 +18,7 @@ package appeng.integration.modules.ic2; + import ic2.api.recipe.IRecipeInput; import net.minecraft.item.ItemStack; @@ -25,37 +26,39 @@ import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; + /** * Implementation of IRecipeInput for the macerator recipe. + * * @author GuntherDW */ public class IC2RecipeInput implements IRecipeInput { - @Nonnull - private final ItemStack itemstack; - private final int amount; + @Nonnull + private final ItemStack itemstack; + private final int amount; - public IC2RecipeInput( ItemStack in, int amount ) - { - this.itemstack = in; - this.amount = amount; - } + public IC2RecipeInput( ItemStack in, int amount ) + { + this.itemstack = in; + this.amount = amount; + } - @Override - public boolean matches( ItemStack itemStack ) - { - return this.itemstack.isItemEqual( itemStack ); - } + @Override + public boolean matches( ItemStack itemStack ) + { + return this.itemstack.isItemEqual( itemStack ); + } - @Override - public int getAmount() - { - return this.amount; - } + @Override + public int getAmount() + { + return this.amount; + } - @Override - public List getInputs() - { - return Collections.unmodifiableList( Collections.singletonList( itemstack ) ); - } + @Override + public List getInputs() + { + return Collections.unmodifiableList( Collections.singletonList( itemstack ) ); + } } diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index c4a1bde53..275b5507c 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -93,7 +93,8 @@ class CondenserCategory extends BlankRecipeCategory * @since JEI 4.5.0 */ @Override - public String getModName() { + public String getModName() + { return AppEng.MOD_NAME; } diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java index 38e34e1fa..b4dc1d7d1 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java @@ -50,7 +50,10 @@ class GrinderRecipeCategory extends BlankRecipeCategory } @Override - public String getModName() { return AppEng.MOD_NAME; } + public String getModName() + { + return AppEng.MOD_NAME; + } @Override public String getUid() diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java index 1d5d0d8ae..43b498fac 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java @@ -80,7 +80,8 @@ class InscriberRecipeCategory extends BlankRecipeCategory maybePart = this.accessor.getMaybePart( te, mop ); if( maybePart.isPresent() ) diff --git a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java index 070cf5665..fe3348b8e 100644 --- a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java @@ -107,7 +107,7 @@ public final class TileWailaDataProvider implements IWailaDataProvider } @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) + public NBTTagCompound getNBTData( EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos ) { for( final IWailaDataProvider provider : this.providers ) { diff --git a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java index 88e273917..2f19a8dff 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java @@ -73,7 +73,8 @@ public final class ChargerWailaDataProvider extends BaseWailaDataProvider final EntityPlayer player = accessor.getPlayer(); currentToolTip.add( WailaText.Contains + ": " + currentInventory ); - ITooltipFlag.TooltipFlags tooltipFlag = Minecraft.getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL; + ITooltipFlag.TooltipFlags tooltipFlag = Minecraft + .getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL; chargingItem.getItem().addInformation( chargingItem, player.world, currentToolTip, tooltipFlag ); } } diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 577e58403..06fad2c22 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -44,10 +44,10 @@ public abstract class AEBaseItem extends Item public String toString() { String regName = getRegistryName() != null ? getRegistryName().getResourcePath() : "unregistered"; - return getClass().getSimpleName() + "[" + regName + "]"; + return getClass().getSimpleName() + "[" + regName + "]"; } - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) @Override @SuppressWarnings( "unchecked" ) public final void addInformation( final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips ) @@ -59,7 +59,7 @@ public abstract class AEBaseItem extends Item @SuppressWarnings( "unchecked" ) public final void getSubItems( final CreativeTabs creativeTab, final NonNullList itemStacks ) { - if(isInCreativeTab(creativeTab)) + if( isInCreativeTab( creativeTab ) ) this.getCheckedSubItems( creativeTab, itemStacks ); } @@ -69,7 +69,7 @@ public abstract class AEBaseItem extends Item return false; } - @SideOnly(Side.CLIENT) + @SideOnly( Side.CLIENT ) protected void addCheckedInformation( final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips ) { super.addInformation( stack, world, lines, advancedTooltips ); diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index bfcfb101b..5befe3326 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -124,7 +124,8 @@ public class NetworkToolViewer implements INetworkTool @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { - return this.inv.isItemValidForSlot( i, itemstack ) && itemstack.getItem() instanceof IUpgradeModule && ( (IUpgradeModule) itemstack.getItem() ).getType( itemstack ) != null; + return this.inv.isItemValidForSlot( i, + itemstack ) && itemstack.getItem() instanceof IUpgradeModule && ( (IUpgradeModule) itemstack.getItem() ).getType( itemstack ) != null; } @Override diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index a87f52536..9c31e72e3 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -97,7 +97,8 @@ 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/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 434ca50eb..fe37aa648 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -304,10 +304,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, upgrades = ( (ISegmentedInventory) te ).getInventoryByName( "upgrades" ); } - if( upgrades != null && !player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() instanceof IUpgradeModule ) + if( upgrades != null && !player.getHeldItem( hand ).isEmpty() && player.getHeldItem( hand ).getItem() instanceof IUpgradeModule ) { - final IUpgradeModule um = (IUpgradeModule) player.getHeldItem(hand).getItem(); - final Upgrades u = um.getType( player.getHeldItem(hand) ); + final IUpgradeModule um = (IUpgradeModule) player.getHeldItem( hand ).getItem(); + final Upgrades u = um.getType( player.getHeldItem( hand ) ); if( u != null ) { @@ -319,7 +319,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, return EnumActionResult.PASS; } - player.inventory.setInventorySlotContents( player.inventory.currentItem, ad.addItems( player.getHeldItem(hand) ) ); + player.inventory.setInventorySlotContents( player.inventory.currentItem, ad.addItems( player.getHeldItem( hand ) ) ); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index 675513596..1b4833cfe 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -143,7 +143,8 @@ public enum MaterialType this( metaValue, modelName, features ); this.droppedEntity = c; - EntityRegistry.registerModEntity( new ResourceLocation( "appliedenergistics2", this.droppedEntity.getName() ), this.droppedEntity, this.droppedEntity.getSimpleName(), + EntityRegistry.registerModEntity( new ResourceLocation( "appliedenergistics2", this.droppedEntity.getName() ), this.droppedEntity, + this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, true ); } @@ -153,7 +154,8 @@ public enum MaterialType this( metaValue, modelName, features ); this.oreName = oreDictionary; this.droppedEntity = c; - EntityRegistry.registerModEntity( new ResourceLocation( "appliedenergistics2", this.droppedEntity.getName() ), this.droppedEntity, this.droppedEntity.getSimpleName(), + EntityRegistry.registerModEntity( new ResourceLocation( "appliedenergistics2", this.droppedEntity.getName() ), this.droppedEntity, + this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, true ); } diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 82cfe885f..f57e7440b 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -66,14 +66,19 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { this.setHasSubtypes( true ); - EntityRegistry.registerModEntity( new ResourceLocation( "appliedenergistics2", EntityGrowingCrystal.class.getName() ), EntityGrowingCrystal.class, EntityGrowingCrystal.class.getSimpleName(), EntityIds.get( EntityGrowingCrystal.class ), AppEng.instance(), 16, 4, true ); + EntityRegistry.registerModEntity( new ResourceLocation( "appliedenergistics2", EntityGrowingCrystal.class.getName() ), EntityGrowingCrystal.class, + EntityGrowingCrystal.class.getSimpleName(), EntityIds.get( EntityGrowingCrystal.class ), AppEng.instance(), 16, 4, true ); } @Nullable public static ResolverResult getResolver( final int certus2 ) { - return AEApi.instance().definitions().items().crystalSeed().maybeStack( 1 ) + return AEApi.instance() + .definitions() + .items() + .crystalSeed() + .maybeStack( 1 ) .map( crystalSeedStack -> { crystalSeedStack.setItemDamage( certus2 ); @@ -236,7 +241,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal // Cannot read the pickup delay of the original item, so we // use the pickup delay used for items dropped by a player instead - egc.setPickupDelay(40); + egc.setPickupDelay( 40 ); return egc; } diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index a95ef2560..bbe314bf8 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -61,15 +61,15 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt @Override public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { - this.clearPattern( player.getHeldItem(hand), player ); + this.clearPattern( player.getHeldItem( hand ), player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } @Override public EnumActionResult onItemUseFirst( final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return this.clearPattern( player.getHeldItem(hand), player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; + return this.clearPattern( player.getHeldItem( hand ), player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } private boolean clearPattern( final ItemStack stack, final EntityPlayer player ) diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index a4d1f8a53..8faffb809 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -72,7 +72,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public EnumActionResult onItemUseFirst( final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return AEApi.instance().partHelper().placeBus( player.getHeldItem(hand), pos, side, player, hand, world ); + return AEApi.instance().partHelper().placeBus( player.getHeldItem( hand ), pos, side, player, hand, world ); } @Override @@ -183,7 +183,8 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte return ItemStack.EMPTY; } - final boolean defaultValue = ( b.isTopSolid( blockState ) && hasSimpleModel( blockState ) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; + final boolean defaultValue = ( b + .isTopSolid( blockState ) && hasSimpleModel( blockState ) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; if( FacadeConfig.instance().checkEnabled( b, metadata, defaultValue ) ) { if( returnItem ) @@ -236,13 +237,16 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } Item item = Item.REGISTRY.getObjectById( data[0] ); - if ( item == null ) { + if( item == null ) + { return ItemStack.EMPTY; } itemId = item.getRegistryName(); itemDamage = data[1]; - } else { + } + else + { // First item is numeric item id, second is damage itemId = new ResourceLocation( nbt.getString( TAG_ITEM_ID ) ); itemDamage = nbt.getInteger( TAG_DAMAGE ); @@ -309,12 +313,17 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte public ItemStack createFromIDs( final int[] ids ) { - ItemStack facadeStack = AEApi.instance().definitions().items().facade().maybeStack( 1 ) + ItemStack facadeStack = AEApi.instance() + .definitions() + .items() + .facade() + .maybeStack( 1 ) .orElseThrow( () -> new MissingDefinition( "Tried to create a facade, while facades are being deactivated." ) ); // Convert back to a registry name... Item item = Item.REGISTRY.getObjectById( ids[0] ); - if ( item == null ) { + if( item == null ) + { return ItemStack.EMPTY; } diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index f7faede94..37dcd2919 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -154,12 +154,12 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup @Override public EnumActionResult onItemUse( final EntityPlayer player, final World w, final BlockPos pos, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { - if( this.getTypeByStack( player.getHeldItem(hand) ) == PartType.INVALID_TYPE ) + if( this.getTypeByStack( player.getHeldItem( hand ) ) == PartType.INVALID_TYPE ) { return EnumActionResult.FAIL; } - return AEApi.instance().partHelper().placeBus( player.getHeldItem(hand), pos, side, player, hand, w ); + return AEApi.instance().partHelper().placeBus( player.getHeldItem( hand ), pos, side, player, hand, w ); } @Override @@ -242,19 +242,23 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup } catch( final InstantiationException e ) { - throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part.getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); + throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part + .getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); } catch( final IllegalAccessException e ) { - throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part.getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); + throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part + .getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); } catch( final InvocationTargetException e ) { - throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part.getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); + throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part + .getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); } catch( final NoSuchMethodException e ) { - throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part.getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); + throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part + .getName() + " ; Possibly didn't have correct constructor( ItemStack )", e ); } } diff --git a/src/main/java/appeng/items/parts/PartModels.java b/src/main/java/appeng/items/parts/PartModels.java index 1dca25c8f..2a7fbd1cc 100644 --- a/src/main/java/appeng/items/parts/PartModels.java +++ b/src/main/java/appeng/items/parts/PartModels.java @@ -35,5 +35,4 @@ import java.lang.annotation.Target; ElementType.METHOD } ) public @interface PartModels -{ -} +{} diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index d33be9c6a..cdf1155f8 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -131,7 +131,8 @@ public enum PartType } }, - CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet.noneOf( IntegrationType.class ), PartDenseCable.class ) + CABLE_DENSE_SMART( 60, "cable_dense_smart", EnumSet.of( AEFeature.CHANNELS, AEFeature.DENSE_CABLES ), EnumSet + .noneOf( IntegrationType.class ), PartDenseCable.class ) { @Override public boolean isCable() @@ -181,7 +182,8 @@ public enum PartType PATTERN_TERMINAL( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), - CRAFTING_TERMINAL( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartCraftingTerminal.class ), + CRAFTING_TERMINAL( 360, "crafting_terminal", EnumSet.of( AEFeature.CRAFTING_TERMINAL ), EnumSet + .noneOf( IntegrationType.class ), PartCraftingTerminal.class ), TERMINAL( 380, "terminal", EnumSet.of( AEFeature.TERMINAL ), EnumSet.noneOf( IntegrationType.class ), PartTerminal.class ), @@ -233,7 +235,7 @@ public enum PartType }, P2P_TUNNEL_IC2( 465, "p2p_tunnel_ic2", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_EU ), EnumSet - .of ( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ) + .of( IntegrationType.IC2 ), PartP2PIC2Power.class, GuiText.EUTunnel ) { @Override String getUnlocalizedName() @@ -243,7 +245,7 @@ public enum PartType }, P2P_TUNNEL_RF( 466, "p2p_tunnel_rf", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_RF ), EnumSet - .of ( IntegrationType.RF ), PartP2PRFPower.class, GuiText.RFTunnel ) + .of( IntegrationType.RF ), PartP2PRFPower.class, GuiText.RFTunnel ) { @Override String getUnlocalizedName() @@ -263,13 +265,13 @@ public enum PartType }, P2P_TUNNEL_FE( 469, "p2p_tunnel_fe", EnumSet.of( AEFeature.P2P_TUNNEL, AEFeature.P2P_TUNNEL_FE ), EnumSet - .noneOf( IntegrationType.class ), PartP2PFEPower.class, GuiText.FETunnel ) + .noneOf( IntegrationType.class ), PartP2PFEPower.class, GuiText.FETunnel ) { @Override String getUnlocalizedName() - { - return "p2p_tunnel"; - } + { + return "p2p_tunnel"; + } }, // P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of( diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index 126574fce..56547d17e 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -110,9 +110,11 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe if( cellInventory != null ) { - lines.add( cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' + cellInventory.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal() ); + lines.add( + cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + ' ' + cellInventory.getTotalBytes() + ' ' + GuiText.BytesUsed.getLocal() ); - lines.add( cellInventory.getStoredItemTypes() + " " + GuiText.Of.getLocal() + ' ' + cellInventory.getTotalItemTypes() + ' ' + GuiText.Types.getLocal() ); + lines.add( cellInventory.getStoredItemTypes() + " " + GuiText.Of.getLocal() + ' ' + cellInventory.getTotalItemTypes() + ' ' + GuiText.Types + .getLocal() ); if( handler.isPreformatted() ) { @@ -220,8 +222,8 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe @Override public ActionResult onItemRightClick( final World world, final EntityPlayer player, final EnumHand hand ) { - this.disassembleDrive( player.getHeldItem(hand), world, player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); + this.disassembleDrive( player.getHeldItem( hand ), world, player ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } private boolean disassembleDrive( final ItemStack stack, final World world, final EntityPlayer player ) @@ -287,13 +289,17 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe @Override public EnumActionResult onItemUseFirst( final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return this.disassembleDrive( player.getHeldItem(hand), world, player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; + return this.disassembleDrive( player.getHeldItem( hand ), world, player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } @Override public ItemStack getContainerItem( final ItemStack itemStack ) { - return AEApi.instance().definitions().materials().emptyStorageCell().maybeStack( 1 ) + return AEApi.instance() + .definitions() + .materials() + .emptyStorageCell() + .maybeStack( 1 ) .orElseThrow( () -> new MissingDefinition( "Tried to use empty storage cells while basic storage cells are defined." ) ); } diff --git a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java index 23146bf55..7267b3cf6 100644 --- a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java @@ -38,6 +38,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; + public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenchItem { @@ -82,7 +83,7 @@ public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenc { final IMEInventoryHandler inventory = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS ); - if( inventory instanceof ICellInventoryHandler) + if( inventory instanceof ICellInventoryHandler ) { final CellConfig cc = new CellConfig( stack ); diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index 188a827c1..fe1152306 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -170,7 +170,8 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag } final int floorBuffer = 64; - StorageHelper.getInstance().swapRegions( w, min.x + 1, min.y + 1, min.z + 1, destination, 0, floorBuffer, 0, targetX - 1, targetY - 1, targetZ - 1 ); + StorageHelper.getInstance().swapRegions( w, min.x + 1, min.y + 1, min.z + 1, destination, 0, floorBuffer, 0, targetX - 1, targetY - 1, + targetZ - 1 ); this.setStoredSize( is, targetX, targetY, targetZ ); return new TransitionResult( true, 0 ); diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 8ea30869d..8242fa2a6 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -58,14 +58,14 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { if( p.isSneaking() ) { - this.encode( p.getHeldItem(hand), p ); + this.encode( p.getHeldItem( hand ), p ); p.swingArm( hand ); - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } - return new ActionResult( EnumActionResult.PASS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.PASS, p.getHeldItem( hand ) ); } - + @Override public boolean itemInteractionForEntity( ItemStack is, final EntityPlayer player, final EntityLivingBase target, final EnumHand hand ) { diff --git a/src/main/java/appeng/items/tools/ToolBiometricCardRendering.java b/src/main/java/appeng/items/tools/ToolBiometricCardRendering.java index 272d53b8b..9c167b148 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCardRendering.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCardRendering.java @@ -1,3 +1,4 @@ + package appeng.items.tools; diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index 1e7b7415e..8f3b91600 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -148,9 +148,9 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard { if( player.isSneaking() && !w.isRemote ) { - final IMemoryCard mem = (IMemoryCard) player.getHeldItem(hand).getItem(); + final IMemoryCard mem = (IMemoryCard) player.getHeldItem( hand ).getItem(); mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED ); - player.getHeldItem(hand).setTagCompound( null ); + player.getHeldItem( hand ).setTagCompound( null ); return EnumActionResult.SUCCESS; } else @@ -158,7 +158,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard return super.onItemUse( player, w, pos, hand, side, hx, hy, hz ); } } - + @Override public boolean doesSneakBypassUse( final ItemStack itemstack, final IBlockAccess world, final BlockPos pos, final EntityPlayer player ) { diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 70ca61c99..c938bc558 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -90,7 +90,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 8de71028b..21238e21a 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -91,13 +91,13 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe static { for( final AEColor color : AEColor.VALID_COLORS ) - { + { final String dyeName = color.dye.getUnlocalizedName(); final String oreDictName = "dye" + WordUtils.capitalize( dyeName ); final int oreDictId = OreDictionary.getOreID( oreDictName ); ORE_TO_COLOR.put( oreDictId, color ); - } + } } public ToolColorApplicator() @@ -108,7 +108,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe @Override public EnumActionResult onItemUse( EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ) { - return this.onItemUse( p.getHeldItem(hand), p, w, pos, hand, side, hitX, hitY, hitZ ); + return this.onItemUse( p.getHeldItem( hand ), p, w, pos, hand, side, hitX, hitY, hitZ ); } @Override @@ -285,7 +285,8 @@ 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/ToolColorApplicatorRendering.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java index a53fec611..d3596e012 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicatorRendering.java @@ -1,3 +1,4 @@ + package appeng.items.tools.powered; @@ -32,7 +33,8 @@ public class ToolColorApplicatorRendering extends ItemRenderingCustomizer private ModelResourceLocation getMesh( ItemStack itemStack ) { - // If the stack has no color, don't use the colored model since the impact of calling getColor for every quad is extremely high, + // If the stack has no color, don't use the colored model since the impact of calling getColor for every quad is + // extremely high, // if the stack tries to re-search its inventory for a new paintball everytime AEColor col = ( (ToolColorApplicator) itemStack.getItem() ).getActiveColor( itemStack ); return ( col != null ) ? MODEL_COLORED : MODEL_UNCOLORED; diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 1a85ddb4b..97556f7f5 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -66,10 +66,13 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT this.heatUp = new HashMap(); this.coolDown = new HashMap(); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.COBBLESTONE ) ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONEBRICK.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.STONEBRICK, 1, 2 ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONE.getDefaultState() ), + new InWorldToolOperationResult( new ItemStack( Blocks.COBBLESTONE ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONEBRICK.getDefaultState() ), + new InWorldToolOperationResult( new ItemStack( Blocks.STONEBRICK, 1, 2 ) ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.LAVA, true ), new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_LAVA, true ), new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_LAVA, true ), + new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.GRASS, true ), new InWorldToolOperationResult( new ItemStack( Blocks.DIRT ) ) ); final List snowBalls = new ArrayList(); @@ -215,7 +218,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT if( target == null ) { - return new ActionResult( EnumActionResult.FAIL, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.FAIL, p.getHeldItem( hand ) ); } else { @@ -232,13 +235,13 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } @Override public EnumActionResult onItemUse( EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ) { - return this.onItemUse( p.getHeldItem(hand), p, w, pos, hand, side, hitX, hitY, hitZ ); + return this.onItemUse( p.getHeldItem( hand ), p, w, pos, hand, side, hitX, hitY, hitZ ); } @Override @@ -299,7 +302,8 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT { if( result.getItem() instanceof ItemBlock ) { - if( Block.getBlockFromItem( result.getItem() ) == blockID && result.getItem().getDamage( result ) == blockID.getMetaFromState( state ) ) + if( Block.getBlockFromItem( result.getItem() ) == blockID && result.getItem().getDamage( result ) == blockID + .getMetaFromState( state ) ) { canFurnaceable = false; } @@ -318,7 +322,8 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT { this.extractAEPower( item, 1600 ); final InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) ); - w.playSound( p, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); + w.playSound( p, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, + itemRand.nextFloat() * 0.4F + 0.8F ); if( or.getBlockItem().isEmpty() ) { @@ -349,7 +354,8 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT if( w.isAirBlock( offsetPos ) ) { this.extractAEPower( item, 1600 ); - w.playSound( p, offsetPos.getX() + 0.5D, offsetPos.getY() + 0.5D, offsetPos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); + w.playSound( p, offsetPos.getX() + 0.5D, offsetPos.getY() + 0.5D, offsetPos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, + SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); w.setBlockState( offsetPos, Blocks.FIRE.getDefaultState() ); } diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index 1cac45060..628084a7f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -112,17 +112,17 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell @Override public ActionResult onItemRightClick( final World w, final EntityPlayer p, final @Nullable EnumHand hand ) { - if( this.getAECurrentPower( p.getHeldItem(hand) ) > 1600 ) + if( this.getAECurrentPower( p.getHeldItem( hand ) ) > 1600 ) { int shots = 1; - final CellUpgrades cu = (CellUpgrades) this.getUpgradesInventory( p.getHeldItem(hand) ); + final CellUpgrades cu = (CellUpgrades) this.getUpgradesInventory( p.getHeldItem( hand ) ); if( cu != null ) { shots += cu.getInstalledUpgrades( Upgrades.SPEED ); } - final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( p.getHeldItem(hand), null, StorageChannel.ITEMS ); + final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( p.getHeldItem( hand ), null, StorageChannel.ITEMS ); if( inv != null ) { final IItemList itemList = inv.getAvailableItems( AEApi.instance().storage().createItemList() ); @@ -132,25 +132,25 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell shots = Math.min( shots, (int) aeAmmo.getStackSize() ); for( int sh = 0; sh < shots; sh++ ) { - this.extractAEPower( p.getHeldItem(hand), 1600 ); + this.extractAEPower( p.getHeldItem( hand ), 1600 ); if( Platform.isClient() ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } aeAmmo.setStackSize( 1 ); final ItemStack ammo = ( (IAEItemStack) aeAmmo ).getItemStack(); if( ammo == null ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } ammo.setCount( 1 ); aeAmmo = inv.extractItems( aeAmmo, Actionable.MODULATE, new PlayerSource( p, null ) ); if( aeAmmo == null ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } final LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() ); @@ -172,7 +172,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { this.shootPaintBalls( type, w, p, Vec3d, Vec3d1, direction, d0, d1, d2 ); } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } else { @@ -186,16 +186,17 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { p.sendMessage( PlayerMessages.AmmoDepleted.get() ); } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } } } - return new ActionResult( EnumActionResult.FAIL, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.FAIL, p.getHeldItem( hand ) ); } private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2 ) { - final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.x, Vec3d1.x ), Math.min( Vec3d.y, Vec3d1.y ), Math.min( Vec3d.z, Vec3d1.z ), Math.max( Vec3d.x, Vec3d1.x ), Math.max( Vec3d.y, Vec3d1.y ), Math.max( Vec3d.z, Vec3d1.z ) ).grow( 16, 16, 16 ); + final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.x, Vec3d1.x ), Math.min( Vec3d.y, Vec3d1.y ), Math.min( Vec3d.z, Vec3d1.z ), Math + .max( Vec3d.x, Vec3d1.x ), Math.max( Vec3d.y, Vec3d1.y ), Math.max( Vec3d.z, Vec3d1.z ) ).grow( 16, 16, 16 ); Entity entity = null; final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); @@ -248,7 +249,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell try { - AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) ); + AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, + new PacketMatterCannon( d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) ( pos == null ? 32 : pos.hitVec + .squareDistanceTo( vec ) + 1 ) ) ); } catch( final Exception err ) { @@ -313,7 +316,8 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { hasDestroyed = false; - final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.x, Vec3d1.x ), Math.min( Vec3d.y, Vec3d1.y ), Math.min( Vec3d.z, Vec3d1.z ), Math.max( Vec3d.x, Vec3d1.x ), Math.max( Vec3d.y, Vec3d1.y ), Math.max( Vec3d.z, Vec3d1.z ) ).grow( 16, 16, 16 ); + final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.x, Vec3d1.x ), Math.min( Vec3d.y, Vec3d1.y ), Math.min( Vec3d.z, Vec3d1.z ), Math + .max( Vec3d.x, Vec3d1.x ), Math.max( Vec3d.y, Vec3d1.y ), Math.max( Vec3d.z, Vec3d1.z ) ).grow( 16, 16, 16 ); Entity entity = null; final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); @@ -365,7 +369,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell try { - AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) ); + AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, + new PacketMatterCannon( d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) ( pos == null ? 32 : pos.hitVec + .squareDistanceTo( vec ) + 1 ) ) ); } catch( final Exception err ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 3180ae4e0..4f820c3e9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -68,7 +68,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } @SideOnly( Side.CLIENT ) @@ -190,8 +190,8 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, } @Override - public boolean shouldCauseReequipAnimation( ItemStack oldStack, ItemStack newStack, boolean slotChanged ) + public boolean shouldCauseReequipAnimation( ItemStack oldStack, ItemStack newStack, boolean slotChanged ) { - return slotChanged; + return slotChanged; } } diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 1071fd6ab..3a9b3df80 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -59,8 +59,8 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { - AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem(hand), w, player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); + AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem( hand ), w, player ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } @SideOnly( Side.CLIENT ) @@ -120,7 +120,8 @@ 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 ) @@ -153,9 +154,9 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless tag.setString( "name", name ); } - @Override - public boolean shouldCauseReequipAnimation( ItemStack oldStack, ItemStack newStack, boolean slotChanged ) + @Override + public boolean shouldCauseReequipAnimation( ItemStack oldStack, ItemStack newStack, boolean slotChanged ) { - return slotChanged; - } + return slotChanged; + } } diff --git a/src/main/java/appeng/items/tools/powered/powersink/IC2.java b/src/main/java/appeng/items/tools/powered/powersink/IC2.java index aab674f37..5b3750a4d 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/IC2.java +++ b/src/main/java/appeng/items/tools/powered/powersink/IC2.java @@ -1,4 +1,4 @@ -///* +/// * // * This file is part of Applied Energistics 2. // * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. // * @@ -9,117 +9,118 @@ // * // * Applied Energistics 2 is distributed in the hope that it will be useful, // * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // * GNU Lesser General Public License for more details. // * // * You should have received a copy of the GNU Lesser General Public License -// * along with Applied Energistics 2. If not, see . +// * along with Applied Energistics 2. If not, see . // */ // -//package appeng.items.tools.powered.powersink; +// package appeng.items.tools.powered.powersink; // // -//import net.minecraft.entity.EntityLivingBase; -//import net.minecraft.item.ItemStack; +// import net.minecraft.entity.EntityLivingBase; +// import net.minecraft.item.ItemStack; // -//import ic2.api.item.IElectricItemManager; -//import ic2.api.item.ISpecialElectricItem; +// import ic2.api.item.IElectricItemManager; +// import ic2.api.item.ISpecialElectricItem; // -//import appeng.api.config.PowerUnits; -//import appeng.coremod.annotations.Integration.Interface; -//import appeng.coremod.annotations.Integration.InterfaceList; -//import appeng.coremod.annotations.Integration.Method; -//import appeng.integration.IntegrationType; +// import appeng.api.config.PowerUnits; +// import appeng.coremod.annotations.Integration.Interface; +// import appeng.coremod.annotations.Integration.InterfaceList; +// import appeng.coremod.annotations.Integration.Method; +// import appeng.integration.IntegrationType; // // -//@InterfaceList( value = { -// @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = IntegrationType.IC2 ), -// @Interface( iface = "ic2.api.item.IElectricItemManager", iname = IntegrationType.IC2 ) -//} ) -//public abstract class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpecialElectricItem -//{ -// public IC2( double powerCapacity ) -// { -// super( powerCapacity ); -// } +// @InterfaceList( value = { +// @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = IntegrationType.IC2 ), +// @Interface( iface = "ic2.api.item.IElectricItemManager", iname = IntegrationType.IC2 ) +// } ) +// public abstract class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpecialElectricItem +// { +// public IC2( double powerCapacity ) +// { +// super( powerCapacity ); +// } // -// @Override -// public double charge( ItemStack is, double amount, int tier, boolean ignoreTransferLimit, boolean simulate ) -// { -// double addedAmt = amount; -// double limit = this.getTransferLimit( is ); +// @Override +// public double charge( ItemStack is, double amount, int tier, boolean ignoreTransferLimit, boolean simulate ) +// { +// double addedAmt = amount; +// double limit = this.getTransferLimit( is ); // -// if( !ignoreTransferLimit && amount > limit ) -// { -// addedAmt = limit; -// } +// if( !ignoreTransferLimit && amount > limit ) +// { +// addedAmt = limit; +// } // -// return addedAmt - ( (int) this.injectExternalPower( PowerUnits.EU, is, addedAmt, simulate ) ); -// } +// return addedAmt - ( (int) this.injectExternalPower( PowerUnits.EU, is, addedAmt, simulate ) ); +// } // -// @Override -// public double discharge( ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate ) -// { -// return 0; -// } +// @Override +// public double discharge( ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean +/// externally, boolean simulate ) +// { +// return 0; +// } // -// @Override -// public double getCharge( ItemStack is ) -// { -// return (int) PowerUnits.AE.convertTo( PowerUnits.EU, this.getAECurrentPower( is ) ); -// } +// @Override +// public double getCharge( ItemStack is ) +// { +// return (int) PowerUnits.AE.convertTo( PowerUnits.EU, this.getAECurrentPower( is ) ); +// } // -// @Override -// public boolean canUse( ItemStack is, double amount ) -// { -// return this.getCharge( is ) > amount; -// } +// @Override +// public boolean canUse( ItemStack is, double amount ) +// { +// return this.getCharge( is ) > amount; +// } // -// @Override -// public boolean use( ItemStack is, double amount, EntityLivingBase entity ) -// { -// if( this.canUse( is, amount ) ) -// { -// // use the power.. -// this.extractAEPower( is, PowerUnits.EU.convertTo( PowerUnits.AE, amount ) ); -// return true; -// } -// return false; -// } +// @Override +// public boolean use( ItemStack is, double amount, EntityLivingBase entity ) +// { +// if( this.canUse( is, amount ) ) +// { +// // use the power.. +// this.extractAEPower( is, PowerUnits.EU.convertTo( PowerUnits.AE, amount ) ); +// return true; +// } +// return false; +// } // -// @Override -// public void chargeFromArmor( ItemStack itemStack, EntityLivingBase entity ) -// { -// // wtf? -// } +// @Override +// public void chargeFromArmor( ItemStack itemStack, EntityLivingBase entity ) +// { +// // wtf? +// } // -// @Override -// public String getToolTip( ItemStack itemStack ) -// { -// return null; -// } +// @Override +// public String getToolTip( ItemStack itemStack ) +// { +// return null; +// } // -// @Override -// public double getMaxCharge( ItemStack itemStack ) -// { -// return PowerUnits.AE.convertTo( PowerUnits.EU, this.getAEMaxPower( itemStack ) ); -// } +// @Override +// public double getMaxCharge( ItemStack itemStack ) +// { +// return PowerUnits.AE.convertTo( PowerUnits.EU, this.getAEMaxPower( itemStack ) ); +// } // -// @Override -// public int getTier( ItemStack itemStack ) -// { -// return 1; -// } +// @Override +// public int getTier( ItemStack itemStack ) +// { +// return 1; +// } // -// private double getTransferLimit( ItemStack itemStack ) -// { -// return Math.max( 32, this.getMaxCharge( itemStack ) / 200 ); -// } +// private double getTransferLimit( ItemStack itemStack ) +// { +// return Math.max( 32, this.getMaxCharge( itemStack ) / 200 ); +// } // -// @Override -// @Method( iname = IntegrationType.IC2 ) -// public IElectricItemManager getManager( ItemStack itemStack ) -// { -// return this; -// } -//} +// @Override +// @Method( iname = IntegrationType.IC2 ) +// public IElectricItemManager getManager( ItemStack itemStack ) +// { +// return this; +// } +// } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index 95a507b74..085fe28f7 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -67,7 +67,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE ); } p.swingArm( hand ); - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } @Override diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index cf43fdc13..1d1848019 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -54,7 +54,8 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool { if( Platform.isClient() ) { - //TODO 1.10-R - if we return FAIL on client, action will not be sent to server. Fix that in all Block#onItemUseFirst overrides. + // TODO 1.10-R - if we return FAIL on client, action will not be sent to server. Fix that in all + // Block#onItemUseFirst overrides. return !world.isRemote ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } diff --git a/src/main/java/appeng/loot/ChestLoot.java b/src/main/java/appeng/loot/ChestLoot.java index 7bf26dcca..dec22e403 100644 --- a/src/main/java/appeng/loot/ChestLoot.java +++ b/src/main/java/appeng/loot/ChestLoot.java @@ -34,57 +34,36 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import appeng.api.AEApi; import appeng.api.definitions.IMaterials; + public class ChestLoot { @SubscribeEvent - public void loadLootTable( LootTableLoadEvent event ){ + public void loadLootTable( LootTableLoadEvent event ) + { if( event.getName() == LootTableList.CHESTS_ABANDONED_MINESHAFT ) { - //TODO 1.9.4 aftermath - All these loot quality, pools and stuff. Figure it out and balance it. + // TODO 1.9.4 aftermath - All these loot quality, pools and stuff. Figure it out and balance it. final IMaterials materials = AEApi.instance().definitions().materials(); materials.certusQuartzCrystal().maybeStack( 1 ).ifPresent( is -> { - event.getTable().addPool( new LootPool( - new LootEntry[] { - new LootEntryItem( - is.getItem(), - 2, - 3, - new LootFunction[] { new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, - new LootCondition[] { new RandomChance( 1 ) }, - "AE2 Crystal_" + is.getItemDamage() - ) - }, - new LootCondition[0], - new RandomValueRange( 1, 4 ), - new RandomValueRange( 0, 2 ), "AE2 Crystals" - ) - ); + event.getTable().addPool( new LootPool( new LootEntry[] { + new LootEntryItem( is.getItem(), 2, 3, new LootFunction[] { + new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, new LootCondition[] { + new RandomChance( 1 ) }, "AE2 Crystal_" + is.getItemDamage() ) + }, new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), "AE2 Crystals" ) ); } ); materials.certusQuartzDust().maybeStack( 1 ).ifPresent( is -> { - event.getTable().addPool( new LootPool( - new LootEntryItem[] { - new LootEntryItem( - is.getItem(), - 2, - 3, - new LootFunction[] { new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, - new LootCondition[] { new RandomChance( 1 ) }, - "AE2 Dust_" + is.getItemDamage() - ) - }, - new LootCondition[0], - new RandomValueRange( 1, 4 ), - new RandomValueRange( 0, 2 ), - "AE2 DUSTS" - ) - ); + event.getTable().addPool( new LootPool( new LootEntryItem[] { + new LootEntryItem( is.getItem(), 2, 3, new LootFunction[] { + new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, new LootCondition[] { + new RandomChance( 1 ) }, "AE2 Dust_" + is.getItemDamage() ) + }, new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), "AE2 DUSTS" ) ); } ); } } - + } \ No newline at end of file diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index cd7b0c6b8..cde195820 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -86,7 +86,8 @@ public class GridConnection implements IGridConnection, IPathItem final String aCoordinates = a.getGridBlock().getLocation().toString(); final String bCoordinates = b.getGridBlock().getLocation().toString(); - throw new ExistingConnectionException( String.format( EXISTING_CONNECTION_MESSAGE, aMachineClass, aCoordinates, bMachineClass, bCoordinates, fromAtoB ) ); + throw new ExistingConnectionException( String.format( EXISTING_CONNECTION_MESSAGE, aMachineClass, aCoordinates, bMachineClass, bCoordinates, + fromAtoB ) ); } this.sideA = a; diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 3d3d933c7..ebbb34285 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -78,7 +78,8 @@ public class NetworkEventBus } else { - throw new IllegalStateException( "Invalid ME Network Event Subscriber, " + m.getName() + "s Parameter must extend MENetworkEvent." ); + throw new IllegalStateException( "Invalid ME Network Event Subscriber, " + m + .getName() + "s Parameter must extend MENetworkEvent." ); } } else diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 445d3ffe5..bcc53f513 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -91,7 +91,8 @@ 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,7 +102,8 @@ 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,7 +537,8 @@ 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/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index c62de806c..f96f0876d 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -351,10 +351,10 @@ public class PathGridCache implements IPathingGrid players.add( n.getPlayerID() ); } -// for( final int id : players ) -// { -// Platform.addStat( id, currentBracket.getAchievement() ); -// } + // for( final int id : players ) + // { + // Platform.addStat( id, currentBracket.getAchievement() ); + // } } } this.lastChannels = this.getChannelsInUse(); diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index 77827c018..6b51aaf82 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -124,17 +124,26 @@ public class SpatialPylonCache implements ISpatialCache { case X: - this.isValid = this.isValid && ( ( this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y ) || ( this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z ) ) && ( ( this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y ) || ( this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z ) ); + this.isValid = this.isValid && ( ( this.captureMax.y == cl.getMin().y || this.captureMin.y == cl + .getMax().y ) || ( this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z ) ) && ( ( this.captureMax.y == cl + .getMax().y || this.captureMin.y == cl + .getMin().y ) || ( this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z ) ); break; case Y: - this.isValid = this.isValid && ( ( this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x ) || ( this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z ) ) && ( ( this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x ) || ( this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z ) ); + this.isValid = this.isValid && ( ( this.captureMax.x == cl.getMin().x || this.captureMin.x == cl + .getMax().x ) || ( this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z ) ) && ( ( this.captureMax.x == cl + .getMax().x || this.captureMin.x == cl + .getMin().x ) || ( this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z ) ); break; case Z: - this.isValid = this.isValid && ( ( this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y ) || ( this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x ) ) && ( ( this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y ) || ( this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x ) ); + this.isValid = this.isValid && ( ( this.captureMax.y == cl.getMin().y || this.captureMin.y == cl + .getMax().y ) || ( this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x ) ) && ( ( this.captureMax.y == cl + .getMax().y || this.captureMin.y == cl + .getMin().y ) || ( this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x ) ); break; case UNFORMED: diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index ff51b6b54..010b4fcc7 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -759,7 +759,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU if( details.isCraftable() ) { - FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ), details.getOutput( ic, this.getWorld() ), ic ); + FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ), + details.getOutput( ic, this.getWorld() ), ic ); for( int x = 0; x < ic.getSizeInventory(); x++ ) { @@ -981,7 +982,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU final int hash = System.identityHashCode( this ); final int hmm = this.finalOutput == null ? 0 : this.finalOutput.hashCode(); - return Long.toString( now, Character.MAX_RADIX ) + '-' + Integer.toString( hash, Character.MAX_RADIX ) + '-' + Integer.toString( hmm, Character.MAX_RADIX ); + return Long.toString( now, Character.MAX_RADIX ) + '-' + Integer.toString( hash, Character.MAX_RADIX ) + '-' + Integer.toString( hmm, + Character.MAX_RADIX ); } private NBTTagCompound generateLinkData( final String craftingID, final boolean standalone, final boolean req ) diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 6e6ea47cf..d6a97ee96 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -260,12 +260,14 @@ public class QuantumCluster implements ILocatable, IAECluster @Override public Iterator getTiles() { - return new ChainedIterator( this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this.getRing()[5], this.getRing()[6], this.getRing()[7], this.center ); + return new ChainedIterator( this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this + .getRing()[5], this.getRing()[6], this.getRing()[7], this.center ); } public boolean isCorner( final TileQuantumBridge tileQuantumBridge ) { - return this.getRing()[0] == tileQuantumBridge || this.getRing()[2] == tileQuantumBridge || this.getRing()[4] == tileQuantumBridge || this.getRing()[6] == tileQuantumBridge; + return this.getRing()[0] == tileQuantumBridge || this.getRing()[2] == tileQuantumBridge || this.getRing()[4] == tileQuantumBridge || this + .getRing()[6] == tileQuantumBridge; } @Override diff --git a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java index d0612910e..faadc973e 100644 --- a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java +++ b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java @@ -60,7 +60,8 @@ public class MEMonitorPassThrough> extends MEPassThrough before = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) ); + final IItemList before = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal() + .getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) ); super.setInternal( i ); if( i instanceof IMEMonitor ) @@ -68,7 +69,8 @@ public class MEMonitorPassThrough> extends MEPassThrough) i; } - final IItemList after = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) ); + final IItemList after = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal() + .getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) ); if( this.monitor != null ) { diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index bef23ef79..ea495ca7a 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -97,7 +97,8 @@ public class NetworkInventoryHandler> implements IMEInvent { final IMEInventoryHandler inv = ii.next(); - if( inv.validForPass( 1 ) && inv.canAccept( input ) && ( inv.isPrioritized( input ) || inv.extractItems( input, Actionable.SIMULATE, src ) != null ) ) + if( inv.validForPass( 1 ) && inv + .canAccept( input ) && ( inv.isPrioritized( input ) || inv.extractItems( input, Actionable.SIMULATE, src ) != null ) ) { input = inv.injectItems( input, type, src ); } diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 5dacf35a3..1abd4c766 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -1196,7 +1196,8 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } // Collect the number of channels used per side - // We have to do this even for non-smart cables since a glass cable can display a connection as smart if the adjacent tile requires it + // We have to do this even for non-smart cables since a glass cable can display a connection as smart if the + // adjacent tile requires it for( EnumFacing facing : EnumFacing.values() ) { int channels = cable.getChannelsOnSide( facing ); @@ -1209,7 +1210,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { FacadeRenderState facadeState = getFacadeRenderState( facing ); - if ( facadeState != null ) + if( facadeState != null ) { renderState.getFacades().put( facing, facadeState ); } @@ -1249,7 +1250,8 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return renderState; } - private FacadeRenderState getFacadeRenderState( EnumFacing side ) { + private FacadeRenderState getFacadeRenderState( EnumFacing side ) + { // Store the "masqueraded" itemstack for the given side, if there is a facade IFacadePart facade = getFacade( side.ordinal() ); if( facade != null ) @@ -1333,5 +1335,4 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return true; } - } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 495b01184..65b012fb9 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -177,7 +177,7 @@ public class PartPlacement ; if( held.getCount() == 0 ) { - player.inventory.mainInventory.set(player.inventory.currentItem, ItemStack.EMPTY); + player.inventory.mainInventory.set( player.inventory.currentItem, ItemStack.EMPTY ); MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); } } @@ -352,7 +352,7 @@ public class PartPlacement ; if( held.getCount() == 0 ) { - player.inventory.mainInventory.set(player.inventory.currentItem, ItemStack.EMPTY); + player.inventory.mainInventory.set( player.inventory.currentItem, ItemStack.EMPTY ); MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); } } diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index b6734e33a..84678becf 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -292,7 +292,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab if( changed ) { - AppEng.proxy.sendToAllNearExcept( null, pos.getX(), pos.getY(), pos.getZ(), 64, this.getTile().getWorld(), new PacketTransitionEffect( entity.posX, entity.posY, entity.posZ, this.getSide(), false ) ); + AppEng.proxy.sendToAllNearExcept( null, pos.getX(), pos.getY(), pos.getZ(), 64, this.getTile().getWorld(), + new PacketTransitionEffect( entity.posX, entity.posY, entity.posZ, this.getSide(), false ) ); } } } @@ -456,7 +457,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab { energy.extractAEPower( requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG ); this.breakBlockAndStoreItems( w, pos, items ); - AppEng.proxy.sendToAllNearExcept( null, pos.getX(), pos.getY(), pos.getZ(), 64, w, new PacketTransitionEffect( pos.getX(), pos.getY(), pos.getZ(), this.getSide(), true ) ); + AppEng.proxy.sendToAllNearExcept( null, pos.getX(), pos.getY(), pos.getZ(), 64, w, + new PacketTransitionEffect( pos.getX(), pos.getY(), pos.getZ(), this.getSide(), true ) ); } else { diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index bef4d32c0..ccea6dc83 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -218,7 +218,8 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 ) { - newItems = myAdaptor.removeSimilarItems( toSend, whatToImport == null ? ItemStack.EMPTY : whatToImport.getItemStack(), fzMode, this.configDestination( inv ) ); + newItems = myAdaptor.removeSimilarItems( toSend, whatToImport == null ? ItemStack.EMPTY : whatToImport.getItemStack(), fzMode, + this.configDestination( inv ) ); } else { diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index 1c399ce0a..62d6394b5 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -49,8 +49,7 @@ public class PlaneBakedModel implements IBakedModel private final List quads; - PlaneBakedModel( VertexFormat format, TextureAtlasSprite frontTexture, TextureAtlasSprite sidesTexture, TextureAtlasSprite backTexture, - PlaneConnections connections ) + PlaneBakedModel( VertexFormat format, TextureAtlasSprite frontTexture, TextureAtlasSprite sidesTexture, TextureAtlasSprite backTexture, PlaneConnections connections ) { this.frontTexture = frontTexture; diff --git a/src/main/java/appeng/parts/automation/PlaneConnections.java b/src/main/java/appeng/parts/automation/PlaneConnections.java index 5643ed510..7b3075da3 100644 --- a/src/main/java/appeng/parts/automation/PlaneConnections.java +++ b/src/main/java/appeng/parts/automation/PlaneConnections.java @@ -26,7 +26,8 @@ import com.google.common.base.Strings; /** - * Models in which directions - looking at the front face - a plane (annihilation, formation, etc.) is connected to other planes of the same type. + * Models in which directions - looking at the front face - a plane (annihilation, formation, etc.) is connected to + * other planes of the same type. */ public final class PlaneConnections { @@ -108,7 +109,7 @@ public final class PlaneConnections public String getFilenameSuffix() { String suffix = Integer.toBinaryString( getIndex() ); - return Strings.padStart(suffix, 4, '0'); + return Strings.padStart( suffix, 4, '0' ); } @Override diff --git a/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java b/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java index 698940ca3..f44613e1c 100644 --- a/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java +++ b/src/main/java/appeng/parts/layers/LayerIEnergyHandler.java @@ -90,4 +90,4 @@ public class LayerIEnergyHandler extends LayerBase implements IEnergyHandler, IE return false; } - } +} diff --git a/src/main/java/appeng/parts/layers/LayerIEnergySource.java b/src/main/java/appeng/parts/layers/LayerIEnergySource.java index 652492b7e..70869981a 100644 --- a/src/main/java/appeng/parts/layers/LayerIEnergySource.java +++ b/src/main/java/appeng/parts/layers/LayerIEnergySource.java @@ -202,6 +202,4 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource return 0; } - - } diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index 9d33ac179..f6430e415 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -172,8 +172,8 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor cachedStacks.length ) return ItemStack.EMPTY; @@ -200,7 +200,7 @@ class ItemHandlerAdapter implements IMEInventory, IBaseMonitor implements IEnergyStorage { - private static final P2PModels MODELS = new P2PModels( "part/p2p/p2p_tunnel_fe" ); + private static final P2PModels MODELS = new P2PModels( "part/p2p/p2p_tunnel_fe" ); - private boolean cachedTarget = false; + private boolean cachedTarget = false; - private IEnergyStorage outputTarget; + private IEnergyStorage outputTarget; - @PartModels - public static List getModels() - { - return MODELS.getModels(); - } + @PartModels + public static List getModels() + { + return MODELS.getModels(); + } - @Override - public IPartModel getStaticModels() - { - return MODELS.getModel( isPowered(), isActive() ); - } + @Override + public IPartModel getStaticModels() + { + return MODELS.getModel( isPowered(), isActive() ); + } - public PartP2PFEPower( ItemStack is ) - { - super( is ); - } + public PartP2PFEPower( ItemStack is ) + { + super( is ); + } - @Override - public void onTunnelNetworkChange() - { - this.getHost().notifyNeighbors(); - } + @Override + public void onTunnelNetworkChange() + { + this.getHost().notifyNeighbors(); + } - @Override - public void onNeighborChanged() - { - super.onNeighborChanged(); + @Override + public void onNeighborChanged() + { + super.onNeighborChanged(); - this.cachedTarget = false; - } + this.cachedTarget = false; + } - @Override - public int receiveEnergy( int maxReceive, boolean simulate ) - { - if( this.isOutput() ) - { - return 0; - } + @Override + public int receiveEnergy( int maxReceive, boolean simulate ) + { + if( this.isOutput() ) + { + return 0; + } - if( this.isActive() ) - { - int total = 0; + if( this.isActive() ) + { + int total = 0; - try - { - for( PartP2PFEPower t : this.getOutputs() ) - { - if( Platform.getRandomInt() % 2 > 0 ) - { - int receiver = t.getOutput().receiveEnergy( maxReceive, simulate ); - maxReceive -= receiver; - total += receiver; + try + { + for( PartP2PFEPower t : this.getOutputs() ) + { + if( Platform.getRandomInt() % 2 > 0 ) + { + int receiver = t.getOutput().receiveEnergy( maxReceive, simulate ); + maxReceive -= receiver; + total += receiver; - if( maxReceive <= 0 ) - { - break; - } - } - } + if( maxReceive <= 0 ) + { + break; + } + } + } - if( maxReceive > 0 ) - { - for( PartP2PFEPower t : this.getOutputs() ) - { - int receiver = t.getOutput().receiveEnergy( maxReceive, simulate ); - maxReceive -= receiver; - total += receiver; + if( maxReceive > 0 ) + { + for( PartP2PFEPower t : this.getOutputs() ) + { + int receiver = t.getOutput().receiveEnergy( maxReceive, simulate ); + maxReceive -= receiver; + total += receiver; - if( maxReceive <= 0 ) - { - break; - } - } - } + if( maxReceive <= 0 ) + { + break; + } + } + } - this.queueTunnelDrain( PowerUnits.RF, total ); - } - catch( GridAccessException ignored ) - { - } + this.queueTunnelDrain( PowerUnits.RF, total ); + } + catch( GridAccessException ignored ) + { + } - return total; - } + return total; + } - return 0; - } + return 0; + } - @Override - public int extractEnergy( int maxExtract, boolean simulate ) - { - return 0; - } + @Override + public int extractEnergy( int maxExtract, boolean simulate ) + { + return 0; + } - private IEnergyStorage getOutput() - { - if( this.isOutput() ) - { - if( !this.cachedTarget ) - { - TileEntity self = this.getTile(); - TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos().getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) ); - this.outputTarget = te.hasCapability( CapabilityEnergy.ENERGY, this.getSide().getOpposite().getFacing() ) ? te.getCapability( CapabilityEnergy.ENERGY, this.getSide().getOpposite().getFacing() ) : null; - this.cachedTarget = true; - } + private IEnergyStorage getOutput() + { + if( this.isOutput() ) + { + if( !this.cachedTarget ) + { + TileEntity self = this.getTile(); + TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos() + .getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) ); + this.outputTarget = te.hasCapability( CapabilityEnergy.ENERGY, this.getSide().getOpposite().getFacing() ) ? te + .getCapability( CapabilityEnergy.ENERGY, this.getSide().getOpposite().getFacing() ) : null; + this.cachedTarget = true; + } - if( this.outputTarget == null || !this.outputTarget.canReceive() ) - { - return null; - } + if( this.outputTarget == null || !this.outputTarget.canReceive() ) + { + return null; + } - return this.outputTarget; - } - return null; - } + return this.outputTarget; + } + return null; + } - @Override - public int getEnergyStored() - { - if( this.isOutput() || !this.isActive() ) - { - return 0; - } + @Override + public int getEnergyStored() + { + if( this.isOutput() || !this.isActive() ) + { + return 0; + } - int total = 0; + int total = 0; - try - { - for( PartP2PFEPower t : this.getOutputs() ) - { - total += t.getOutput().getEnergyStored(); - } - } - catch( GridAccessException e ) - { - return 0; - } + try + { + for( PartP2PFEPower t : this.getOutputs() ) + { + total += t.getOutput().getEnergyStored(); + } + } + catch( GridAccessException e ) + { + return 0; + } + return total; + } - return total; - } + @Override + public int getMaxEnergyStored() + { + if( this.isOutput() || !this.isActive() ) + { + return 0; + } - @Override - public int getMaxEnergyStored() - { - if( this.isOutput() || !this.isActive() ) - { - return 0; - } + int total = 0; - int total = 0; + try + { + for( PartP2PFEPower t : this.getOutputs() ) + { + total += t.getOutput().getMaxEnergyStored(); + } + } + catch( GridAccessException e ) + { + return 0; + } - try - { - for( PartP2PFEPower t : this.getOutputs() ) - { - total += t.getOutput().getMaxEnergyStored(); - } - } - catch( GridAccessException e ) - { - return 0; - } + return total; + } - return total; - } + @Override + public boolean canExtract() + { + return false; + } - @Override - public boolean canExtract() - { - return false; - } - - @Override - public boolean canReceive() - { - return true; - } + @Override + public boolean canReceive() + { + return true; + } @Override public boolean hasCapability( @Nonnull Capability capability ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 757846064..5e0c01527 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -294,10 +294,11 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip * The ItemStack should not be modified in this function! * Note: This behaviour is subtly different from IFluidHandlers.fill() * - * @param slot Slot to insert into. - * @param stack ItemStack to insert. + * @param slot Slot to insert into. + * @param stack ItemStack to insert. * @param simulate If true, the insertion is only simulated - * @return The remaining ItemStack that was not inserted (if the entire stack is accepted, then return ItemStack.EMPTY). + * @return The remaining ItemStack that was not inserted (if the entire stack is accepted, then return + * ItemStack.EMPTY). * May be the same as the input ItemStack if unchanged, otherwise a new ItemStack. **/ @Nonnull @@ -305,11 +306,12 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip public ItemStack insertItem( int slot, @Nonnull ItemStack stack, boolean simulate ) { - if( isItemValidForSlot( slot, stack ) ) + if( isItemValidForSlot( slot, stack ) ) { AdaptorIInventory adaptor = new AdaptorIInventory( this.getDestination() ); - if( simulate ) { + if( simulate ) + { return adaptor.simulateAdd( stack ); } else @@ -325,8 +327,8 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip * if nothing is extracted, otherwise it's stack size must not be greater than amount or the * itemstacks getMaxStackSize(). * - * @param slot Slot to extract from. - * @param amount Amount to extract (may be greater than the current stacks max limit) + * @param slot Slot to extract from. + * @param amount Amount to extract (may be greater than the current stacks max limit) * @param simulate If true, the extraction is only simulated * @return ItemStack extracted from the slot, must be ItemStack.EMPTY, if nothing can be extracted **/ diff --git a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java index 9004c56fb..6a40bcfd9 100644 --- a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java +++ b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java @@ -19,173 +19,176 @@ package appeng.parts.p2p; -//import javax.annotation.Nullable; +// import javax.annotation.Nullable; // -//import net.minecraft.item.ItemStack; -//import net.minecraft.nbt.NBTTagCompound; -//import net.minecraft.util.IIcon; -//import net.minecraftforge.common.util.ForgeDirection; +// import net.minecraft.item.ItemStack; +// import net.minecraft.nbt.NBTTagCompound; +// import net.minecraft.util.IIcon; +// import net.minecraftforge.common.util.ForgeDirection; // -//import cpw.mods.fml.relauncher.Side; -//import cpw.mods.fml.relauncher.SideOnly; +// import cpw.mods.fml.relauncher.Side; +// import cpw.mods.fml.relauncher.SideOnly; // -//import li.cil.oc.api.API; -//import li.cil.oc.api.Items; -//import li.cil.oc.api.Network; -//import li.cil.oc.api.network.Environment; -//import li.cil.oc.api.network.Message; -//import li.cil.oc.api.network.Node; -//import li.cil.oc.api.network.SidedEnvironment; -//import li.cil.oc.api.network.Visibility; +// import li.cil.oc.api.API; +// import li.cil.oc.api.Items; +// import li.cil.oc.api.Network; +// import li.cil.oc.api.network.Environment; +// import li.cil.oc.api.network.Message; +// import li.cil.oc.api.network.Node; +// import li.cil.oc.api.network.SidedEnvironment; +// import li.cil.oc.api.network.Visibility; // -//import appeng.api.networking.events.MENetworkBootingStatusChange; -//import appeng.api.networking.events.MENetworkChannelsChanged; -//import appeng.api.networking.events.MENetworkEventSubscribe; -//import appeng.api.networking.events.MENetworkPowerStatusChange; -//import appeng.integration.IntegrationRegistry; -//import appeng.integration.IntegrationType; -//import appeng.coremod.annotations.Integration.Interface; -//import appeng.coremod.annotations.Integration.InterfaceList; +// import appeng.api.networking.events.MENetworkBootingStatusChange; +// import appeng.api.networking.events.MENetworkChannelsChanged; +// import appeng.api.networking.events.MENetworkEventSubscribe; +// import appeng.api.networking.events.MENetworkPowerStatusChange; +// import appeng.integration.IntegrationRegistry; +// import appeng.integration.IntegrationType; +// import appeng.coremod.annotations.Integration.Interface; +// import appeng.coremod.annotations.Integration.InterfaceList; // // -//@InterfaceList( value = { @Interface( iface = "li.cil.oc.api.network.Environment", iname = IntegrationType.OpenComputers ), @Interface( iface = "li.cil.oc.api.network.SidedEnvironment", iname = IntegrationType.OpenComputers ) } ) -//public final class PartP2POpenComputers extends PartP2PTunnel implements Environment, SidedEnvironment -//{ -// @Nullable -// private final Node node; +// @InterfaceList( value = { @Interface( iface = "li.cil.oc.api.network.Environment", iname = +// IntegrationType.OpenComputers ), @Interface( iface = "li.cil.oc.api.network.SidedEnvironment", iname = +// IntegrationType.OpenComputers ) } ) +// public final class PartP2POpenComputers extends PartP2PTunnel implements Environment, +// SidedEnvironment +// { +// @Nullable +// private final Node node; // -// public PartP2POpenComputers( final ItemStack is ) -// { -// super( is ); +// public PartP2POpenComputers( final ItemStack is ) +// { +// super( is ); // -// if( !IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) -// { -// throw new RuntimeException( "OpenComputers is not installed!" ); -// } +// if( !IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) +// { +// throw new RuntimeException( "OpenComputers is not installed!" ); +// } // -// // Avoid NPE when called in pre-init phase (part population). -// if( API.network != null ) -// { -// this.node = Network.newNode( this, Visibility.None ).create(); -// } -// else -// { -// this.node = null; // to satisfy final -// } -// } +// // Avoid NPE when called in pre-init phase (part population). +// if( API.network != null ) +// { +// this.node = Network.newNode( this, Visibility.None ).create(); +// } +// else +// { +// this.node = null; // to satisfy final +// } +// } // -// @MENetworkEventSubscribe -// public void changeStateA( final MENetworkBootingStatusChange bs ) -// { -// this.updateConnections(); -// } +// @MENetworkEventSubscribe +// public void changeStateA( final MENetworkBootingStatusChange bs ) +// { +// this.updateConnections(); +// } // -// @MENetworkEventSubscribe -// public void changeStateB( final MENetworkChannelsChanged bs ) -// { -// this.updateConnections(); -// } +// @MENetworkEventSubscribe +// public void changeStateB( final MENetworkChannelsChanged bs ) +// { +// this.updateConnections(); +// } // -// @MENetworkEventSubscribe -// public void changeStateC( final MENetworkPowerStatusChange bs ) -// { -// this.updateConnections(); -// } +// @MENetworkEventSubscribe +// public void changeStateC( final MENetworkPowerStatusChange bs ) +// { +// this.updateConnections(); +// } // -// @Override -// @SideOnly( Side.CLIENT ) -// public IIcon getTypeTexture() -// { -// return Items.get( "adapter" ).block().getBlockTextureFromSide( 2 ); -// } +// @Override +// @SideOnly( Side.CLIENT ) +// public IIcon getTypeTexture() +// { +// return Items.get( "adapter" ).block().getBlockTextureFromSide( 2 ); +// } // -// @Override -// public void removeFromWorld() -// { -// super.removeFromWorld(); -// if( this.node != null ) -// { -// this.node.remove(); -// } -// } +// @Override +// public void removeFromWorld() +// { +// super.removeFromWorld(); +// if( this.node != null ) +// { +// this.node.remove(); +// } +// } // -// @Override -// public void onTunnelNetworkChange() -// { -// this.updateConnections(); -// } +// @Override +// public void onTunnelNetworkChange() +// { +// this.updateConnections(); +// } // -// @Override -// public void readFromNBT( final NBTTagCompound data ) -// { -// super.readFromNBT( data ); -// if( this.node != null ) -// { -// this.node.load( data ); -// } -// } +// @Override +// public void readFromNBT( final NBTTagCompound data ) +// { +// super.readFromNBT( data ); +// if( this.node != null ) +// { +// this.node.load( data ); +// } +// } // -// @Override -// public void writeToNBT( final NBTTagCompound data ) -// { -// super.writeToNBT( data ); -// if( this.node != null ) -// { -// this.node.save( data ); -// } -// } +// @Override +// public void writeToNBT( final NBTTagCompound data ) +// { +// super.writeToNBT( data ); +// if( this.node != null ) +// { +// this.node.save( data ); +// } +// } // -// private void updateConnections() -// { -// if( this.getProxy().isPowered() && this.getProxy().isActive() ) -// { -// // Make sure we're connected to existing OC nodes in the world. -// Network.joinOrCreateNetwork( this.getTile() ); +// private void updateConnections() +// { +// if( this.getProxy().isPowered() && this.getProxy().isActive() ) +// { +// // Make sure we're connected to existing OC nodes in the world. +// Network.joinOrCreateNetwork( this.getTile() ); // -// if( this.isOutput() && this.getInput() != null && this.node != null ) -// { -// Network.joinOrCreateNetwork( this.getInput().getTile() ); -// this.node.connect( this.getInput().node() ); -// } -// } -// else if( this.node != null ) -// { -// this.node.remove(); -// } -// } +// if( this.isOutput() && this.getInput() != null && this.node != null ) +// { +// Network.joinOrCreateNetwork( this.getInput().getTile() ); +// this.node.connect( this.getInput().node() ); +// } +// } +// else if( this.node != null ) +// { +// this.node.remove(); +// } +// } // -// @Nullable -// @Override -// public Node node() -// { -// return this.node; -// } +// @Nullable +// @Override +// public Node node() +// { +// return this.node; +// } // -// @Override -// public void onConnect( final Node node ) -// { -// } +// @Override +// public void onConnect( final Node node ) +// { +// } // -// @Override -// public void onDisconnect( final Node node ) -// { -// } +// @Override +// public void onDisconnect( final Node node ) +// { +// } // -// @Override -// public void onMessage( final Message message ) -// { -// } +// @Override +// public void onMessage( final Message message ) +// { +// } // -// @Nullable -// @Override -// public Node sidedNode( final ForgeDirection side ) -// { -// return side == this.getSide() ? this.node : null; -// } +// @Nullable +// @Override +// public Node sidedNode( final ForgeDirection side ) +// { +// return side == this.getSide() ? this.node : null; +// } // -// @Override -// public boolean canConnect( final ForgeDirection side ) -// { -// return side == this.getSide(); -// } -//} +// @Override +// public boolean canConnect( final ForgeDirection side ) +// { +// return side == this.getSide(); +// } +// } diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index d0c4ec82e..cfb71d2a7 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -18,6 +18,7 @@ package appeng.parts.p2p; + import java.util.List; import java.util.Stack; @@ -27,7 +28,6 @@ import cofh.redstoneflux.api.IEnergyReceiver; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - import appeng.api.config.PowerUnits; import appeng.integration.IntegrationType; import appeng.me.GridAccessException; @@ -141,7 +141,8 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen if( !this.cachedTarget ) { TileEntity self = this.getTile(); - TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos().getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) ); + TileEntity te = self.getWorld().getTileEntity( new BlockPos( self.getPos().getX() + this.getSide().xOffset, self.getPos() + .getY() + this.getSide().yOffset, self.getPos().getZ() + this.getSide().zOffset ) ); this.outputTarget = te instanceof IEnergyReceiver ? (IEnergyReceiver) te : null; this.cachedTarget = true; } @@ -211,4 +212,4 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { return true; } - } +} diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index 38f4f9dc6..b48df58ac 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -127,7 +127,8 @@ public class PartConversionMonitor extends AbstractPartMonitor else { final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, input, new PlayerSource( player, this ) ); - player.inventory.setInventorySlotContents( player.inventory.currentItem, failedToInsert == null ? ItemStack.EMPTY : failedToInsert.getItemStack() ); + player.inventory.setInventorySlotContents( player.inventory.currentItem, + failedToInsert == null ? ItemStack.EMPTY : failedToInsert.getItemStack() ); } } catch( final GridAccessException e ) diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java index ab328accd..d14c9d734 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java @@ -44,9 +44,9 @@ public class PartCraftingTerminal extends AbstractPartTerminal @PartModels public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/crafting_terminal_on" ); - public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF ); - public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON ); - public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL ); + public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF ); + public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON ); + public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL ); private final AppEngInternalInventory craftingGrid = new AppEngInternalInventory( this, 9 ); diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java index 3d76abe4b..282646e2c 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java @@ -49,8 +49,8 @@ public class PartPatternTerminal extends AbstractPartTerminal public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/pattern_terminal_on" ); public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF ); - public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON ) ; - public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL ) ; + public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON ); + public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL ); private final AppEngInternalInventory crafting = new AppEngInternalInventory( this, 9 ); private final AppEngInternalInventory output = new AppEngInternalInventory( this, 3 ); diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 5665c3a57..7e5421936 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -416,7 +416,6 @@ public class RecipeHandler implements IRecipeHandler } } - for( final Entry e : processed.entrySet() ) { AELog.info( "Recipes Loading: " + e.getKey().getSimpleName() + ": " + e.getValue() + " loaded." ); @@ -769,7 +768,8 @@ public class RecipeHandler implements IRecipeHandler public static class MaterialExists implements IConditionFactory { @Override - public BooleanSupplier parse( JsonContext jsonContext, JsonObject jsonObject ) { + public BooleanSupplier parse( JsonContext jsonContext, JsonObject jsonObject ) + { String material = JsonUtils.getString( jsonObject, "material" ); Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, material ); return () -> result != null; @@ -777,19 +777,20 @@ public class RecipeHandler implements IRecipeHandler } } - public static class PartFactory implements IIngredientFactory - { + public static class PartFactory implements IIngredientFactory + { - @Nonnull - @Override - public net.minecraft.item.crafting.Ingredient parse( JsonContext context, JsonObject json ) - { + @Nonnull + @Override + public net.minecraft.item.crafting.Ingredient parse( JsonContext context, JsonObject json ) + { String partName = json.get( "part" ).getAsString(); Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, partName ); if( result instanceof ResolverResultSet ) { ResolverResultSet resolverResultSet = (ResolverResultSet) result; - return net.minecraft.item.crafting.Ingredient.fromStacks(resolverResultSet.results.toArray(new ItemStack[resolverResultSet.results.size()])); + return net.minecraft.item.crafting.Ingredient + .fromStacks( resolverResultSet.results.toArray( new ItemStack[resolverResultSet.results.size()] ) ); } else if( result instanceof ResolverResult ) { @@ -803,7 +804,7 @@ public class RecipeHandler implements IRecipeHandler AELog.warn( "Looking for ingredient with name '" + partName + "' ended up with a null item!" ); return net.minecraft.item.crafting.Ingredient.EMPTY; - } - } + } + } } diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 3bca41a84..80dd71f10 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -163,7 +163,8 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg } @Override - public boolean canFit(int i, int i1) { + public boolean canFit( int i, int i1 ) + { return false; } diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index ea70ddf46..e5ec79a2f 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -60,7 +60,8 @@ public final class FacadeRecipe extends net.minecraftforge.registries.IForgeRegi { if( inv.getStackInSlot( 0 ).isEmpty() && inv.getStackInSlot( 2 ).isEmpty() && inv.getStackInSlot( 6 ).isEmpty() && inv.getStackInSlot( 8 ).isEmpty() ) { - if( this.anchor.isSameAs( inv.getStackInSlot( 1 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 3 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 5 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 7 ) ) ) + if( this.anchor.isSameAs( inv.getStackInSlot( 1 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 3 ) ) && this.anchor + .isSameAs( inv.getStackInSlot( 5 ) ) && this.anchor.isSameAs( inv.getStackInSlot( 7 ) ) ) { final ItemStack facades = facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade ); if( !facades.isEmpty() && createFacade ) @@ -81,7 +82,8 @@ public final class FacadeRecipe extends net.minecraftforge.registries.IForgeRegi } @Override - public boolean canFit(int i, int i1) { + public boolean canFit( int i, int i1 ) + { return false; } diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index 93e329362..771217d61 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -38,6 +38,7 @@ import appeng.api.recipes.IIngredient; import javax.annotation.Nullable; + public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements IRecipe, IRecipeBakeable { // Added in for future ease of change, but hard coded for now. @@ -178,7 +179,8 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn } @Override - public boolean canFit(int i, int i1) { + public boolean canFit( int i, int i1 ) + { return false; } @@ -273,7 +275,8 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn { return false; } - return( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); + return( target.getItem() == input + .getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); } public ShapedRecipe setMirrored( final boolean mirror ) diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index 7f05d4f4f..9de33785f 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -138,7 +138,8 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr } @Override - public boolean canFit(int i, int i1) { + public boolean canFit( int i, int i1 ) + { return false; } @@ -150,7 +151,8 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr private boolean checkItemEquals( final ItemStack target, final ItemStack input ) { - return( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); + return( target.getItem() == input + .getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); } /** diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index be4cbec27..d2feee536 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -114,7 +114,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer try { // TODO : 1.12 Cleanup/remove the old recipe loader. -// Registration.addRecipeToRegister( new ShapedRecipe( outIS, args.toArray( new Object[args.size()] ) ) ); + // Registration.addRecipeToRegister( new ShapedRecipe( outIS, args.toArray( new Object[args.size()] ) ) ); } catch( final Throwable e ) { diff --git a/src/main/java/appeng/recipes/handlers/Shapeless.java b/src/main/java/appeng/recipes/handlers/Shapeless.java index 26a4d36f8..a3a2b2876 100644 --- a/src/main/java/appeng/recipes/handlers/Shapeless.java +++ b/src/main/java/appeng/recipes/handlers/Shapeless.java @@ -77,7 +77,8 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer try { // TODO : 1.12 Cleanup/remove the old recipe loader. -// Registration.addRecipeToRegister( new ShapelessRecipe( outIS, args.toArray( new Object[args.size()] ) ) ); + // Registration.addRecipeToRegister( new ShapelessRecipe( outIS, args.toArray( new Object[args.size()] ) ) + // ); } catch( final Throwable e ) { diff --git a/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java b/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java index 1a755cc0e..85dcc145f 100644 --- a/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartRecipeFactory.java @@ -18,6 +18,7 @@ package appeng.recipes.helpers; + import appeng.core.AppEng; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; @@ -28,36 +29,37 @@ import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.IRecipeFactory; import net.minecraftforge.common.crafting.JsonContext; + /** * @author GuntherDW */ public class PartRecipeFactory implements IRecipeFactory { - @Override - public IRecipe parse( JsonContext context, JsonObject json ) - { - String type = JsonUtils.getString( json, "type" ); - if( type.contains( "shaped" ) ) - { - PartShapedCraftingFactory recipe = PartShapedCraftingFactory.factory( context, json ); - CraftingHelper.ShapedPrimer primer = new CraftingHelper.ShapedPrimer(); - primer.width = recipe.getWidth(); - primer.height = recipe.getHeight(); - primer.mirrored = JsonUtils.getBoolean( json, "mirrored", true ); - primer.input = recipe.getIngredients(); + @Override + public IRecipe parse( JsonContext context, JsonObject json ) + { + String type = JsonUtils.getString( json, "type" ); + if( type.contains( "shaped" ) ) + { + PartShapedCraftingFactory recipe = PartShapedCraftingFactory.factory( context, json ); + CraftingHelper.ShapedPrimer primer = new CraftingHelper.ShapedPrimer(); + primer.width = recipe.getWidth(); + primer.height = recipe.getHeight(); + primer.mirrored = JsonUtils.getBoolean( json, "mirrored", true ); + primer.input = recipe.getIngredients(); - return new PartShapedCraftingFactory( new ResourceLocation( AppEng.MOD_ID, "part_shaped_crafting" ), recipe.getRecipeOutput(), primer ); - } - else if( type.contains( "shapeless" ) ) - { - PartShapelessCraftingFactory recipe = PartShapelessCraftingFactory.factory( context, json ); + return new PartShapedCraftingFactory( new ResourceLocation( AppEng.MOD_ID, "part_shaped_crafting" ), recipe.getRecipeOutput(), primer ); + } + else if( type.contains( "shapeless" ) ) + { + PartShapelessCraftingFactory recipe = PartShapelessCraftingFactory.factory( context, json ); - return new PartShapelessCraftingFactory( new ResourceLocation( AppEng.MOD_ID, "part_shapeless_crafting" ), recipe.getIngredients(), recipe.getRecipeOutput() ); - } - else - { - throw new JsonSyntaxException( "Applied Energistics 2 was given a custom recipe that it does not know how to handle!\n" - + "Type should either be '" + AppEng.MOD_ID + ":shapeless' or '" + AppEng.MOD_ID + ":shaped', got '" + type + "'!" ); - } - } + return new PartShapelessCraftingFactory( new ResourceLocation( AppEng.MOD_ID, "part_shapeless_crafting" ), recipe.getIngredients(), recipe + .getRecipeOutput() ); + } + else + { + throw new JsonSyntaxException( "Applied Energistics 2 was given a custom recipe that it does not know how to handle!\n" + "Type should either be '" + AppEng.MOD_ID + ":shapeless' or '" + AppEng.MOD_ID + ":shaped', got '" + type + "'!" ); + } + } } diff --git a/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java b/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java index 75e76eca0..0b0122d43 100644 --- a/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java @@ -18,6 +18,7 @@ package appeng.recipes.helpers; + import appeng.api.recipes.ResolverResult; import appeng.core.AELog; import appeng.core.Api; @@ -42,96 +43,96 @@ import javax.annotation.Nonnull; import java.util.Map; import java.util.Set; + /** * @author GuntherDW */ public class PartShapedCraftingFactory extends ShapedOreRecipe { + public PartShapedCraftingFactory( ResourceLocation group, @Nonnull ItemStack result, CraftingHelper.ShapedPrimer primer ) + { + super( group, result, primer ); + } - public PartShapedCraftingFactory( ResourceLocation group, @Nonnull ItemStack result, CraftingHelper.ShapedPrimer primer ) - { - super( group, result, primer ); - } + // Copied from ShapedOreRecipe.java, modified a bit. + public static PartShapedCraftingFactory factory( JsonContext context, JsonObject json ) + { + String group = JsonUtils.getString( json, "group", "" ); - // Copied from ShapedOreRecipe.java, modified a bit. - public static PartShapedCraftingFactory factory( JsonContext context, JsonObject json ) - { - String group = JsonUtils.getString( json, "group", "" ); + Map ingMap = Maps.newHashMap(); + for( Map.Entry entry : JsonUtils.getJsonObject( json, "key" ).entrySet() ) + { + if( entry.getKey().length() != 1 ) + throw new JsonSyntaxException( "Invalid key entry: '" + entry.getKey() + "' is an invalid symbol (must be 1 character only)." ); + if( " ".equals( entry.getKey() ) ) + throw new JsonSyntaxException( "Invalid key entry: ' ' is a reserved symbol." ); - Map ingMap = Maps.newHashMap(); - for( Map.Entry entry : JsonUtils.getJsonObject( json, "key" ).entrySet() ) - { - if( entry.getKey().length() != 1 ) - throw new JsonSyntaxException( "Invalid key entry: '" + entry.getKey() + "' is an invalid symbol (must be 1 character only)." ); - if( " ".equals( entry.getKey() ) ) - throw new JsonSyntaxException( "Invalid key entry: ' ' is a reserved symbol." ); + ingMap.put( entry.getKey().toCharArray()[0], CraftingHelper.getIngredient( entry.getValue(), context ) ); + } - ingMap.put( entry.getKey().toCharArray()[0], CraftingHelper.getIngredient( entry.getValue(), context ) ); - } + ingMap.put( ' ', net.minecraft.item.crafting.Ingredient.EMPTY ); - ingMap.put( ' ', net.minecraft.item.crafting.Ingredient.EMPTY ); + JsonArray patternJ = JsonUtils.getJsonArray( json, "pattern" ); - JsonArray patternJ = JsonUtils.getJsonArray( json, "pattern" ); + if( patternJ.size() == 0 ) + throw new JsonSyntaxException( "Invalid pattern: empty pattern not allowed" ); - if( patternJ.size() == 0 ) - throw new JsonSyntaxException( "Invalid pattern: empty pattern not allowed" ); + String[] pattern = new String[patternJ.size()]; + for( int x = 0; x < pattern.length; ++x ) + { + String line = JsonUtils.getString( patternJ.get( x ), "pattern[" + x + "]" ); + if( x > 0 && pattern[0].length() != line.length() ) + throw new JsonSyntaxException( "Invalid pattern: each row must be the same width" ); + pattern[x] = line; + } - String[] pattern = new String[patternJ.size()]; - for( int x = 0; x < pattern.length; ++x ) - { - String line = JsonUtils.getString( patternJ.get( x ), "pattern[" + x + "]" ); - if( x > 0 && pattern[0].length() != line.length() ) - throw new JsonSyntaxException( "Invalid pattern: each row must be the same width" ); - pattern[x] = line; - } + CraftingHelper.ShapedPrimer primer = new CraftingHelper.ShapedPrimer(); + primer.width = pattern[0].length(); + primer.height = pattern.length; + primer.mirrored = JsonUtils.getBoolean( json, "mirrored", true ); + primer.input = NonNullList.withSize( primer.width * primer.height, net.minecraft.item.crafting.Ingredient.EMPTY ); - CraftingHelper.ShapedPrimer primer = new CraftingHelper.ShapedPrimer(); - primer.width = pattern[0].length(); - primer.height = pattern.length; - primer.mirrored = JsonUtils.getBoolean( json, "mirrored", true ); - primer.input = NonNullList.withSize( primer.width * primer.height, net.minecraft.item.crafting.Ingredient.EMPTY ); + Set keys = Sets.newHashSet( ingMap.keySet() ); + keys.remove( ' ' ); - Set keys = Sets.newHashSet( ingMap.keySet() ); - keys.remove( ' ' ); + int x = 0; + for( String line : pattern ) + { + for( char chr : line.toCharArray() ) + { + net.minecraft.item.crafting.Ingredient ing = ingMap.get( chr ); + if( ing == null ) + throw new JsonSyntaxException( "Pattern references symbol '" + chr + "' but it's not defined in the key" ); + primer.input.set( x++, ing ); + keys.remove( chr ); + } + } - int x = 0; - for( String line : pattern ) - { - for( char chr : line.toCharArray() ) - { - net.minecraft.item.crafting.Ingredient ing = ingMap.get( chr ); - if( ing == null ) - throw new JsonSyntaxException( "Pattern references symbol '" + chr + "' but it's not defined in the key" ); - primer.input.set( x++, ing ); - keys.remove( chr ); - } - } + if( !keys.isEmpty() ) + throw new JsonSyntaxException( "Key defines symbols that aren't used in pattern: " + keys ); - if( !keys.isEmpty() ) - throw new JsonSyntaxException( "Key defines symbols that aren't used in pattern: " + keys ); + JsonObject resultObject = (JsonObject) json.get( "result" ); + int count = JsonUtils.getInt( resultObject, "count", 1 ); - JsonObject resultObject = (JsonObject) json.get( "result" ); - int count = JsonUtils.getInt( resultObject, "count", 1); + String ingredient = resultObject.get( "part" ).getAsString(); + Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, ingredient ); + if( result instanceof ResolverResult ) + { + ResolverResult resolverResult = (ResolverResult) result; - String ingredient = resultObject.get( "part" ).getAsString(); - Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, ingredient ); - if( result instanceof ResolverResult ) - { - ResolverResult resolverResult = (ResolverResult) result; + Item item = Item.getByNameOrId( AppEng.MOD_ID + ":" + resolverResult.itemName ); + if( item == null ) + { + AELog.warn( "item was null for " + resolverResult.itemName + " ( " + ingredient + " )!" ); + throw new JsonSyntaxException( "Got a null item for " + resolverResult.itemName + " ( " + ingredient + " ). This should never happen!" ); + } + ItemStack itemStack = new ItemStack( item, count, resolverResult.damageValue, resolverResult.compound ); - Item item = Item.getByNameOrId( AppEng.MOD_ID + ":" + resolverResult.itemName ); - if(item == null) - { - AELog.warn( "item was null for " + resolverResult.itemName + " ( " + ingredient + " )!" ); - throw new JsonSyntaxException ( "Got a null item for " + resolverResult.itemName + " ( " + ingredient + " ). This should never happen!" ); - } - ItemStack itemStack = new ItemStack( item, count, resolverResult.damageValue, resolverResult.compound ); + return new PartShapedCraftingFactory( group.isEmpty() ? null : new ResourceLocation( group ), itemStack, primer ); + } - return new PartShapedCraftingFactory( group.isEmpty() ? null : new ResourceLocation( group ), itemStack, primer ); - } - - // Should never reach this part unless mangled JSON or bug in AE. - throw new JsonSyntaxException ( "Couldn't find the resulting item in AE. This means AE was provided a recipe that it shouldn't be handling.\nWas looking for : '" + ingredient + "'." ); - } + // Should never reach this part unless mangled JSON or bug in AE. + throw new JsonSyntaxException( "Couldn't find the resulting item in AE. This means AE was provided a recipe that it shouldn't be handling.\nWas looking for : '" + ingredient + "'." ); + } } \ No newline at end of file diff --git a/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java b/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java index da962ecdf..4f46d61dd 100644 --- a/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java +++ b/src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java @@ -18,6 +18,7 @@ package appeng.recipes.helpers; + import appeng.api.recipes.ResolverResult; import appeng.api.recipes.ResolverResultSet; import appeng.core.AELog; @@ -39,52 +40,52 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import javax.annotation.Nonnull; + /** * @author GuntherDW */ public class PartShapelessCraftingFactory extends ShapelessOreRecipe { - public PartShapelessCraftingFactory( ResourceLocation group, NonNullList input, @Nonnull ItemStack result ) - { - super( group, input, result ); - } + public PartShapelessCraftingFactory( ResourceLocation group, NonNullList input, @Nonnull ItemStack result ) + { + super( group, input, result ); + } - // Copied from ShapelessOreRecipe.java, modified a bit. - public static PartShapelessCraftingFactory factory( JsonContext context, JsonObject json) - { - String group = JsonUtils.getString(json, "group", ""); + // Copied from ShapelessOreRecipe.java, modified a bit. + public static PartShapelessCraftingFactory factory( JsonContext context, JsonObject json ) + { + String group = JsonUtils.getString( json, "group", "" ); - NonNullList ings = NonNullList.create(); - for( JsonElement ele : JsonUtils.getJsonArray( json, "ingredients" ) ) - ings.add( CraftingHelper.getIngredient( ele, context ) ); + NonNullList ings = NonNullList.create(); + for( JsonElement ele : JsonUtils.getJsonArray( json, "ingredients" ) ) + ings.add( CraftingHelper.getIngredient( ele, context ) ); - if( ings.isEmpty() ) - throw new JsonParseException("No ingredients for shapeless recipe"); + if( ings.isEmpty() ) + throw new JsonParseException( "No ingredients for shapeless recipe" ); - JsonObject resultObject = (JsonObject) json.get( "result" ); - int count = JsonUtils.getInt( resultObject, "count", 1); + JsonObject resultObject = (JsonObject) json.get( "result" ); + int count = JsonUtils.getInt( resultObject, "count", 1 ); - String ingredient = resultObject.get( "part" ).getAsString(); - Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, ingredient ); - if( result instanceof ResolverResult ) - { - ResolverResult resolverResult = (ResolverResult) result; + String ingredient = resultObject.get( "part" ).getAsString(); + Object result = (Object) Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, ingredient ); + if( result instanceof ResolverResult ) + { + ResolverResult resolverResult = (ResolverResult) result; - Item item = Item.getByNameOrId( AppEng.MOD_ID + ":" + resolverResult.itemName ); + Item item = Item.getByNameOrId( AppEng.MOD_ID + ":" + resolverResult.itemName ); - if( item == null ) - { - AELog.warn( "item was null for " + resolverResult.itemName + " ( " + ingredient + " )!" ); - throw new JsonSyntaxException ( "Got a null item for " + resolverResult.itemName + " ( " + ingredient + " ). This should never happen!" ); - } + if( item == null ) + { + AELog.warn( "item was null for " + resolverResult.itemName + " ( " + ingredient + " )!" ); + throw new JsonSyntaxException( "Got a null item for " + resolverResult.itemName + " ( " + ingredient + " ). This should never happen!" ); + } - ItemStack itemStack = new ItemStack( item, count, resolverResult.damageValue, resolverResult.compound ); + ItemStack itemStack = new ItemStack( item, count, resolverResult.damageValue, resolverResult.compound ); - return new PartShapelessCraftingFactory(group.isEmpty() ? null : new ResourceLocation(group), ings, itemStack); - } + return new PartShapelessCraftingFactory( group.isEmpty() ? null : new ResourceLocation( group ), ings, itemStack ); + } - throw new JsonSyntaxException( "Couldn't find the resulting item in AE. This means AE was provided a recipe that it shouldn't be handling.\n" - + "Was looking for : '" + ingredient + "'." ); - } + throw new JsonSyntaxException( "Couldn't find the resulting item in AE. This means AE was provided a recipe that it shouldn't be handling.\n" + "Was looking for : '" + ingredient + "'." ); + } } diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 6ebfa7a75..5472e343b 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -343,7 +343,8 @@ public final class CompassService if( closest < Integer.MAX_VALUE ) { - this.callback.calculatedDirection( true, false, CompassService.this.rad( cx, cz, chosen_x, chosen_z ), CompassService.this.dist( cx, cz, chosen_x, chosen_z ) ); + this.callback.calculatedDirection( true, false, CompassService.this.rad( cx, cz, chosen_x, chosen_z ), + CompassService.this.dist( cx, cz, chosen_x, chosen_z ) ); if( CompassService.this.jobSize() < 2 ) { diff --git a/src/main/java/appeng/services/export/ForgeExportConfig.java b/src/main/java/appeng/services/export/ForgeExportConfig.java index accddbe76..261f90aff 100644 --- a/src/main/java/appeng/services/export/ForgeExportConfig.java +++ b/src/main/java/appeng/services/export/ForgeExportConfig.java @@ -76,11 +76,14 @@ public final class ForgeExportConfig implements ExportConfig { this.config = Preconditions.checkNotNull( config ); - this.exportItemNamesEnabled = this.config.getBoolean( EXPORT_ITEM_NAMES_KEY, GENERAL_CATEGORY, EXPORT_ITEM_NAMES_DEFAULT, EXPORT_ITEM_NAMES_DESCRIPTION ); + this.exportItemNamesEnabled = this.config.getBoolean( EXPORT_ITEM_NAMES_KEY, GENERAL_CATEGORY, EXPORT_ITEM_NAMES_DEFAULT, + EXPORT_ITEM_NAMES_DESCRIPTION ); this.cacheEnabled = this.config.getBoolean( ENABLE_CACHE_KEY, CACHE_CATEGORY, ENABLE_CACHE_DEFAULT, ENABLE_CACHE_DESCRIPTION ); - this.additionalInformationEnabled = this.config.getBoolean( ENABLE_ADDITIONAL_INFO_KEY, GENERAL_CATEGORY, ENABLE_ADDITIONAL_INFO_DEFAULT, ENABLE_ADDITIONAL_INFO_DESCRIPTION ); + this.additionalInformationEnabled = this.config.getBoolean( ENABLE_ADDITIONAL_INFO_KEY, GENERAL_CATEGORY, ENABLE_ADDITIONAL_INFO_DEFAULT, + ENABLE_ADDITIONAL_INFO_DESCRIPTION ); this.cache = this.config.getString( DIGEST_KEY, CACHE_CATEGORY, DIGEST_DEFAULT, DIGEST_DESCRIPTION ); - this.forceRefreshEnabled = this.config.getBoolean( ENABLE_FORCE_REFRESH_KEY, GENERAL_CATEGORY, ENABLE_FORCE_REFRESH_DEFAULT, ENABLE_FORCE_REFRESH_DESCRIPTION ); + this.forceRefreshEnabled = this.config.getBoolean( ENABLE_FORCE_REFRESH_KEY, GENERAL_CATEGORY, ENABLE_FORCE_REFRESH_DEFAULT, + ENABLE_FORCE_REFRESH_DESCRIPTION ); } @Override diff --git a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java index e3a52fa41..38ecff9e8 100644 --- a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java +++ b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java @@ -80,7 +80,7 @@ final class MinecraftItemCSVExporter implements Exporter * phase when all items are determined) * @param mode mode in which the export should be operated. Resulting CSV will change depending on this. */ - MinecraftItemCSVExporter(@Nonnull final File exportDirectory, @Nonnull final IForgeRegistry itemRegistry, @Nonnull final ExportMode mode ) + MinecraftItemCSVExporter( @Nonnull final File exportDirectory, @Nonnull final IForgeRegistry itemRegistry, @Nonnull final ExportMode mode ) { this.exportDirectory = Preconditions.checkNotNull( exportDirectory ); Preconditions.checkArgument( !exportDirectory.isFile() ); diff --git a/src/main/java/appeng/services/version/VersionCheckerConfig.java b/src/main/java/appeng/services/version/VersionCheckerConfig.java index a299b8405..996d76509 100644 --- a/src/main/java/appeng/services/version/VersionCheckerConfig.java +++ b/src/main/java/appeng/services/version/VersionCheckerConfig.java @@ -66,13 +66,18 @@ public final class VersionCheckerConfig // initializes default values by caching this.isEnabled = this.config.getBoolean( "enabled", "general", true, "If true, the version checker is enabled. Acts as a master switch." ); - this.lastCheck = this.config.getString( "lastCheck", "cache", "0", "The number of milliseconds since January 1, 1970, 00:00:00 GMT of the last successful check." ); - this.interval = this.config.getInt( "interval", "cache", DEFAULT_INTERVAL_HOURS, MIN_INTERVAL_HOURS, MAX_INTERVAL_HOURS, "Waits as many hours, until it checks again." ); + this.lastCheck = this.config.getString( "lastCheck", "cache", "0", + "The number of milliseconds since January 1, 1970, 00:00:00 GMT of the last successful check." ); + this.interval = this.config.getInt( "interval", "cache", DEFAULT_INTERVAL_HOURS, MIN_INTERVAL_HOURS, MAX_INTERVAL_HOURS, + "Waits as many hours, until it checks again." ); - this.level = this.config.getString( "level", "channel", "Beta", "Determines the channel level which should be checked for updates. Can be either Stable, Beta or Alpha." ); + this.level = this.config.getString( "level", "channel", "Beta", + "Determines the channel level which should be checked for updates. Can be either Stable, Beta or Alpha." ); - this.shouldNotifyPlayer = this.config.getBoolean( "notify", "client", true, "If true, the player is getting a notification, that a new version is available." ); - this.shouldPostChangelog = this.config.getBoolean( "changelog", "client", true, "If true, the player is getting a notification including changelog. Only happens if notification are enabled." ); + this.shouldNotifyPlayer = this.config.getBoolean( "notify", "client", true, + "If true, the player is getting a notification, that a new version is available." ); + this.shouldPostChangelog = this.config.getBoolean( "changelog", "client", true, + "If true, the player is getting a notification including changelog. Only happens if notification are enabled." ); } public boolean isVersionCheckingEnabled() diff --git a/src/main/java/appeng/services/version/VersionParser.java b/src/main/java/appeng/services/version/VersionParser.java index d256f2593..baed475f4 100644 --- a/src/main/java/appeng/services/version/VersionParser.java +++ b/src/main/java/appeng/services/version/VersionParser.java @@ -156,7 +156,8 @@ public final class VersionParser */ private Channel parseChannel( @Nonnull final String rawChannel ) throws InvalidChannelException { - if( !( rawChannel.equalsIgnoreCase( Channel.Alpha.name() ) || rawChannel.equalsIgnoreCase( Channel.Beta.name() ) || rawChannel.equalsIgnoreCase( Channel.Stable.name() ) ) ) + if( !( rawChannel.equalsIgnoreCase( Channel.Alpha.name() ) || rawChannel.equalsIgnoreCase( Channel.Beta.name() ) || rawChannel + .equalsIgnoreCase( Channel.Stable.name() ) ) ) { throw new InvalidChannelException(); } diff --git a/src/main/java/appeng/spatial/BiomeGenStorage.java b/src/main/java/appeng/spatial/BiomeGenStorage.java index b48adc406..507d7fb8f 100644 --- a/src/main/java/appeng/spatial/BiomeGenStorage.java +++ b/src/main/java/appeng/spatial/BiomeGenStorage.java @@ -18,14 +18,16 @@ package appeng.spatial; + import net.minecraft.world.biome.Biome; + public class BiomeGenStorage extends Biome { public BiomeGenStorage() { - super(new BiomeProperties( "Storage Cell" ).setRainDisabled().setTemperature( -100 )); + super( new BiomeProperties( "Storage Cell" ).setRainDisabled().setTemperature( -100 ) ); this.decorator.treesPerChunk = 0; this.decorator.flowersPerChunk = 0; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 44f45777c..81890e508 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -112,7 +112,8 @@ public class CachedPlane { for( int z = 0; z < this.z_size; z++ ) { - this.myColumns[x][z] = new Column( w.getChunkFromChunkCoords( ( minX + x ) >> 4, ( minZ + z ) >> 4 ), ( minX + x ) & 0xF, ( minZ + z ) & 0xF, minCY, cy_size ); + this.myColumns[x][z] = new Column( w.getChunkFromChunkCoords( ( minX + x ) >> 4, + ( minZ + z ) >> 4 ), ( minX + x ) & 0xF, ( minZ + z ) & 0xF, minCY, cy_size ); } } @@ -135,7 +136,8 @@ public class CachedPlane final TileEntity te = tx.getValue(); final BlockPos tePOS = te.getPos(); - if( tePOS.getX() >= minX && tePOS.getX() <= maxX && tePOS.getY() >= minY && tePOS.getY() <= maxY && tePOS.getZ() >= minZ && tePOS.getZ() <= maxZ ) + if( tePOS.getX() >= minX && tePOS.getX() <= maxX && tePOS.getY() >= minY && tePOS.getY() <= maxY && tePOS.getZ() >= minZ && tePOS + .getZ() <= maxZ ) { if( mr.askToMove( te ) ) { @@ -148,7 +150,8 @@ public class CachedPlane final Block blk = (Block) details[0]; // don't skip air, just let the code replace it... - if( blk != null && blk.isAir( c.getWorld().getBlockState( tePOS ), c.getWorld(), tePOS ) && blk.isReplaceable( c.getWorld(), tePOS ) ) + if( blk != null && blk.isAir( c.getWorld().getBlockState( tePOS ), c.getWorld(), tePOS ) && blk.isReplaceable( c.getWorld(), + tePOS ) ) { c.getWorld().setBlockToAir( tePOS ); } @@ -173,7 +176,8 @@ public class CachedPlane { final NextTickListEntry entry = (NextTickListEntry) o; final BlockPos tePOS = entry.position; - if( tePOS.getX() >= minX && tePOS.getX() <= maxX && tePOS.getY() >= minY && tePOS.getY() <= maxY && tePOS.getZ() >= minZ && tePOS.getZ() <= maxZ ) + if( tePOS.getX() >= minX && tePOS.getX() <= maxX && tePOS.getY() >= minY && tePOS.getY() <= maxY && tePOS.getZ() >= minZ && tePOS + .getZ() <= maxZ ) { final NextTickListEntry newEntry = new NextTickListEntry( tePOS, entry.getBlock() ); newEntry.scheduledTime = entry.scheduledTime - k; diff --git a/src/main/java/appeng/spatial/StorageWorldProvider.java b/src/main/java/appeng/spatial/StorageWorldProvider.java index 90ad339d4..c38f62c5b 100644 --- a/src/main/java/appeng/spatial/StorageWorldProvider.java +++ b/src/main/java/appeng/spatial/StorageWorldProvider.java @@ -47,7 +47,7 @@ public class StorageWorldProvider extends WorldProvider biome = AppEng.instance().getRegistration().getStorageBiome(); this.biomeProvider = new BiomeProviderSingle( biome ); } - + @Override public IChunkGenerator createChunkGenerator() { diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index aefba6d4a..03ee8d72f 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -130,7 +130,8 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor } @Override - public boolean hasCustomName() { + public boolean hasCustomName() + { return this.hasCustomInventoryName(); } @@ -145,7 +146,8 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor { final double squaredMCReach = 64.0D; - return this.world.getTileEntity( this.pos ) == this && p.getDistanceSq( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D ) <= squaredMCReach; + return this.world.getTileEntity( this.pos ) == this && p.getDistanceSq( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, + this.pos.getZ() + 0.5D ) <= squaredMCReach; } @Override diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index d16f25b61..609a6bc1e 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -552,7 +552,8 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade { try { - return (int) ( this.getProxy().getEnergy().extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, PowerMultiplier.CONFIG ) / acceleratorTax ); + return (int) ( this.getProxy().getEnergy().extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, + PowerMultiplier.CONFIG ) / acceleratorTax ); } catch( final GridAccessException e ) { diff --git a/src/main/java/appeng/tile/events/TileEventType.java b/src/main/java/appeng/tile/events/TileEventType.java index 4f8e12723..e0db474fd 100644 --- a/src/main/java/appeng/tile/events/TileEventType.java +++ b/src/main/java/appeng/tile/events/TileEventType.java @@ -21,7 +21,8 @@ package appeng.tile.events; public enum TileEventType { - WORLD_NBT_READ, WORLD_NBT_WRITE, + WORLD_NBT_READ, + WORLD_NBT_WRITE, /** * Methods annotated with this need to return a boolean diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index fa372f501..37d16d283 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -168,7 +168,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable final double xOff = -0.15 * this.getUp().getFrontOffsetX(); final double yOff = -0.15 * this.getUp().getFrontOffsetY(); final double zOff = -0.15 * this.getUp().getFrontOffsetZ(); - out.add( new AxisAlignedBB( xOff + 0.15, yOff + 0.15, zOff + 0.15,// ahh + out.add( new AxisAlignedBB( xOff + 0.15, yOff + 0.15, zOff + 0.15, // ahh xOff + 0.85, yOff + 0.85, zOff + 0.85 ) ); } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java index eda954bee..385a340ae 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java @@ -113,7 +113,8 @@ public class AppEngInternalInventory implements IInventory, Iterable return ItemStack.EMPTY; } - private ItemStack getOldStack( int slot ) { + private ItemStack getOldStack( int slot ) + { if( this.inv[slot] == null ) return ItemStack.EMPTY; @@ -123,7 +124,7 @@ public class AppEngInternalInventory implements IInventory, Iterable @Override public void setInventorySlotContents( final int slot, final ItemStack newItemStack ) { - final ItemStack oldStack = getOldStack(slot); + final ItemStack oldStack = getOldStack( slot ); this.inv[slot] = newItemStack; if( this.getTileEntity() != null && this.eventsEnabled() ) diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index d52490ad0..db97dbc33 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -257,7 +257,8 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid { try { - this.injectExternalPower( PowerUnits.AE, this.getProxy().getEnergy().extractAEPower( Math.min( 500.0, 1500.0 - this.getInternalCurrentPower() ), Actionable.MODULATE, PowerMultiplier.ONE ) ); + this.injectExternalPower( PowerUnits.AE, this.getProxy().getEnergy().extractAEPower( Math.min( 500.0, 1500.0 - this.getInternalCurrentPower() ), + Actionable.MODULATE, PowerMultiplier.ONE ) ); } catch( final GridAccessException e ) { diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index db13ed238..1b9be6e6f 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -118,7 +118,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, final double requiredPower = this.getRequiredPower(); final ItemStack output = this.getOutput(); - while( requiredPower <= this.getStoredPower() && !output.isEmpty() && requiredPower > 0 ) + while( requiredPower <= this.getStoredPower() && !output.isEmpty() && requiredPower > 0 ) { if( this.canAddOutput( output ) ) { diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index 463f752f0..b2b7b9f84 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -293,21 +293,21 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, // :P } } -// -// @Override -// public boolean canInsertItem( final int slotIndex, final ItemStack insertingItem, final EnumFacing side ) -// { -// if( !this.isItemValidForSlot( slotIndex, insertingItem ) ) -// { -// return false; -// } -// if( !getStackInSlot( slotIndex ).isEmpty() ) -// { -// return false; -// } -// return true; -// } - + // + // @Override + // public boolean canInsertItem( final int slotIndex, final ItemStack insertingItem, final EnumFacing side ) + // { + // if( !this.isItemValidForSlot( slotIndex, insertingItem ) ) + // { + // return false; + // } + // if( !getStackInSlot( slotIndex ).isEmpty() ) + // { + // return false; + // } + // return true; + // } + @Override public boolean canExtractItem( final int slotIndex, final ItemStack extractedItem, final EnumFacing side ) { diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 2574d67c2..3267bb0d0 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -347,8 +347,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II @Override public boolean hasCapability( Capability capability, @Nullable EnumFacing facing ) { - return this.duality.hasCapability( capability, facing ) - || super.hasCapability( capability, facing ); + return this.duality.hasCapability( capability, facing ) || super.hasCapability( capability, facing ); } @Override diff --git a/src/main/java/appeng/tile/networking/TileEnergyCell.java b/src/main/java/appeng/tile/networking/TileEnergyCell.java index 89c4ba168..e6621dd9e 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileEnergyCell.java @@ -69,7 +69,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage * Given a fill factor, return the storage level (0-7) used for the state of the block. * This is also used for determining the item model. */ - public static int getStorageLevelFromFillFactor( double fillFactor ) { + public static int getStorageLevelFromFillFactor( double fillFactor ) + { byte boundMetadata = (byte) ( 8.0 * ( fillFactor ) ); if( boundMetadata > 7 ) diff --git a/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java b/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java index 538155111..c6e3380a5 100644 --- a/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java +++ b/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java @@ -1,5 +1,5 @@ -package appeng.tile.powersink; +package appeng.tile.powersink; import net.minecraftforge.energy.IEnergyStorage; @@ -41,7 +41,7 @@ class ForgeEnergyAdapter implements IEnergyStorage } @Override - public final int getMaxEnergyStored( ) + public final int getMaxEnergyStored() { return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, sink.getAEMaxPower() ) ); } diff --git a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java index ecf85828f..a48843754 100644 --- a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java +++ b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java @@ -15,6 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Applied Energistics 2. If not, see . */ + package appeng.tile.powersink; diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index bab2decbc..fde14bd2f 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -142,7 +142,11 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock private boolean isCenter() { - return AEApi.instance().definitions().blocks().quantumLink().maybeBlock() + return AEApi.instance() + .definitions() + .blocks() + .quantumLink() + .maybeBlock() .map( link -> getBlockType() == link ) .orElse( false ); } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 57d031658..aa5a73cd2 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -970,13 +970,12 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal } } - - @Override - public boolean isEmpty() - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isEmpty() + { + // TODO Auto-generated method stub + return false; + } private class FluidHandler implements IFluidHandler { diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index c9338f0f1..3c4cc70e7 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -241,7 +241,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior @MENetworkEventSubscribe public void channelRender( final MENetworkChannelsChanged c ) { - this.recalculateDisplay(); + this.recalculateDisplay(); } @Override diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index 73be1829a..46554db90 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -92,8 +92,10 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC private final ConfigManager manager; - private final int[] input = { INPUT_SLOT_INDEX_TOP_LEFT, INPUT_SLOT_INDEX_TOP_RIGHT, INPUT_SLOT_INDEX_CENTER_LEFT, INPUT_SLOT_INDEX_CENTER_RIGHT, INPUT_SLOT_INDEX_BOTTOM_LEFT, INPUT_SLOT_INDEX_BOTTOM_RIGHT }; - private final int[] output = { OUTPUT_SLOT_INDEX_TOP_LEFT, OUTPUT_SLOT_INDEX_TOP_RIGHT, OUTPUT_SLOT_INDEX_CENTER_LEFT, OUTPUT_SLOT_INDEX_CENTER_RIGHT, OUTPUT_SLOT_INDEX_BOTTOM_LEFT, OUTPUT_SLOT_INDEX_BOTTOM_RIGHT }; + private final int[] input = { INPUT_SLOT_INDEX_TOP_LEFT, INPUT_SLOT_INDEX_TOP_RIGHT, INPUT_SLOT_INDEX_CENTER_LEFT, INPUT_SLOT_INDEX_CENTER_RIGHT, + INPUT_SLOT_INDEX_BOTTOM_LEFT, INPUT_SLOT_INDEX_BOTTOM_RIGHT }; + private final int[] output = { OUTPUT_SLOT_INDEX_TOP_LEFT, OUTPUT_SLOT_INDEX_TOP_RIGHT, OUTPUT_SLOT_INDEX_CENTER_LEFT, OUTPUT_SLOT_INDEX_CENTER_RIGHT, + OUTPUT_SLOT_INDEX_BOTTOM_LEFT, OUTPUT_SLOT_INDEX_BOTTOM_RIGHT }; private final AppEngInternalInventory cells; private final UpgradeInventory upgrades; diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index fc2b93273..f19221be4 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -134,7 +134,8 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable if( this.getPlayerOpen() == 1 ) { - this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_OPEN, + SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } @@ -157,7 +158,8 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable if( this.getPlayerOpen() == 0 ) { - this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_CLOSE, SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_CLOSE, + SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java index a137bc491..8f779e3c7 100644 --- a/src/main/java/appeng/util/InventoryAdaptor.java +++ b/src/main/java/appeng/util/InventoryAdaptor.java @@ -42,8 +42,10 @@ import appeng.util.inv.WrapperMCISidedInventory; /** - * Universal Facade for other inventories. Used to conveniently interact with various types of inventories. This is not used for - * actually monitoring an inventory. It is just for insertion and extraction, and is primarily used by import/export buses. + * Universal Facade for other inventories. Used to conveniently interact with various types of inventories. This is not + * used for + * actually monitoring an inventory. It is just for insertion and extraction, and is primarily used by import/export + * buses. */ public abstract class InventoryAdaptor implements Iterable { @@ -56,7 +58,7 @@ public abstract class InventoryAdaptor implements Iterable return null; } - if ( te instanceof ICapabilityProvider ) + if( te instanceof ICapabilityProvider ) { ICapabilityProvider capProvider = (ICapabilityProvider) te; diff --git a/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java index fbfc05574..b0039be74 100644 --- a/src/main/java/appeng/util/ItemSorters.java +++ b/src/main/java/appeng/util/ItemSorters.java @@ -33,7 +33,8 @@ 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 ) @@ -45,7 +46,8 @@ 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 ) @@ -70,7 +72,8 @@ 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 ) @@ -83,7 +86,8 @@ 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/LookDirection.java b/src/main/java/appeng/util/LookDirection.java index 33ea42b2b..9d5507d3c 100644 --- a/src/main/java/appeng/util/LookDirection.java +++ b/src/main/java/appeng/util/LookDirection.java @@ -18,8 +18,10 @@ package appeng.util; + import net.minecraft.util.math.Vec3d; + public class LookDirection { diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index cacd4eaad..6e4f47489 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -698,7 +698,8 @@ public class Platform try { - ITooltipFlag.TooltipFlags tooltipFlag = Minecraft.getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL; + ITooltipFlag.TooltipFlags tooltipFlag = Minecraft + .getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL; return itemStack.getTooltip( Minecraft.getMinecraft().player, tooltipFlag ); } catch( final Exception errB ) @@ -1803,14 +1804,14 @@ public class Platform return (float) ( player.posY + player.getEyeHeight() - player.getDefaultEyeHeight() ); } -// public static void addStat( final int playerID, final Achievement achievement ) -// { -// final EntityPlayer p = AEApi.instance().registries().players().findPlayer( playerID ); -// if( p != null ) -// { -// p.addStat( achievement, 1 ); -// } -// } + // public static void addStat( final int playerID, final Achievement achievement ) + // { + // final EntityPlayer p = AEApi.instance().registries().players().findPlayer( playerID ); + // if( p != null ) + // { + // p.addStat( achievement, 1 ); + // } + // } public static boolean isRecipePrioritized( final ItemStack what ) { diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index e5b5e94c8..236311473 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -87,13 +87,15 @@ public class ItemComparisonHelper */ public boolean isEqualItem( @Nonnull final ItemStack left, @Nonnull final ItemStack right ) { - return this.isItemEqual(left, right); + return this.isItemEqual( left, right ); } /** - * A slightly different method from ItemStack.java to skip the isEmpty() check. This allows you to check for identical empty spots.. + * A slightly different method from ItemStack.java to skip the isEmpty() check. This allows you to check for + * identical empty spots.. */ - public boolean isItemEqual( ItemStack left, ItemStack right ) { + public boolean isItemEqual( ItemStack left, ItemStack right ) + { return left.getItem() == right.getItem() && left.getItemDamage() == right.getItemDamage(); } @@ -395,7 +397,8 @@ public class ItemComparisonHelper return true; } - if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb.hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) ) + if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb + .hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) ) { return true; } diff --git a/src/main/java/appeng/util/inv/ItemSlot.java b/src/main/java/appeng/util/inv/ItemSlot.java index c4780771c..c5e157d4e 100644 --- a/src/main/java/appeng/util/inv/ItemSlot.java +++ b/src/main/java/appeng/util/inv/ItemSlot.java @@ -36,7 +36,8 @@ public class ItemSlot public ItemStack getItemStack() { - return this.itemStack.isEmpty() ? ( this.aeItemStack == null ? ItemStack.EMPTY : ( this.itemStack = this.aeItemStack.getItemStack() ) ) : this.itemStack; + return this.itemStack + .isEmpty() ? ( this.aeItemStack == null ? ItemStack.EMPTY : ( this.itemStack = this.aeItemStack.getItemStack() ) ) : this.itemStack; } public void setItemStack( final ItemStack is ) diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index c7c94c34b..04e1b7432 100644 --- a/src/main/java/appeng/util/item/AEFluidStack.java +++ b/src/main/java/appeng/util/item/AEFluidStack.java @@ -150,7 +150,8 @@ public final class AEFluidStack extends AEStack implements IAEFlu final FluidStack fluidStack = FluidStack.loadFluidStackFromNBT( d ); - if (!showCraftingLabel) { + if( !showCraftingLabel ) + { showCraftingLabel = stackSize == 0; } @@ -321,7 +322,8 @@ public final class AEFluidStack extends AEStack implements IAEFlu return true; } - if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb.hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) ) + if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb + .hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) ) { return true; } diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 21d89a72c..e010c2eb9 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -167,7 +167,7 @@ public final class AEItemStack extends AEStack implements IAEItemS short itemNumericId = data.readShort(); d.setString( "id", String.valueOf( itemNumericId ) ); d.setShort( "Damage", data.readShort() ); - d.setByte( "Count", (byte) 1 ); // 1 Because vanilla'll freak out otherwise + d.setByte( "Count", (byte) 1 ); // 1 Because vanilla'll freak out otherwise if( hasTagCompound ) { @@ -186,7 +186,8 @@ public final class AEItemStack extends AEStack implements IAEItemS final ItemStack itemstack = new ItemStack( d ); - if(!showCraftingLabel) { + if( !showCraftingLabel ) + { showCraftingLabel = stackSize == 0 && isCraftable; } @@ -448,7 +449,8 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public ItemStack getItemStack() { - final ItemStack is = new ItemStack( this.getDefinition().getItem(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ), this.getDefinition().getDamageValue() ); + final ItemStack is = new ItemStack( this.getDefinition().getItem(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ), this.getDefinition() + .getDamageValue() ); if( this.getDefinition().getTagCompound() != null ) { is.setTagCompound( this.getDefinition().getTagCompound().getNBTTagCompoundCopy() ); @@ -524,7 +526,8 @@ public final class AEItemStack extends AEStack implements IAEItemS return true; } - if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb.hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) ) + if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb + .hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) ) { return true; } @@ -577,7 +580,8 @@ public final class AEItemStack extends AEStack implements IAEItemS private int compareNBT( final AEItemDef b ) { - final int nbt = this.compare( ( this.getDefinition().getTagCompound() == null ? 0 : this.getDefinition().getTagCompound().getHash() ), ( b.getTagCompound() == null ? 0 : b.getTagCompound().getHash() ) ); + final int nbt = this.compare( ( this.getDefinition().getTagCompound() == null ? 0 : this.getDefinition().getTagCompound().getHash() ), + ( b.getTagCompound() == null ? 0 : b.getTagCompound().getHash() ) ); if( nbt == 0 ) { return this.compare( System.identityHashCode( this.getDefinition().getTagCompound() ), System.identityHashCode( b.getTagCompound() ) ); @@ -611,7 +615,7 @@ public final class AEItemStack extends AEStack implements IAEItemS return this.getDefinition().getDisplayName(); } - + @SideOnly( Side.CLIENT ) public String getModID() { diff --git a/src/main/java/appeng/util/item/AEStack.java b/src/main/java/appeng/util/item/AEStack.java index 1439663ad..ed3ab901e 100644 --- a/src/main/java/appeng/util/item/AEStack.java +++ b/src/main/java/appeng/util/item/AEStack.java @@ -109,12 +109,14 @@ public abstract class AEStack implements IAEStack implements IAEStack> 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/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index 84ccddd8d..28f756f7b 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -204,7 +204,8 @@ public final class MeteoritePlacer } } - for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, new AxisAlignedBB( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) ) + for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, + new AxisAlignedBB( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) ) { final Entity e = (Entity) o; e.setDead(); @@ -214,7 +215,6 @@ public final class MeteoritePlacer private void placeMeteorite( final IMeteoriteWorld w, final int x, final int y, final int z ) { - // spawn meteor this.skyStoneDefinition.maybeBlock().ifPresent( block -> placeMeteoriteSkyStone( w, x, y, z, block ) ); diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 0c380d48b..f0ff71b8e 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -56,7 +56,7 @@ public final class QuartzWorldGen implements IWorldGenerator } @Override - public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider ) + public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider ) { int seaLevel = w.provider.getAverageGroundLevel() + 1;