diff --git a/block/AEBaseBlock.java b/block/AEBaseBlock.java index 7f748db7..7c00b6ab 100644 --- a/block/AEBaseBlock.java +++ b/block/AEBaseBlock.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import appeng.client.texture.FlippableIcon; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -36,7 +37,6 @@ import appeng.block.networking.BlockCableBus; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; import appeng.client.render.WorldRender; -import appeng.client.texture.FlipableIcon; import appeng.client.texture.MissingIcon; import appeng.core.features.AEFeature; import appeng.core.features.AEFeatureHandler; @@ -94,11 +94,11 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @SideOnly(Side.CLIENT) - private FlipableIcon optionaIcon(IIconRegister ir, String Name, IIcon substitute) + private FlippableIcon optionalIcon(IIconRegister ir, String Name, IIcon substitute) { // if the input is an flippable IIcon find the original. - while (substitute instanceof FlipableIcon) - substitute = ((FlipableIcon) substitute).getOriginal(); + while (substitute instanceof FlippableIcon) + substitute = ((FlippableIcon) substitute).getOriginal(); if ( substitute != null ) { @@ -110,15 +110,15 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc ); if ( res != null ) - return new FlipableIcon( ir.registerIcon( Name ) ); + return new FlippableIcon( ir.registerIcon( Name ) ); } catch (Throwable e) { - return new FlipableIcon( substitute ); + return new FlippableIcon( substitute ); } } - return new FlipableIcon( ir.registerIcon( Name ) ); + return new FlippableIcon( ir.registerIcon( Name ) ); } @Override @@ -126,21 +126,21 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature public void registerBlockIcons(IIconRegister iconRegistry) { BlockRenderInfo info = getRendererInstance(); - FlipableIcon topIcon; - FlipableIcon bottomIcon; - FlipableIcon sideIcon; - FlipableIcon eastIcon; - FlipableIcon westIcon; - FlipableIcon southIcon; - FlipableIcon northIcon; + FlippableIcon topIcon; + FlippableIcon bottomIcon; + FlippableIcon sideIcon; + FlippableIcon eastIcon; + FlippableIcon westIcon; + FlippableIcon southIcon; + FlippableIcon northIcon; - this.blockIcon = topIcon = optionaIcon( iconRegistry, this.getTextureName(), null ); - bottomIcon = optionaIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon ); - sideIcon = optionaIcon( iconRegistry, this.getTextureName() + "Side", topIcon ); - eastIcon = optionaIcon( iconRegistry, this.getTextureName() + "East", sideIcon ); - westIcon = optionaIcon( iconRegistry, this.getTextureName() + "West", sideIcon ); - southIcon = optionaIcon( iconRegistry, this.getTextureName() + "Front", sideIcon ); - northIcon = optionaIcon( iconRegistry, this.getTextureName() + "Back", sideIcon ); + this.blockIcon = topIcon = optionalIcon( iconRegistry, this.getTextureName(), null ); + bottomIcon = optionalIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon ); + sideIcon = optionalIcon( iconRegistry, this.getTextureName() + "Side", topIcon ); + eastIcon = optionalIcon( iconRegistry, this.getTextureName() + "East", sideIcon ); + westIcon = optionalIcon( iconRegistry, this.getTextureName() + "West", sideIcon ); + southIcon = optionalIcon( iconRegistry, this.getTextureName() + "Front", sideIcon ); + northIcon = optionalIcon( iconRegistry, this.getTextureName() + "Back", sideIcon ); info.updateIcons( bottomIcon, topIcon, northIcon, southIcon, eastIcon, westIcon ); } @@ -148,7 +148,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature public void registerNoIcons() { BlockRenderInfo info = getRendererInstance(); - FlipableIcon i = new FlipableIcon( new MissingIcon( this ) ); + FlippableIcon i = new FlippableIcon( new MissingIcon( this ) ); info.updateIcons( i, i, i, i, i, i ); } @@ -173,7 +173,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature return getIcon( mapRotation( w, x, y, z, s ), w.getBlockMetadata( x, y, z ) ); } - protected void setTileEntiy(Class c) + protected void setTileEntity(Class c) { AEBaseTile.registerTileItem( c, new ItemStackSrc( this, 0 ) ); GameRegistry.registerTileEntity( tileEntityType = c, FeatureFullname ); @@ -181,7 +181,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature setTileProvider( hasBlockTileEntity() ); } - protected void setfeature(EnumSet f) + protected void setFeature(EnumSet f) { feature = new AEFeatureHandler( f, this, FeatureSubname ); } @@ -475,7 +475,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature if ( collisionHandler != null ) { - Iterable bbs = collisionHandler.getSelectedBoundingBoxsFromPool( w, x, y, z, null, true ); + Iterable bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, true ); MovingObjectPosition br = null; double lastDist = 0; @@ -537,7 +537,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature EntityPlayer player = Minecraft.getMinecraft().thePlayer; LookDirection ld = Platform.getPlayerRay( player, Platform.getEyeOffset( player ) ); - Iterable bbs = collisionHandler.getSelectedBoundingBoxsFromPool( w, x, y, z, Minecraft.getMinecraft().thePlayer, true ); + Iterable bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, Minecraft.getMinecraft().thePlayer, true ); AxisAlignedBB br = null; double lastDist = 0; @@ -572,7 +572,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } } - for (AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxsFromPool( w, x, y, z, null, false )) + for (AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, false )) { if ( b == null ) b = bx; diff --git a/block/crafting/BlockCraftingMonitor.java b/block/crafting/BlockCraftingMonitor.java index 567a0dfa..1cc696d8 100644 --- a/block/crafting/BlockCraftingMonitor.java +++ b/block/crafting/BlockCraftingMonitor.java @@ -18,7 +18,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit public BlockCraftingMonitor() { super( BlockCraftingMonitor.class ); - setTileEntiy( TileCraftingMonitorTile.class ); + setTileEntity( TileCraftingMonitorTile.class ); } @Override diff --git a/block/crafting/BlockCraftingStorage.java b/block/crafting/BlockCraftingStorage.java index af67349d..61f6992c 100644 --- a/block/crafting/BlockCraftingStorage.java +++ b/block/crafting/BlockCraftingStorage.java @@ -14,7 +14,7 @@ public class BlockCraftingStorage extends BlockCraftingUnit public BlockCraftingStorage() { super( BlockCraftingStorage.class ); - setTileEntiy( TileCraftingStorageTile.class ); + setTileEntity( TileCraftingStorageTile.class ); } @Override diff --git a/block/crafting/BlockCraftingUnit.java b/block/crafting/BlockCraftingUnit.java index 8a387487..cb8eb813 100644 --- a/block/crafting/BlockCraftingUnit.java +++ b/block/crafting/BlockCraftingUnit.java @@ -30,12 +30,12 @@ public class BlockCraftingUnit extends AEBaseBlock public BlockCraftingUnit(Class childClass) { super( childClass, Material.iron ); hasSubtypes = true; - setfeature( EnumSet.of( AEFeature.CraftingCPU ) ); + setFeature( EnumSet.of( AEFeature.CraftingCPU ) ); } public BlockCraftingUnit() { this( BlockCraftingUnit.class ); - setTileEntiy( TileCraftingTile.class ); + setTileEntity( TileCraftingTile.class ); } @Override diff --git a/block/crafting/BlockMolecularAssembler.java b/block/crafting/BlockMolecularAssembler.java index 4c9b69e5..e23d1863 100644 --- a/block/crafting/BlockMolecularAssembler.java +++ b/block/crafting/BlockMolecularAssembler.java @@ -21,8 +21,8 @@ public class BlockMolecularAssembler extends AEBaseBlock public BlockMolecularAssembler() { super( BlockMolecularAssembler.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.MolecularAssembler ) ); - setTileEntiy( TileMolecularAssembler.class ); + setFeature( EnumSet.of( AEFeature.MolecularAssembler ) ); + setTileEntity( TileMolecularAssembler.class ); isOpaque = false; lightOpacity = 1; } diff --git a/block/grindstone/BlockCrank.java b/block/grindstone/BlockCrank.java index 578a1338..0dde5424 100644 --- a/block/grindstone/BlockCrank.java +++ b/block/grindstone/BlockCrank.java @@ -25,8 +25,8 @@ public class BlockCrank extends AEBaseBlock public BlockCrank() { super( BlockCrank.class, Material.wood ); - setfeature( EnumSet.of( AEFeature.GrindStone ) ); - setTileEntiy( TileCrank.class ); + setFeature( EnumSet.of( AEFeature.GrindStone ) ); + setTileEntity( TileCrank.class ); setLightOpacity( 0 ); isFullSize = isOpaque = false; } diff --git a/block/grindstone/BlockGrinder.java b/block/grindstone/BlockGrinder.java index f75cf057..b0b1632b 100644 --- a/block/grindstone/BlockGrinder.java +++ b/block/grindstone/BlockGrinder.java @@ -17,8 +17,8 @@ public class BlockGrinder extends AEBaseBlock public BlockGrinder() { super( BlockGrinder.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.GrindStone ) ); - setTileEntiy( TileGrinder.class ); + setFeature( EnumSet.of( AEFeature.GrindStone ) ); + setTileEntity( TileGrinder.class ); setHardness( 3.2F ); } diff --git a/block/misc/BlockCellWorkbench.java b/block/misc/BlockCellWorkbench.java index 6647a5a9..468eb690 100644 --- a/block/misc/BlockCellWorkbench.java +++ b/block/misc/BlockCellWorkbench.java @@ -17,8 +17,8 @@ public class BlockCellWorkbench extends AEBaseBlock public BlockCellWorkbench() { super( BlockCellWorkbench.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.StorageCells ) ); - setTileEntiy( TileCellWorkbench.class ); + setFeature( EnumSet.of( AEFeature.StorageCells ) ); + setTileEntity( TileCellWorkbench.class ); } @Override diff --git a/block/misc/BlockCharger.java b/block/misc/BlockCharger.java index 39bf9e86..08e59b43 100644 --- a/block/misc/BlockCharger.java +++ b/block/misc/BlockCharger.java @@ -33,8 +33,8 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision public BlockCharger() { super( BlockCharger.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Core ) ); - setTileEntiy( TileCharger.class ); + setFeature( EnumSet.of( AEFeature.Core ) ); + setTileEntity( TileCharger.class ); setLightOpacity( 2 ); isFullSize = isOpaque = false; } @@ -98,7 +98,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileCharger tile = getTileEntity( w, x, y, z ); if ( tile != null ) diff --git a/block/misc/BlockCondenser.java b/block/misc/BlockCondenser.java index 89bddecb..d14ca7da 100644 --- a/block/misc/BlockCondenser.java +++ b/block/misc/BlockCondenser.java @@ -17,8 +17,8 @@ public class BlockCondenser extends AEBaseBlock public BlockCondenser() { super( BlockCondenser.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Core ) ); - setTileEntiy( TileCondenser.class ); + setFeature( EnumSet.of( AEFeature.Core ) ); + setTileEntity( TileCondenser.class ); } @Override diff --git a/block/misc/BlockInscriber.java b/block/misc/BlockInscriber.java index caca7a6c..e161d0f9 100644 --- a/block/misc/BlockInscriber.java +++ b/block/misc/BlockInscriber.java @@ -19,8 +19,8 @@ public class BlockInscriber extends AEBaseBlock public BlockInscriber() { super( BlockInscriber.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Inscriber ) ); - setTileEntiy( TileInscriber.class ); + setFeature( EnumSet.of( AEFeature.Inscriber ) ); + setTileEntity( TileInscriber.class ); setLightOpacity( 2 ); isFullSize = isOpaque = false; } diff --git a/block/misc/BlockInterface.java b/block/misc/BlockInterface.java index e4a3312c..7c811002 100644 --- a/block/misc/BlockInterface.java +++ b/block/misc/BlockInterface.java @@ -20,8 +20,8 @@ public class BlockInterface extends AEBaseBlock public BlockInterface() { super( BlockInterface.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Core ) ); - setTileEntiy( TileInterface.class ); + setFeature( EnumSet.of( AEFeature.Core ) ); + setTileEntity( TileInterface.class ); } @Override diff --git a/block/misc/BlockLightDetector.java b/block/misc/BlockLightDetector.java index 87abae00..575f6a5d 100644 --- a/block/misc/BlockLightDetector.java +++ b/block/misc/BlockLightDetector.java @@ -15,8 +15,8 @@ public class BlockLightDetector extends BlockQuartzTorch public BlockLightDetector() { super( BlockLightDetector.class ); - setfeature( EnumSet.of( AEFeature.LightDetector ) ); - setTileEntiy( TileLightDetector.class ); + setFeature( EnumSet.of( AEFeature.LightDetector ) ); + setTileEntity( TileLightDetector.class ); } @Override diff --git a/block/misc/BlockPaint.java b/block/misc/BlockPaint.java index e0b46e7e..35de99a1 100644 --- a/block/misc/BlockPaint.java +++ b/block/misc/BlockPaint.java @@ -24,8 +24,8 @@ public class BlockPaint extends AEBaseBlock public BlockPaint() { super( BlockPaint.class, new MaterialLiquid( MapColor.airColor ) ); - setfeature( EnumSet.of( AEFeature.PaintBalls ) ); - setTileEntiy( TilePaint.class ); + setFeature( EnumSet.of( AEFeature.PaintBalls ) ); + setTileEntity( TilePaint.class ); setLightOpacity( 0 ); isFullSize = false; isOpaque = false; diff --git a/block/misc/BlockQuartzGrowthAccelerator.java b/block/misc/BlockQuartzGrowthAccelerator.java index 3bd4f3c9..1e9931a6 100644 --- a/block/misc/BlockQuartzGrowthAccelerator.java +++ b/block/misc/BlockQuartzGrowthAccelerator.java @@ -29,8 +29,8 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient public BlockQuartzGrowthAccelerator() { super( BlockQuartzGrowthAccelerator.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.Core ) ); - setTileEntiy( TileQuartzGrowthAccelerator.class ); + setFeature( EnumSet.of( AEFeature.Core ) ); + setTileEntity( TileQuartzGrowthAccelerator.class ); } @Override diff --git a/block/misc/BlockQuartzTorch.java b/block/misc/BlockQuartzTorch.java index 81ffdfdb..56c50d68 100644 --- a/block/misc/BlockQuartzTorch.java +++ b/block/misc/BlockQuartzTorch.java @@ -39,7 +39,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I public BlockQuartzTorch() { this( BlockQuartzTorch.class ); - setfeature( EnumSet.of( AEFeature.DecorativeLights ) ); + setFeature( EnumSet.of( AEFeature.DecorativeLights ) ); setLightLevel( 0.9375F ); } @@ -91,7 +91,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { ForgeDirection up = getOrientable( w, x, y, z ).getUp(); double xOff = -0.3 * up.offsetX; diff --git a/block/misc/BlockSecurity.java b/block/misc/BlockSecurity.java index b214a9f3..4c4e1eec 100644 --- a/block/misc/BlockSecurity.java +++ b/block/misc/BlockSecurity.java @@ -19,8 +19,8 @@ public class BlockSecurity extends AEBaseBlock public BlockSecurity() { super( BlockSecurity.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Security ) ); - setTileEntiy( TileSecurity.class ); + setFeature( EnumSet.of( AEFeature.Security ) ); + setTileEntity( TileSecurity.class ); } @Override diff --git a/block/misc/BlockSkyCompass.java b/block/misc/BlockSkyCompass.java index 74622cc7..c6913f2d 100644 --- a/block/misc/BlockSkyCompass.java +++ b/block/misc/BlockSkyCompass.java @@ -27,8 +27,8 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision public BlockSkyCompass() { super( BlockSkyCompass.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.MeteoriteCompass ) ); - setTileEntiy( TileSkyCompass.class ); + setFeature( EnumSet.of( AEFeature.MeteoriteCompass ) ); + setTileEntity( TileSkyCompass.class ); isOpaque = isFullSize = false; lightOpacity = 0; } @@ -86,7 +86,7 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileSkyCompass tile = getTileEntity( w, x, y, z ); if ( tile != null ) diff --git a/block/misc/BlockTinyTNT.java b/block/misc/BlockTinyTNT.java index 2eae7337..ab912126 100644 --- a/block/misc/BlockTinyTNT.java +++ b/block/misc/BlockTinyTNT.java @@ -36,7 +36,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision public BlockTinyTNT() { super( BlockTinyTNT.class, Material.tnt ); - setfeature( EnumSet.of( AEFeature.TinyTNT ) ); + setFeature( EnumSet.of( AEFeature.TinyTNT ) ); setLightOpacity( 3 ); setBlockBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); isFullSize = isOpaque = false; @@ -150,7 +150,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { return Arrays.asList( new AxisAlignedBB[] { AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) } ); } diff --git a/block/misc/BlockVibrationChamber.java b/block/misc/BlockVibrationChamber.java index 5b3f8da0..8b14a202 100644 --- a/block/misc/BlockVibrationChamber.java +++ b/block/misc/BlockVibrationChamber.java @@ -23,8 +23,8 @@ public class BlockVibrationChamber extends AEBaseBlock public BlockVibrationChamber() { super( BlockVibrationChamber.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.PowerGen ) ); - setTileEntiy( TileVibrationChamber.class ); + setFeature( EnumSet.of( AEFeature.PowerGen ) ); + setTileEntity( TileVibrationChamber.class ); setHardness( 4.2F ); } diff --git a/block/networking/BlockCableBus.java b/block/networking/BlockCableBus.java index 3e8a86b2..32926069 100644 --- a/block/networking/BlockCableBus.java +++ b/block/networking/BlockCableBus.java @@ -76,7 +76,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection public BlockCableBus() { super( BlockCableBus.class, AEGlassMaterial.instance ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); setLightOpacity( 0 ); isFullSize = isOpaque = false; } @@ -399,7 +399,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection public void setupTile() { - setTileEntiy( noTesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBus.class.getName() ) ); + setTileEntity( noTesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBus.class.getName() ) ); if ( Platform.isClient() ) { tesrTile = Api.instance.partHelper.getCombinedInstance( TileCableBusTESR.class.getName() ); diff --git a/block/networking/BlockController.java b/block/networking/BlockController.java index cceed85d..4309e014 100644 --- a/block/networking/BlockController.java +++ b/block/networking/BlockController.java @@ -16,8 +16,8 @@ public class BlockController extends AEBaseBlock public BlockController() { super( BlockController.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Channels ) ); - setTileEntiy( TileController.class ); + setFeature( EnumSet.of( AEFeature.Channels ) ); + setTileEntity( TileController.class ); setHardness( 6 ); } diff --git a/block/networking/BlockCreativeEnergyCell.java b/block/networking/BlockCreativeEnergyCell.java index d0334664..ab2a9a41 100644 --- a/block/networking/BlockCreativeEnergyCell.java +++ b/block/networking/BlockCreativeEnergyCell.java @@ -12,8 +12,8 @@ public class BlockCreativeEnergyCell extends AEBaseBlock public BlockCreativeEnergyCell() { super( BlockCreativeEnergyCell.class, AEGlassMaterial.instance ); - setfeature( EnumSet.of( AEFeature.Creative ) ); - setTileEntiy( TileCreativeEnergyCell.class ); + setFeature( EnumSet.of( AEFeature.Creative ) ); + setTileEntity( TileCreativeEnergyCell.class ); } } diff --git a/block/networking/BlockDenseEnergyCell.java b/block/networking/BlockDenseEnergyCell.java index a151c1aa..21fcdddd 100644 --- a/block/networking/BlockDenseEnergyCell.java +++ b/block/networking/BlockDenseEnergyCell.java @@ -18,8 +18,8 @@ public class BlockDenseEnergyCell extends BlockEnergyCell public BlockDenseEnergyCell() { super( BlockDenseEnergyCell.class ); - setfeature( EnumSet.of( AEFeature.DenseEnergyCells ) ); - setTileEntiy( TileDenseEnergyCell.class ); + setFeature( EnumSet.of( AEFeature.DenseEnergyCells ) ); + setTileEntity( TileDenseEnergyCell.class ); } @Override diff --git a/block/networking/BlockEnergyAcceptor.java b/block/networking/BlockEnergyAcceptor.java index 731beb5f..10ca41ac 100644 --- a/block/networking/BlockEnergyAcceptor.java +++ b/block/networking/BlockEnergyAcceptor.java @@ -12,8 +12,8 @@ public class BlockEnergyAcceptor extends AEBaseBlock public BlockEnergyAcceptor() { super( BlockEnergyAcceptor.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.Core ) ); - setTileEntiy( TileEnergyAcceptor.class ); + setFeature( EnumSet.of( AEFeature.Core ) ); + setTileEntity( TileEnergyAcceptor.class ); } } diff --git a/block/networking/BlockEnergyCell.java b/block/networking/BlockEnergyCell.java index 590770d9..b3a89b08 100644 --- a/block/networking/BlockEnergyCell.java +++ b/block/networking/BlockEnergyCell.java @@ -32,8 +32,8 @@ public class BlockEnergyCell extends AEBaseBlock public BlockEnergyCell() { this( BlockEnergyCell.class ); - setfeature( EnumSet.of( AEFeature.Core ) ); - setTileEntiy( TileEnergyCell.class ); + setFeature( EnumSet.of( AEFeature.Core ) ); + setTileEntity( TileEnergyCell.class ); } @Override diff --git a/block/networking/BlockWireless.java b/block/networking/BlockWireless.java index aebba609..6dda040c 100644 --- a/block/networking/BlockWireless.java +++ b/block/networking/BlockWireless.java @@ -25,8 +25,8 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision public BlockWireless() { super( BlockWireless.class, AEGlassMaterial.instance ); - setfeature( EnumSet.of( AEFeature.Core, AEFeature.WirelessAccessTerminal ) ); - setTileEntiy( TileWireless.class ); + setFeature( EnumSet.of( AEFeature.Core, AEFeature.WirelessAccessTerminal ) ); + setTileEntity( TileWireless.class ); setLightOpacity( 0 ); isFullSize = false; isOpaque = false; @@ -45,7 +45,7 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileWireless tile = getTileEntity( w, x, y, z ); if ( tile != null ) diff --git a/block/qnb/BlockQuantumLinkChamber.java b/block/qnb/BlockQuantumLinkChamber.java index 69e7331c..bb179ef5 100644 --- a/block/qnb/BlockQuantumLinkChamber.java +++ b/block/qnb/BlockQuantumLinkChamber.java @@ -30,8 +30,8 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli public BlockQuantumLinkChamber() { super( BlockQuantumLinkChamber.class, AEGlassMaterial.instance ); - setfeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) ); - setTileEntiy( TileQuantumBridge.class ); + setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) ); + setTileEntity( TileQuantumBridge.class ); float shave = 2.0f / 16.0f; setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave ); setLightOpacity( 0 ); @@ -94,7 +94,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { double OnePx = 2.0 / 16.0; return Arrays.asList( new AxisAlignedBB[] { AxisAlignedBB.getBoundingBox( OnePx, OnePx, OnePx, 1.0 - OnePx, 1.0 - OnePx, 1.0 - OnePx ) } ); diff --git a/block/qnb/BlockQuantumRing.java b/block/qnb/BlockQuantumRing.java index 7870c096..eac97887 100644 --- a/block/qnb/BlockQuantumRing.java +++ b/block/qnb/BlockQuantumRing.java @@ -21,8 +21,8 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision public BlockQuantumRing() { super( BlockQuantumRing.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) ); - setTileEntiy( TileQuantumBridge.class ); + setFeature( EnumSet.of( AEFeature.QuantumNetworkBridge ) ); + setTileEntity( TileQuantumBridge.class ); float shave = 2.0f / 16.0f; setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave ); setLightOpacity( 1 ); @@ -54,7 +54,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { double OnePx = 2.0 / 16.0; TileQuantumBridge bridge = getTileEntity( w, x, y, z ); diff --git a/block/solids/BlockFluix.java b/block/solids/BlockFluix.java index ecb8414f..7759c8ef 100644 --- a/block/solids/BlockFluix.java +++ b/block/solids/BlockFluix.java @@ -11,7 +11,7 @@ public class BlockFluix extends AEDecorativeBlock public BlockFluix() { super( BlockFluix.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); + setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } } diff --git a/block/solids/BlockQuartz.java b/block/solids/BlockQuartz.java index 20bb1f8c..0bb99931 100644 --- a/block/solids/BlockQuartz.java +++ b/block/solids/BlockQuartz.java @@ -11,7 +11,7 @@ public class BlockQuartz extends AEDecorativeBlock public BlockQuartz() { super( BlockQuartz.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); + setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } } diff --git a/block/solids/BlockQuartzChiseled.java b/block/solids/BlockQuartzChiseled.java index 896d6997..ac54c6e0 100644 --- a/block/solids/BlockQuartzChiseled.java +++ b/block/solids/BlockQuartzChiseled.java @@ -11,7 +11,7 @@ public class BlockQuartzChiseled extends AEDecorativeBlock public BlockQuartzChiseled() { super( BlockQuartzChiseled.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); + setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } } diff --git a/block/solids/BlockQuartzGlass.java b/block/solids/BlockQuartzGlass.java index 4d902dac..c210f7e7 100644 --- a/block/solids/BlockQuartzGlass.java +++ b/block/solids/BlockQuartzGlass.java @@ -40,7 +40,7 @@ public class BlockQuartzGlass extends AEBaseBlock public BlockQuartzGlass(Class c) { super( c, Material.glass ); - setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); + setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); setLightOpacity( 0 ); isOpaque = false; } diff --git a/block/solids/BlockQuartzLamp.java b/block/solids/BlockQuartzLamp.java index 43e141f6..b6e24858 100644 --- a/block/solids/BlockQuartzLamp.java +++ b/block/solids/BlockQuartzLamp.java @@ -18,7 +18,7 @@ public class BlockQuartzLamp extends BlockQuartzGlass public BlockQuartzLamp() { super( BlockQuartzLamp.class ); - setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) ); + setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) ); setLightLevel( 1.0f ); setBlockTextureName( "BlockQuartzGlass" ); } diff --git a/block/solids/BlockQuartzPillar.java b/block/solids/BlockQuartzPillar.java index b42328b6..71526565 100644 --- a/block/solids/BlockQuartzPillar.java +++ b/block/solids/BlockQuartzPillar.java @@ -15,7 +15,7 @@ public class BlockQuartzPillar extends AEBaseBlock implements IOrientableBlock public BlockQuartzPillar() { super( BlockQuartzPillar.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); + setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } @Override diff --git a/block/solids/BlockSkyStone.java b/block/solids/BlockSkyStone.java index afc1103b..fc83662e 100644 --- a/block/solids/BlockSkyStone.java +++ b/block/solids/BlockSkyStone.java @@ -63,7 +63,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock public BlockSkyStone() { super( BlockSkyStone.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); setHardness( 50 ); hasSubtypes = true; blockResistance = 150.0f; @@ -175,7 +175,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); } - // use AE2's enderer, no rotatable blocks. + // use AE2's renderer, no rotatable blocks. int getRealRenderType() { return getRenderType(); diff --git a/block/solids/OreQuartz.java b/block/solids/OreQuartz.java index 9c40a9f1..85f2c3d7 100644 --- a/block/solids/OreQuartz.java +++ b/block/solids/OreQuartz.java @@ -25,7 +25,7 @@ public class OreQuartz extends AEBaseBlock public OreQuartz(Class self) { super( self, Material.rock ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); setHardness( 3.0F ); setResistance( 5.0F ); boostBrightnessLow = 0; diff --git a/block/spatial/BlockMatrixFrame.java b/block/spatial/BlockMatrixFrame.java index 3ff746bf..ec6c514c 100644 --- a/block/spatial/BlockMatrixFrame.java +++ b/block/spatial/BlockMatrixFrame.java @@ -23,7 +23,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision public BlockMatrixFrame() { super( BlockMatrixFrame.class, Material.anvil); - setfeature( EnumSet.of( AEFeature.SpatialIO ) ); + setFeature( EnumSet.of( AEFeature.SpatialIO ) ); setResistance( 6000000.0F ); setBlockUnbreakable(); setLightOpacity( 0 ); @@ -55,7 +55,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { return Arrays.asList( new AxisAlignedBB[] {} );// AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) // } ); diff --git a/block/spatial/BlockSpatialIOPort.java b/block/spatial/BlockSpatialIOPort.java index da26eadb..a47f6321 100644 --- a/block/spatial/BlockSpatialIOPort.java +++ b/block/spatial/BlockSpatialIOPort.java @@ -18,8 +18,8 @@ public class BlockSpatialIOPort extends AEBaseBlock public BlockSpatialIOPort() { super( BlockSpatialIOPort.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.SpatialIO ) ); - setTileEntiy( TileSpatialIOPort.class ); + setFeature( EnumSet.of( AEFeature.SpatialIO ) ); + setTileEntity( TileSpatialIOPort.class ); } @Override diff --git a/block/spatial/BlockSpatialPylon.java b/block/spatial/BlockSpatialPylon.java index 50ae3ecf..a6962e20 100644 --- a/block/spatial/BlockSpatialPylon.java +++ b/block/spatial/BlockSpatialPylon.java @@ -17,8 +17,8 @@ public class BlockSpatialPylon extends AEBaseBlock public BlockSpatialPylon() { super( BlockSpatialPylon.class, AEGlassMaterial.instance ); - setfeature( EnumSet.of( AEFeature.SpatialIO ) ); - setTileEntiy( TileSpatialPylon.class ); + setFeature( EnumSet.of( AEFeature.SpatialIO ) ); + setTileEntity( TileSpatialPylon.class ); } @Override diff --git a/block/storage/BlockChest.java b/block/storage/BlockChest.java index 27553fdd..47b93457 100644 --- a/block/storage/BlockChest.java +++ b/block/storage/BlockChest.java @@ -23,8 +23,8 @@ public class BlockChest extends AEBaseBlock public BlockChest() { super( BlockChest.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEChest ) ); - setTileEntiy( TileChest.class ); + setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEChest ) ); + setTileEntity( TileChest.class ); } @Override diff --git a/block/storage/BlockDrive.java b/block/storage/BlockDrive.java index a06b0155..546d4cbc 100644 --- a/block/storage/BlockDrive.java +++ b/block/storage/BlockDrive.java @@ -19,8 +19,8 @@ public class BlockDrive extends AEBaseBlock public BlockDrive() { super( BlockDrive.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEDrive ) ); - setTileEntiy( TileDrive.class ); + setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEDrive ) ); + setTileEntity( TileDrive.class ); } @Override diff --git a/block/storage/BlockIOPort.java b/block/storage/BlockIOPort.java index 942ffe42..6b4c0ec7 100644 --- a/block/storage/BlockIOPort.java +++ b/block/storage/BlockIOPort.java @@ -18,8 +18,8 @@ public class BlockIOPort extends AEBaseBlock public BlockIOPort() { super( BlockIOPort.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) ); - setTileEntiy( TileIOPort.class ); + setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) ); + setTileEntity( TileIOPort.class ); } @Override diff --git a/block/storage/BlockSkyChest.java b/block/storage/BlockSkyChest.java index a6f53ac9..1bfc1a23 100644 --- a/block/storage/BlockSkyChest.java +++ b/block/storage/BlockSkyChest.java @@ -33,8 +33,8 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision public BlockSkyChest() { super( BlockSkyChest.class, Material.rock ); - setfeature( EnumSet.of( AEFeature.Core, AEFeature.SkyStoneChests ) ); - setTileEntiy( TileSkyChest.class ); + setFeature( EnumSet.of( AEFeature.Core, AEFeature.SkyStoneChests ) ); + setTileEntity( TileSkyChest.class ); isOpaque = isFullSize = false; lightOpacity = 0; hasSubtypes = true; @@ -97,7 +97,7 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { TileSkyChest sk = getTileEntity( w, x, y, z ); double sc = 0.06; diff --git a/client/gui/AEBaseGui.java b/client/gui/AEBaseGui.java index 65bafe00..72196034 100644 --- a/client/gui/AEBaseGui.java +++ b/client/gui/AEBaseGui.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +import appeng.container.slot.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -36,17 +37,8 @@ import appeng.client.me.SlotDisconnected; import appeng.client.me.SlotME; import appeng.client.render.AppEngRenderItem; import appeng.container.AEBaseContainer; -import appeng.container.slot.AppEngCraftingSlot; -import appeng.container.slot.AppEngSlot; import appeng.container.slot.AppEngSlot.hasCalculatedValidness; -import appeng.container.slot.OptionalSlotFake; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotInaccessable; -import appeng.container.slot.SlotOutput; -import appeng.container.slot.SlotPatternTerm; -import appeng.container.slot.SlotRestrictedInput; +import appeng.container.slot.SlotInaccessible; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; @@ -909,7 +901,7 @@ public abstract class AEBaseGui extends GuiContainer if ( ((AppEngSlot) s).isValid == hasCalculatedValidness.NotAvailable ) { boolean isValid = s.isItemValid( is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled - || s instanceof SlotInaccessable || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected; + || s instanceof SlotInaccessible || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected; if ( isValid && s instanceof SlotRestrictedInput ) { try diff --git a/client/gui/AEBaseMEGui.java b/client/gui/AEBaseMEGui.java index 34eaec81..6e85703c 100644 --- a/client/gui/AEBaseMEGui.java +++ b/client/gui/AEBaseMEGui.java @@ -55,7 +55,7 @@ public abstract class AEBaseMEGui extends AEBaseGui return currenttip; } - // Vanillia version... + // Vanilla version... // protected void drawItemStackTooltip(ItemStack stack, int x, int y) @Override protected void renderToolTip(ItemStack stack, int x, int y) diff --git a/client/gui/implementations/GuiCellWorkbench.java b/client/gui/implementations/GuiCellWorkbench.java index d2712187..823e6ae9 100644 --- a/client/gui/implementations/GuiCellWorkbench.java +++ b/client/gui/implementations/GuiCellWorkbench.java @@ -56,7 +56,7 @@ public class GuiCellWorkbench extends GuiUpgradeable @Override public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) { - handleButtonVisiblity(); + handleButtonVisibility(); bindTexture( getBackground() ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, ySize ); @@ -148,7 +148,7 @@ public class GuiCellWorkbench extends GuiUpgradeable buttonList.add( copyMode ); } - protected void handleButtonVisiblity() + protected void handleButtonVisibility() { copyMode.setState( ccwb.copyMode == CopyMode.CLEAR_ON_REMOVE ); diff --git a/client/gui/implementations/GuiCraftConfirm.java b/client/gui/implementations/GuiCraftConfirm.java index cbf92ed4..980a2d4b 100644 --- a/client/gui/implementations/GuiCraftConfirm.java +++ b/client/gui/implementations/GuiCraftConfirm.java @@ -390,7 +390,7 @@ public class GuiCraftConfirm extends AEBaseGui for (int z = viewStart; z < Math.min( viewEnd, visual.size() ); z++) { - IAEItemStack refStack = visual.get( z );// repo.getRefrenceItem( z ); + IAEItemStack refStack = visual.get( z );// repo.getReferenceItem( z ); if ( refStack != null ) { GL11.glPushMatrix(); diff --git a/client/gui/implementations/GuiCraftingCPU.java b/client/gui/implementations/GuiCraftingCPU.java index 8cbd7586..d782c93c 100644 --- a/client/gui/implementations/GuiCraftingCPU.java +++ b/client/gui/implementations/GuiCraftingCPU.java @@ -277,7 +277,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource for (int z = viewStart; z < Math.min( viewEnd, visual.size() ); z++) { - IAEItemStack refStack = visual.get( z );// repo.getRefrenceItem( z ); + IAEItemStack refStack = visual.get( z );// repo.getReferenceItem( z ); if ( refStack != null ) { GL11.glPushMatrix(); diff --git a/client/gui/implementations/GuiInscriber.java b/client/gui/implementations/GuiInscriber.java index 0d6ea4ee..52143946 100644 --- a/client/gui/implementations/GuiInscriber.java +++ b/client/gui/implementations/GuiInscriber.java @@ -41,7 +41,7 @@ public class GuiInscriber extends AEBaseGui @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - pb.max = cvc.maxProessingTime; + pb.max = cvc.maxProcessingTime; pb.current = cvc.processingTime; pb.FullMsg = (pb.current * 100 / pb.max) + "%"; diff --git a/client/gui/implementations/GuiLevelEmitter.java b/client/gui/implementations/GuiLevelEmitter.java index ff91a1f8..91234510 100644 --- a/client/gui/implementations/GuiLevelEmitter.java +++ b/client/gui/implementations/GuiLevelEmitter.java @@ -148,7 +148,7 @@ public class GuiLevelEmitter extends GuiUpgradeable } } - protected void handleButtonVisiblity() + protected void handleButtonVisibility() { craftingMode.setVisibility( bc.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 ); fuzzyMode.setVisibility( bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 ); diff --git a/client/gui/implementations/GuiNetworkStatus.java b/client/gui/implementations/GuiNetworkStatus.java index a04bc11d..ea5fe4ce 100644 --- a/client/gui/implementations/GuiNetworkStatus.java +++ b/client/gui/implementations/GuiNetworkStatus.java @@ -160,7 +160,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource for (int z = viewStart; z < Math.min( viewEnd, repo.size() ); z++) { - IAEItemStack refStack = repo.getRefrenceItem( z ); + IAEItemStack refStack = repo.getReferenceItem( z ); if ( refStack != null ) { GL11.glPushMatrix(); @@ -242,7 +242,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource return currenttip; } - // Vanillia version... + // Vanilla version... protected void drawItemStackTooltip(ItemStack stack, int x, int y) { Slot s = getSlot( x, y ); diff --git a/client/gui/implementations/GuiUpgradeable.java b/client/gui/implementations/GuiUpgradeable.java index e0edfb61..0ed3cf01 100644 --- a/client/gui/implementations/GuiUpgradeable.java +++ b/client/gui/implementations/GuiUpgradeable.java @@ -96,7 +96,7 @@ public class GuiUpgradeable extends AEBaseGui @Override public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) { - handleButtonVisiblity(); + handleButtonVisibility(); bindTexture( getBackground() ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, ySize ); @@ -116,7 +116,7 @@ public class GuiUpgradeable extends AEBaseGui return "guis/bus.png"; } - protected void handleButtonVisiblity() + protected void handleButtonVisibility() { if ( redstoneMode != null ) redstoneMode.setVisibility( bc.getInstalledUpgrades( Upgrades.REDSTONE ) > 0 ); diff --git a/client/gui/widgets/GuiImgButton.java b/client/gui/widgets/GuiImgButton.java index f9a9c048..a753d9ec 100644 --- a/client/gui/widgets/GuiImgButton.java +++ b/client/gui/widgets/GuiImgButton.java @@ -179,7 +179,7 @@ public class GuiImgButton extends GuiButton implements ITooltip registerApp( 16 * 1 + 2, Settings.CRAFT_ONLY, YesNo.NO, ButtonToolTips.Craft, ButtonToolTips.CraftEither ); registerApp( 16 * 11 + 2, Settings.CRAFT_VIA_REDSTONE, YesNo.YES, ButtonToolTips.EmitterMode, ButtonToolTips.CraftViaRedstone ); - registerApp( 16 * 11 + 1, Settings.CRAFT_VIA_REDSTONE, YesNo.NO, ButtonToolTips.EmitterMode, ButtonToolTips.EmitWhenCrafing ); + registerApp( 16 * 11 + 1, Settings.CRAFT_VIA_REDSTONE, YesNo.NO, ButtonToolTips.EmitterMode, ButtonToolTips.EmitWhenCrafting ); registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsNo ); diff --git a/client/me/InternalSlotME.java b/client/me/InternalSlotME.java index 4f1046c1..34455ad8 100644 --- a/client/me/InternalSlotME.java +++ b/client/me/InternalSlotME.java @@ -26,7 +26,7 @@ public class InternalSlotME public IAEItemStack getAEStack() { - return repo.getRefrenceItem( offset ); + return repo.getReferenceItem( offset ); } public boolean hasPower() diff --git a/client/me/ItemRepo.java b/client/me/ItemRepo.java index 3c2b8b81..7489a09b 100644 --- a/client/me/ItemRepo.java +++ b/client/me/ItemRepo.java @@ -44,7 +44,7 @@ public class ItemRepo this.sortSrc = sortSrc; } - public IAEItemStack getRefrenceItem(int idx) + public IAEItemStack getReferenceItem(int idx) { idx += src.getCurrentScroll() * rowSize; diff --git a/client/render/BlockRenderInfo.java b/client/render/BlockRenderInfo.java index fbcb727e..c61929ef 100644 --- a/client/render/BlockRenderInfo.java +++ b/client/render/BlockRenderInfo.java @@ -1,9 +1,9 @@ package appeng.client.render; +import appeng.client.texture.FlippableIcon; +import appeng.client.texture.TmpFlippableIcon; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import appeng.client.texture.FlipableIcon; -import appeng.client.texture.TmpFlipableIcon; public class BlockRenderInfo { @@ -15,21 +15,21 @@ public class BlockRenderInfo final public BaseBlockRender rendererInstance; private boolean useTmp = false; - private TmpFlipableIcon tmpTopIcon = new TmpFlipableIcon(); - private TmpFlipableIcon tmpBottomIcon = new TmpFlipableIcon(); - private TmpFlipableIcon tmpSouthIcon = new TmpFlipableIcon(); - private TmpFlipableIcon tmpNorthIcon = new TmpFlipableIcon(); - private TmpFlipableIcon tmpEastIcon = new TmpFlipableIcon(); - private TmpFlipableIcon tmpWestIcon = new TmpFlipableIcon(); + private TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon(); + private TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon(); + private TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon(); + private TmpFlippableIcon tmpNorthIcon = new TmpFlippableIcon(); + private TmpFlippableIcon tmpEastIcon = new TmpFlippableIcon(); + private TmpFlippableIcon tmpWestIcon = new TmpFlippableIcon(); - private FlipableIcon topIcon = null; - private FlipableIcon bottomIcon = null; - private FlipableIcon southIcon = null; - private FlipableIcon northIcon = null; - private FlipableIcon eastIcon = null; - private FlipableIcon westIcon = null; + private FlippableIcon topIcon = null; + private FlippableIcon bottomIcon = null; + private FlippableIcon southIcon = null; + private FlippableIcon northIcon = null; + private FlippableIcon eastIcon = null; + private FlippableIcon westIcon = null; - public void updateIcons(FlipableIcon Bottom, FlipableIcon Top, FlipableIcon North, FlipableIcon South, FlipableIcon East, FlipableIcon West) + public void updateIcons(FlippableIcon Bottom, FlippableIcon Top, FlippableIcon North, FlippableIcon South, FlippableIcon East, FlippableIcon West) { topIcon = Top; bottomIcon = Bottom; @@ -67,7 +67,7 @@ public class BlockRenderInfo useTmp = true; } - public FlipableIcon getTexture(ForgeDirection dir) + public FlippableIcon getTexture(ForgeDirection dir) { if ( useTmp ) { diff --git a/client/render/TESRWrapper.java b/client/render/TESRWrapper.java index d3f02f56..edeadc58 100644 --- a/client/render/TESRWrapper.java +++ b/client/render/TESRWrapper.java @@ -55,7 +55,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, rbinstance ); if ( Platform.isDrawing( tess ) ) - throw new RuntimeException( "Error durring rendering." ); + throw new RuntimeException( "Error during rendering." ); GL11.glPopAttrib(); GL11.glPopMatrix(); @@ -64,7 +64,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer { AELog.severe( "Hi, Looks like there was a crash while rendering something..." ); t.printStackTrace(); - AELog.severe( "MC will now crash ( probobly )!" ); + AELog.severe( "MC will now crash ( probably )!" ); throw new RuntimeException( t ); } diff --git a/client/render/WorldRender.java b/client/render/WorldRender.java index 671a7d1d..0a07567a 100644 --- a/client/render/WorldRender.java +++ b/client/render/WorldRender.java @@ -21,7 +21,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler private RenderBlocks renderer = new RenderBlocks(); final int renderID = RenderingRegistry.getNextAvailableRenderId(); public static final WorldRender instance = new WorldRender(); - boolean hasErrored = false; + boolean hasError = false; public HashMap blockRenders = new HashMap(); @@ -73,9 +73,9 @@ public class WorldRender implements ISimpleBlockRenderingHandler } else { - if ( !hasErrored ) + if ( !hasError ) { - hasErrored = true; + hasError = true; AELog.severe( "Invalid render - item/block mismatch" ); AELog.severe( " item: " + item.getUnlocalizedName() ); AELog.severe( " block: " + blk.getUnlocalizedName() ); diff --git a/client/render/blocks/RenderBlockSkyChest.java b/client/render/blocks/RenderBlockSkyChest.java index cdd9aa76..a59000f4 100644 --- a/client/render/blocks/RenderBlockSkyChest.java +++ b/client/render/blocks/RenderBlockSkyChest.java @@ -87,12 +87,12 @@ public class RenderBlockSkyChest extends BaseBlockRender GL11.glTranslatef( -0.0F, -1.0F, -1.0F ); long now = System.currentTimeMillis(); - long distnace = now - skyChest.lastEvent; + long distance = now - skyChest.lastEvent; if ( skyChest.playerOpen > 0 ) - skyChest.lidAngle += distnace * 0.0001; + skyChest.lidAngle += distance * 0.0001; else - skyChest.lidAngle -= distnace * 0.0001; + skyChest.lidAngle -= distance * 0.0001; if ( skyChest.lidAngle > 0.5f ) skyChest.lidAngle = 0.5f; diff --git a/client/render/blocks/RenderMEChest.java b/client/render/blocks/RenderMEChest.java index 99dc132c..6182c0da 100644 --- a/client/render/blocks/RenderMEChest.java +++ b/client/render/blocks/RenderMEChest.java @@ -2,6 +2,7 @@ package appeng.client.render.blocks; import java.util.EnumSet; +import appeng.client.texture.FlippableIcon; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -15,7 +16,6 @@ import appeng.api.util.AEColor; import appeng.block.AEBaseBlock; import appeng.client.render.BaseBlockRender; import appeng.client.texture.ExtraBlockTextures; -import appeng.client.texture.FlipableIcon; import appeng.client.texture.OffsetIcon; import appeng.tile.storage.TileChest; import appeng.util.Platform; @@ -68,7 +68,7 @@ public class RenderMEChest extends BaseBlockRender Tessellator.instance.setBrightness( b ); Tessellator.instance.setColorOpaque_I( 0xffffff ); - FlipableIcon fico = new FlipableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) ); + FlippableIcon fico = new FlippableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) ); if ( forward == ForgeDirection.EAST && (up == ForgeDirection.NORTH || up == ForgeDirection.SOUTH) ) fico.setFlip( true, false ); else if ( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST ) diff --git a/client/render/blocks/RendererCableBus.java b/client/render/blocks/RendererCableBus.java index 04bb15cd..f17e12ed 100644 --- a/client/render/blocks/RendererCableBus.java +++ b/client/render/blocks/RendererCableBus.java @@ -22,7 +22,7 @@ public class RendererCableBus extends BaseBlockRender @Override public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj) { - // nothin. + // nothing. } @Override diff --git a/client/render/items/ItemEncodedPatternRenderer.java b/client/render/items/ItemEncodedPatternRenderer.java index 59dad6b1..716ca5fb 100644 --- a/client/render/items/ItemEncodedPatternRenderer.java +++ b/client/render/items/ItemEncodedPatternRenderer.java @@ -15,14 +15,14 @@ public class ItemEncodedPatternRenderer implements IItemRenderer { RenderItem ri = new RenderItem(); - boolean resursive; + boolean recursive; @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { boolean isShiftHeld = Keyboard.isKeyDown( Keyboard.KEY_LSHIFT ) || Keyboard.isKeyDown( Keyboard.KEY_RSHIFT ); - if ( resursive == false && type == IItemRenderer.ItemRenderType.INVENTORY && isShiftHeld ) + if ( recursive == false && type == IItemRenderer.ItemRenderType.INVENTORY && isShiftHeld ) { ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem(); if ( iep.getOutput( item ) != null ) @@ -41,7 +41,7 @@ public class ItemEncodedPatternRenderer implements IItemRenderer @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - resursive = true; + recursive = true; ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem(); @@ -54,6 +54,6 @@ public class ItemEncodedPatternRenderer implements IItemRenderer RenderHelper.disableStandardItemLighting(); GL11.glPopAttrib(); - resursive = false; + recursive = false; } } diff --git a/client/texture/FlipableIcon.java b/client/texture/FlippableIcon.java similarity index 89% rename from client/texture/FlipableIcon.java rename to client/texture/FlippableIcon.java index c4e3c103..95dbcf87 100644 --- a/client/texture/FlipableIcon.java +++ b/client/texture/FlippableIcon.java @@ -1,106 +1,106 @@ -package appeng.client.texture; - -import net.minecraft.util.IIcon; - -public class FlipableIcon implements IIcon -{ - - protected IIcon original; - boolean flip_u; - boolean flip_v; - - public FlipableIcon(IIcon o) { - - if ( o == null ) - throw new RuntimeException( "Cannot create a wrapper icon with a null icon." ); - - original = o; - flip_u = false; - flip_v = false; - } - - @Override - public int getIconWidth() - { - return original.getIconWidth(); - } - - @Override - public int getIconHeight() - { - return original.getIconHeight(); - } - - @Override - public float getMinU() - { - if ( flip_u ) - return original.getMaxU(); - return original.getMinU(); - } - - @Override - public float getMaxU() - { - if ( flip_u ) - return original.getMinU(); - return original.getMaxU(); - } - - @Override - public float getInterpolatedU(double px) - { - if ( flip_u ) - return original.getInterpolatedU( 16 - px ); - return original.getInterpolatedU( px ); - } - - @Override - public float getMinV() - { - if ( flip_v ) - return original.getMaxV(); - return original.getMinV(); - } - - @Override - public float getMaxV() - { - if ( flip_v ) - return original.getMinV(); - return original.getMaxV(); - } - - @Override - public float getInterpolatedV(double px) - { - if ( flip_v ) - return original.getInterpolatedV( 16 - px ); - return original.getInterpolatedV( px ); - } - - @Override - public String getIconName() - { - return original.getIconName(); - } - - public IIcon getOriginal() - { - return original; - } - - public void setFlip(boolean u, boolean v) - { - flip_u = u; - flip_v = v; - } - - public int setFlip(int orientation) - { - flip_u = (orientation & 8) == 8; - flip_v = (orientation & 16) == 16; - return orientation & 7; - } - -} +package appeng.client.texture; + +import net.minecraft.util.IIcon; + +public class FlippableIcon implements IIcon +{ + + protected IIcon original; + boolean flip_u; + boolean flip_v; + + public FlippableIcon(IIcon o) { + + if ( o == null ) + throw new RuntimeException( "Cannot create a wrapper icon with a null icon." ); + + original = o; + flip_u = false; + flip_v = false; + } + + @Override + public int getIconWidth() + { + return original.getIconWidth(); + } + + @Override + public int getIconHeight() + { + return original.getIconHeight(); + } + + @Override + public float getMinU() + { + if ( flip_u ) + return original.getMaxU(); + return original.getMinU(); + } + + @Override + public float getMaxU() + { + if ( flip_u ) + return original.getMinU(); + return original.getMaxU(); + } + + @Override + public float getInterpolatedU(double px) + { + if ( flip_u ) + return original.getInterpolatedU( 16 - px ); + return original.getInterpolatedU( px ); + } + + @Override + public float getMinV() + { + if ( flip_v ) + return original.getMaxV(); + return original.getMinV(); + } + + @Override + public float getMaxV() + { + if ( flip_v ) + return original.getMinV(); + return original.getMaxV(); + } + + @Override + public float getInterpolatedV(double px) + { + if ( flip_v ) + return original.getInterpolatedV( 16 - px ); + return original.getInterpolatedV( px ); + } + + @Override + public String getIconName() + { + return original.getIconName(); + } + + public IIcon getOriginal() + { + return original; + } + + public void setFlip(boolean u, boolean v) + { + flip_u = u; + flip_v = v; + } + + public int setFlip(int orientation) + { + flip_u = (orientation & 8) == 8; + flip_v = (orientation & 16) == 16; + return orientation & 7; + } + +} diff --git a/client/texture/TmpFlipableIcon.java b/client/texture/TmpFlippableIcon.java similarity index 71% rename from client/texture/TmpFlipableIcon.java rename to client/texture/TmpFlippableIcon.java index 615aa170..de13d9e6 100644 --- a/client/texture/TmpFlipableIcon.java +++ b/client/texture/TmpFlippableIcon.java @@ -1,37 +1,37 @@ -package appeng.client.texture; - -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; - -public class TmpFlipableIcon extends FlipableIcon -{ - - private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block ); - - public TmpFlipableIcon() { - super( nullIcon ); - } - - public void setOriginal(IIcon i) - { - setFlip( false, false ); - - while (i instanceof FlipableIcon) - { - FlipableIcon fi = (FlipableIcon) i; - if ( fi.flip_u ) - this.flip_u = !this.flip_u; - - if ( fi.flip_v ) - this.flip_v = !this.flip_v; - - i = fi.getOriginal(); - } - - if ( i == null ) - original = nullIcon; - else - original = i; - } - -} +package appeng.client.texture; + +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; + +public class TmpFlippableIcon extends FlippableIcon +{ + + private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block ); + + public TmpFlippableIcon() { + super( nullIcon ); + } + + public void setOriginal(IIcon i) + { + setFlip( false, false ); + + while (i instanceof FlippableIcon) + { + FlippableIcon fi = (FlippableIcon) i; + if ( fi.flip_u ) + this.flip_u = !this.flip_u; + + if ( fi.flip_v ) + this.flip_v = !this.flip_v; + + i = fi.getOriginal(); + } + + if ( i == null ) + original = nullIcon; + else + original = i; + } + +} diff --git a/container/AEBaseContainer.java b/container/AEBaseContainer.java index 9cf1dc2e..5ab81d2f 100644 --- a/container/AEBaseContainer.java +++ b/container/AEBaseContainer.java @@ -10,6 +10,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import appeng.container.slot.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -41,14 +42,7 @@ import appeng.client.me.InternalSlotME; import appeng.client.me.SlotME; import appeng.container.guisync.GuiSync; import appeng.container.guisync.SyncDat; -import appeng.container.slot.AppEngSlot; -import appeng.container.slot.SlotCraftingMatrix; -import appeng.container.slot.SlotCraftingTerm; -import appeng.container.slot.SlotDisabled; -import appeng.container.slot.SlotFake; -import appeng.container.slot.SlotInaccessable; -import appeng.container.slot.SlotPlayerHotBar; -import appeng.container.slot.SlotPlayerInv; +import appeng.container.slot.SlotInaccessible; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketInventoryAction; @@ -115,7 +109,7 @@ public abstract class AEBaseContainer extends Container public void setTargetStack(IAEItemStack stack) { - // client dosn't need to re-send, makes for lower overhead rapid packets. + // client doesn't need to re-send, makes for lower overhead rapid packets. if ( Platform.isClient() ) { ItemStack a = stack == null ? null : stack.getItemStack(); @@ -346,7 +340,7 @@ public abstract class AEBaseContainer extends Container ItemStack tis = null; AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots! - if ( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessable ) + if ( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible ) return null; if ( clickSlot != null && clickSlot.getHasStack() ) { diff --git a/container/implementations/ContainerCellWorkbench.java b/container/implementations/ContainerCellWorkbench.java index 1c45e2e1..4eef5397 100644 --- a/container/implementations/ContainerCellWorkbench.java +++ b/container/implementations/ContainerCellWorkbench.java @@ -21,7 +21,6 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.OptionalSlotRestrictedInput; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.inventory.AppEngNullInventory; import appeng.tile.misc.TileCellWorkbench; import appeng.util.Platform; @@ -197,7 +196,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable int offset = 0; IInventory cell = myte.getInventoryByName( "cell" ); - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.WORKBENCH_CELL, cell, 0, 152, 8, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, invPlayer ) ); IInventory inv = myte.getInventoryByName( "config" ); UpgradeInventoryWrapper = new Upgrades();// Platform.isServer() ? new Upgrades() : new AppEngInternalInventory( @@ -211,7 +210,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable for (int z = 0; z < 8; z++) { int iSLot = zz * 8 + z; - addSlotToContainer( new OptionalSlotRestrictedInput( PlaceableItemType.UPGRADES, UpgradeInventoryWrapper, this, iSLot, 187 + zz * 18, + addSlotToContainer( new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, UpgradeInventoryWrapper, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, invPlayer ) ); } /* diff --git a/container/implementations/ContainerChest.java b/container/implementations/ContainerChest.java index 6f2cb52c..7902df12 100644 --- a/container/implementations/ContainerChest.java +++ b/container/implementations/ContainerChest.java @@ -3,7 +3,6 @@ package appeng.container.implementations; import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.storage.TileChest; public class ContainerChest extends AEBaseContainer @@ -15,7 +14,7 @@ public class ContainerChest extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.STORAGE_CELLS, myte, 1, 80, 37, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, myte, 1, 80, 37, invPlayer ) ); bindPlayerInventory( ip, 0, 166 - /* height of playerinventory */82 ); } diff --git a/container/implementations/ContainerCondenser.java b/container/implementations/ContainerCondenser.java index ba11eb06..b90e768b 100644 --- a/container/implementations/ContainerCondenser.java +++ b/container/implementations/ContainerCondenser.java @@ -7,7 +7,6 @@ import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.misc.TileCondenser; import appeng.util.Platform; @@ -20,9 +19,9 @@ public class ContainerCondenser extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.TRASH, te, 0, 51, 52, ip ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.TRASH, te, 0, 51, 52, ip ) ); addSlotToContainer( new SlotOutput( te, 1, 105, 52, -1 ) ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.STORAGE_COMPONENT, te.getInternalInventory(), 2, 101, 26, ip )).setStackLimit( 1 ) ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_COMPONENT, te.getInternalInventory(), 2, 101, 26, ip )).setStackLimit( 1 ) ); bindPlayerInventory( ip, 0, 197 - /* height of playerinventory */82 ); } diff --git a/container/implementations/ContainerCraftAmount.java b/container/implementations/ContainerCraftAmount.java index 632e998a..1587457e 100644 --- a/container/implementations/ContainerCraftAmount.java +++ b/container/implementations/ContainerCraftAmount.java @@ -1,5 +1,6 @@ package appeng.container.implementations; +import appeng.container.slot.SlotInaccessible; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.world.World; @@ -11,7 +12,6 @@ import appeng.api.networking.security.PlayerSource; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.container.AEBaseContainer; -import appeng.container.slot.SlotInaccessable; import appeng.tile.inventory.AppEngInternalInventory; public class ContainerCraftAmount extends AEBaseContainer @@ -26,7 +26,7 @@ public class ContainerCraftAmount extends AEBaseContainer super( ip, te ); priHost = te; - craftingItem = new SlotInaccessable( new AppEngInternalInventory( null, 1 ), 0, 34, 53 ); + craftingItem = new SlotInaccessible( new AppEngInternalInventory( null, 1 ), 0, 34, 53 ); addSlotToContainer( craftingItem ); } diff --git a/container/implementations/ContainerCraftConfirm.java b/container/implementations/ContainerCraftConfirm.java index 8ae35137..d989695c 100644 --- a/container/implementations/ContainerCraftConfirm.java +++ b/container/implementations/ContainerCraftConfirm.java @@ -213,12 +213,12 @@ public class ContainerCraftConfirm extends AEBaseContainer p.setStackSize( out.getCountRequestable() ); IStorageGrid sg = getGrid().getCache( IStorageGrid.class ); - IMEInventory itemsg = sg.getItemInventory(); + IMEInventory items = sg.getItemInventory(); if ( c != null && result.isSimulation() ) { m = o.copy(); - o = itemsg.extractItems( o, Actionable.SIMULATE, mySrc ); + o = items.extractItems( o, Actionable.SIMULATE, mySrc ); if ( o == null ) { diff --git a/container/implementations/ContainerCraftingTerm.java b/container/implementations/ContainerCraftingTerm.java index c07ae362..91277466 100644 --- a/container/implementations/ContainerCraftingTerm.java +++ b/container/implementations/ContainerCraftingTerm.java @@ -39,9 +39,9 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE outputSlot.putStack( CraftingManager.getInstance().findMatchingRecipe( ic, getPlayerInv().player.worldObj ) ); } - public ContainerCraftingTerm(InventoryPlayer ip, ITerminalHost montiorable) { - super( ip, montiorable, false ); - ct = (PartCraftingTerminal) montiorable; + public ContainerCraftingTerm(InventoryPlayer ip, ITerminalHost monitorable) { + super( ip, monitorable, false ); + ct = (PartCraftingTerminal) monitorable; IInventory crafting = ct.getInventoryByName( "crafting" ); @@ -49,7 +49,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE for (int x = 0; x < 3; x++) addSlotToContainer( craftingSlots[x + y * 3] = new SlotCraftingMatrix( this, crafting, x + y * 3, 37 + x * 18, -72 + y * 18 ) ); - addSlotToContainer( outputSlot = new SlotCraftingTerm( getPlayerInv().player, mySrc, powerSrc, montiorable, crafting, crafting, output, 131, -72 + 18, this ) ); + addSlotToContainer( outputSlot = new SlotCraftingTerm( getPlayerInv().player, mySrc, powerSrc, monitorable, crafting, crafting, output, 131, -72 + 18, this ) ); bindPlayerInventory( ip, 0, 0 ); diff --git a/container/implementations/ContainerDrive.java b/container/implementations/ContainerDrive.java index 7437d7ca..2e4b21a5 100644 --- a/container/implementations/ContainerDrive.java +++ b/container/implementations/ContainerDrive.java @@ -3,7 +3,6 @@ package appeng.container.implementations; import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.storage.TileDrive; public class ContainerDrive extends AEBaseContainer @@ -18,7 +17,7 @@ public class ContainerDrive extends AEBaseContainer for (int y = 0; y < 5; y++) for (int x = 0; x < 2; x++) { - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.STORAGE_CELLS, te, x + y * 2, 71 + x * 18, 14 + y * 18, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, te, x + y * 2, 71 + x * 18, 14 + y * 18, invPlayer ) ); } bindPlayerInventory( ip, 0, 199 - /* height of playerinventory */82 ); diff --git a/container/implementations/ContainerFormationPlane.java b/container/implementations/ContainerFormationPlane.java index f454cce1..5b364c2f 100644 --- a/container/implementations/ContainerFormationPlane.java +++ b/container/implementations/ContainerFormationPlane.java @@ -9,7 +9,6 @@ import appeng.api.config.Upgrades; import appeng.container.slot.OptionalSlotFakeTypeOnly; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.parts.automation.PartFormationPlane; import appeng.util.Platform; @@ -68,11 +67,11 @@ public class ContainerFormationPlane extends ContainerUpgradeable } IInventory upgrades = myte.getInventoryByName( "upgrades" ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, invPlayer )).setNotDraggable() ); } @Override diff --git a/container/implementations/ContainerGrinder.java b/container/implementations/ContainerGrinder.java index 065e6daa..7a59dd35 100644 --- a/container/implementations/ContainerGrinder.java +++ b/container/implementations/ContainerGrinder.java @@ -1,11 +1,10 @@ package appeng.container.implementations; +import appeng.container.slot.SlotInaccessible; import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; -import appeng.container.slot.SlotInaccessable; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.grindstone.TileGrinder; public class ContainerGrinder extends AEBaseContainer @@ -17,11 +16,11 @@ public class ContainerGrinder extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ORE, te, 0, 12, 17, invPlayer ) ); - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ORE, te, 1, 12 + 18, 17, invPlayer ) ); - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ORE, te, 2, 12 + 36, 17, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, te, 0, 12, 17, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, te, 1, 12 + 18, 17, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, te, 2, 12 + 36, 17, invPlayer ) ); - addSlotToContainer( new SlotInaccessable( te, 6, 80, 40 ) ); + addSlotToContainer( new SlotInaccessible( te, 6, 80, 40 ) ); addSlotToContainer( new SlotOutput( te, 3, 112, 63, 2 * 16 + 15 ) ); addSlotToContainer( new SlotOutput( te, 4, 112 + 18, 63, 2 * 16 + 15 ) ); diff --git a/container/implementations/ContainerIOPort.java b/container/implementations/ContainerIOPort.java index 9774a100..1511fb8a 100644 --- a/container/implementations/ContainerIOPort.java +++ b/container/implementations/ContainerIOPort.java @@ -10,7 +10,6 @@ import appeng.api.config.Settings; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.storage.TileIOPort; import appeng.util.Platform; @@ -57,18 +56,18 @@ public class ContainerIOPort extends ContainerUpgradeable for (int y = 0; y < 3; y++) for (int x = 0; x < 2; x++) - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.STORAGE_CELLS, cells, x + y * 2, offx + x * 18, offy + y * 18, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offx + x * 18, offy + y * 18, invPlayer ) ); offx = 122; offy = 17; for (int y = 0; y < 3; y++) for (int x = 0; x < 2; x++) - addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offx + x * 18, offy + y * 18, PlaceableItemType.STORAGE_CELLS.IIcon ) ); + addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offx + x * 18, offy + y * 18, SlotRestrictedInput.PlacableItemType.STORAGE_CELLS.IIcon ) ); IInventory upgrades = myte.getInventoryByName( "upgrades" ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); } @Override diff --git a/container/implementations/ContainerInscriber.java b/container/implementations/ContainerInscriber.java index 172a4531..08fbec55 100644 --- a/container/implementations/ContainerInscriber.java +++ b/container/implementations/ContainerInscriber.java @@ -8,7 +8,6 @@ import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.recipes.handlers.Inscribe; import appeng.recipes.handlers.Inscribe.InscriberRecipe; import appeng.tile.misc.TileInscriber; @@ -24,7 +23,7 @@ public class ContainerInscriber extends AEBaseContainer Slot bottom; @GuiSync(0) - public int maxProessingTime = -1; + public int maxProcessingTime = -1; @GuiSync(1) public int processingTime = -1; @@ -33,9 +32,9 @@ public class ContainerInscriber extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( top = new SlotRestrictedInput( PlaceableItemType.INSCRIBER_PLATE, myte, 0, 45, 16, invPlayer ) ); - addSlotToContainer( bottom = new SlotRestrictedInput( PlaceableItemType.INSCRIBER_PLATE, myte, 1, 45, 62, invPlayer ) ); - addSlotToContainer( middle = new SlotRestrictedInput( PlaceableItemType.INSCRIBER_INPUT, myte, 2, 63, 39, invPlayer ) ); + addSlotToContainer( top = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, myte, 0, 45, 16, invPlayer ) ); + addSlotToContainer( bottom = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, myte, 1, 45, 62, invPlayer ) ); + addSlotToContainer( middle = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, myte, 2, 63, 39, invPlayer ) ); addSlotToContainer( new SlotOutput( myte, 3, 113, 40, -1 ) ); @@ -125,7 +124,7 @@ public class ContainerInscriber extends AEBaseContainer if ( Platform.isServer() ) { - this.maxProessingTime = myte.maxProessingTime; + this.maxProcessingTime = myte.maxProcessingTime; this.processingTime = myte.processingTime; } } diff --git a/container/implementations/ContainerInterface.java b/container/implementations/ContainerInterface.java index 47db08af..d9094570 100644 --- a/container/implementations/ContainerInterface.java +++ b/container/implementations/ContainerInterface.java @@ -9,7 +9,6 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotFake; import appeng.container.slot.SlotNormal; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; @@ -30,7 +29,7 @@ public class ContainerInterface extends ContainerUpgradeable myDuality = te.getInterfaceDuality(); for (int x = 0; x < 9; x++) - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ENCODED_PATTERN, myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, invPlayer ) ); for (int x = 0; x < 8; x++) addSlotToContainer( new SlotFake( myDuality.getConfig(), x, 17 + 18 * x, 35 ) ); diff --git a/container/implementations/ContainerLevelEmitter.java b/container/implementations/ContainerLevelEmitter.java index 9003d7a2..6f4fd895 100644 --- a/container/implementations/ContainerLevelEmitter.java +++ b/container/implementations/ContainerLevelEmitter.java @@ -13,7 +13,6 @@ import appeng.api.config.YesNo; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.parts.automation.PartLevelEmitter; import appeng.util.Platform; import cpw.mods.fml.relauncher.Side; @@ -66,13 +65,13 @@ public class ContainerLevelEmitter extends ContainerUpgradeable IInventory upgrades = myte.getInventoryByName( "upgrades" ); if ( availableUpgrades() > 0 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); if ( availableUpgrades() > 1 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); if ( availableUpgrades() > 2 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); if ( availableUpgrades() > 3 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); IInventory inv = myte.getInventoryByName( "config" ); addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) ); diff --git a/container/implementations/ContainerMAC.java b/container/implementations/ContainerMAC.java index f3ac40f5..65565c71 100644 --- a/container/implementations/ContainerMAC.java +++ b/container/implementations/ContainerMAC.java @@ -12,7 +12,6 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotMACPattern; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.items.misc.ItemEncodedPattern; import appeng.tile.crafting.TileMolecularAssembler; import appeng.util.Platform; @@ -85,18 +84,18 @@ public class ContainerMAC extends ContainerUpgradeable offx = 126; offy = 16; - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offx, offy, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offx, offy, invPlayer ) ); addSlotToContainer( new SlotOutput( mac, 9, offx, offy + 32, -1 ) ); offx = 122; offy = 17; IInventory upgrades = myte.getInventoryByName( "upgrades" ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, invPlayer )).setNotDraggable() ); } @Override diff --git a/container/implementations/ContainerMEMonitorable.java b/container/implementations/ContainerMEMonitorable.java index d5c674d7..e1a94e49 100644 --- a/container/implementations/ContainerMEMonitorable.java +++ b/container/implementations/ContainerMEMonitorable.java @@ -38,7 +38,6 @@ import appeng.api.util.IConfigurableObject; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEInventoryUpdate; @@ -73,8 +72,8 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa return networkNode; } - protected ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost montiorable, boolean bindInventory) { - super( ip, montiorable instanceof TileEntity ? (TileEntity) montiorable : null, montiorable instanceof IPart ? (IPart) montiorable : null ); + protected ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost monitorable, boolean bindInventory) { + super( ip, monitorable instanceof TileEntity ? (TileEntity) monitorable : null, monitorable instanceof IPart ? (IPart) monitorable : null ); clientCM = new ConfigManager( this ); @@ -84,22 +83,22 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa if ( Platform.isServer() ) { - serverCM = montiorable.getConfigManager(); + serverCM = monitorable.getConfigManager(); - monitor = montiorable.getItemInventory(); + monitor = monitorable.getItemInventory(); if ( monitor != null ) { monitor.addListener( this, null ); cellInv = monitor; - if ( montiorable instanceof IPortableCell ) - powerSrc = (IPortableCell) montiorable; - else if ( montiorable instanceof IMEChest ) - powerSrc = (IMEChest) montiorable; - else if ( montiorable instanceof IGridHost ) + if ( monitorable instanceof IPortableCell ) + powerSrc = (IPortableCell) monitorable; + else if ( monitorable instanceof IMEChest ) + powerSrc = (IMEChest) monitorable; + else if ( monitorable instanceof IGridHost ) { - IGridNode node = ((IGridHost) montiorable).getGridNode( ForgeDirection.UNKNOWN ); + IGridNode node = ((IGridHost) monitorable).getGridNode( ForgeDirection.UNKNOWN ); if ( node != null ) { networkNode = node; @@ -116,11 +115,11 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa monitor = null; canAccessViewCells = false; - if ( montiorable instanceof IViewCellStorage ) + if ( monitorable instanceof IViewCellStorage ) { for (int y = 0; y < 5; y++) { - cellView[y] = new SlotRestrictedInput( PlaceableItemType.VIEWCELL, ((IViewCellStorage) montiorable).getViewCellStorage(), y, 206, y * 18 + 8, + cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEWCELL, ((IViewCellStorage) monitorable).getViewCellStorage(), y, 206, y * 18 + 8, invPlayer ); cellView[y].allowEdit = canAccessViewCells; addSlotToContainer( cellView[y] ); @@ -131,8 +130,8 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa bindPlayerInventory( ip, 0, 0 ); } - public ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost montiorable) { - this( ip, montiorable, true ); + public ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost monitorable) { + this( ip, monitorable, true ); } @Override diff --git a/container/implementations/ContainerMEPortableCell.java b/container/implementations/ContainerMEPortableCell.java index 15e968d2..62072e1e 100644 --- a/container/implementations/ContainerMEPortableCell.java +++ b/container/implementations/ContainerMEPortableCell.java @@ -14,10 +14,10 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable double powerMultiplier = 0.5; IPortableCell civ; - public ContainerMEPortableCell(InventoryPlayer ip, IPortableCell montiorable) { - super( ip, (ITerminalHost) montiorable, false ); + public ContainerMEPortableCell(InventoryPlayer ip, IPortableCell monitorable) { + super( ip, (ITerminalHost) monitorable, false ); lockPlayerInventorySlot( ip.currentItem ); - civ = montiorable; + civ = monitorable; bindPlayerInventory( ip, 0, 0 ); } diff --git a/container/implementations/ContainerNetworkTool.java b/container/implementations/ContainerNetworkTool.java index e39190ca..bace2a0a 100644 --- a/container/implementations/ContainerNetworkTool.java +++ b/container/implementations/ContainerNetworkTool.java @@ -7,7 +7,6 @@ import appeng.api.implementations.guiobjects.INetworkTool; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.util.Platform; public class ContainerNetworkTool extends AEBaseContainer @@ -26,7 +25,7 @@ public class ContainerNetworkTool extends AEBaseContainer for (int y = 0; y < 3; y++) for (int x = 0; x < 3; x++) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, te, y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, invPlayer )) ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, te, y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, invPlayer )) ); bindPlayerInventory( ip, 0, 166 - /* height of playerinventory */82 ); } diff --git a/container/implementations/ContainerPatternTerm.java b/container/implementations/ContainerPatternTerm.java index 4811fb36..1f51eb2a 100644 --- a/container/implementations/ContainerPatternTerm.java +++ b/container/implementations/ContainerPatternTerm.java @@ -33,7 +33,6 @@ import appeng.container.slot.SlotFakeCraftingMatrix; import appeng.container.slot.SlotPatternOutputs; import appeng.container.slot.SlotPatternTerm; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.core.sync.packets.PacketPatternSlot; import appeng.helpers.IContainerCraftingPacket; import appeng.items.storage.ItemViewCell; @@ -62,10 +61,10 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA public PartPatternTerminal ct; - public ContainerPatternTerm(InventoryPlayer ip, ITerminalHost montiorable) + public ContainerPatternTerm(InventoryPlayer ip, ITerminalHost monitorable) { - super( ip, montiorable, false ); - ct = (PartPatternTerminal) montiorable; + super( ip, monitorable, false ); + ct = (PartPatternTerminal) monitorable; IInventory patternInv = ct.getInventoryByName( "pattern" ); IInventory output = ct.getInventoryByName( "output" ); @@ -75,7 +74,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA for (int x = 0; x < 3; x++) addSlotToContainer( craftingSlots[x + y * 3] = new SlotFakeCraftingMatrix( crafting, x + y * 3, 18 + x * 18, -76 + y * 18 ) ); - addSlotToContainer( craftSlot = new SlotPatternTerm( ip.player, mySrc, powerSrc, montiorable, crafting, patternInv, cOut, 110, -76 + 18, this, 2, this ) ); + addSlotToContainer( craftSlot = new SlotPatternTerm( ip.player, mySrc, powerSrc, monitorable, crafting, patternInv, cOut, 110, -76 + 18, this, 2, this ) ); craftSlot.IIcon = -1; for (int y = 0; y < 3; y++) @@ -85,8 +84,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA outputSlots[y].IIcon = -1; } - addSlotToContainer( patternSlotIN = new SlotRestrictedInput( PlaceableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, invPlayer ) ); - addSlotToContainer( patternSlotOUT = new SlotRestrictedInput( PlaceableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, invPlayer ) ); + addSlotToContainer( patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, invPlayer ) ); + addSlotToContainer( patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, invPlayer ) ); patternSlotOUT.setStackLimit( 1 ); diff --git a/container/implementations/ContainerQNB.java b/container/implementations/ContainerQNB.java index e76f56b5..11e0587b 100644 --- a/container/implementations/ContainerQNB.java +++ b/container/implementations/ContainerQNB.java @@ -3,7 +3,6 @@ package appeng.container.implementations; import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.qnb.TileQuantumBridge; public class ContainerQNB extends AEBaseContainer @@ -15,9 +14,9 @@ public class ContainerQNB extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.QE_SINGULARTIY, te, 0, 80, 37, invPlayer )).setStackLimit( 1 ) ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.QE_SINGULARITY, te, 0, 80, 37, invPlayer )).setStackLimit( 1 ) ); - bindPlayerInventory( ip, 0, 166 - /* height of playerinventory */82 ); + bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } } diff --git a/container/implementations/ContainerQuartzKnife.java b/container/implementations/ContainerQuartzKnife.java index c2854946..557cb9ad 100644 --- a/container/implementations/ContainerQuartzKnife.java +++ b/container/implementations/ContainerQuartzKnife.java @@ -11,7 +11,6 @@ import appeng.api.AEApi; import appeng.container.AEBaseContainer; import appeng.container.slot.QuartzKnifeOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.items.contents.QuartzKnifeObj; import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.IAEAppEngInventory; @@ -37,7 +36,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn super( ip, null, null ); toolInv = te; - addSlotToContainer( metals = new SlotRestrictedInput( PlaceableItemType.METAL_INGOTS, inSlot, 0, 94, 44, ip ) ); + addSlotToContainer( metals = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.METAL_INGOTS, inSlot, 0, 94, 44, ip ) ); addSlotToContainer( output = new QuartzKnifeOutput( this, 0, 134, 44, -1 ) ); lockPlayerInventorySlot( ip.currentItem ); diff --git a/container/implementations/ContainerSecurity.java b/container/implementations/ContainerSecurity.java index ae246888..53378f71 100644 --- a/container/implementations/ContainerSecurity.java +++ b/container/implementations/ContainerSecurity.java @@ -15,7 +15,6 @@ import appeng.api.storage.ITerminalHost; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.InvOperation; @@ -33,14 +32,14 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE TileSecurity securityBox; - public ContainerSecurity(InventoryPlayer ip, ITerminalHost montiorable) { - super( ip, montiorable, false ); + public ContainerSecurity(InventoryPlayer ip, ITerminalHost monitorable) { + super( ip, monitorable, false ); - securityBox = (TileSecurity) montiorable; + securityBox = (TileSecurity) monitorable; - addSlotToContainer( configSlot = new SlotRestrictedInput( PlaceableItemType.BIOMETRIC_CARD, securityBox.configSlot, 0, 37, -33, ip ) ); + addSlotToContainer( configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, securityBox.configSlot, 0, 37, -33, ip ) ); - addSlotToContainer( wirelessIn = new SlotRestrictedInput( PlaceableItemType.ENCODEABLE_ITEM, wirelessEncoder, 0, 212, 10, ip ) ); + addSlotToContainer( wirelessIn = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODEABLE_ITEM, wirelessEncoder, 0, 212, 10, ip ) ); addSlotToContainer( wirelessOut = new SlotOutput( wirelessEncoder, 1, 212, 68, -1 ) ); bindPlayerInventory( ip, 0, 0 ); diff --git a/container/implementations/ContainerSpatialIOPort.java b/container/implementations/ContainerSpatialIOPort.java index 4d4a615f..875e8af5 100644 --- a/container/implementations/ContainerSpatialIOPort.java +++ b/container/implementations/ContainerSpatialIOPort.java @@ -10,7 +10,6 @@ import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.spatial.TileSpatialIOPort; import appeng.util.Platform; @@ -39,8 +38,8 @@ public class ContainerSpatialIOPort extends AEBaseContainer if ( Platform.isServer() ) network = te.getGridNode( ForgeDirection.UNKNOWN ).getGrid(); - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.SPATIAL_STORAGE_CELLS, te, 0, 52, 48, invPlayer ) ); - addSlotToContainer( new SlotOutput( te, 1, 113, 48, PlaceableItemType.SPATIAL_STORAGE_CELLS.IIcon ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS, te, 0, 52, 48, invPlayer ) ); + addSlotToContainer( new SlotOutput( te, 1, 113, 48, SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS.IIcon ) ); bindPlayerInventory( ip, 0, 197 - /* height of playerinventory */82 ); } diff --git a/container/implementations/ContainerStorageBus.java b/container/implementations/ContainerStorageBus.java index 9a19e86d..9c4d936f 100644 --- a/container/implementations/ContainerStorageBus.java +++ b/container/implementations/ContainerStorageBus.java @@ -19,7 +19,6 @@ import appeng.container.guisync.GuiSync; import appeng.container.slot.OptionalSlotFakeTypeOnly; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.parts.misc.PartStorageBus; import appeng.util.Platform; import appeng.util.iterators.NullIterator; @@ -85,11 +84,11 @@ public class ContainerStorageBus extends ContainerUpgradeable } IInventory upgrades = myte.getInventoryByName( "upgrades" ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, invPlayer )).setNotDraggable() ); } @Override diff --git a/container/implementations/ContainerUpgradeable.java b/container/implementations/ContainerUpgradeable.java index 80ff3727..c2898a4e 100644 --- a/container/implementations/ContainerUpgradeable.java +++ b/container/implementations/ContainerUpgradeable.java @@ -21,7 +21,6 @@ import appeng.container.slot.OptionalSlotFake; import appeng.container.slot.OptionalSlotFakeTypeOnly; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.items.contents.NetworkToolViewer; import appeng.items.tools.ToolNetworkTool; import appeng.parts.automation.PartExportBus; @@ -78,7 +77,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl { for (int v = 0; v < 3; v++) for (int u = 0; u < 3; u++) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, tbinv, u + v * 3, 186 + u * 18, getHeight() - 82 + v * 18, + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, tbinv, u + v * 3, 186 + u * 18, getHeight() - 82 + v * 18, invPlayer )).setPlayerSide() ); } @@ -91,13 +90,13 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl { IInventory upgrades = myte.getInventoryByName( "upgrades" ); if ( availableUpgrades() > 0 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8 + 18 * 0, invPlayer )).setNotDraggable() ); if ( availableUpgrades() > 1 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18 * 1, invPlayer )).setNotDraggable() ); if ( availableUpgrades() > 2 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, invPlayer )).setNotDraggable() ); if ( availableUpgrades() > 3 ) - addSlotToContainer( (new SlotRestrictedInput( PlaceableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); + addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, invPlayer )).setNotDraggable() ); } protected void setupConfig() diff --git a/container/implementations/ContainerVibrationChamber.java b/container/implementations/ContainerVibrationChamber.java index 6d70da9c..7eaf3258 100644 --- a/container/implementations/ContainerVibrationChamber.java +++ b/container/implementations/ContainerVibrationChamber.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.tile.misc.TileVibrationChamber; import appeng.util.Platform; @@ -17,7 +16,7 @@ public class ContainerVibrationChamber extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( new SlotRestrictedInput( PlaceableItemType.FUEL, te, 0, 80, 37, invPlayer ) ); + addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.FUEL, te, 0, 80, 37, invPlayer ) ); bindPlayerInventory( ip, 0, 166 - /* height of playerinventory */82 ); } diff --git a/container/implementations/ContainerWireless.java b/container/implementations/ContainerWireless.java index 79a20f3a..84f2d0c2 100644 --- a/container/implementations/ContainerWireless.java +++ b/container/implementations/ContainerWireless.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.InventoryPlayer; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotRestrictedInput; -import appeng.container.slot.SlotRestrictedInput.PlaceableItemType; import appeng.core.AEConfig; import appeng.tile.networking.TileWireless; @@ -25,7 +24,7 @@ public class ContainerWireless extends AEBaseContainer super( ip, te, null ); myte = te; - addSlotToContainer( boosterSlot = new SlotRestrictedInput( PlaceableItemType.RANGE_BOOSTER, myte, 0, 80, 47, invPlayer ) ); + addSlotToContainer( boosterSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.RANGE_BOOSTER, myte, 0, 80, 47, invPlayer ) ); bindPlayerInventory( ip, 0, 166 - /* height of playerinventory */82 ); } diff --git a/container/implementations/ContainerWirelessTerm.java b/container/implementations/ContainerWirelessTerm.java index 6416a369..c1390dce 100644 --- a/container/implementations/ContainerWirelessTerm.java +++ b/container/implementations/ContainerWirelessTerm.java @@ -11,9 +11,9 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell WirelessTerminalGuiObject wtgo; - public ContainerWirelessTerm(InventoryPlayer ip, WirelessTerminalGuiObject montiorable) { - super( ip, montiorable ); - wtgo = montiorable; + public ContainerWirelessTerm(InventoryPlayer ip, WirelessTerminalGuiObject monitorable) { + super( ip, monitorable ); + wtgo = monitorable; } @Override diff --git a/container/slot/OptionalSlotRestrictedInput.java b/container/slot/OptionalSlotRestrictedInput.java index 4b47df34..ca324bef 100644 --- a/container/slot/OptionalSlotRestrictedInput.java +++ b/container/slot/OptionalSlotRestrictedInput.java @@ -9,7 +9,7 @@ public class OptionalSlotRestrictedInput extends SlotRestrictedInput final int groupNum; IOptionalSlotHost host; - public OptionalSlotRestrictedInput(PlaceableItemType valid, IInventory i, IOptionalSlotHost host, int slotnum, int x, int y, int grpNum, + public OptionalSlotRestrictedInput(PlacableItemType valid, IInventory i, IOptionalSlotHost host, int slotnum, int x, int y, int grpNum, InventoryPlayer invPlayer) { super( valid, i, slotnum, x, y, invPlayer ); this.groupNum = grpNum; diff --git a/container/slot/SlotCraftingTerm.java b/container/slot/SlotCraftingTerm.java index bef86f18..15efa3e9 100644 --- a/container/slot/SlotCraftingTerm.java +++ b/container/slot/SlotCraftingTerm.java @@ -71,7 +71,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot public ItemStack craftItem(EntityPlayer p, ItemStack request, IMEMonitor inv, IItemList all) { - // update crafting matrx... + // update crafting matrix... ItemStack is = getStack(); if ( is != null && Platform.isSameItem( request, is ) ) @@ -133,7 +133,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot postCraft( p, inv, set, is ); } - // shouldn't be nessiary... + // shouldn't be necessary... p.openContainer.onCraftMatrixChanged( getCraftingMatrix() ); return is; diff --git a/container/slot/SlotInaccessableHD.java b/container/slot/SlotInaccessableHD.java deleted file mode 100644 index 3fc72a3b..00000000 --- a/container/slot/SlotInaccessableHD.java +++ /dev/null @@ -1,12 +0,0 @@ -package appeng.container.slot; - -import net.minecraft.inventory.IInventory; - -public class SlotInaccessableHD extends SlotInaccessable -{ - - public SlotInaccessableHD(IInventory i, int slotIdx, int x, int y) { - super( i, slotIdx, x, y ); - } - -} diff --git a/container/slot/SlotInaccessable.java b/container/slot/SlotInaccessible.java similarity index 85% rename from container/slot/SlotInaccessable.java rename to container/slot/SlotInaccessible.java index 5424b0ad..d6981192 100644 --- a/container/slot/SlotInaccessable.java +++ b/container/slot/SlotInaccessible.java @@ -4,10 +4,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -public class SlotInaccessable extends AppEngSlot +public class SlotInaccessible extends AppEngSlot { - public SlotInaccessable(IInventory i, int slotIdx, int x, int y) { + public SlotInaccessible(IInventory i, int slotIdx, int x, int y) { super( i, slotIdx, x, y ); } diff --git a/container/slot/SlotInaccessibleHD.java b/container/slot/SlotInaccessibleHD.java new file mode 100644 index 00000000..3634d902 --- /dev/null +++ b/container/slot/SlotInaccessibleHD.java @@ -0,0 +1,12 @@ +package appeng.container.slot; + +import net.minecraft.inventory.IInventory; + +public class SlotInaccessibleHD extends SlotInaccessible +{ + + public SlotInaccessibleHD(IInventory i, int slotIdx, int x, int y) { + super( i, slotIdx, x, y ); + } + +} diff --git a/container/slot/SlotRestrictedInput.java b/container/slot/SlotRestrictedInput.java index 73349452..84dbd611 100644 --- a/container/slot/SlotRestrictedInput.java +++ b/container/slot/SlotRestrictedInput.java @@ -26,15 +26,15 @@ import appeng.util.Platform; public class SlotRestrictedInput extends AppEngSlot { - public enum PlaceableItemType + public enum PlacableItemType { STORAGE_CELLS(15), ORE(1 * 16 + 15), STORAGE_COMPONENT(3 * 16 + 15), - ENCODEABLE_ITEM(4 * 16 + 15), TRASH(5 * 16 + 15), VALID_ENCODED_PATTERN_W_OUPUT(7 * 16 + 15), ENCODED_PATTERN_W_OUTPUT(7 * 16 + 15), + ENCODEABLE_ITEM(4 * 16 + 15), TRASH(5 * 16 + 15), VALID_ENCODED_PATTERN_W_OUTPUT(7 * 16 + 15), ENCODED_PATTERN_W_OUTPUT(7 * 16 + 15), ENCODED_CRAFTING_PATTERN(7 * 16 + 15), ENCODED_PATTERN(7 * 16 + 15), PATTERN(8 * 16 + 15), BLANK_PATTERN(8 * 16 + 15), POWERED_TOOL(9 * 16 + 15), - RANGE_BOOSTER(6 * 16 + 15), QE_SINGULARTIY(10 * 16 + 15), SPATIAL_STORAGE_CELLS(11 * 16 + 15), + RANGE_BOOSTER(6 * 16 + 15), QE_SINGULARITY(10 * 16 + 15), SPATIAL_STORAGE_CELLS(11 * 16 + 15), FUEL(12 * 16 + 15), UPGRADES(13 * 16 + 15), WORKBENCH_CELL(15), BIOMETRIC_CARD(14 * 16 + 15), VIEWCELL(4 * 16 + 14), @@ -42,7 +42,7 @@ public class SlotRestrictedInput extends AppEngSlot public final int IIcon; - private PlaceableItemType(int o) { + private PlacableItemType(int o) { IIcon = o; } }; @@ -57,7 +57,7 @@ public class SlotRestrictedInput extends AppEngSlot public boolean isValid(ItemStack is, World theWorld) { - if ( which == PlaceableItemType.VALID_ENCODED_PATTERN_W_OUPUT ) + if ( which == PlacableItemType.VALID_ENCODED_PATTERN_W_OUTPUT ) { ICraftingPatternDetails ap = is.getItem() instanceof ICraftingPatternItem ? ((ICraftingPatternItem) is.getItem()).getPatternForItem( is, theWorld ) : null; @@ -68,7 +68,7 @@ public class SlotRestrictedInput extends AppEngSlot return true; } - public PlaceableItemType which; + public PlacableItemType which; public boolean allowEdit = true; public int stackLimit = -1; private InventoryPlayer p; @@ -85,7 +85,7 @@ public class SlotRestrictedInput extends AppEngSlot return this; } - public SlotRestrictedInput(PlaceableItemType valid, IInventory i, int slotnum, int x, int y, InventoryPlayer p) { + public SlotRestrictedInput(PlacableItemType valid, IInventory i, int slotnum, int x, int y, InventoryPlayer p) { super( i, slotnum, x, y ); which = valid; IIcon = valid.IIcon; @@ -95,7 +95,7 @@ public class SlotRestrictedInput extends AppEngSlot @Override public ItemStack getDisplayStack() { - if ( Platform.isClient() && (which == PlaceableItemType.ENCODED_PATTERN) ) + if ( Platform.isClient() && (which == PlacableItemType.ENCODED_PATTERN) ) { ItemStack is = super.getStack(); if ( is != null && is.getItem() instanceof ItemEncodedPattern ) @@ -139,7 +139,7 @@ public class SlotRestrictedInput extends AppEngSlot return de.isCraftable(); } return false; - case VALID_ENCODED_PATTERN_W_OUPUT: + case VALID_ENCODED_PATTERN_W_OUTPUT: case ENCODED_PATTERN_W_OUTPUT: case ENCODED_PATTERN: { if ( i.getItem() instanceof ICraftingPatternItem ) @@ -187,7 +187,7 @@ public class SlotRestrictedInput extends AppEngSlot return TileEntityFurnace.getItemBurnTime( i ) > 0; case POWERED_TOOL: return Platform.isChargeable( i ); - case QE_SINGULARTIY: + case QE_SINGULARITY: return api.materials().materialQESingularity.sameAsStack( i ); case RANGE_BOOSTER: return api.materials().materialWirelessBooster.sameAsStack( i ); diff --git a/core/AEConfig.java b/core/AEConfig.java index a419e6aa..b7f207cf 100644 --- a/core/AEConfig.java +++ b/core/AEConfig.java @@ -126,11 +126,11 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon public boolean disableColoredCableRecipesInNEI = true; - public boolean updateable = false; + public boolean updatable = false; final private File myPath; - public double metoriteClusterChance = 0.1; - public double metoriteSpawnChance = 0.3; + public double meteoriteClusterChance = 0.1; + public double meteoriteSpawnChance = 0.3; public int craftingCalculationTimePerTick = 5; @@ -235,8 +235,8 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon spawnChargedChance = (float) (1.0 - get( "worldGen", "spawnChargedChance", 1.0 - spawnChargedChance ).getDouble( 1.0 - spawnChargedChance )); minMeteoriteDistance = get( "worldGen", "minMeteoriteDistance", minMeteoriteDistance ).getInt( minMeteoriteDistance ); - metoriteClusterChance = get( "worldGen", "metoriteClusterChance", metoriteClusterChance ).getDouble( metoriteClusterChance ); - metoriteSpawnChance = get( "worldGen", "metoriteSpawnChance", metoriteSpawnChance ).getDouble( metoriteSpawnChance ); + meteoriteClusterChance = get( "worldGen", "meteoriteClusterChance", meteoriteClusterChance ).getDouble( meteoriteClusterChance ); + meteoriteSpawnChance = get( "worldGen", "meteoriteSpawnChance", meteoriteSpawnChance ).getDouble( meteoriteSpawnChance ); quartzOresPerCluster = get( "worldGen", "quartzOresPerCluster", quartzOresPerCluster ).getInt( quartzOresPerCluster ); quartzOresClusterAmount = get( "worldGen", "quartzOresClusterAmount", quartzOresClusterAmount ).getInt( quartzOresClusterAmount ); @@ -270,7 +270,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon { if ( feature.isVisible() ) { - if ( get( "Features." + feature.getCategory(), feature.name(), feature.defaultVaue() ).getBoolean( feature.defaultVaue() ) ) + if ( get( "Features." + feature.getCategory(), feature.name(), feature.defaultValue() ).getBoolean( feature.defaultValue() ) ) featureFlags.add( feature ); } else @@ -326,7 +326,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon } } - updateable = true; + updatable = true; } public boolean useAEVersion(MaterialType mt) @@ -377,7 +377,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon } } - if ( updateable ) + if ( updatable ) save(); } diff --git a/core/Registration.java b/core/Registration.java index 2d9481f9..659ed10f 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -199,24 +199,24 @@ public class Registration { registerSpatial( false ); - IRecipeHandlerRegistry recipeRegistery = AEApi.instance().registries().recipes(); - recipeRegistery.addNewSubItemResolver( new AEItemResolver() ); + IRecipeHandlerRegistry recipeRegistry = AEApi.instance().registries().recipes(); + recipeRegistry.addNewSubItemResolver( new AEItemResolver() ); - recipeRegistery.addNewCraftHandler( "hccrusher", HCCrusher.class ); - recipeRegistery.addNewCraftHandler( "mekcrusher", MekCrusher.class ); - recipeRegistery.addNewCraftHandler( "mekechamber", MekEnrichment.class ); - recipeRegistery.addNewCraftHandler( "grind", Grind.class ); - recipeRegistery.addNewCraftHandler( "crusher", Crusher.class ); - recipeRegistery.addNewCraftHandler( "grindfz", GrindFZ.class ); - recipeRegistery.addNewCraftHandler( "pulverizer", Pulverizer.class ); - recipeRegistery.addNewCraftHandler( "macerator", Macerator.class ); + recipeRegistry.addNewCraftHandler( "hccrusher", HCCrusher.class ); + recipeRegistry.addNewCraftHandler( "mekcrusher", MekCrusher.class ); + recipeRegistry.addNewCraftHandler( "mekechamber", MekEnrichment.class ); + recipeRegistry.addNewCraftHandler( "grind", Grind.class ); + recipeRegistry.addNewCraftHandler( "crusher", Crusher.class ); + recipeRegistry.addNewCraftHandler( "grindfz", GrindFZ.class ); + recipeRegistry.addNewCraftHandler( "pulverizer", Pulverizer.class ); + recipeRegistry.addNewCraftHandler( "macerator", Macerator.class ); - recipeRegistery.addNewCraftHandler( "smelt", Smelt.class ); - recipeRegistery.addNewCraftHandler( "inscribe", Inscribe.class ); - recipeRegistery.addNewCraftHandler( "press", Press.class ); + recipeRegistry.addNewCraftHandler( "smelt", Smelt.class ); + recipeRegistry.addNewCraftHandler( "inscribe", Inscribe.class ); + recipeRegistry.addNewCraftHandler( "press", Press.class ); - recipeRegistery.addNewCraftHandler( "shaped", Shaped.class ); - recipeRegistery.addNewCraftHandler( "shapeless", Shapeless.class ); + recipeRegistry.addNewCraftHandler( "shaped", Shaped.class ); + recipeRegistry.addNewCraftHandler( "shapeless", Shapeless.class ); RecipeSorter.register( "AE2-Facade", FacadeRecipe.class, Category.SHAPED, "" ); RecipeSorter.register( "AE2-Shaped", ShapedRecipe.class, Category.SHAPED, "" ); @@ -267,8 +267,8 @@ public class Registration else { Field f = partClass.getField( "part" + type.name() ); - Enum varients[] = type.getVarients(); - if ( varients == null ) + Enum variants[] = type.getVariants(); + if ( variants == null ) { ItemStackSrc is = ((ItemMultiPart) partItem.item()).createPart( type, null ); if ( is != null ) @@ -278,11 +278,11 @@ public class Registration } else { - if ( varients[0] instanceof AEColor ) + if ( variants[0] instanceof AEColor ) { ColoredItemDefinition def = new ColoredItemDefinition(); - for (Enum v : varients) + for (Enum v : variants) { ItemStackSrc is = ((ItemMultiPart) partItem.item()).createPart( type, v ); if ( is != null ) diff --git a/core/WorldSettings.java b/core/WorldSettings.java index e1a6925e..e0c4f071 100644 --- a/core/WorldSettings.java +++ b/core/WorldSettings.java @@ -143,7 +143,7 @@ public class WorldSettings extends Configuration } } - public Collection getNearByMetetorites(int dim, int chunkX, int chunkZ) + public Collection getNearByMeteorites(int dim, int chunkX, int chunkZ) { LinkedList ll = new LinkedList(); @@ -194,7 +194,7 @@ public class WorldSettings extends Configuration } } - public boolean addNearByMetetorites(int dim, int chunkX, int chunkZ, NBTTagCompound newData) + public boolean addNearByMeteorites(int dim, int chunkX, int chunkZ, NBTTagCompound newData) { synchronized (WorldSettings.class) { diff --git a/core/api/ApiPart.java b/core/api/ApiPart.java index c30be2ad..d7a9ffe3 100644 --- a/core/api/ApiPart.java +++ b/core/api/ApiPart.java @@ -56,7 +56,7 @@ public class ApiPart implements IPartHelper for (Class layerInterface : interfaces2Layer.keySet()) { if ( AppEng.instance.isIntegrationEnabled( IntegrationType.FMP ) ) - ((IFMP) AppEng.instance.getIntegration( IntegrationType.FMP )).registerPassThru( layerInterface ); + ((IFMP) AppEng.instance.getIntegration( IntegrationType.FMP )).registerPassThrough( layerInterface ); } } @@ -338,7 +338,7 @@ public class ApiPart implements IPartHelper return true; } else - AELog.info( "Layer " + layer + " not registered, " + layerInterface + " aready has a layer." ); + AELog.info( "Layer " + layer + " not registered, " + layerInterface + " already has a layer." ); } catch (Throwable t) { diff --git a/core/features/AEFeature.java b/core/features/AEFeature.java index bdbefc87..163a6f9e 100644 --- a/core/features/AEFeature.java +++ b/core/features/AEFeature.java @@ -30,7 +30,7 @@ public enum AEFeature SpatialIO("NetworkFeatures"), QuantumNetworkBridge("NetworkFeatures"), Channels("NetworkFeatures"), - LevelEmiter("NetworkBuses"), CraftingTerminal("NetworkBuses"), StorageMonitor("NetworkBuses"), P2PTunnel("NetworkBuses"), FormationPlane("NetworkBuses"), AnnihilationPlane( + LevelEmitter("NetworkBuses"), CraftingTerminal("NetworkBuses"), StorageMonitor("NetworkBuses"), P2PTunnel("NetworkBuses"), FormationPlane("NetworkBuses"), AnnihilationPlane( "NetworkBuses"), ImportBus("NetworkBuses"), ExportBus("NetworkBuses"), StorageBus("NetworkBuses"), PartConversionMonitor("NetworkBuses"), StorageCells("Storage"), PortableCell("PortableCell"), MEChest("Storage"), MEDrive("Storage"), IOPort("Storage"), @@ -75,7 +75,7 @@ public enum AEFeature return Category; } - public Boolean defaultVaue() + public Boolean defaultValue() { return defValue; } diff --git a/core/features/registries/LocateableRegistry.java b/core/features/registries/LocatableRegistry.java similarity index 82% rename from core/features/registries/LocateableRegistry.java rename to core/features/registries/LocatableRegistry.java index b8d7a6b1..ee99632f 100644 --- a/core/features/registries/LocateableRegistry.java +++ b/core/features/registries/LocatableRegistry.java @@ -1,48 +1,48 @@ -package appeng.core.features.registries; - -import java.util.HashMap; - -import net.minecraftforge.common.MinecraftForge; -import appeng.api.events.LocatableEventAnnounce; -import appeng.api.events.LocatableEventAnnounce.LocatableEvent; -import appeng.api.features.ILocatable; -import appeng.api.features.ILocatableRegistry; -import appeng.util.Platform; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class LocateableRegistry implements ILocatableRegistry -{ - - private HashMap set; - - @SubscribeEvent - public void updateLocateable(LocatableEventAnnounce e) - { - if ( Platform.isClient() ) - return; // IGNORE! - - if ( e.change == LocatableEvent.Register ) - { - set.put( e.target.getLocatableSerial(), e.target ); - } - else if ( e.change == LocatableEvent.Unregister ) - { - set.remove( e.target.getLocatableSerial() ); - } - } - - public LocateableRegistry() { - set = new HashMap(); - MinecraftForge.EVENT_BUS.register( this ); - } - - /** - * Find a locate-able object by its serial. - */ - @Override - public Object findLocatableBySerial(long ser) - { - return set.get( ser ); - } - -} +package appeng.core.features.registries; + +import java.util.HashMap; + +import net.minecraftforge.common.MinecraftForge; +import appeng.api.events.LocatableEventAnnounce; +import appeng.api.events.LocatableEventAnnounce.LocatableEvent; +import appeng.api.features.ILocatable; +import appeng.api.features.ILocatableRegistry; +import appeng.util.Platform; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class LocatableRegistry implements ILocatableRegistry +{ + + private HashMap set; + + @SubscribeEvent + public void updateLocatable(LocatableEventAnnounce e) + { + if ( Platform.isClient() ) + return; // IGNORE! + + if ( e.change == LocatableEvent.Register ) + { + set.put( e.target.getLocatableSerial(), e.target ); + } + else if ( e.change == LocatableEvent.Unregister ) + { + set.remove( e.target.getLocatableSerial() ); + } + } + + public LocatableRegistry() { + set = new HashMap(); + MinecraftForge.EVENT_BUS.register( this ); + } + + /** + * Find a locate-able object by its serial. + */ + @Override + public Object findLocatableBySerial(long ser) + { + return set.get( ser ); + } + +} diff --git a/core/features/registries/P2PTunnelRegistry.java b/core/features/registries/P2PTunnelRegistry.java index 8b66b283..1e50aa19 100644 --- a/core/features/registries/P2PTunnelRegistry.java +++ b/core/features/registries/P2PTunnelRegistry.java @@ -22,13 +22,13 @@ public class P2PTunnelRegistry implements IP2PTunnelRegistry public ItemStack getModItem(String modID, String Name, int meta) { - ItemStack myItmeStack = GameRegistry.findItemStack( modID, Name, 1 ); + ItemStack myItemStack = GameRegistry.findItemStack( modID, Name, 1 ); - if ( myItmeStack == null ) + if ( myItemStack == null ) return null; - myItmeStack.setItemDamage( meta ); - return myItmeStack; + myItemStack.setItemDamage( meta ); + return myItemStack; } public void configure() diff --git a/core/features/registries/RegistryContainer.java b/core/features/registries/RegistryContainer.java index 2a8cbf64..274862cc 100644 --- a/core/features/registries/RegistryContainer.java +++ b/core/features/registries/RegistryContainer.java @@ -21,12 +21,12 @@ public class RegistryContainer implements IRegistryContainer private GrinderRecipeManager GrinderRecipes = new GrinderRecipeManager(); private ExternalStorageRegistry ExternalStorageHandlers = new ExternalStorageRegistry(); private CellRegistry CellRegistry = new CellRegistry(); - private LocateableRegistry LocateableRegistry = new LocateableRegistry(); - private SpecialComparisonRegistry SpecialComparsonRegistry = new SpecialComparisonRegistry(); - private WirelessRegistry WirelessRegistery = new WirelessRegistry(); + private LocatableRegistry LocatableRegistry = new LocatableRegistry(); + private SpecialComparisonRegistry SpecialComparisonRegistry = new SpecialComparisonRegistry(); + private WirelessRegistry WirelessRegistry = new WirelessRegistry(); private GridCacheRegistry GridCacheRegistry = new GridCacheRegistry(); private P2PTunnelRegistry P2PRegistry = new P2PTunnelRegistry(); - private MovableTileRegistry MoveableReg = new MovableTileRegistry(); + private MovableTileRegistry MovableReg = new MovableTileRegistry(); private MatterCannonAmmoRegistry matterCannonReg = new MatterCannonAmmoRegistry(); private PlayerRegistry playerreg = new PlayerRegistry(); private IRecipeHandlerRegistry recipeReg = new RecipeHandlerRegistry(); @@ -34,7 +34,7 @@ public class RegistryContainer implements IRegistryContainer @Override public IWirelessTermRegistry wireless() { - return WirelessRegistery; + return WirelessRegistry; } @Override @@ -52,7 +52,7 @@ public class RegistryContainer implements IRegistryContainer @Override public ISpecialComparisonRegistry specialComparison() { - return SpecialComparsonRegistry; + return SpecialComparisonRegistry; } @Override @@ -64,7 +64,7 @@ public class RegistryContainer implements IRegistryContainer @Override public ILocatableRegistry locatable() { - return LocateableRegistry; + return LocatableRegistry; } @Override @@ -76,7 +76,7 @@ public class RegistryContainer implements IRegistryContainer @Override public IMovableRegistry movable() { - return MoveableReg; + return MovableReg; } @Override diff --git a/core/features/registries/WorldGenRegistry.java b/core/features/registries/WorldGenRegistry.java index 1d664a60..53820a58 100644 --- a/core/features/registries/WorldGenRegistry.java +++ b/core/features/registries/WorldGenRegistry.java @@ -13,7 +13,7 @@ public class WorldGenRegistry implements IWorldGen { HashSet> badProviders = new HashSet(); - HashSet badDimentions = new HashSet(); + HashSet badDimensions = new HashSet(); }; @@ -41,7 +41,7 @@ public class WorldGenRegistry implements IWorldGen if ( w == null ) throw new IllegalArgumentException( "Bad Provider Passed" ); - if ( types[type.ordinal()].badProviders.contains( w.provider.getClass() ) || types[type.ordinal()].badDimentions.contains( w.provider.dimensionId ) ) + if ( types[type.ordinal()].badProviders.contains( w.provider.getClass() ) || types[type.ordinal()].badDimensions.contains( w.provider.dimensionId ) ) return false; return true; @@ -65,7 +65,7 @@ public class WorldGenRegistry implements IWorldGen if ( type == null ) throw new IllegalArgumentException( "Bad Type Passed" ); - types[type.ordinal()].badDimentions.add( dimid ); + types[type.ordinal()].badDimensions.add( dimid ); } } diff --git a/core/localization/ButtonToolTips.java b/core/localization/ButtonToolTips.java index 57ae22e7..16f14925 100644 --- a/core/localization/ButtonToolTips.java +++ b/core/localization/ButtonToolTips.java @@ -36,7 +36,7 @@ public enum ButtonToolTips Stash, StashDesc, Encode, EncodeDescription, Substitutions, SubstitutionsOn, SubstitutionsOff, SubstitutionsDesc, CraftOnly, CraftEither, - Craft, Mod, DosntDespawn, EmitterMode, CraftViaRedstone, EmitWhenCrafing, ReportInaccessibleItems, ReportInaccessibleItemsYes, ReportInaccessibleItemsNo; + Craft, Mod, DoesntDespawn, EmitterMode, CraftViaRedstone, EmitWhenCrafting, ReportInaccessibleItems, ReportInaccessibleItemsYes, ReportInaccessibleItemsNo; String root; diff --git a/core/stats/Achievements.java b/core/stats/Achievements.java index f9b3c907..19940028 100644 --- a/core/stats/Achievements.java +++ b/core/stats/Achievements.java @@ -23,7 +23,7 @@ public enum Achievements SpatialIO(-4, -4, AEApi.instance().blocks().blockSpatialIOPort, AchievementType.Craft), // done - SpatialIOExplorerer(-4, -2, AEApi.instance().items().itemSpatialCell128, AchievementType.Custom), + SpatialIOExplorer(-4, -2, AEApi.instance().items().itemSpatialCell128, AchievementType.Custom), // done StorageCell(-6, -4, AEApi.instance().items().itemCell64k, AchievementType.CraftItem), @@ -98,10 +98,10 @@ public enum Achievements public void setParent(Achievements parent) { - this.parent = parent.getAchivement(); + this.parent = parent.getAchievement(); } - public Achievement getAchivement() + public Achievement getAchievement() { if ( stat == null && stack != null ) { @@ -138,7 +138,7 @@ public enum Achievements public void addToPlayer(EntityPlayer player) { - player.addStat( getAchivement(), 1 ); + player.addStat( getAchievement(), 1 ); } } diff --git a/core/stats/PlayerStatsRegistration.java b/core/stats/PlayerStatsRegistration.java index ef1c0af9..31f50c1b 100644 --- a/core/stats/PlayerStatsRegistration.java +++ b/core/stats/PlayerStatsRegistration.java @@ -94,7 +94,7 @@ public class PlayerStatsRegistration Achievements.GlassCable.setParent( Achievements.Charger ); - Achievements.SpatialIOExplorerer.setParent( Achievements.SpatialIO ); + Achievements.SpatialIOExplorer.setParent( Achievements.SpatialIO ); Achievements.IOPort.setParent( Achievements.StorageCell ); @@ -128,7 +128,7 @@ public class PlayerStatsRegistration for (Achievements a : Achievements.values()) { - Achievement ach = a.getAchivement(); + Achievement ach = a.getAchievement(); if ( ach != null ) list.add( ach ); } diff --git a/core/sync/GuiBridge.java b/core/sync/GuiBridge.java index a4985529..24697d6c 100644 --- a/core/sync/GuiBridge.java +++ b/core/sync/GuiBridge.java @@ -240,7 +240,7 @@ public enum GuiBridge implements IGuiHandler Object o = target.newInstance( inventory, tE ); /** - * triggers achivemnet when the player sees presses. + * triggers achievement when the player sees presses. */ if ( o instanceof AEBaseContainer ) { diff --git a/core/sync/network/NetworkHandler.java b/core/sync/network/NetworkHandler.java index bff21b31..e5f8a149 100644 --- a/core/sync/network/NetworkHandler.java +++ b/core/sync/network/NetworkHandler.java @@ -58,13 +58,13 @@ public class NetworkHandler } @SubscribeEvent - public void newConection(ServerConnectionFromClientEvent ev) + public void newConnection(ServerConnectionFromClientEvent ev) { WorldSettings.getInstance().sendToPlayer( ev.manager, null ); } @SubscribeEvent - public void newConection(PlayerLoggedInEvent loginEvent) + public void newConnection(PlayerLoggedInEvent loginEvent) { if ( loginEvent.player instanceof EntityPlayerMP ) WorldSettings.getInstance().sendToPlayer( null, (EntityPlayerMP) loginEvent.player ); diff --git a/core/sync/packets/PacketMEInventoryUpdate.java b/core/sync/packets/PacketMEInventoryUpdate.java index 435fc3dc..c35f42d7 100644 --- a/core/sync/packets/PacketMEInventoryUpdate.java +++ b/core/sync/packets/PacketMEInventoryUpdate.java @@ -65,21 +65,21 @@ public class PacketMEInventoryUpdate extends AppEngPacket } ); - ByteBuf uncompesssed = Unpooled.buffer( stream.readableBytes() ); + ByteBuf uncompressed = Unpooled.buffer( stream.readableBytes() ); byte tmp[] = new byte[1024]; while (gzReader.available() != 0) { int bytes = gzReader.read( tmp ); if ( bytes > 0 ) - uncompesssed.writeBytes( tmp, 0, bytes ); + uncompressed.writeBytes( tmp, 0, bytes ); } gzReader.close(); - // int uncompesssedBytes = uncompesssed.readableBytes(); - // AELog.info( "Recv: " + originalBytes + " -> " + uncompesssedBytes ); + // int uncompressedBytes = uncompressed.readableBytes(); + // AELog.info( "Recv: " + originalBytes + " -> " + uncompressedBytes ); - while (uncompesssed.readableBytes() > 0) - list.add( AEItemStack.loadItemStackFromPacket( uncompesssed ) ); + while (uncompressed.readableBytes() > 0) + list.add( AEItemStack.loadItemStackFromPacket( uncompressed ) ); empty = list.isEmpty(); } diff --git a/crafting/CraftingLink.java b/crafting/CraftingLink.java index 1dacb2d8..d0e385d9 100644 --- a/crafting/CraftingLink.java +++ b/crafting/CraftingLink.java @@ -101,7 +101,7 @@ public class CraftingLink implements ICraftingLink tag.setBoolean( "req", req != null ); } - public void setNextus(CraftingLinkNexus n) + public void setNexus(CraftingLinkNexus n) { if ( tie != null ) tie.remove( this ); diff --git a/crafting/CraftingLinkNexus.java b/crafting/CraftingLinkNexus.java index 6906a84a..861950f8 100644 --- a/crafting/CraftingLinkNexus.java +++ b/crafting/CraftingLinkNexus.java @@ -112,7 +112,7 @@ public class CraftingLinkNexus public void removeNode() { if ( req != null ) - req.setNextus( null ); + req.setNexus( null ); req = null; tickOfDeath = 0; diff --git a/crafting/CraftingTreeNode.java b/crafting/CraftingTreeNode.java index fff61140..864c9231 100644 --- a/crafting/CraftingTreeNode.java +++ b/crafting/CraftingTreeNode.java @@ -60,7 +60,7 @@ public class CraftingTreeNode for (ICraftingPatternDetails details : cc.getCraftingFor( what, parent == null ? null : parent.details, slot, world ))// in // order. { - if ( parent == null || parent.notRecurive( details ) ) + if ( parent == null || parent.notRecursive( details ) ) nodes.add( new CraftingTreeProcess( cc, job, details, this, depth + 1, world ) ); } @@ -73,7 +73,7 @@ public class CraftingTreeNode return is; } - boolean notRecurive(ICraftingPatternDetails details) + boolean notRecursive(ICraftingPatternDetails details) { IAEItemStack[] o = details.getCondensedOutputs(); for (IAEItemStack i : o) @@ -88,7 +88,7 @@ public class CraftingTreeNode if ( parent == null ) return true; - return parent.notRecurive( details ); + return parent.notRecursive( details ); } public IAEItemStack request(MECraftingInventory inv, long l, BaseActionSource src) throws CraftBranchFailure, InterruptedException diff --git a/crafting/CraftingTreeProcess.java b/crafting/CraftingTreeProcess.java index 9d425ebf..52c89a95 100644 --- a/crafting/CraftingTreeProcess.java +++ b/crafting/CraftingTreeProcess.java @@ -135,9 +135,9 @@ public class CraftingTreeProcess } } - public boolean notRecurive(ICraftingPatternDetails details) + public boolean notRecursive(ICraftingPatternDetails details) { - return parent == null || parent.notRecurive( details ); + return parent == null || parent.notRecursive( details ); } long getTimes(long remaining, long stackSize) diff --git a/crafting/MECraftingInventory.java b/crafting/MECraftingInventory.java index 365fdc7a..3efd5771 100644 --- a/crafting/MECraftingInventory.java +++ b/crafting/MECraftingInventory.java @@ -39,12 +39,12 @@ public class MECraftingInventory implements IMEInventory par = null; } - public MECraftingInventory(MECraftingInventory parrent) + public MECraftingInventory(MECraftingInventory parent) { - this.target = parrent; - this.logExtracted = parrent.logExtracted; - this.logInjections = parrent.logInjections; - this.logMissing = parrent.logMissing; + this.target = parent; + this.logExtracted = parent.logExtracted; + this.logInjections = parent.logInjections; + this.logMissing = parent.logMissing; if ( logMissing ) missingCache = AEApi.instance().storage().createItemList(); @@ -63,7 +63,7 @@ public class MECraftingInventory implements IMEInventory localCache = target.getAvailableItems( AEApi.instance().storage().createItemList() ); - par = parrent; + par = parent; } public MECraftingInventory(IMEMonitor target, BaseActionSource src, boolean logExtracted, boolean logInjections, boolean logMissing) @@ -200,10 +200,10 @@ public class MECraftingInventory implements IMEInventory if ( logInjections ) { - for (IAEItemStack injec : injectedCache) + for (IAEItemStack inject : injectedCache) { IAEItemStack result = null; - added.add( result = target.injectItems( injec, Actionable.MODULATE, src ) ); + added.add( result = target.injectItems( inject, Actionable.MODULATE, src ) ); if ( result != null ) { diff --git a/debug/BlockChunkloader.java b/debug/BlockChunkloader.java index e5237439..0a1947a2 100644 --- a/debug/BlockChunkloader.java +++ b/debug/BlockChunkloader.java @@ -18,8 +18,8 @@ public class BlockChunkloader extends AEBaseBlock implements LoadingCallback public BlockChunkloader() { super( BlockChunkloader.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); - setTileEntiy( TileChunkLoader.class ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setTileEntity( TileChunkLoader.class ); ForgeChunkManager.setForcedChunkLoadingCallback( AppEng.instance, this ); } diff --git a/debug/BlockCubeGenerator.java b/debug/BlockCubeGenerator.java index 06532e85..bda1664e 100644 --- a/debug/BlockCubeGenerator.java +++ b/debug/BlockCubeGenerator.java @@ -14,8 +14,8 @@ public class BlockCubeGenerator extends AEBaseBlock public BlockCubeGenerator() { super( BlockCubeGenerator.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); - setTileEntiy( TileCubeGenerator.class ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setTileEntity( TileCubeGenerator.class ); } @Override diff --git a/debug/BlockItemGen.java b/debug/BlockItemGen.java index 065be7c3..b651755e 100644 --- a/debug/BlockItemGen.java +++ b/debug/BlockItemGen.java @@ -12,8 +12,8 @@ public class BlockItemGen extends AEBaseBlock public BlockItemGen() { super( BlockItemGen.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); - setTileEntiy( TileItemGen.class ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setTileEntity( TileItemGen.class ); } @Override diff --git a/debug/BlockPhantomNode.java b/debug/BlockPhantomNode.java index 0e274e79..f6862365 100644 --- a/debug/BlockPhantomNode.java +++ b/debug/BlockPhantomNode.java @@ -14,8 +14,8 @@ public class BlockPhantomNode extends AEBaseBlock public BlockPhantomNode() { super( BlockPhantomNode.class, Material.iron ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); - setTileEntiy( TilePhantomNode.class ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setTileEntity( TilePhantomNode.class ); } @Override diff --git a/debug/ToolDebugCard.java b/debug/ToolDebugCard.java index d45a461e..77ec1e8f 100644 --- a/debug/ToolDebugCard.java +++ b/debug/ToolDebugCard.java @@ -34,7 +34,7 @@ public class ToolDebugCard extends AEBaseItem public ToolDebugCard() { super( ToolDebugCard.class ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } public String timeMeasurement(long nanos) @@ -172,7 +172,7 @@ public class ToolDebugCard extends AEBaseItem if ( node != null && node.getGrid() != null ) { IEnergyGrid eg = node.getGrid().getCache( IEnergyGrid.class ); - outputMsg( player, "GridEnerg: " + eg.getStoredPower() + " : " + eg.getEnergyDemand( Double.MAX_VALUE ) ); + outputMsg( player, "GridEnergy: " + eg.getStoredPower() + " : " + eg.getEnergyDemand( Double.MAX_VALUE ) ); } } } diff --git a/debug/ToolEraser.java b/debug/ToolEraser.java index 2aa30722..9dcdda79 100644 --- a/debug/ToolEraser.java +++ b/debug/ToolEraser.java @@ -21,7 +21,7 @@ public class ToolEraser extends AEBaseItem public ToolEraser() { super( ToolEraser.class ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } @Override diff --git a/debug/ToolMeteoritePlacer.java b/debug/ToolMeteoritePlacer.java index d3c3f5e0..ec3b8075 100644 --- a/debug/ToolMeteoritePlacer.java +++ b/debug/ToolMeteoritePlacer.java @@ -18,7 +18,7 @@ public class ToolMeteoritePlacer extends AEBaseItem public ToolMeteoritePlacer() { super( ToolMeteoritePlacer.class ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } @Override @@ -31,7 +31,7 @@ public class ToolMeteoritePlacer extends AEBaseItem boolean worked = mp.spawnMeteorite( new MeteoritePlacer.StandardWorld( world ), x, y, z ); if ( !worked ) - player.addChatMessage( new ChatComponentText( "Un-suiteable Location." ) ); + player.addChatMessage( new ChatComponentText( "Un-suitable Location." ) ); return true; } diff --git a/debug/ToolReplicatorCard.java b/debug/ToolReplicatorCard.java index 12d78354..e98a6802 100644 --- a/debug/ToolReplicatorCard.java +++ b/debug/ToolReplicatorCard.java @@ -25,7 +25,7 @@ public class ToolReplicatorCard extends AEBaseItem public ToolReplicatorCard() { super( ToolReplicatorCard.class ); - setfeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); + setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } @Override diff --git a/facade/FacadePart.java b/facade/FacadePart.java index 57ce4fe9..c0dbca5a 100644 --- a/facade/FacadePart.java +++ b/facade/FacadePart.java @@ -65,7 +65,7 @@ public class FacadePart implements IFacadePart, IBoxProvider { if ( e instanceof EntityLivingBase ) { - // prevent weird snagg behavior + // prevent weird snag behavior ch.addBox( 0.0, 0.0, 14, 16.0, 16.0, 16.0 ); } else diff --git a/fmp/CableBusPart.java b/fmp/CableBusPart.java index 0592730a..e1f14465 100644 --- a/fmp/CableBusPart.java +++ b/fmp/CableBusPart.java @@ -370,9 +370,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds } @Override - public void removePart(ForgeDirection side, boolean supressUpdate) + public void removePart(ForgeDirection side, boolean suppressUpdate) { - cb.removePart( side, supressUpdate ); + cb.removePart( side, suppressUpdate ); } boolean canUpdate = false; diff --git a/helpers/DualityInterface.java b/helpers/DualityInterface.java index e6d58814..4860d7c9 100644 --- a/helpers/DualityInterface.java +++ b/helpers/DualityInterface.java @@ -355,7 +355,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt requireWork[slot] = req.copy(); return; } - else if ( req.isSameType( Stored ) ) // same type ( qty diffrent? )! + else if ( req.isSameType( Stored ) ) // same type ( qty different? )! { if ( req.getStackSize() != Stored.stackSize ) { @@ -429,11 +429,11 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt throw new GridAccessException(); } - IAEItemStack aquired = Platform.poweredExtraction( src, destination, itemStack, mySrc ); - if ( aquired != null ) + IAEItemStack acquired = Platform.poweredExtraction( src, destination, itemStack, mySrc ); + if ( acquired != null ) { changed = true; - ItemStack issue = adaptor.addItems( aquired.getItemStack() ); + ItemStack issue = adaptor.addItems( acquired.getItemStack() ); if ( issue != null ) throw new RuntimeException( "bad attempt at managing inventory. ( addItems )" ); } @@ -970,25 +970,25 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return craftingTracker.getRequestedJobs(); } - public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack aquired, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack acquired, Actionable mode) { int slot = craftingTracker.getSlot( link ); - if ( aquired != null && slot >= 0 && slot <= requireWork.length ) + if ( acquired != null && slot >= 0 && slot <= requireWork.length ) { InventoryAdaptor adaptor = getAdaptor( slot ); if ( mode == Actionable.SIMULATE ) - return AEItemStack.create( adaptor.simulateAdd( aquired.getItemStack() ) ); + return AEItemStack.create( adaptor.simulateAdd( acquired.getItemStack() ) ); else { - IAEItemStack is = AEItemStack.create( adaptor.addItems( aquired.getItemStack() ) ); + IAEItemStack is = AEItemStack.create( adaptor.addItems( acquired.getItemStack() ) ); updatePlan( slot ); return is; } } - return aquired; + return acquired; } public void jobStateChange(ICraftingLink link) @@ -1088,7 +1088,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return (te.zCoord << 24) ^ (te.xCoord << 8) ^ te.yCoord; } - public void initalize() + public void initialize() { updateCraftingList(); } diff --git a/helpers/ICustomCollision.java b/helpers/ICustomCollision.java index 5bb0809d..b214fa8e 100644 --- a/helpers/ICustomCollision.java +++ b/helpers/ICustomCollision.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; public interface ICustomCollision { - Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity thePlayer, boolean b); + Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity thePlayer, boolean b); void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e); diff --git a/helpers/MetaRotation.java b/helpers/MetaRotation.java index dd951fda..c465ee9b 100644 --- a/helpers/MetaRotation.java +++ b/helpers/MetaRotation.java @@ -26,7 +26,7 @@ public class MetaRotation implements IOrientable if ( w instanceof World ) ((World) w).setBlockMetadataWithNotify( x, y, z, Up.ordinal(), 1 + 2 ); else - throw new RuntimeException( w.getClass().getName() + " recieved, exptected World" ); + throw new RuntimeException( w.getClass().getName() + " received, expected World" ); } @Override diff --git a/helpers/MeteoritePlacer.java b/helpers/MeteoritePlacer.java index 75ce1a47..65a5c1b4 100644 --- a/helpers/MeteoritePlacer.java +++ b/helpers/MeteoritePlacer.java @@ -35,7 +35,7 @@ public class MeteoritePlacer return 0; } - public void getRandomFall(IMetroiteWorld w, int x, int y, int z) + public void getRandomFall(IMeteoriteWorld w, int x, int y, int z) { double a = Math.random(); if ( a > 0.9 ) @@ -48,7 +48,7 @@ public class MeteoritePlacer put( w, x, y, z, Blocks.gravel ); } - public void getRandomInset(IMetroiteWorld w, int x, int y, int z) + public void getRandomInset(IMeteoriteWorld w, int x, int y, int z) { double a = Math.random(); if ( a > 0.9 ) @@ -73,17 +73,17 @@ public class MeteoritePlacer Block blk; int meta; - public FalloutCopy(IMetroiteWorld w, int x, int y, int z) { + public FalloutCopy(IMeteoriteWorld w, int x, int y, int z) { blk = w.getBlock( x, y, z ); meta = w.getBlockMetadata( x, y, z ); } - public void getOther(IMetroiteWorld w, int x, int y, int z, double a) + public void getOther(IMeteoriteWorld w, int x, int y, int z, double a) { } - public void getRandomFall(IMetroiteWorld w, int x, int y, int z) + public void getRandomFall(IMeteoriteWorld w, int x, int y, int z) { double a = Math.random(); if ( a > 0.9 ) @@ -92,7 +92,7 @@ public class MeteoritePlacer getOther( w, x, y, z, a ); } - public void getRandomInset(IMetroiteWorld w, int x, int y, int z) + public void getRandomInset(IMeteoriteWorld w, int x, int y, int z) { double a = Math.random(); if ( a > 0.9 ) @@ -107,7 +107,7 @@ public class MeteoritePlacer private class FalloutSand extends FalloutCopy { - public FalloutSand(IMetroiteWorld w, int x, int y, int z) { + public FalloutSand(IMeteoriteWorld w, int x, int y, int z) { super( w, x, y, z ); } @@ -116,7 +116,7 @@ public class MeteoritePlacer return 2; } - public void getOther(IMetroiteWorld w, int x, int y, int z, double a) + public void getOther(IMeteoriteWorld w, int x, int y, int z, double a) { if ( a > 0.66 ) put( w, x, y, z, Blocks.glass ); @@ -127,7 +127,7 @@ public class MeteoritePlacer private class FalloutSnow extends FalloutCopy { - public FalloutSnow(IMetroiteWorld w, int x, int y, int z) { + public FalloutSnow(IMeteoriteWorld w, int x, int y, int z) { super( w, x, y, z ); } @@ -136,7 +136,7 @@ public class MeteoritePlacer return 2; } - public void getOther(IMetroiteWorld w, int x, int y, int z, double a) + public void getOther(IMeteoriteWorld w, int x, int y, int z, double a) { if ( a > 0.7 ) put( w, x, y, z, Blocks.snow ); @@ -146,7 +146,7 @@ public class MeteoritePlacer }; - public interface IMetroiteWorld + public interface IMeteoriteWorld { int minX(int in); @@ -177,7 +177,7 @@ public class MeteoritePlacer }; - static public class StandardWorld implements IMetroiteWorld + static public class StandardWorld implements IMeteoriteWorld { protected World w; @@ -380,10 +380,10 @@ public class MeteoritePlacer Block skystone = AEApi.instance().blocks().blockSkyStone.block(); Block skychest; - double real_sizeOfMetorite = (Math.random() * 6.0) + 2; - double real_crator = real_sizeOfMetorite * 2 + 5; + double real_sizeOfMeteorite = (Math.random() * 6.0) + 2; + double real_crator = real_sizeOfMeteorite * 2 + 5; - double sizeOfMetorite = real_sizeOfMetorite * real_sizeOfMetorite; + double sizeOfMeteorite = real_sizeOfMeteorite * real_sizeOfMeteorite; double crator = real_crator * real_crator; public MeteoritePlacer() { @@ -422,17 +422,17 @@ public class MeteoritePlacer NBTTagCompound settings; - public boolean spawnMeteorite(IMetroiteWorld w, NBTTagCompound metoriteBlob) + public boolean spawnMeteorite(IMeteoriteWorld w, NBTTagCompound meteoriteBlob) { - settings = metoriteBlob; + settings = meteoriteBlob; int x = settings.getInteger( "x" ); int y = settings.getInteger( "y" ); int z = settings.getInteger( "z" ); - real_sizeOfMetorite = settings.getDouble( "real_sizeOfMetorite" ); + real_sizeOfMeteorite = settings.getDouble( "real_sizeOfMeteorite" ); real_crator = settings.getDouble( "real_crator" ); - sizeOfMetorite = settings.getDouble( "sizeOfMetorite" ); + sizeOfMeteorite = settings.getDouble( "sizeOfMeteorite" ); crator = settings.getDouble( "crator" ); Block blk = Block.getBlockById( settings.getInteger( "blk" ) ); @@ -450,7 +450,7 @@ public class MeteoritePlacer if ( skyMode > 10 ) placeCrator( w, x, y, z ); - placeMetor( w, x, y, z ); + placeMeteorite( w, x, y, z ); // collapse blocks... if ( skyMode > 3 ) @@ -468,7 +468,7 @@ public class MeteoritePlacer return Cx * Cx + Cz * Cz; } - public boolean spawnMeteorite(IMetroiteWorld w, int x, int y, int z) + public boolean spawnMeteorite(IMeteoriteWorld w, int x, int y, int z) { int validBlocks = 0; @@ -485,9 +485,9 @@ public class MeteoritePlacer settings.setInteger( "z", z ); settings.setInteger( "blk", Block.getIdFromBlock( blk ) ); - settings.setDouble( "real_sizeOfMetorite", real_sizeOfMetorite ); + settings.setDouble( "real_sizeOfMeteorite", real_sizeOfMeteorite ); settings.setDouble( "real_crator", real_crator ); - settings.setDouble( "sizeOfMetorite", sizeOfMetorite ); + settings.setDouble( "sizeOfMeteorite", sizeOfMeteorite ); settings.setDouble( "crator", crator ); settings.setBoolean( "lava", Math.random() > 0.9 ); @@ -549,7 +549,7 @@ public class MeteoritePlacer if ( skyMode > 10 ) placeCrator( w, x, y, z ); - placeMetor( w, x, y, z ); + placeMeteorite( w, x, y, z ); // collapse blocks... if ( skyMode > 3 ) @@ -558,13 +558,13 @@ public class MeteoritePlacer settings.setInteger( "skyMode", skyMode ); w.done(); - WorldSettings.getInstance().addNearByMetetorites( w.getWorld().provider.dimensionId, x >> 4, z >> 4, settings ); + WorldSettings.getInstance().addNearByMeteorites( w.getWorld().provider.dimensionId, x >> 4, z >> 4, settings ); return true; } return false; } - private void placeCrator(IMetroiteWorld w, int x, int y, int z) + private void placeCrator(IMeteoriteWorld w, int x, int y, int z) { boolean lava = settings.getBoolean( "lava" ); @@ -583,7 +583,7 @@ public class MeteoritePlacer { double dx = i - x; double dz = k - z; - double h = y - real_sizeOfMetorite + 1 + type.adjustCrator(); + double h = y - real_sizeOfMeteorite + 1 + type.adjustCrator(); double distanceFrom = dx * dx + dz * dz; @@ -608,7 +608,7 @@ public class MeteoritePlacer } } - private void placeMetor(IMetroiteWorld w, int x, int y, int z) + private void placeMeteorite(IMeteoriteWorld w, int x, int y, int z) { int Xmeteor_l = w.minX( x - 8 ); int Xmeteor_h = w.maxX( x + 8 ); @@ -624,7 +624,7 @@ public class MeteoritePlacer double dy = j - y; double dz = k - z; - if ( dx * dx * 0.7 + dy * dy * (j > y ? 1.4 : 0.8) + dz * dz * 0.7 < sizeOfMetorite ) + if ( dx * dx * 0.7 + dy * dy * (j > y ? 1.4 : 0.8) + dz * dz * 0.7 < sizeOfMeteorite ) put( w, i, j, k, skystone ); } @@ -720,7 +720,7 @@ public class MeteoritePlacer } } - private void Decay(IMetroiteWorld w, int x, int y, int z) + private void Decay(IMeteoriteWorld w, int x, int y, int z) { double randomShit = 0; @@ -794,7 +794,7 @@ public class MeteoritePlacer } } - private boolean put(IMetroiteWorld w, int i, int j, int k, Block blk) + private boolean put(IMeteoriteWorld w, int i, int j, int k, Block blk) { Block original = w.getBlock( i, j, k ); @@ -805,7 +805,7 @@ public class MeteoritePlacer return true; } - private void put(IMetroiteWorld w, int i, int j, int k, Block blk, int meta) + private void put(IMeteoriteWorld w, int i, int j, int k, Block blk, int meta) { if ( w.getBlock( i, j, k ) == Blocks.bedrock ) return; diff --git a/helpers/PatternHelper.java b/helpers/PatternHelper.java index 62ea5458..14fa708b 100644 --- a/helpers/PatternHelper.java +++ b/helpers/PatternHelper.java @@ -33,8 +33,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable> target; - public PlayerSecuirtyWrapper(HashMap> playerPerms) { + public PlayerSecurityWrapper(HashMap> playerPerms) { target = playerPerms; } diff --git a/hooks/AETrading.java b/hooks/AETrading.java index a07a6ef3..f06f46ec 100644 --- a/hooks/AETrading.java +++ b/hooks/AETrading.java @@ -28,19 +28,19 @@ public class AETrading implements IVillageTradeHandler l.add( new MerchantRecipe( a, b ) ); } - private void addTrade(MerchantRecipeList list, ItemStack a, ItemStack b, Random rand, int convertion_Variance) + private void addTrade(MerchantRecipeList list, ItemStack a, ItemStack b, Random rand, int conversion_Variance) { // Sell ItemStack From = a.copy(); ItemStack To = b.copy(); - From.stackSize = 1 + (Math.abs( rand.nextInt() ) % (1 + convertion_Variance)); + From.stackSize = 1 + (Math.abs( rand.nextInt() ) % (1 + conversion_Variance)); To.stackSize = 1; addToList( list, From, To ); } - private void addMerchent(MerchantRecipeList list, ItemStack item, int emera, Random rand, int greed) + private void addMerchant(MerchantRecipeList list, ItemStack item, int emera, Random rand, int greed) { if ( item == null ) return; @@ -77,9 +77,9 @@ public class AETrading implements IVillageTradeHandler @Override public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { - addMerchent( recipeList, AEApi.instance().materials().materialSilicon.stack( 1 ), 1, random, 2 ); - addMerchent( recipeList, AEApi.instance().materials().materialCertusQuartzCrystal.stack( 1 ), 2, random, 4 ); - addMerchent( recipeList, AEApi.instance().materials().materialCertusQuartzDust.stack( 1 ), 1, random, 3 ); + addMerchant( recipeList, AEApi.instance().materials().materialSilicon.stack( 1 ), 1, random, 2 ); + addMerchant( recipeList, AEApi.instance().materials().materialCertusQuartzCrystal.stack( 1 ), 2, random, 4 ); + addMerchant( recipeList, AEApi.instance().materials().materialCertusQuartzDust.stack( 1 ), 1, random, 3 ); addTrade( recipeList, AEApi.instance().materials().materialCertusQuartzDust.stack( 1 ), AEApi.instance().materials().materialCertusQuartzCrystal.stack( 1 ), random, 2 ); diff --git a/hooks/MeteoriteWorldGen.java b/hooks/MeteoriteWorldGen.java index 68621fc8..6fe67956 100644 --- a/hooks/MeteoriteWorldGen.java +++ b/hooks/MeteoriteWorldGen.java @@ -40,23 +40,23 @@ final public class MeteoriteWorldGen implements IWorldGenerator { if ( WorldGenRegistry.instance.isWorldGenEnabled( WorldGenType.Meteorites, w ) ) { - // add new metorites? - if ( r.nextFloat() < AEConfig.instance.metoriteSpawnChance ) + // add new meteorites? + if ( r.nextFloat() < AEConfig.instance.meteoriteSpawnChance ) { int x = r.nextInt( 16 ) + (chunkX << 4); int z = r.nextInt( 16 ) + (chunkZ << 4); int depth = 180 + r.nextInt( 20 ); - TickHandler.instance.addCallable( w, new MetoriteSpawn( x, depth, z, w ) ); + TickHandler.instance.addCallable( w, new MeteoriteSpawn( x, depth, z, w ) ); } else - TickHandler.instance.addCallable( w, new MetoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) ); + TickHandler.instance.addCallable( w, new MeteoriteSpawn( chunkX << 4, 128, chunkZ << 4, w ) ); } else WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ ); } - class MetoriteSpawn implements Callable + class MeteoriteSpawn implements Callable { final int x; @@ -64,7 +64,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator final World w; int depth; - public MetoriteSpawn(int x, int depth, int z, World w) { + public MeteoriteSpawn(int x, int depth, int z, World w) { this.x = x; this.z = z; this.w = w; @@ -80,7 +80,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator double minSqDist = Double.MAX_VALUE; // near by meteorites! - for (NBTTagCompound data : getNearByMetetorites( w, chunkX, chunkZ )) + for (NBTTagCompound data : getNearByMeteorites( w, chunkX, chunkZ )) { MeteoritePlacer mp = new MeteoritePlacer(); mp.spawnMeteorite( new MeteoritePlacer.ChunkOnly( w, chunkX, chunkZ ), data ); @@ -88,10 +88,10 @@ final public class MeteoriteWorldGen implements IWorldGenerator minSqDist = Math.min( minSqDist, mp.getSqDistance( x, z ) ); } - boolean isCluster = (minSqDist < 30 * 30) && Platform.getRandomFloat() < AEConfig.instance.metoriteClusterChance; + boolean isCluster = (minSqDist < 30 * 30) && Platform.getRandomFloat() < AEConfig.instance.meteoriteClusterChance; if ( minSqDist > AEConfig.instance.minMeteoriteDistanceSq || isCluster ) - tryMetroite( w, depth, x, z ); + tryMeteorite( w, depth, x, z ); WorldSettings.getInstance().setGenerated( w.provider.dimensionId, chunkX, chunkZ ); WorldSettings.getInstance().getCompass().updateArea( w, chunkX, chunkZ ); @@ -100,9 +100,9 @@ final public class MeteoriteWorldGen implements IWorldGenerator } } - private boolean tryMetroite(World w, int depth, int x, int z) + private boolean tryMeteorite(World w, int depth, int x, int z) { - for (int trys = 0; trys < 20; trys++) + for (int tries = 0; tries < 20; tries++) { MeteoritePlacer mp = new MeteoritePlacer(); @@ -138,9 +138,9 @@ final public class MeteoriteWorldGen implements IWorldGenerator return false; } - private Collection getNearByMetetorites(World w, int chunkX, int chunkZ) + private Collection getNearByMeteorites(World w, int chunkX, int chunkZ) { - return WorldSettings.getInstance().getNearByMetetorites( w.provider.dimensionId, chunkX, chunkZ ); + return WorldSettings.getInstance().getNearByMeteorites( w.provider.dimensionId, chunkX, chunkZ ); } } diff --git a/integration/abstraction/IFMP.java b/integration/abstraction/IFMP.java index 40cd5781..6cad3607 100644 --- a/integration/abstraction/IFMP.java +++ b/integration/abstraction/IFMP.java @@ -13,7 +13,7 @@ public interface IFMP CableBusContainer getCableContainer(TileEntity te); - void registerPassThru(Class layerInterface); + void registerPassThrough(Class layerInterface); Event newFMPPacketEvent(EntityPlayerMP sender); diff --git a/integration/abstraction/helpers/BaseMJperdition.java b/integration/abstraction/helpers/BaseMJperdition.java index d8789184..c56ff065 100644 --- a/integration/abstraction/helpers/BaseMJperdition.java +++ b/integration/abstraction/helpers/BaseMJperdition.java @@ -10,7 +10,7 @@ public abstract class BaseMJperdition @Method(iname = "MJ5") public abstract PowerReceiver getPowerReceiver(); - public abstract double useEnergy(double f, double requred, boolean b); + public abstract double useEnergy(double f, double required, boolean b); public abstract void addEnergy(float failed); diff --git a/integration/modules/BC.java b/integration/modules/BC.java index 8a365f54..31f17d86 100644 --- a/integration/modules/BC.java +++ b/integration/modules/BC.java @@ -2,6 +2,7 @@ package appeng.integration.modules; import java.lang.reflect.Field; +import appeng.integration.modules.BCHelpers.AERotatableBlockSchematic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,7 +23,6 @@ import appeng.integration.BaseModule; import appeng.integration.abstraction.IBC; import appeng.integration.modules.BCHelpers.AECableSchematicTile; import appeng.integration.modules.BCHelpers.AEGenericSchematicTile; -import appeng.integration.modules.BCHelpers.AERotateableBlockSchematic; import appeng.integration.modules.BCHelpers.BCPipeHandler; import buildcraft.BuildCraftEnergy; import buildcraft.BuildCraftTransport; @@ -250,7 +250,7 @@ public class BC extends BaseModule implements IBC Block myBlock = def.block(); if ( myBlock instanceof IOrientableBlock && ((IOrientableBlock) myBlock).usesMetadata() && def.entity() == null ) { - SchematicRegistry.registerSchematicBlock( myBlock, AERotateableBlockSchematic.class ); + SchematicRegistry.registerSchematicBlock( myBlock, AERotatableBlockSchematic.class ); } else if ( myBlock == cable ) { diff --git a/integration/modules/BCHelpers/AERotateableBlockSchematic.java b/integration/modules/BCHelpers/AERotatableBlockSchematic.java similarity index 87% rename from integration/modules/BCHelpers/AERotateableBlockSchematic.java rename to integration/modules/BCHelpers/AERotatableBlockSchematic.java index 76b79d64..c9f30fb4 100644 --- a/integration/modules/BCHelpers/AERotateableBlockSchematic.java +++ b/integration/modules/BCHelpers/AERotatableBlockSchematic.java @@ -5,7 +5,7 @@ import appeng.util.Platform; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicBlock; -public class AERotateableBlockSchematic extends SchematicBlock +public class AERotatableBlockSchematic extends SchematicBlock { @Override diff --git a/integration/modules/FMP.java b/integration/modules/FMP.java index 1186e6c1..264cc904 100644 --- a/integration/modules/FMP.java +++ b/integration/modules/FMP.java @@ -143,7 +143,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF } @Override - public void registerPassThru(Class layerInterface) + public void registerPassThrough(Class layerInterface) { try { diff --git a/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java index 02b1d138..00296175 100644 --- a/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java +++ b/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java @@ -185,7 +185,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler try { ItemStack[] is = ing.getItemStackSet(); - PositionedStack stack = new PositionedStack( useSingleItems ? Platform.findPrefered( is ) : is, 25 + x * 18, 6 + y * 18, false ); + PositionedStack stack = new PositionedStack( useSingleItems ? Platform.findPreferred( is ) : is, 25 + x * 18, 6 + y * 18, false ); stack.setMaxSize( 1 ); this.ingredients.add( stack ); } diff --git a/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java b/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java index ff9468fc..2d4f3537 100644 --- a/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java +++ b/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java @@ -185,7 +185,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler try { ItemStack[] is = ing.getItemStackSet(); - PositionedStack stack = new PositionedStack( useSingleItems ? Platform.findPrefered( is ) : ing.getItemStackSet(), 25 + x * 18, + PositionedStack stack = new PositionedStack( useSingleItems ? Platform.findPreferred( is ) : ing.getItemStackSet(), 25 + x * 18, 6 + y * 18, false ); stack.setMaxSize( 1 ); this.ingredients.add( stack ); diff --git a/items/AEBaseItem.java b/items/AEBaseItem.java index 419e05ec..47c1539d 100644 --- a/items/AEBaseItem.java +++ b/items/AEBaseItem.java @@ -27,7 +27,7 @@ public class AEBaseItem extends Item implements IAEFeature return feature; } - public void setfeature(EnumSet f) + public void setFeature(EnumSet f) { feature = new AEFeatureHandler( f, this, FeatureSubname ); } diff --git a/items/materials/ItemMultiMaterial.java b/items/materials/ItemMultiMaterial.java index 32091cb5..a47b75d5 100644 --- a/items/materials/ItemMultiMaterial.java +++ b/items/materials/ItemMultiMaterial.java @@ -55,7 +55,7 @@ public class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, public ItemMultiMaterial() { super( ItemMultiMaterial.class ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); setHasSubtypes( true ); instance = this; } diff --git a/items/misc/ItemCrystalSeed.java b/items/misc/ItemCrystalSeed.java index f2a4f6f1..abf2e642 100644 --- a/items/misc/ItemCrystalSeed.java +++ b/items/misc/ItemCrystalSeed.java @@ -69,7 +69,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal public ItemCrystalSeed() { super( ItemCrystalSeed.class ); setHasSubtypes( true ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); EntityRegistry.registerModEntity( EntityGrowingCrystal.class, EntityGrowingCrystal.class.getSimpleName(), EntityIds.get( EntityGrowingCrystal.class ), AppEng.instance, 16, 4, true ); @@ -125,7 +125,7 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal @Override public void addInformation(ItemStack stack, EntityPlayer p, List l, boolean b) { - l.add( ButtonToolTips.DosntDespawn.getLocal() ); + l.add( ButtonToolTips.DoesntDespawn.getLocal() ); int progress = getProgress( stack ) % SINGLE_OFFSET; l.add( Math.floor( (float) progress / (float) (SINGLE_OFFSET / 100) ) + "%" ); super.addInformation( stack, p, l, b ); diff --git a/items/misc/ItemEncodedPattern.java b/items/misc/ItemEncodedPattern.java index ba7fce17..3fd8c91c 100644 --- a/items/misc/ItemEncodedPattern.java +++ b/items/misc/ItemEncodedPattern.java @@ -27,7 +27,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt public ItemEncodedPattern() { super( ItemEncodedPattern.class ); - setfeature( EnumSet.of( AEFeature.Patterns ) ); + setFeature( EnumSet.of( AEFeature.Patterns ) ); setMaxStackSize( 1 ); if ( Platform.isClient() ) MinecraftForgeClient.registerItemRenderer( this, new ItemEncodedPatternRenderer() ); @@ -109,7 +109,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt } } - // rather simple client side cacheing. + // rather simple client side caching. static WeakHashMap simpleCache = new WeakHashMap(); public ItemStack getOutput(ItemStack item) diff --git a/items/misc/ItemPaintBall.java b/items/misc/ItemPaintBall.java index 6f631aa5..535ca04d 100644 --- a/items/misc/ItemPaintBall.java +++ b/items/misc/ItemPaintBall.java @@ -19,7 +19,7 @@ public class ItemPaintBall extends AEBaseItem public ItemPaintBall() { super( ItemPaintBall.class ); - setfeature( EnumSet.of( AEFeature.PaintBalls ) ); + setFeature( EnumSet.of( AEFeature.PaintBalls ) ); hasSubtypes = true; if ( Platform.isClient() ) MinecraftForgeClient.registerItemRenderer( this, new PaintBallRender() ); diff --git a/items/parts/ItemFacade.java b/items/parts/ItemFacade.java index 60beb85c..1161b469 100644 --- a/items/parts/ItemFacade.java +++ b/items/parts/ItemFacade.java @@ -37,7 +37,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte public ItemFacade() { super( ItemFacade.class ); - setfeature( EnumSet.of( AEFeature.Facades ) ); + setFeature( EnumSet.of( AEFeature.Facades ) ); setHasSubtypes( true ); if ( Platform.isClient() ) MinecraftForgeClient.registerItemRenderer( this, BusRenderer.instance ); diff --git a/items/parts/ItemMultiPart.java b/items/parts/ItemMultiPart.java index 6dad54be..ff59731c 100644 --- a/items/parts/ItemMultiPart.java +++ b/items/parts/ItemMultiPart.java @@ -37,7 +37,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup { PartType part; - int varient; + int variant; @SideOnly(Side.CLIENT) IIcon ico; @@ -49,13 +49,13 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup public ItemMultiPart() { super( ItemMultiPart.class ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); AEApi.instance().partHelper().setItemBusRenderer( this ); setHasSubtypes( true ); instance = this; } - public ItemStackSrc createPart(PartType mat, Enum varient) + public ItemStackSrc createPart(PartType mat, Enum variant) { try { @@ -69,12 +69,12 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup return null; // part not supported.. } - int varID = varient == null ? 0 : varient.ordinal(); + int varID = variant == null ? 0 : variant.ordinal(); // verify for (PartTypeIst p : dmgToPart.values()) { - if ( p.part == mat && p.varient == varID ) + if ( p.part == mat && p.variant == varID ) throw new RuntimeException( "Cannot create the same material twice..." ); } @@ -89,7 +89,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup PartTypeIst pti = new PartTypeIst(); pti.part = mat; - pti.varient = varID; + pti.variant = varID; if ( dmgToPart.get( newPartNum ) == null ) { @@ -157,10 +157,10 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup if ( pt == null ) return "Unnamed"; - Enum[] varients = pt.getVarients(); + Enum[] variants = pt.getVariants(); - if ( varients != null ) - return super.getItemStackDisplayName( is ) + " - " + varients[dmgToPart.get( is.getItemDamage() ).varient].toString(); + if ( variants != null ) + return super.getItemStackDisplayName( is ) + " - " + variants[dmgToPart.get( is.getItemDamage() ).variant].toString(); if ( pt.getExtraName() != null ) return super.getItemStackDisplayName( is ) + " - " + pt.getExtraName().getLocal(); @@ -224,10 +224,10 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup cList.add( new ItemStack( this, 1, part.getKey() ) ); } - public int varientOf(int itemDamage) + public int variantOf(int itemDamage) { if ( dmgToPart.containsKey( itemDamage ) ) - return dmgToPart.get( itemDamage ).varient; + return dmgToPart.get( itemDamage ).variant; return 0; } @@ -266,8 +266,8 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup return null; } - public ItemStack getStackFromTypeAndVarient(PartType mt, int varient) + public ItemStack getStackFromTypeAndVarient(PartType mt, int variant) { - return new ItemStack( this, 1, mt.baseDamage + varient ); + return new ItemStack( this, 1, mt.baseDamage + variant ); } } diff --git a/items/parts/PartType.java b/items/parts/PartType.java index 924f369f..69f66a39 100644 --- a/items/parts/PartType.java +++ b/items/parts/PartType.java @@ -72,7 +72,7 @@ public enum PartType ExportBus(260, AEFeature.ExportBus, PartExportBus.class), - LevelEmitter(280, AEFeature.LevelEmiter, PartLevelEmitter.class), + LevelEmitter(280, AEFeature.LevelEmitter, PartLevelEmitter.class), AnnihilationPlane(300, AEFeature.AnnihilationPlane, PartAnnihilationPlane.class), @@ -126,7 +126,7 @@ public enum PartType baseDamage = baseMetaValue; } - public Enum[] getVarients() + public Enum[] getVariants() { if ( this == CableSmart || this == CableCovered || this == CableGlass || this == CableDense ) return AEColor.values(); diff --git a/items/storage/ItemBasicStorageCell.java b/items/storage/ItemBasicStorageCell.java index 50771e96..d02471e7 100644 --- a/items/storage/ItemBasicStorageCell.java +++ b/items/storage/ItemBasicStorageCell.java @@ -41,7 +41,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II public ItemBasicStorageCell(MaterialType whichCell, int Kilobytes) { super( ItemBasicStorageCell.class, Kilobytes + "k" ); - setfeature( EnumSet.of( AEFeature.StorageCells ) ); + setFeature( EnumSet.of( AEFeature.StorageCells ) ); setMaxStackSize( 1 ); totalBytes = Kilobytes * 1024; component = whichCell; @@ -123,7 +123,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II } @Override - public boolean isBlackListed(ItemStack cellItem, IAEItemStack requsetedAddition) + public boolean isBlackListed(ItemStack cellItem, IAEItemStack requestedAddition) { return false; } @@ -190,7 +190,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II return true; } - private boolean dissassembleDrive(ItemStack stack, World world, EntityPlayer player) + private boolean disassembleDrive(ItemStack stack, World world, EntityPlayer player) { if ( player.isSneaking() ) { @@ -228,14 +228,14 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - dissassembleDrive( stack, world, player ); + disassembleDrive( stack, world, player ); return stack; } @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - return dissassembleDrive( stack, world, player ); + return disassembleDrive( stack, world, player ); } @Override diff --git a/items/storage/ItemCreativeStorageCell.java b/items/storage/ItemCreativeStorageCell.java index 881117ca..89fdfbf6 100644 --- a/items/storage/ItemCreativeStorageCell.java +++ b/items/storage/ItemCreativeStorageCell.java @@ -15,7 +15,7 @@ public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenc public ItemCreativeStorageCell() { super( ItemCreativeStorageCell.class ); - setfeature( EnumSet.of( AEFeature.StorageCells, AEFeature.Creative ) ); + setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.Creative ) ); setMaxStackSize( 1 ); } diff --git a/items/storage/ItemSpatialStorageCell.java b/items/storage/ItemSpatialStorageCell.java index 89f40ce3..3f63f950 100644 --- a/items/storage/ItemSpatialStorageCell.java +++ b/items/storage/ItemSpatialStorageCell.java @@ -28,7 +28,7 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag public ItemSpatialStorageCell(MaterialType whichCell, int spatialScale) { super( ItemSpatialStorageCell.class, spatialScale + "Cubed" ); - setfeature( EnumSet.of( AEFeature.SpatialIO ) ); + setFeature( EnumSet.of( AEFeature.SpatialIO ) ); setMaxStackSize( 1 ); maxRegion = spatialScale; component = whichCell; diff --git a/items/storage/ItemViewCell.java b/items/storage/ItemViewCell.java index 63c0bb16..b5789474 100644 --- a/items/storage/ItemViewCell.java +++ b/items/storage/ItemViewCell.java @@ -28,7 +28,7 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem public ItemViewCell() { super( ItemViewCell.class ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); setMaxStackSize( 1 ); } diff --git a/items/tools/ToolBiometricCard.java b/items/tools/ToolBiometricCard.java index f2bd643c..82b914ec 100644 --- a/items/tools/ToolBiometricCard.java +++ b/items/tools/ToolBiometricCard.java @@ -27,7 +27,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard public ToolBiometricCard() { super( ToolBiometricCard.class ); - setfeature( EnumSet.of( AEFeature.Security ) ); + setFeature( EnumSet.of( AEFeature.Security ) ); setMaxStackSize( 1 ); if ( Platform.isClient() ) MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() ); diff --git a/items/tools/ToolMemoryCard.java b/items/tools/ToolMemoryCard.java index 1d820c32..f4cd28c7 100644 --- a/items/tools/ToolMemoryCard.java +++ b/items/tools/ToolMemoryCard.java @@ -21,7 +21,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard public ToolMemoryCard() { super( ToolMemoryCard.class ); - setfeature( EnumSet.of( AEFeature.Core ) ); + setFeature( EnumSet.of( AEFeature.Core ) ); setMaxStackSize( 1 ); } diff --git a/items/tools/ToolNetworkTool.java b/items/tools/ToolNetworkTool.java index 3b5e2f07..703474bd 100644 --- a/items/tools/ToolNetworkTool.java +++ b/items/tools/ToolNetworkTool.java @@ -38,7 +38,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench, public ToolNetworkTool() { super( ToolNetworkTool.class, null ); - setfeature( EnumSet.of( AEFeature.NetworkTool ) ); + setFeature( EnumSet.of( AEFeature.NetworkTool ) ); setMaxStackSize( 1 ); } diff --git a/items/tools/powered/ToolChargedStaff.java b/items/tools/powered/ToolChargedStaff.java index e97d255c..761b98f6 100644 --- a/items/tools/powered/ToolChargedStaff.java +++ b/items/tools/powered/ToolChargedStaff.java @@ -18,7 +18,7 @@ public class ToolChargedStaff extends AEBasePoweredItem public ToolChargedStaff() { super( ToolChargedStaff.class, null ); - setfeature( EnumSet.of( AEFeature.ChargedStaff, AEFeature.PoweredTools ) ); + setFeature( EnumSet.of( AEFeature.ChargedStaff, AEFeature.PoweredTools ) ); maxStoredPower = AEConfig.instance.staff_battery; } diff --git a/items/tools/powered/ToolColorApplicator.java b/items/tools/powered/ToolColorApplicator.java index 8ec3f3ca..27df65c9 100644 --- a/items/tools/powered/ToolColorApplicator.java +++ b/items/tools/powered/ToolColorApplicator.java @@ -75,7 +75,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe public ToolColorApplicator() { super( ToolColorApplicator.class, null ); - setfeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) ); + setFeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) ); maxStoredPower = AEConfig.instance.colorapplicator_battery; if ( Platform.isClient() ) MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() ); @@ -250,12 +250,12 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe // clean paint balls.. Block testBlk = w.getBlock( x + oside.offsetX, y + oside.offsetY, z + oside.offsetZ ); - TileEntity painte = w.getTileEntity( x + oside.offsetX, y + oside.offsetY, z + oside.offsetZ ); - if ( getAECurrentPower( is ) > powerPerUse && testBlk instanceof BlockPaint && painte instanceof TilePaint ) + TileEntity painted = w.getTileEntity( x + oside.offsetX, y + oside.offsetY, z + oside.offsetZ ); + if ( getAECurrentPower( is ) > powerPerUse && testBlk instanceof BlockPaint && painted instanceof TilePaint ) { inv.extractItems( AEItemStack.create( paintBall ), Actionable.MODULATE, new BaseActionSource() ); extractAEPower( is, powerPerUse ); - ((TilePaint) painte).cleanSide( oside.getOpposite() ); + ((TilePaint) painted).cleanSide( oside.getOpposite() ); return true; } } @@ -402,11 +402,11 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe } @Override - public boolean isBlackListed(ItemStack cellItem, IAEItemStack requsetedAddition) + public boolean isBlackListed(ItemStack cellItem, IAEItemStack requestedAddition) { - if ( requsetedAddition != null ) + if ( requestedAddition != null ) { - int[] id = OreDictionary.getOreIDs( requsetedAddition.getItemStack() ); + int[] id = OreDictionary.getOreIDs( requestedAddition.getItemStack() ); for (int x : id) { @@ -414,10 +414,10 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe return false; } - if ( requsetedAddition.getItem() instanceof ItemSnowball ) + if ( requestedAddition.getItem() instanceof ItemSnowball ) return false; - return !(requsetedAddition.getItem() instanceof ItemPaintBall && requsetedAddition.getItemDamage() < 20); + return !(requestedAddition.getItem() instanceof ItemPaintBall && requestedAddition.getItemDamage() < 20); } return true; } diff --git a/items/tools/powered/ToolEntropyManipulator.java b/items/tools/powered/ToolEntropyManipulator.java index b823a258..bfecffed 100644 --- a/items/tools/powered/ToolEntropyManipulator.java +++ b/items/tools/powered/ToolEntropyManipulator.java @@ -136,7 +136,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT public ToolEntropyManipulator() { super( ToolEntropyManipulator.class, null ); - setfeature( EnumSet.of( AEFeature.EntropyManipulator, AEFeature.PoweredTools ) ); + setFeature( EnumSet.of( AEFeature.EntropyManipulator, AEFeature.PoweredTools ) ); maxStoredPower = AEConfig.instance.manipulator_battery; coolDown = new Hashtable(); diff --git a/items/tools/powered/ToolMassCannon.java b/items/tools/powered/ToolMassCannon.java index a82a18fd..8b0756d9 100644 --- a/items/tools/powered/ToolMassCannon.java +++ b/items/tools/powered/ToolMassCannon.java @@ -60,7 +60,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell public ToolMassCannon() { super( ToolMassCannon.class, null ); - setfeature( EnumSet.of( AEFeature.MatterCannon, AEFeature.PoweredTools ) ); + setFeature( EnumSet.of( AEFeature.MatterCannon, AEFeature.PoweredTools ) ); maxStoredPower = AEConfig.instance.mattercannon_battery; } @@ -144,8 +144,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell Vec3 direction = Vec3.createVectorHelper( (double) f7 * d3, (double) f6 * d3, (double) f8 * d3 ); direction.normalize(); - float penitration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f; - if ( penitration <= 0 ) + float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f; + if ( penetration <= 0 ) { ItemStack type = ((IAEItemStack) aeammo).getItemStack(); if ( type.getItem() instanceof ItemPaintBall ) @@ -156,7 +156,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } else { - standardAmmo( penitration, w, p, vec3, vec31, direction, d0, d1, d2 ); + standardAmmo( penetration, w, p, vec3, vec31, direction, d0, d1, d2 ); } } @@ -180,7 +180,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell Entity entity = null; List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); - double Closeest = 9999999.0D; + double closest = 9999999.0D; int l; for (l = 0; l < list.size(); ++l) @@ -203,10 +203,10 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell { double nd = vec3.squareDistanceTo( movingobjectposition1.hitVec ); - if ( nd < Closeest ) + if ( nd < closest ) { entity = entity1; - Closeest = nd; + closest = nd; } } } @@ -216,7 +216,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, false ); Vec3 Srec = Vec3.createVectorHelper( d0, d1, d2 ); - if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest ) + if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > closest ) { pos = new MovingObjectPosition( entity ); } @@ -292,10 +292,10 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } } - private void standardAmmo(float penitration, World w, EntityPlayer p, Vec3 vec3, Vec3 vec31, Vec3 direction, double d0, double d1, double d2) + private void standardAmmo(float penetration, World w, EntityPlayer p, Vec3 vec3, Vec3 vec31, Vec3 direction, double d0, double d1, double d2) { boolean hasDestroyedSomething = true; - while (penitration > 0 && hasDestroyedSomething) + while (penetration > 0 && hasDestroyedSomething) { hasDestroyedSomething = false; @@ -305,7 +305,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell Entity entity = null; List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); - double Closeest = 9999999.0D; + double closest = 9999999.0D; int l; for (l = 0; l < list.size(); ++l) @@ -328,10 +328,10 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell { double nd = vec3.squareDistanceTo( movingobjectposition1.hitVec ); - if ( nd < Closeest ) + if ( nd < closest ) { entity = entity1; - Closeest = nd; + closest = nd; } } } @@ -340,7 +340,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell Vec3 Srec = Vec3.createVectorHelper( d0, d1, d2 ); MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true ); - if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest ) + if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > closest ) { pos = new MovingObjectPosition( entity ); } @@ -367,11 +367,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell if ( pos.typeOfHit == MovingObjectType.ENTITY ) { - int dmg = (int) Math.ceil( penitration / 20.0f ); + int dmg = (int) Math.ceil( penetration / 20.0f ); if ( pos.entityHit instanceof EntityLivingBase ) { EntityLivingBase el = (EntityLivingBase) pos.entityHit; - penitration -= dmg; + penetration -= dmg; el.knockBack( p, 0, (double) -direction.xCoord, (double) -direction.zCoord ); // el.knockBack( p, 0, vec3.xCoord, // vec3.zCoord ); @@ -392,7 +392,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell else if ( pos.typeOfHit == MovingObjectType.BLOCK ) { if ( !AEConfig.instance.isFeatureEnabled( AEFeature.MassCannonBlockDamage ) ) - penitration = 0; + penetration = 0; else { Block b = w.getBlock( pos.blockX, pos.blockY, pos.blockZ ); @@ -402,11 +402,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell float hardness = b.getBlockHardness( w, pos.blockX, pos.blockY, pos.blockZ ) * 9.0f; if ( hardness >= 0.0 ) { - if ( penitration > hardness && Platform.hasPermissions( new DimensionalCoord( w, pos.blockX, pos.blockY, pos.blockZ ), p ) ) + if ( penetration > hardness && Platform.hasPermissions( new DimensionalCoord( w, pos.blockX, pos.blockY, pos.blockZ ), p ) ) { hasDestroyedSomething = true; - penitration -= hardness; - penitration *= 0.60; + penetration -= hardness; + penetration *= 0.60; w.func_147480_a( pos.blockX, pos.blockY, pos.blockZ, true ); // w.destroyBlock( pos.blockX, pos.blockY, pos.blockZ, true ); } @@ -492,13 +492,13 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } @Override - public boolean isBlackListed(ItemStack cellItem, IAEItemStack requsetedAddition) + public boolean isBlackListed(ItemStack cellItem, IAEItemStack requestedAddition) { - float pen = AEApi.instance().registries().matterCannon().getPenetration( requsetedAddition.getItemStack() ); + float pen = AEApi.instance().registries().matterCannon().getPenetration( requestedAddition.getItemStack() ); if ( pen > 0 ) return false; - if ( requsetedAddition.getItem() instanceof ItemPaintBall ) + if ( requestedAddition.getItem() instanceof ItemPaintBall ) return false; return true; diff --git a/items/tools/powered/ToolPortableCell.java b/items/tools/powered/ToolPortableCell.java index 4ea18aab..b2d6da42 100644 --- a/items/tools/powered/ToolPortableCell.java +++ b/items/tools/powered/ToolPortableCell.java @@ -36,7 +36,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, public ToolPortableCell() { super( ToolPortableCell.class, null ); - setfeature( EnumSet.of( AEFeature.PortableCell, AEFeature.StorageCells, AEFeature.PoweredTools ) ); + setFeature( EnumSet.of( AEFeature.PortableCell, AEFeature.StorageCells, AEFeature.PoweredTools ) ); maxStoredPower = AEConfig.instance.portablecell_battery; } @@ -92,7 +92,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, } @Override - public boolean isBlackListed(ItemStack cellItem, IAEItemStack requsetedAddition) + public boolean isBlackListed(ItemStack cellItem, IAEItemStack requestedAddition) { return false; } diff --git a/items/tools/powered/ToolWirelessTerminal.java b/items/tools/powered/ToolWirelessTerminal.java index bee98397..37f08b58 100644 --- a/items/tools/powered/ToolWirelessTerminal.java +++ b/items/tools/powered/ToolWirelessTerminal.java @@ -28,7 +28,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless public ToolWirelessTerminal() { super( ToolWirelessTerminal.class, null ); - setfeature( EnumSet.of( AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools ) ); + setFeature( EnumSet.of( AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools ) ); maxStoredPower = AEConfig.instance.wireless_battery; } diff --git a/items/tools/powered/powersink/IC2.java b/items/tools/powered/powersink/IC2.java index 63b08b3b..078c3b0f 100644 --- a/items/tools/powered/powersink/IC2.java +++ b/items/tools/powered/powersink/IC2.java @@ -32,7 +32,7 @@ public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpe } @Override - public double discharge(ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externaly, boolean simulate) + public double discharge(ItemStack itemStack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate) { return 0; } diff --git a/items/tools/quartz/ToolQuartzCuttingKnife.java b/items/tools/quartz/ToolQuartzCuttingKnife.java index 30c992a9..7f476dfb 100644 --- a/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -21,7 +21,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem public ToolQuartzCuttingKnife(AEFeature Type) { super( ToolQuartzCuttingKnife.class, Type.name() ); - setfeature( EnumSet.of( type = Type, AEFeature.QuartzKnife ) ); + setFeature( EnumSet.of( type = Type, AEFeature.QuartzKnife ) ); setMaxDamage( 50 ); setMaxStackSize( 1 ); } diff --git a/items/tools/quartz/ToolQuartzWrench.java b/items/tools/quartz/ToolQuartzWrench.java index 55178961..8b8dc9d3 100644 --- a/items/tools/quartz/ToolQuartzWrench.java +++ b/items/tools/quartz/ToolQuartzWrench.java @@ -21,7 +21,7 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren public ToolQuartzWrench(AEFeature type) { super( ToolQuartzWrench.class, type.name() ); - setfeature( EnumSet.of( type, AEFeature.QuartzWrench ) ); + setFeature( EnumSet.of( type, AEFeature.QuartzWrench ) ); setMaxStackSize( 1 ); } diff --git a/me/Grid.java b/me/Grid.java index cb6c0d7a..e9e5727c 100644 --- a/me/Grid.java +++ b/me/Grid.java @@ -156,7 +156,7 @@ public class Grid implements IGrid @Override public IReadOnlyCollection getNodes() { - return new NodeIteratable( Machines ); + return new NodeIterable( Machines ); } @Override diff --git a/me/GridConnection.java b/me/GridConnection.java index dc44ac5c..ade8c509 100644 --- a/me/GridConnection.java +++ b/me/GridConnection.java @@ -48,7 +48,7 @@ public class GridConnection implements IGridConnection, IPathItem } if ( a == null || b == null ) - throw new GridException( "Connection Forged Between null enties." ); + throw new GridException( "Connection Forged Between null entities." ); if ( a.hasConnection( b ) || b.hasConnection( a ) ) throw new GridException( "Connection already exists." ); diff --git a/me/GridNode.java b/me/GridNode.java index 3c76c78c..cc223b8c 100644 --- a/me/GridNode.java +++ b/me/GridNode.java @@ -379,10 +379,10 @@ public class GridNode implements IGridNode, IPathItem @Override public int compare(IGridConnection o1, IGridConnection o2) { - boolean preferedA = o1.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED ); - boolean preferedB = o2.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED ); + boolean preferredA = o1.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED ); + boolean preferredB = o2.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED ); - return preferedA == preferedB ? 0 : (preferedA ? -1 : 1); + return preferredA == preferredB ? 0 : (preferredA ? -1 : 1); } } ); diff --git a/me/NodeIteratable.java b/me/NodeIterable.java similarity index 82% rename from me/NodeIteratable.java rename to me/NodeIterable.java index b2a25d68..700e1d90 100644 --- a/me/NodeIteratable.java +++ b/me/NodeIterable.java @@ -1,57 +1,57 @@ -package appeng.me; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Set; - -import appeng.api.networking.IGridNode; -import appeng.api.util.IReadOnlyCollection; - -public class NodeIteratable implements IReadOnlyCollection -{ - - final private HashMap> Machines; - - public NodeIteratable(HashMap> Machines) { - this.Machines = Machines; - } - - @Override - public Iterator iterator() - { - return new NodeIterator( Machines ); - } - - @Override - public int size() - { - int size = 0; - - for (Set o : Machines.values()) - size += o.size(); - - return size; - } - - @Override - public boolean isEmpty() - { - for (Set o : Machines.values()) - if ( !o.isEmpty() ) - return false; - - return true; - } - - @Override - public boolean contains(Object node) - { - Class c = ((IGridNode) node).getMachine().getClass(); - - Set p = Machines.get( c ); - if ( p != null ) - return p.contains( node ); - - return false; - } -} +package appeng.me; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Set; + +import appeng.api.networking.IGridNode; +import appeng.api.util.IReadOnlyCollection; + +public class NodeIterable implements IReadOnlyCollection +{ + + final private HashMap> Machines; + + public NodeIterable(HashMap> Machines) { + this.Machines = Machines; + } + + @Override + public Iterator iterator() + { + return new NodeIterator( Machines ); + } + + @Override + public int size() + { + int size = 0; + + for (Set o : Machines.values()) + size += o.size(); + + return size; + } + + @Override + public boolean isEmpty() + { + for (Set o : Machines.values()) + if ( !o.isEmpty() ) + return false; + + return true; + } + + @Override + public boolean contains(Object node) + { + Class c = ((IGridNode) node).getMachine().getClass(); + + Set p = Machines.get( c ); + if ( p != null ) + return p.contains( node ); + + return false; + } +} diff --git a/me/cache/CraftingGridCache.java b/me/cache/CraftingGridCache.java index cc490f15..fd2bd626 100644 --- a/me/cache/CraftingGridCache.java +++ b/me/cache/CraftingGridCache.java @@ -158,7 +158,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper if ( n == null ) links.put( l.getCraftingID(), n = new CraftingLinkNexus( l.getCraftingID() ) ); - l.setNextus( n ); + l.setNexus( n ); } @Override @@ -543,7 +543,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper public Future beginCraftingJob(World world, IGrid grid, BaseActionSource actionSrc, IAEItemStack slotItem, ICraftingCallback cb) { if ( world == null || grid == null || actionSrc == null || slotItem == null ) - throw new RuntimeException( "Invalid Craftinb Job Request" ); + throw new RuntimeException( "Invalid Crafting Job Request" ); CraftingJob cj = new CraftingJob( world, grid, actionSrc, slotItem, cb ); return craftingPool.submit( cj, (ICraftingJob) cj ); diff --git a/me/cache/NetworkMonitor.java b/me/cache/NetworkMonitor.java index a074fa42..e68a86c4 100644 --- a/me/cache/NetworkMonitor.java +++ b/me/cache/NetworkMonitor.java @@ -68,10 +68,10 @@ public class NetworkMonitor> extends MEMonitorHandler for (T changedItem : changes) { - T diffrence = changedItem; + T difference = changedItem; if ( !Add && changedItem != null ) - (diffrence = changedItem.copy()).setStackSize( -changedItem.getStackSize() ); + (difference = changedItem.copy()).setStackSize( -changedItem.getStackSize() ); if ( myGridCache.interestManager.containsKey( changedItem ) ) { @@ -88,7 +88,7 @@ public class NetworkMonitor> extends MEMonitorHandler myGridCache.interestManager.enableTransactions(); for (ItemWatcher iw : list) - iw.getHost().onStackChange( myStorageList, fullStack, diffrence, src, getChannel() ); + iw.getHost().onStackChange( myStorageList, fullStack, difference, src, getChannel() ); myGridCache.interestManager.disableTransactions(); } diff --git a/me/cache/PathGridCache.java b/me/cache/PathGridCache.java index c7f2bb09..494d1b00 100644 --- a/me/cache/PathGridCache.java +++ b/me/cache/PathGridCache.java @@ -89,7 +89,7 @@ public class PathGridCache implements IPathingGrid if ( !AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) { - int used = calculateRequiredChanels(); + int used = calculateRequiredChannels(); int nodes = myGrid.getNodes().size(); ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); @@ -100,7 +100,7 @@ public class PathGridCache implements IPathingGrid } else if ( controllerState == ControllerState.NO_CONTROLLER ) { - int requiredChannels = calculateRequiredChanels(); + int requiredChannels = calculateRequiredChannels(); int used = requiredChannels; if ( requiredChannels > 8 ) used = 0; @@ -197,7 +197,7 @@ public class PathGridCache implements IPathingGrid for (int id : players) { - Platform.addStat( id, currentBracket.getAchivement() ); + Platform.addStat( id, currentBracket.getAchievement() ); } } } @@ -218,7 +218,7 @@ public class PathGridCache implements IPathingGrid return Achievements.Networking3; } - private int calculateRequiredChanels() + private int calculateRequiredChannels() { int depth = 0; semiOpen.clear(); diff --git a/me/cache/SpatialPylonCache.java b/me/cache/SpatialPylonCache.java index 8277f15a..cac5ab50 100644 --- a/me/cache/SpatialPylonCache.java +++ b/me/cache/SpatialPylonCache.java @@ -23,7 +23,7 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache { long powerRequired = 0; - double effiency = 0.0; + double efficiency = 0.0; DimensionalCoord captureMin; DimensionalCoord captureMax; @@ -75,7 +75,7 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache int reqX = 0; int reqY = 0; int reqZ = 0; - int requirePylongBlocks = 1; + int requirePylonBlocks = 1; double minPower = 0; double maxPower = 0; @@ -157,21 +157,21 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache reqX = captureMax.x - captureMin.x; reqY = captureMax.y - captureMin.y; reqZ = captureMax.z - captureMin.z; - requirePylongBlocks = Math.max( 6, ((reqX * reqZ + reqX * reqY + reqY * reqZ) * 3) / 8 ); + requirePylonBlocks = Math.max( 6, ((reqX * reqZ + reqX * reqY + reqY * reqZ) * 3) / 8 ); - effiency = (double) pylonBlocks / (double) requirePylongBlocks; + efficiency = (double) pylonBlocks / (double) requirePylonBlocks; - if ( effiency > 1.0 ) - effiency = 1.0; - if ( effiency < 0.0 ) - effiency = 0.0; + if ( efficiency > 1.0 ) + efficiency = 1.0; + if ( efficiency < 0.0 ) + efficiency = 0.0; minPower = (double) reqX * (double) reqY * reqZ * AEConfig.instance.spatialPowerMultiplier; maxPower = Math.pow( minPower, AEConfig.instance.spatialPowerScaler ); } - double affective_effiency = Math.pow( effiency, 0.25 ); - powerRequired = (long) (affective_effiency * minPower + (1.0 - affective_effiency) * maxPower); + double affective_efficiency = Math.pow( efficiency, 0.25 ); + powerRequired = (long) (affective_efficiency * minPower + (1.0 - affective_efficiency) * maxPower); for (SpatialPylonCluster cl : clusters.values()) { @@ -185,7 +185,7 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache @Override public float currentEfficiency() { - return (float) effiency * 100; + return (float) efficiency * 100; } @MENetworkEventSubscribe diff --git a/me/cache/TickManagerCache.java b/me/cache/TickManagerCache.java index 95c4e5eb..6f7f1d06 100644 --- a/me/cache/TickManagerCache.java +++ b/me/cache/TickManagerCache.java @@ -121,7 +121,7 @@ public class TickManagerCache implements ITickManager if ( tt == null ) return false; // throw new RuntimeException( - // "Invalid Alertted device, this node is not marked as alertable, or part of this grid." ); + // "Invalid alerted device, this node is not marked as alertable, or part of this grid." ); // set to awake, this is for sanity. sleeping.remove( node ); diff --git a/me/cluster/MBCalculator.java b/me/cluster/MBCalculator.java index 8ac2d541..b143d755 100644 --- a/me/cluster/MBCalculator.java +++ b/me/cluster/MBCalculator.java @@ -50,7 +50,7 @@ public abstract class MBCalculator public abstract void disconnect(); /** - * verify if the structure is the correct dimentions, or size + * verify if the structure is the correct dimensions, or size * * @param min * @param max diff --git a/me/cluster/implementations/CraftingCPUCluster.java b/me/cluster/implementations/CraftingCPUCluster.java index 6b5f4f81..e03e328e 100644 --- a/me/cluster/implementations/CraftingCPUCluster.java +++ b/me/cluster/implementations/CraftingCPUCluster.java @@ -447,9 +447,9 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU isComplete = true; } - private boolean canCraft(ICraftingPatternDetails details, IAEItemStack[] condencedInputs) + private boolean canCraft(ICraftingPatternDetails details, IAEItemStack[] condensedInputs) { - for (IAEItemStack g : condencedInputs) + for (IAEItemStack g : condensedInputs) { if ( details.isCraftable() ) diff --git a/me/helpers/AENetworkProxy.java b/me/helpers/AENetworkProxy.java index a7f78cab..976043b3 100644 --- a/me/helpers/AENetworkProxy.java +++ b/me/helpers/AENetworkProxy.java @@ -303,11 +303,11 @@ public class AENetworkProxy implements IGridBlock return flags; } - public void setFlags(GridFlags... requreChannel) + public void setFlags(GridFlags... requireChannel) { EnumSet flags = EnumSet.noneOf( GridFlags.class ); - for (GridFlags gf : requreChannel) + for (GridFlags gf : requireChannel) flags.add( gf ); this.flags = flags; diff --git a/me/storage/CellInventory.java b/me/storage/CellInventory.java index 5c9b821e..770342a3 100644 --- a/me/storage/CellInventory.java +++ b/me/storage/CellInventory.java @@ -32,10 +32,10 @@ public class CellInventory implements ICellInventory static final String ITEM_COUNT_TAG = "ic"; static final String ITEM_SLOT = "#"; static final String ITEM_SLOTCOUNT = "@"; - static final String ITEM_PRE_FORMATED_COUNT = "PF"; - static final String ITEM_PRE_FORMATED_SLOT = "PF#"; - static final String ITEM_PRE_FORMATED_NAME = "PN"; - static final String ITEM_PRE_FORMATED_FUZZY = "FP"; + static final String ITEM_PRE_FORMATTED_COUNT = "PF"; + static final String ITEM_PRE_FORMATTED_SLOT = "PF#"; + static final String ITEM_PRE_FORMATTED_NAME = "PN"; + static final String ITEM_PRE_FORMATTED_FUZZY = "FP"; static protected String[] ITEM_SLOT_ARR; static protected String[] ITEM_SLOTCOUNT_ARR; diff --git a/me/storage/MEMonitorIInventory.java b/me/storage/MEMonitorIInventory.java index 7ae60178..4200eb18 100644 --- a/me/storage/MEMonitorIInventory.java +++ b/me/storage/MEMonitorIInventory.java @@ -179,7 +179,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit ItemStack newIS = is == null || is.isExtractable == false && mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack(); ItemStack oldIS = old == null ? null : old.itemStack; - if ( isDiffrent( newIS, oldIS ) ) + if ( isDifferent( newIS, oldIS ) ) { CachedItemStack cis = new CachedItemStack( is.getItemStack() ); memory.put( is.slot, cis ); @@ -241,12 +241,12 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit } if ( !changes.isEmpty() ) - postDiffrence( changes ); + postDifference( changes ); return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER; } - private boolean isDiffrent(ItemStack a, ItemStack b) + private boolean isDifferent(ItemStack a, ItemStack b) { if ( a == b && b == null ) return false; @@ -257,7 +257,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit return !Platform.isSameItemPrecise( a, b ); } - private void postDiffrence(Iterable a) + private void postDifference(Iterable a) { // AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() ); if ( a != null ) diff --git a/me/storage/NetworkInventoryHandler.java b/me/storage/NetworkInventoryHandler.java index f47055c7..fa2450c3 100644 --- a/me/storage/NetworkInventoryHandler.java +++ b/me/storage/NetworkInventoryHandler.java @@ -39,21 +39,21 @@ public class NetworkInventoryHandler> implements IMEInvent final StorageChannel myChannel; final SecurityCache security; - // final TreeMultimap> prorityInventory; - final TreeMap>> prorityInventory; + // final TreeMultimap> priorityInventory; + final TreeMap>> priorityInventory; public NetworkInventoryHandler(StorageChannel chan, SecurityCache security) { myChannel = chan; this.security = security; - prorityInventory = new TreeMap( prioritySorter ); // TreeMultimap.create( prioritySorter, hashSorter ); + priorityInventory = new TreeMap( prioritySorter ); // TreeMultimap.create( prioritySorter, hashSorter ); } public void addNewStorage(IMEInventoryHandler h) { int priority = h.getPriority(); - List> list = prorityInventory.get( priority ); + List> list = priorityInventory.get( priority ); if ( list == null ) - prorityInventory.put( priority, list = new ArrayList() ); + priorityInventory.put( priority, list = new ArrayList() ); list.add( h ); } @@ -155,7 +155,7 @@ public class NetworkInventoryHandler> implements IMEInvent return input; } - Iterator>> i = prorityInventory.values().iterator();// asMap().entrySet().iterator(); + Iterator>> i = priorityInventory.values().iterator();// asMap().entrySet().iterator(); while (i.hasNext()) { @@ -197,7 +197,7 @@ public class NetworkInventoryHandler> implements IMEInvent return null; } - Iterator>> i = prorityInventory.descendingMap().values().iterator();// prorityInventory.asMap().descendingMap().entrySet().iterator(); + Iterator>> i = priorityInventory.descendingMap().values().iterator();// priorityInventory.asMap().descendingMap().entrySet().iterator(); T output = request.copy(); request = request.copy(); @@ -232,8 +232,8 @@ public class NetworkInventoryHandler> implements IMEInvent if ( diveIteration( this, Actionable.SIMULATE ) ) return out; - // for (Entry> h : prorityInventory.entries()) - for (List> i : prorityInventory.values()) + // for (Entry> h : priorityInventory.entries()) + for (List> i : priorityInventory.values()) for (IMEInventoryHandler j : i) out = j.getAvailableItems( out ); diff --git a/parts/AEBasePart.java b/parts/AEBasePart.java index 1831f508..bdf54129 100644 --- a/parts/AEBasePart.java +++ b/parts/AEBasePart.java @@ -292,7 +292,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea } /** - * depending on the from, diffrent settings will be accepted, don't call this with null + * depending on the from, different settings will be accepted, don't call this with null * * @param from * @param compound @@ -393,9 +393,9 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea } else { - String stordName = memc.getSettingsName( memCardIS ); + String storedName = memc.getSettingsName( memCardIS ); NBTTagCompound data = memc.getData( memCardIS ); - if ( name.equals( stordName ) ) + if ( name.equals( storedName ) ) { uploadSettings( SettingsFrom.MEMORY_CARD, data ); memc.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED ); diff --git a/parts/CableBusContainer.java b/parts/CableBusContainer.java index c38adca6..993b3a4c 100644 --- a/parts/CableBusContainer.java +++ b/parts/CableBusContainer.java @@ -115,7 +115,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } @Override - public void removePart(ForgeDirection side, boolean supressUpdate) + public void removePart(ForgeDirection side, boolean suppressUpdate) { if ( side == ForgeDirection.UNKNOWN ) { @@ -130,7 +130,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I setSide( side, null ); } - if ( !supressUpdate ) + if ( !suppressUpdate ) { updateDynamicRender(); updateConnections(); @@ -805,7 +805,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I @Override public void clearContainer() { - throw new RuntimeException( "Now thats silly!" ); + throw new RuntimeException( "Now that is silly!" ); } @Override diff --git a/parts/automation/PartLevelEmitter.java b/parts/automation/PartLevelEmitter.java index b1afd81d..31d9563a 100644 --- a/parts/automation/PartLevelEmitter.java +++ b/parts/automation/PartLevelEmitter.java @@ -83,7 +83,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { reportingValue = v; if ( getConfigManager().getSetting( Settings.LEVEL_TYPE ) == LevelType.ENERGY_LEVEL ) - confgiureWatchers(); + configureWatchers(); else updateState(); } @@ -102,13 +102,13 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH public void upgradesChanged() { - confgiureWatchers(); + configureWatchers(); } @Override public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue) { - confgiureWatchers(); + configureWatchers(); } private void updateState() @@ -155,25 +155,25 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH public void updateWatcher(ICraftingWatcher newWatcher) { myCraftingWatcher = newWatcher; - confgiureWatchers(); + configureWatchers(); } @Override public void updateWatcher(IStackWatcher newWatcher) { myWatcher = newWatcher; - confgiureWatchers(); + configureWatchers(); } @Override public void updateWatcher(IEnergyWatcher newWatcher) { myEnergyWatcher = newWatcher; - confgiureWatchers(); + configureWatchers(); } // update the system... - public void confgiureWatchers() + public void configureWatchers() { IAEItemStack myStack = config.getAEStackInSlot( 0 ); @@ -214,7 +214,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH lastReportedValue = (long) proxy.getEnergy().getStoredPower(); updateState(); - // no more item stuf.. + // no more item stuff.. proxy.getStorage().getItemInventory().removeListener( this ); } catch (GridAccessException e) @@ -251,7 +251,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack) { if ( inv == config ) - confgiureWatchers(); + configureWatchers(); super.onChangeInventory( inv, slot, mc, removedStack, newStack ); } diff --git a/parts/layers/LayerIEnergySink.java b/parts/layers/LayerIEnergySink.java index 547e242c..213b35e8 100644 --- a/parts/layers/LayerIEnergySink.java +++ b/parts/layers/LayerIEnergySink.java @@ -124,7 +124,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink IPart part = getPart( dir ); if ( part instanceof IEnergySink ) { - // use lower number cause ic2 deletes power it sends that isn't recieved. + // use lower number cause ic2 deletes power it sends that isn't received. return ((IEnergySink) part).getDemandedEnergy(); } } diff --git a/parts/layers/LayerIEnergySource.java b/parts/layers/LayerIEnergySource.java index f5bb4831..a110e89b 100644 --- a/parts/layers/LayerIEnergySource.java +++ b/parts/layers/LayerIEnergySource.java @@ -123,7 +123,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource IPart part = getPart( dir ); if ( part instanceof IEnergySource ) { - // use lower number cause ic2 deletes power it sends that isn't recieved. + // use lower number cause ic2 deletes power it sends that isn't received. return ((IEnergySource) part).getOfferedEnergy(); } } diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java index 94eddab7..58e8db7e 100644 --- a/parts/misc/PartInterface.java +++ b/parts/misc/PartInterface.java @@ -66,7 +66,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg public void addToWorld() { super.addToWorld(); - duality.initalize(); + duality.initialize(); } @MENetworkEventSubscribe diff --git a/parts/misc/PartStorageBus.java b/parts/misc/PartStorageBus.java index 74809577..a83df64b 100644 --- a/parts/misc/PartStorageBus.java +++ b/parts/misc/PartStorageBus.java @@ -354,8 +354,8 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC if ( achiv != null ) { - Platform.addStat( achiv.getActionableNode().getPlayerID(), Achievements.Recursive.getAchivement() ); - Platform.addStat( getActionableNode().getPlayerID(), Achievements.Recursive.getAchivement() ); + Platform.addStat( achiv.getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() ); + Platform.addStat( getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() ); } } diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 9fb40267..aa6b4404 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -1,5 +1,6 @@ package appeng.parts.networking; +import appeng.client.texture.FlippableIcon; import io.netty.buffer.ByteBuf; import java.io.IOException; @@ -33,7 +34,6 @@ import appeng.api.util.AEColor; import appeng.api.util.IReadOnlyCollection; import appeng.block.AEBaseBlock; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.FlipableIcon; import appeng.client.texture.TaughtIcon; import appeng.items.parts.ItemMultiPart; import appeng.me.GridAccessException; @@ -55,7 +55,7 @@ public class PartCable extends AEBasePart implements IPartCable super( c, is ); proxy.setFlags( GridFlags.PREFERRED ); proxy.setIdlePowerUsage( 0.0 ); - proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).varientOf( is.getItemDamage() )]; + proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).variantOf( is.getItemDamage() )]; } @Override @@ -447,7 +447,7 @@ public class PartCable extends AEBasePart implements IPartCable } @SideOnly(Side.CLIENT) - public void rendereGlassConection(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, ForgeDirection of) + public void renderGlassConnection(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, ForgeDirection of) { TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); IPartHost ccph = te instanceof IPartHost ? (IPartHost) te : null; @@ -559,7 +559,7 @@ public class PartCable extends AEBasePart implements IPartCable } @SideOnly(Side.CLIENT) - public void renderCoveredConection(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, int channels, ForgeDirection of) + public void renderCoveredConnection(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, int channels, ForgeDirection of) { TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); IPartHost ccph = te instanceof IPartHost ? (IPartHost) te : null; @@ -648,7 +648,7 @@ public class PartCable extends AEBasePart implements IPartCable if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); - FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); + FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( false, true ); } @@ -721,7 +721,7 @@ public class PartCable extends AEBasePart implements IPartCable if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); - FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); + FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( false, true ); } @@ -935,7 +935,7 @@ public class PartCable extends AEBasePart implements IPartCable for (ForgeDirection of : connections) { - rendereGlassConection( x, y, z, rh, renderer, of ); + renderGlassConnection( x, y, z, rh, renderer, of ); } } else diff --git a/parts/networking/PartCableCovered.java b/parts/networking/PartCableCovered.java index a3aae56a..9b17d250 100644 --- a/parts/networking/PartCableCovered.java +++ b/parts/networking/PartCableCovered.java @@ -195,7 +195,7 @@ public class PartCableCovered extends PartCable { for (ForgeDirection of : connections) { - renderCoveredConection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); + renderCoveredConnection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); } rh.setTexture( getTexture( getCableColor() ) ); diff --git a/parts/networking/PartCableSmart.java b/parts/networking/PartCableSmart.java index 27320269..aa953070 100644 --- a/parts/networking/PartCableSmart.java +++ b/parts/networking/PartCableSmart.java @@ -2,6 +2,7 @@ package appeng.parts.networking; import java.util.EnumSet; +import appeng.client.texture.FlippableIcon; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -22,7 +23,6 @@ import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.block.AEBaseBlock; -import appeng.client.texture.FlipableIcon; import appeng.client.texture.OffsetIcon; import appeng.client.texture.TaughtIcon; import appeng.util.Platform; @@ -213,7 +213,7 @@ public class PartCableSmart extends PartCable if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); - FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); + FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( false, true ); } @@ -298,7 +298,7 @@ public class PartCableSmart extends PartCable renderer.uvRotateNorth = 0; AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); - FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); + FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( false, true ); renderer.setRenderBounds( 0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0 ); @@ -306,11 +306,11 @@ public class PartCableSmart extends PartCable Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); - FlipableIcon fpA = new FlipableIcon( defa ); - FlipableIcon fpB = new FlipableIcon( defb ); + FlippableIcon fpA = new FlippableIcon( defa ); + FlippableIcon fpB = new FlippableIcon( defb ); - fpA = new FlipableIcon( defa ); - fpB = new FlipableIcon( defb ); + fpA = new FlippableIcon( defa ); + fpB = new FlippableIcon( defb ); fpA.setFlip( true, false ); fpB.setFlip( true, false ); diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index 12c8d789..28a5e4c9 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -2,6 +2,7 @@ package appeng.parts.networking; import java.util.EnumSet; +import appeng.client.texture.FlippableIcon; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -26,7 +27,6 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.block.AEBaseBlock; import appeng.client.texture.CableBusTextures; -import appeng.client.texture.FlipableIcon; import appeng.client.texture.OffsetIcon; import appeng.client.texture.TaughtIcon; import appeng.util.Platform; @@ -224,7 +224,7 @@ public class PartDenseCable extends PartCable } @SideOnly(Side.CLIENT) - public void renderDenseConection(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, int channels, ForgeDirection of) + public void renderDenseConnection(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, int channels, ForgeDirection of) { TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); IPartHost ccph = te instanceof IPartHost ? (IPartHost) te : null; @@ -246,7 +246,7 @@ public class PartDenseCable extends PartCable * -0.2f ); * * if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock) - * rh.getBlock(); FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( + * rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( * false, true ); } * * Tessellator.instance.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.instance.setColorOpaque_I( @@ -337,11 +337,11 @@ public class PartDenseCable extends PartCable for (ForgeDirection of : connections) { if ( isDense( of ) ) - renderDenseConection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); + renderDenseConnection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); else if ( isSmart( of ) ) renderSmartConection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); else - renderCoveredConection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); + renderCoveredConnection( x, y, z, rh, renderer, channelsOnSide[of.ordinal()], of ); } rh.setTexture( getDenseTexture( getCableColor() ) ); @@ -402,7 +402,7 @@ public class PartDenseCable extends PartCable renderer.uvRotateNorth = 0; AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); - FlipableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); + FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( false, true ); renderer.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 ); @@ -410,11 +410,11 @@ public class PartDenseCable extends PartCable Tessellator.instance.setBrightness( 15 << 20 | 15 << 4 ); - FlipableIcon fpA = new FlipableIcon( defa ); - FlipableIcon fpB = new FlipableIcon( defb ); + FlippableIcon fpA = new FlippableIcon( defa ); + FlippableIcon fpB = new FlippableIcon( defb ); - fpA = new FlipableIcon( defa ); - fpB = new FlipableIcon( defb ); + fpA = new FlippableIcon( defa ); + fpB = new FlippableIcon( defb ); fpA.setFlip( true, false ); fpB.setFlip( true, false ); diff --git a/parts/networking/PartQuartzFiber.java b/parts/networking/PartQuartzFiber.java index 87fd0a6c..bf83c1f1 100644 --- a/parts/networking/PartQuartzFiber.java +++ b/parts/networking/PartQuartzFiber.java @@ -127,12 +127,12 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider @Override public double extractAEPower(double amt, Actionable mode, Set seen) { - double aquiredPower = 0; + double acquiredPower = 0; try { IEnergyGrid eg = proxy.getEnergy(); - aquiredPower += eg.extractAEPower( amt - aquiredPower, mode, seen ); + acquiredPower += eg.extractAEPower( amt - acquiredPower, mode, seen ); } catch (GridAccessException e) { @@ -142,14 +142,14 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider try { IEnergyGrid eg = outerProxy.getEnergy(); - aquiredPower += eg.extractAEPower( amt - aquiredPower, mode, seen ); + acquiredPower += eg.extractAEPower( amt - acquiredPower, mode, seen ); } catch (GridAccessException e) { // :P } - return aquiredPower; + return acquiredPower; } @Override diff --git a/parts/p2p/PartP2PBCPower.java b/parts/p2p/PartP2PBCPower.java index 305be359..6dc9ec09 100644 --- a/parts/p2p/PartP2PBCPower.java +++ b/parts/p2p/PartP2PBCPower.java @@ -271,7 +271,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo if ( output || !proxy.isActive() ) return 0; - double originaInput = mj; + double originalInput = mj; try { @@ -295,7 +295,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo IBatteryObject o = g.getTargetBattery(); if ( o != null ) { - double fraction = originaInput / outputs; + double fraction = originalInput / outputs; if ( cycleLimitMode ) fraction = o.addEnergy( fraction ); else @@ -319,7 +319,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo } } - return originaInput - mj; + return originalInput - mj; } catch (GridAccessException e) { diff --git a/parts/p2p/PartP2PItems.java b/parts/p2p/PartP2PItems.java index 1fb9f5ff..fef463df 100644 --- a/parts/p2p/PartP2PItems.java +++ b/parts/p2p/PartP2PItems.java @@ -53,7 +53,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo } int oldSize = 0; - boolean requsted; + boolean requested; IInventory cachedInv; LinkedList which = new LinkedList(); @@ -135,18 +135,18 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall) { - boolean wasReq = requsted; + boolean wasReq = requested; - if ( requsted && cachedInv != null ) + if ( requested && cachedInv != null ) ((WrapperChainedInventory) cachedInv).cycleOrder(); - requsted = false; + requested = false; return wasReq ? TickRateModulation.FASTER : TickRateModulation.SLOWER; } IInventory getDest() { - requsted = true; + requested = true; if ( cachedInv != null ) return cachedInv; diff --git a/parts/p2p/PartP2PLiquids.java b/parts/p2p/PartP2PLiquids.java index 75948423..717db682 100644 --- a/parts/p2p/PartP2PLiquids.java +++ b/parts/p2p/PartP2PLiquids.java @@ -200,7 +200,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl return Math.min( resource.amount, requestTotal ); } - int avilable = resource.amount; + int available = resource.amount; int used = 0; i = list.iterator(); @@ -210,8 +210,8 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl FluidStack insert = resource.copy(); insert.amount = (int) Math.ceil( insert.amount * ((double) l.tmpUsed / (double) requestTotal) ); - if ( insert.amount > avilable ) - insert.amount = avilable; + if ( insert.amount > available ) + insert.amount = available; IFluidHandler tank = l.getTarget(); if ( tank != null ) @@ -219,7 +219,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl else l.tmpUsed = 0; - avilable -= insert.amount; + available -= insert.amount; used += insert.amount; } diff --git a/parts/p2p/PartP2PRedstone.java b/parts/p2p/PartP2PRedstone.java index 417daefc..d106805a 100644 --- a/parts/p2p/PartP2PRedstone.java +++ b/parts/p2p/PartP2PRedstone.java @@ -97,14 +97,14 @@ public class PartP2PRedstone extends PartP2PTunnel if ( power != newPower ) { power = newPower; - notifyNeightbors(); + notifyNeighbors(); } } recursive = false; } - public void notifyNeightbors() + public void notifyNeighbors() { World worldObj = tile.getWorldObj(); @@ -114,7 +114,7 @@ public class PartP2PRedstone extends PartP2PTunnel Platform.notifyBlocksOfNeighbors( worldObj, xCoord, yCoord, zCoord ); - // and this cause somtimes it can go thought walls. + // and this cause sometimes it can go thought walls. Platform.notifyBlocksOfNeighbors( worldObj, xCoord - 1, yCoord, zCoord ); Platform.notifyBlocksOfNeighbors( worldObj, xCoord, yCoord - 1, zCoord ); Platform.notifyBlocksOfNeighbors( worldObj, xCoord, yCoord, zCoord - 1 ); diff --git a/parts/reporting/PartStorageMonitor.java b/parts/reporting/PartStorageMonitor.java index fe76bfb7..3091d0c5 100644 --- a/parts/reporting/PartStorageMonitor.java +++ b/parts/reporting/PartStorageMonitor.java @@ -125,7 +125,7 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit else if ( !isLocked ) { configuredItem = AEItemStack.create( eq ); - confgiureWatchers(); + configureWatchers(); this.getHost().markForUpdate(); } else @@ -318,11 +318,11 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit public void updateWatcher(IStackWatcher newWatcher) { myWatcher = newWatcher; - confgiureWatchers(); + configureWatchers(); } // update the system... - public void confgiureWatchers() + public void configureWatchers() { if ( myWatcher != null ) myWatcher.clear(); diff --git a/recipes/Ingredient.java b/recipes/Ingredient.java index 544b42f3..7681a6c6 100644 --- a/recipes/Ingredient.java +++ b/recipes/Ingredient.java @@ -80,7 +80,7 @@ public class Ingredient implements IIngredient } catch (IllegalArgumentException e) { - throw new RecipeError( tmpName + " is not a valid ae2 item defintion." ); + throw new RecipeError( tmpName + " is not a valid ae2 item definition." ); } } diff --git a/recipes/RecipeHandler.java b/recipes/RecipeHandler.java index d5949ae0..5529e5f7 100644 --- a/recipes/RecipeHandler.java +++ b/recipes/RecipeHandler.java @@ -11,6 +11,7 @@ import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import appeng.recipes.handlers.IWebsiteSerializer; import net.minecraft.item.ItemStack; import appeng.api.AEApi; import appeng.api.exceptions.MissingIngredientError; @@ -28,7 +29,6 @@ import appeng.core.features.AEFeature; import appeng.items.materials.ItemMultiMaterial; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; -import appeng.recipes.handlers.IWebsiteSeralizer; import appeng.recipes.handlers.OreRegistration; import com.google.common.collect.HashMultimap; @@ -56,17 +56,17 @@ public class RecipeHandler implements IRecipeHandler data.Handlers.add( ch ); } - public List findRecipe(ItemStack output) + public List findRecipe(ItemStack output) { - List out = new LinkedList(); + List out = new LinkedList(); for (ICraftHandler ch : data.Handlers) { try { - if ( ch instanceof IWebsiteSeralizer && ((IWebsiteSeralizer) ch).canCraft( output ) ) + if ( ch instanceof IWebsiteSerializer && ((IWebsiteSerializer) ch).canCraft( output ) ) { - out.add( (IWebsiteSeralizer) ch ); + out.add( (IWebsiteSerializer) ch ); } } catch (Throwable t) @@ -102,7 +102,7 @@ public class RecipeHandler implements IRecipeHandler } catch (RegistrationError e) { - AELog.warning( "Unable to regsiter a recipe: " + e.getMessage() ); + AELog.warning( "Unable to register a recipe: " + e.getMessage() ); if ( data.exceptions ) AELog.error( e ); if ( data.crash ) @@ -112,7 +112,7 @@ public class RecipeHandler implements IRecipeHandler { if ( data.erroronmissing ) { - AELog.warning( "Unable to regsiter a recipe:" + e.getMessage() ); + AELog.warning( "Unable to register a recipe:" + e.getMessage() ); if ( data.exceptions ) AELog.error( e ); if ( data.crash ) @@ -140,7 +140,7 @@ public class RecipeHandler implements IRecipeHandler { ZipOutputStream out = new ZipOutputStream( new FileOutputStream( "recipes.zip" ) ); - HashMultimap combined = HashMultimap.create(); + HashMultimap combined = HashMultimap.create(); for (String s : data.knownItem) { @@ -152,7 +152,7 @@ public class RecipeHandler implements IRecipeHandler for (ItemStack is : i.getItemStackSet()) { String realName = getName( is ); - List recipes = findRecipe( is ); + List recipes = findRecipe( is ); if ( !recipes.isEmpty() ) combined.putAll( realName, recipes ); } @@ -180,7 +180,7 @@ public class RecipeHandler implements IRecipeHandler { int offset = 0; - for (IWebsiteSeralizer ws : combined.get( realName )) + for (IWebsiteSerializer ws : combined.get( realName )) { String rew = ws.getPattern( this ); if ( rew != null && rew.length() > 0 ) @@ -592,11 +592,11 @@ public class RecipeHandler implements IRecipeHandler { if ( hasQty ) { - cList.add( findIngrident( v, qty ) ); + cList.add( findIngredient( v, qty ) ); hasQty = false; } else - cList.add( findIngrident( v, 1 ) ); + cList.add( findIngredient( v, 1 ) ); } } } @@ -607,7 +607,7 @@ public class RecipeHandler implements IRecipeHandler return out; } - private IIngredient findIngrident(String v, int qty) throws RecipeError + private IIngredient findIngredient(String v, int qty) throws RecipeError { GroupIngredient gi = data.groups.get( v ); diff --git a/recipes/game/FacadeRecipe.java b/recipes/game/FacadeRecipe.java index a5352621..f565f75f 100644 --- a/recipes/game/FacadeRecipe.java +++ b/recipes/game/FacadeRecipe.java @@ -21,10 +21,10 @@ public class FacadeRecipe implements IRecipe if ( anchor.sameAsStack( inv.getStackInSlot( 1 ) ) && anchor.sameAsStack( inv.getStackInSlot( 3 ) ) && anchor.sameAsStack( inv.getStackInSlot( 5 ) ) && anchor.sameAsStack( inv.getStackInSlot( 7 ) ) ) { - ItemStack facadeis = facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade ); - if ( facadeis != null && createFacade ) - facadeis.stackSize = 4; - return facadeis; + ItemStack facades = facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade ); + if ( facades != null && createFacade ) + facades.stackSize = 4; + return facades; } } return null; diff --git a/recipes/handlers/Crusher.java b/recipes/handlers/Crusher.java index e1b82b84..569b7b9a 100644 --- a/recipes/handlers/Crusher.java +++ b/recipes/handlers/Crusher.java @@ -15,7 +15,7 @@ import appeng.integration.abstraction.IRC; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class Crusher implements ICraftHandler, IWebsiteSeralizer +public class Crusher implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/Grind.java b/recipes/handlers/Grind.java index e1f6a26b..14b52d76 100644 --- a/recipes/handlers/Grind.java +++ b/recipes/handlers/Grind.java @@ -12,7 +12,7 @@ import appeng.api.recipes.IIngredient; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class Grind implements ICraftHandler, IWebsiteSeralizer +public class Grind implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/GrindFZ.java b/recipes/handlers/GrindFZ.java index 243a1edc..0ea48e24 100644 --- a/recipes/handlers/GrindFZ.java +++ b/recipes/handlers/GrindFZ.java @@ -15,7 +15,7 @@ import appeng.integration.abstraction.IFZ; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class GrindFZ implements ICraftHandler, IWebsiteSeralizer +public class GrindFZ implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/HCCrusher.java b/recipes/handlers/HCCrusher.java index 3f822c8a..e905c19f 100644 --- a/recipes/handlers/HCCrusher.java +++ b/recipes/handlers/HCCrusher.java @@ -14,7 +14,7 @@ import appeng.recipes.RecipeHandler; import appeng.util.Platform; import cpw.mods.fml.common.event.FMLInterModComms; -public class HCCrusher implements ICraftHandler, IWebsiteSeralizer +public class HCCrusher implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/IWebsiteSeralizer.java b/recipes/handlers/IWebsiteSerializer.java similarity index 87% rename from recipes/handlers/IWebsiteSeralizer.java rename to recipes/handlers/IWebsiteSerializer.java index da4eb30c..ea341038 100644 --- a/recipes/handlers/IWebsiteSeralizer.java +++ b/recipes/handlers/IWebsiteSerializer.java @@ -1,15 +1,15 @@ -package appeng.recipes.handlers; - -import net.minecraft.item.ItemStack; -import appeng.api.exceptions.MissingIngredientError; -import appeng.api.exceptions.RegistrationError; -import appeng.recipes.RecipeHandler; - -public interface IWebsiteSeralizer -{ - - String getPattern(RecipeHandler han); - - boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError; - -} +package appeng.recipes.handlers; + +import net.minecraft.item.ItemStack; +import appeng.api.exceptions.MissingIngredientError; +import appeng.api.exceptions.RegistrationError; +import appeng.recipes.RecipeHandler; + +public interface IWebsiteSerializer +{ + + String getPattern(RecipeHandler han); + + boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError; + +} diff --git a/recipes/handlers/Inscribe.java b/recipes/handlers/Inscribe.java index 208cfb3f..341a63e2 100644 --- a/recipes/handlers/Inscribe.java +++ b/recipes/handlers/Inscribe.java @@ -13,7 +13,7 @@ import appeng.api.recipes.IIngredient; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class Inscribe implements ICraftHandler, IWebsiteSeralizer +public class Inscribe implements ICraftHandler, IWebsiteSerializer { public static class InscriberRecipe diff --git a/recipes/handlers/Macerator.java b/recipes/handlers/Macerator.java index 6f84a4a6..ba5918a2 100644 --- a/recipes/handlers/Macerator.java +++ b/recipes/handlers/Macerator.java @@ -15,7 +15,7 @@ import appeng.integration.abstraction.IIC2; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class Macerator implements ICraftHandler, IWebsiteSeralizer +public class Macerator implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/MekCrusher.java b/recipes/handlers/MekCrusher.java index 583eaee6..820ec21b 100644 --- a/recipes/handlers/MekCrusher.java +++ b/recipes/handlers/MekCrusher.java @@ -15,7 +15,7 @@ import appeng.integration.abstraction.IMekanism; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class MekCrusher implements ICraftHandler, IWebsiteSeralizer +public class MekCrusher implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/MekEnrichment.java b/recipes/handlers/MekEnrichment.java index f842b370..7f065dc3 100644 --- a/recipes/handlers/MekEnrichment.java +++ b/recipes/handlers/MekEnrichment.java @@ -15,7 +15,7 @@ import appeng.integration.abstraction.IMekanism; import appeng.recipes.RecipeHandler; import appeng.util.Platform; -public class MekEnrichment implements ICraftHandler, IWebsiteSeralizer +public class MekEnrichment implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/Pulverizer.java b/recipes/handlers/Pulverizer.java index fe749176..c85f426d 100644 --- a/recipes/handlers/Pulverizer.java +++ b/recipes/handlers/Pulverizer.java @@ -13,7 +13,7 @@ import appeng.recipes.RecipeHandler; import appeng.util.Platform; import cpw.mods.fml.common.event.FMLInterModComms; -public class Pulverizer implements ICraftHandler, IWebsiteSeralizer +public class Pulverizer implements ICraftHandler, IWebsiteSerializer { IIngredient pro_input; diff --git a/recipes/handlers/Shaped.java b/recipes/handlers/Shaped.java index f68bb498..4f929eb8 100644 --- a/recipes/handlers/Shaped.java +++ b/recipes/handlers/Shaped.java @@ -15,7 +15,7 @@ import appeng.recipes.game.ShapedRecipe; import appeng.util.Platform; import cpw.mods.fml.common.registry.GameRegistry; -public class Shaped implements ICraftHandler, IWebsiteSeralizer +public class Shaped implements ICraftHandler, IWebsiteSerializer { private int rows; @@ -46,7 +46,7 @@ public class Shaped implements ICraftHandler, IWebsiteSeralizer throw new RecipeError( "Crafting recipes must have 1-3 columns." ); } else - throw new RecipeError( "shaped crafting recpies must have 1-3 rows." ); + throw new RecipeError( "shaped crafting recipes must have 1-3 rows." ); } else throw new RecipeError( "Crafting must produce a single output." ); diff --git a/recipes/handlers/Shapeless.java b/recipes/handlers/Shapeless.java index 3af9255e..5f41c808 100644 --- a/recipes/handlers/Shapeless.java +++ b/recipes/handlers/Shapeless.java @@ -15,7 +15,7 @@ import appeng.recipes.game.ShapelessRecipe; import appeng.util.Platform; import cpw.mods.fml.common.registry.GameRegistry; -public class Shapeless implements ICraftHandler, IWebsiteSeralizer +public class Shapeless implements ICraftHandler, IWebsiteSerializer { List inputs; diff --git a/recipes/handlers/Smelt.java b/recipes/handlers/Smelt.java index 460b894a..ba038522 100644 --- a/recipes/handlers/Smelt.java +++ b/recipes/handlers/Smelt.java @@ -12,7 +12,7 @@ import appeng.recipes.RecipeHandler; import appeng.util.Platform; import cpw.mods.fml.common.registry.GameRegistry; -public class Smelt implements ICraftHandler, IWebsiteSeralizer +public class Smelt implements ICraftHandler, IWebsiteSerializer { IIngredient in; diff --git a/recipes/ores/OreDictionaryHandler.java b/recipes/ores/OreDictionaryHandler.java index cae00e02..65ef8645 100644 --- a/recipes/ores/OreDictionaryHandler.java +++ b/recipes/ores/OreDictionaryHandler.java @@ -56,7 +56,7 @@ public class OreDictionaryHandler { ol.add( n ); - // notify the listener of any ore already in existance. + // notify the listener of any ore already in existence. for (String name : OreDictionary.getOreNames()) { if ( name != null && shouldCare( name ) ) diff --git a/server/ServerHelper.java b/server/ServerHelper.java index d7a564dd..84216f3c 100644 --- a/server/ServerHelper.java +++ b/server/ServerHelper.java @@ -157,6 +157,6 @@ public class ServerHelper extends CommonHelper @Override public void missingCoreMod() { - throw new RuntimeException( "Unable to Load Core Mod, please verify that AE2 is properly install in the mods folder, with a .jar extention." ); + throw new RuntimeException( "Unable to Load Core Mod, please verify that AE2 is properly install in the mods folder, with a .jar extension." ); } } diff --git a/services/CompassService.java b/services/CompassService.java index e620ef61..57870291 100644 --- a/services/CompassService.java +++ b/services/CompassService.java @@ -102,10 +102,10 @@ public class CompassService implements ThreadFactory { if ( cr.hasBeacon( minx, z ) ) { - int closness = dist( cx, cz, minx, z ); - if ( closness < closest ) + int closeness = dist( cx, cz, minx, z ); + if ( closeness < closest ) { - closest = closness; + closest = closeness; chosen_x = minx; chosen_z = z; } @@ -113,10 +113,10 @@ public class CompassService implements ThreadFactory if ( cr.hasBeacon( maxx, z ) ) { - int closness = dist( cx, cz, maxx, z ); - if ( closness < closest ) + int closeness = dist( cx, cz, maxx, z ); + if ( closeness < closest ) { - closest = closness; + closest = closeness; chosen_x = maxx; chosen_z = z; } @@ -127,10 +127,10 @@ public class CompassService implements ThreadFactory { if ( cr.hasBeacon( x, minz ) ) { - int closness = dist( cx, cz, x, minz ); - if ( closness < closest ) + int closeness = dist( cx, cz, x, minz ); + if ( closeness < closest ) { - closest = closness; + closest = closeness; chosen_x = x; chosen_z = minz; } @@ -138,10 +138,10 @@ public class CompassService implements ThreadFactory if ( cr.hasBeacon( x, maxz ) ) { - int closness = dist( cx, cz, x, maxz ); - if ( closness < closest ) + int closeness = dist( cx, cz, x, maxz ); + if ( closeness < closest ) { - closest = closness; + closest = closeness; chosen_x = x; chosen_z = maxz; } diff --git a/spatial/CachedPlane.java b/spatial/CachedPlane.java index df3939d8..df1a6415 100644 --- a/spatial/CachedPlane.java +++ b/spatial/CachedPlane.java @@ -110,7 +110,7 @@ public class CachedPlane LinkedList tiles = new LinkedList(); LinkedList ticks = new LinkedList(); - World wrld; + World world; Block matrixFrame = AEApi.instance().blocks().blockMatrixFrame.block(); IMovableRegistry reg = AEApi.instance().registries().movable(); @@ -118,7 +118,7 @@ public class CachedPlane public CachedPlane(World w, int minx, int miny, int minz, int maxx, int maxy, int maxz) { - wrld = w; + world = w; x_size = maxx - minx + 1; y_size = maxy - miny + 1; @@ -200,8 +200,8 @@ public class CachedPlane c.chunkTileEntityMap.remove( cp ); } - long k = wrld.getTotalWorldTime(); - List list = wrld.getPendingBlockUpdates( c, false ); + long k = world.getTotalWorldTime(); + List list = world.getPendingBlockUpdates( c, false ); if ( list != null ) { for (Object o : list) @@ -223,7 +223,7 @@ public class CachedPlane { try { - wrld.loadedTileEntityList.remove( te ); + world.loadedTileEntityList.remove( te ); } catch (Exception e) { @@ -321,29 +321,29 @@ public class CachedPlane private void addTick(int x, int y, int z, NextTickListEntry ntle) { - wrld.scheduleBlockUpdate( x + x_offset, y + y_offset, z + z_offset, ntle.func_151351_a(), (int) ntle.scheduledTime ); + world.scheduleBlockUpdate( x + x_offset, y + y_offset, z + z_offset, ntle.func_151351_a(), (int) ntle.scheduledTime ); } - private void addTile(int x, int y, int z, TileEntity te, CachedPlane alernateDest, IMovableRegistry mr) + private void addTile(int x, int y, int z, TileEntity te, CachedPlane alternateDest, IMovableRegistry mr) { try { Column c = myColumns[x][z]; - if ( c.dontSkip( y + y_offset ) || alernateDest == null ) + if ( c.dontSkip( y + y_offset ) || alternateDest == null ) { IMovableHandler handler = getHandler( te ); try { - handler.moveTile( te, wrld, x + x_offset, y + y_offset, z + z_offset ); + handler.moveTile( te, world, x + x_offset, y + y_offset, z + z_offset ); } catch (Throwable e) { AELog.error( e ); // attempt recovery... - te.setWorldObj( wrld ); + te.setWorldObj( world ); te.xCoord = x; te.yCoord = y; te.zCoord = z; @@ -353,8 +353,8 @@ public class CachedPlane if ( c.c.isChunkLoaded ) { - wrld.addTileEntity( te ); - wrld.markBlockForUpdate( x, y, z ); + world.addTileEntity( te ); + world.markBlockForUpdate( x, y, z ); } } @@ -362,7 +362,7 @@ public class CachedPlane } else { - alernateDest.addTile( x, y, z, te, null, mr ); + alternateDest.addTile( x, y, z, te, null, mr ); } } catch (Throwable e) @@ -392,7 +392,7 @@ public class CachedPlane Chunk c = myChunks[x][z]; for (int y = 1; y < 255; y += 32) - WorldSettings.getInstance().getCompass().updateArea( wrld, c.xPosition << 4, y, c.zPosition << 4 ); + WorldSettings.getInstance().getCompass().updateArea( world, c.xPosition << 4, y, c.zPosition << 4 ); Platform.sendChunk( c, verticalBits ); diff --git a/spatial/StorageHelper.java b/spatial/StorageHelper.java index 26ddd807..f7c99096 100644 --- a/spatial/StorageHelper.java +++ b/spatial/StorageHelper.java @@ -131,7 +131,7 @@ public class StorageHelper Method onEntityRemoved; /** - * Mostly from dimentional doors.. which mostly got it form X-Comp. + * Mostly from dimensional doors.. which mostly got it form X-Comp. * * @param world * @param entity @@ -182,7 +182,7 @@ public class StorageHelper if ( player != null ) { if ( link.dim.provider instanceof StorageWorldProvider ) - Achievements.SpatialIOExplorerer.addToPlayer( player ); + Achievements.SpatialIOExplorer.addToPlayer( player ); player.mcServer.getConfigurationManager().transferPlayerToDimension( player, link.dim.provider.dimensionId, new METeleporter( newWorld, link ) ); } @@ -299,10 +299,10 @@ public class StorageHelper } for (WorldCoord wc : cDst.updates) - cDst.wrld.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.air ); + cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.air ); for (WorldCoord wc : cSrc.updates) - cSrc.wrld.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.air ); + cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.air ); transverseEdges( x - 1, y - 1, z - 1, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1, new triggerUpdates( src ) ); transverseEdges( i - 1, j - 1, k - 1, i + scaleX + 1, j + scaleY + 1, k + scaleZ + 1, new triggerUpdates( dst ) ); diff --git a/tile/AEBaseTile.java b/tile/AEBaseTile.java index 5d0d84c6..12909319 100644 --- a/tile/AEBaseTile.java +++ b/tile/AEBaseTile.java @@ -391,7 +391,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } /** - * depending on the from, diffrent settings will be accepted, don't call this with null + * depending on the from, different settings will be accepted, don't call this with null * * @param from * @param compound diff --git a/tile/crafting/TileCraftingTile.java b/tile/crafting/TileCraftingTile.java index 731be277..39c75709 100644 --- a/tile/crafting/TileCraftingTile.java +++ b/tile/crafting/TileCraftingTile.java @@ -134,13 +134,13 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP } @MENetworkEventSubscribe - public void onPowerStateChage(MENetworkChannelsChanged ev) + public void onPowerStateChange(MENetworkChannelsChanged ev) { updateMeta( false ); } @MENetworkEventSubscribe - public void onPowerStateChage(MENetworkPowerStatusChange ev) + public void onPowerStateChange(MENetworkPowerStatusChange ev) { updateMeta( false ); } diff --git a/tile/crafting/TileMolecularAssembler.java b/tile/crafting/TileMolecularAssembler.java index 83864935..485524da 100644 --- a/tile/crafting/TileMolecularAssembler.java +++ b/tile/crafting/TileMolecularAssembler.java @@ -94,7 +94,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn for (int x = 0; x < table.getSizeInventory(); x++) inv.setInventorySlotContents( x, table.getStackInSlot( x ) ); - updateSleepyness(); + updateSleepiness(); markDirty(); return true; } @@ -136,10 +136,10 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn pushDirection = ForgeDirection.UNKNOWN; } - updateSleepyness(); + updateSleepiness(); } - private void updateSleepyness() + private void updateSleepiness() { boolean wasEnabled = isAwake; isAwake = myPlan != null && hasMats() || canPush(); @@ -354,7 +354,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn public TickingRequest getTickingRequest(IGridNode node) { recalculatePlan(); - updateSleepyness(); + updateSleepiness(); return new TickingRequest( 1, 1, !isAwake, false ); } @@ -381,14 +381,14 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn markDirty(); ejectHeldItems(); - updateSleepyness(); + updateSleepiness(); progress = 0; return isAwake ? TickRateModulation.IDLE : TickRateModulation.SLEEP; } if ( myPlan == null ) { - updateSleepyness(); + updateSleepiness(); return TickRateModulation.SLEEP; } @@ -459,7 +459,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn } markDirty(); - updateSleepyness(); + updateSleepiness(); return isAwake ? TickRateModulation.IDLE : TickRateModulation.SLEEP; } } diff --git a/tile/grindstone/TileCrank.java b/tile/grindstone/TileCrank.java index 58d81a1b..247d3219 100644 --- a/tile/grindstone/TileCrank.java +++ b/tile/grindstone/TileCrank.java @@ -20,7 +20,7 @@ import appeng.util.Platform; public class TileCrank extends AEBaseTile implements ICustomCollision { - final int ticksPerRoation = 18; + final int ticksPerRotation = 18; // sided values.. public float visibleRotation = 0; @@ -34,11 +34,11 @@ public class TileCrank extends AEBaseTile implements ICustomCollision { if ( rotation > 0 ) { - visibleRotation -= 360 / (ticksPerRoation); + visibleRotation -= 360 / (ticksPerRotation); charge++; - if ( charge >= ticksPerRoation ) + if ( charge >= ticksPerRotation ) { - charge -= ticksPerRoation; + charge -= ticksPerRotation; ICrankable g = getGrinder(); if ( g != null ) g.applyTurn(); @@ -96,7 +96,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision if ( g.canTurn() ) { hits = 0; - rotation += ticksPerRoation; + rotation += ticksPerRotation; this.markForUpdate(); return true; } @@ -116,7 +116,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean isVisual) { double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 * getUp().offsetY; diff --git a/tile/misc/TileCharger.java b/tile/misc/TileCharger.java index 6b956be7..077c3f67 100644 --- a/tile/misc/TileCharger.java +++ b/tile/misc/TileCharger.java @@ -58,7 +58,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable { inv.setInventorySlotContents( 0, null ); } - return false; // TESR dosn't need updates! + return false; // TESR doesn't need updates! } @TileEvent(TileEventType.NETWORK_WRITE) @@ -94,7 +94,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable { injectExternalPower( PowerUnits.AE, gridProxy.getEnergy().extractAEPower( Math.min( 150.0, 1500.0 - internalCurrentPower ), Actionable.MODULATE, PowerMultiplier.ONE ) ); - tickTickTimer = 20; // keep tickin... + tickTickTimer = 20; // keep ticking... } catch (GridAccessException e) { @@ -116,7 +116,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable internalCurrentPower += adjustment; if ( oldPower > internalCurrentPower ) requiresUpdate = true; - tickTickTimer = 20; // keep tickin... + tickTickTimer = 20; // keep ticking... } } else if ( internalCurrentPower > 1499 && AEApi.instance().materials().materialCertusQuartzCrystal.sameAsStack( myItem ) ) diff --git a/tile/misc/TileInscriber.java b/tile/misc/TileInscriber.java index 6aa5e9a6..6db431b1 100644 --- a/tile/misc/TileInscriber.java +++ b/tile/misc/TileInscriber.java @@ -42,10 +42,10 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable AppEngInternalInventory inv = new AppEngInternalInventory( this, 4 ); - public final int maxProessingTime = 100; + public final int maxProcessingTime = 100; public int processingTime = 0; - // cycles from 0 - 16, at 8 it preforms the action, at 16 it reenables the normal rotuine. + // cycles from 0 - 16, at 8 it preforms the action, at 16 it re-enables the normal routine. public boolean smash; public int finalStep; @@ -283,9 +283,9 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable if ( matchA || matchB ) { - for (ItemStack opion : i.imprintable) + for (ItemStack option : i.imprintable) { - if ( Platform.isSameItemPrecise( opion, getStackInSlot( 2 ) ) ) + if ( Platform.isSameItemPrecise( option, getStackInSlot( 2 ) ) ) return i; } } @@ -377,9 +377,9 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable // :P } - if ( processingTime > maxProessingTime ) + if ( processingTime > maxProcessingTime ) { - processingTime = maxProessingTime; + processingTime = maxProcessingTime; InscriberRecipe out = getTask(); if ( out != null ) { diff --git a/tile/misc/TileInterface.java b/tile/misc/TileInterface.java index 8dce9064..7286a2a3 100644 --- a/tile/misc/TileInterface.java +++ b/tile/misc/TileInterface.java @@ -125,7 +125,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IS { gridProxy.setValidSides( EnumSet.complementOf( EnumSet.of( pointAt ) ) ); super.onReady(); - duality.initalize(); + duality.initialize(); } @Override diff --git a/tile/misc/TileSecurity.java b/tile/misc/TileSecurity.java index 05f99f86..fc25a7a7 100644 --- a/tile/misc/TileSecurity.java +++ b/tile/misc/TileSecurity.java @@ -1,5 +1,6 @@ package appeng.tile.misc; +import appeng.helpers.PlayerSecurityWrapper; import io.netty.buffer.ByteBuf; import java.io.IOException; @@ -44,7 +45,6 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.helpers.PlayerSecuirtyWrapper; import appeng.me.GridAccessException; import appeng.me.storage.SecurityInventory; import appeng.tile.TileEvent; @@ -61,7 +61,7 @@ import appeng.util.item.AEItemStack; public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile { - private static int diffrence = 0; + private static int difference = 0; private IConfigManager cm = new ConfigManager( this ); private SecurityInventory inventory = new SecurityInventory( this ); @@ -209,7 +209,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp if ( i instanceof IBiometricCard ) { IBiometricCard bc = (IBiometricCard) i; - bc.registerPermissions( new PlayerSecuirtyWrapper( playerPerms ), pr, is ); + bc.registerPermissions( new PlayerSecurityWrapper( playerPerms ), pr, is ); } } @@ -237,11 +237,11 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp public TileSecurity() { gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); gridProxy.setIdlePowerUsage( 2.0 ); - diffrence++; + difference++; - securityKey = System.currentTimeMillis() * 10 + diffrence; - if ( diffrence > 10 ) - diffrence = 0; + securityKey = System.currentTimeMillis() * 10 + difference; + if ( difference > 10 ) + difference = 0; cm.registerSetting( Settings.SORT_BY, SortOrder.NAME ); cm.registerSetting( Settings.VIEW_MODE, ViewItems.ALL ); diff --git a/tile/misc/TileVibrationChamber.java b/tile/misc/TileVibrationChamber.java index 8f811a7d..8a350c7a 100644 --- a/tile/misc/TileVibrationChamber.java +++ b/tile/misc/TileVibrationChamber.java @@ -51,7 +51,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka { boolean wasOn = isOn; isOn = data.readBoolean(); - return wasOn != isOn; // TESR dosn't need updates! + return wasOn != isOn; // TESR doesn't need updates! } @TileEvent(TileEventType.NETWORK_WRITE) diff --git a/tile/networking/TileCableBus.java b/tile/networking/TileCableBus.java index c23f2a81..21fa2479 100644 --- a/tile/networking/TileCableBus.java +++ b/tile/networking/TileCableBus.java @@ -186,9 +186,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public void removePart(ForgeDirection side, boolean supressUpdate) + public void removePart(ForgeDirection side, boolean suppressUpdate) { - cb.removePart( side, supressUpdate ); + cb.removePart( side, suppressUpdate ); } @Override @@ -210,7 +210,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public Iterable getSelectedBoundingBoxsFromPool(World w, int x, int y, int z, Entity e, boolean visual) + public Iterable getSelectedBoundingBoxesFromPool(World w, int x, int y, int z, Entity e, boolean visual) { return cb.getSelectedBoundingBoxsFromPool( false, true, e, visual ); } @@ -218,7 +218,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public void addCollidingBlockToList(World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e) { - for (AxisAlignedBB bx : getSelectedBoundingBoxsFromPool( w, x, y, z, e, false )) + for (AxisAlignedBB bx : getSelectedBoundingBoxesFromPool( w, x, y, z, e, false )) out.add( AxisAlignedBB.getBoundingBox( bx.minX, bx.minY, bx.minZ, bx.maxX, bx.maxY, bx.maxZ ) ); } diff --git a/tile/networking/TileController.java b/tile/networking/TileController.java index 4f915c60..5bff5913 100644 --- a/tile/networking/TileController.java +++ b/tile/networking/TileController.java @@ -39,7 +39,7 @@ public class TileController extends AENetworkPowerTile implements IAEPowerStorag } @Override - protected double getFunnelPowerDemand(double maxRecived) + protected double getFunnelPowerDemand(double maxReceived) { try { @@ -48,7 +48,7 @@ public class TileController extends AENetworkPowerTile implements IAEPowerStorag catch (GridAccessException e) { // no grid? use local... - return super.getFunnelPowerDemand( maxRecived ); + return super.getFunnelPowerDemand( maxReceived ); } } diff --git a/tile/powersink/AERootPoweredTile.java b/tile/powersink/AERootPoweredTile.java index c23f1d27..6d7333ed 100644 --- a/tile/powersink/AERootPoweredTile.java +++ b/tile/powersink/AERootPoweredTile.java @@ -17,7 +17,7 @@ import appeng.tile.events.TileEventType; public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowerStorage { - // values that determin general function, are set by inheriting classes if + // values that determine general function, are set by inheriting classes if // needed. These should generally remain static. protected double internalMaxPower = 10000; protected boolean internalCanAcceptPower = true; diff --git a/tile/powersink/MinecraftJoules5.java b/tile/powersink/MinecraftJoules5.java index 8f1310c3..b24f33c9 100644 --- a/tile/powersink/MinecraftJoules5.java +++ b/tile/powersink/MinecraftJoules5.java @@ -66,8 +66,8 @@ public abstract class MinecraftJoules5 extends AERootPoweredTile implements IPow @Method(iname = "MJ5") final public void doWork(PowerHandler workProvider) { - float requred = (float) getExternalPowerDemand( PowerUnits.MJ, bcPowerWrapper.getPowerReceiver().getEnergyStored() ); - double failed = injectExternalPower( PowerUnits.MJ, bcPowerWrapper.useEnergy( 0.0f, requred, true ) ); + float required = (float) getExternalPowerDemand( PowerUnits.MJ, bcPowerWrapper.getPowerReceiver().getEnergyStored() ); + double failed = injectExternalPower( PowerUnits.MJ, bcPowerWrapper.useEnergy( 0.0f, required, true ) ); if ( failed > 0.01 ) bcPowerWrapper.addEnergy( (float) failed ); } diff --git a/tile/powersink/UniversalElectricity.java b/tile/powersink/UniversalElectricity.java index b96f7b60..cd1a271e 100644 --- a/tile/powersink/UniversalElectricity.java +++ b/tile/powersink/UniversalElectricity.java @@ -19,17 +19,17 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I final public float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive) { float accepted = 0; - double recievedPower = receive.getWatts(); + double receivedPower = receive.getWatts(); if ( doReceive ) { - accepted = (float) (recievedPower - injectExternalPower( PowerUnits.KJ, recievedPower )); + accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower )); } else { double whatIWant = getExternalPowerDemand( PowerUnits.KJ ); - if ( whatIWant > recievedPower ) - accepted = (float) recievedPower; + if ( whatIWant > receivedPower ) + accepted = (float) receivedPower; else accepted = (float) whatIWant; } diff --git a/tile/spatial/TileSpatialIOPort.java b/tile/spatial/TileSpatialIOPort.java index 62da4044..e2479d1a 100644 --- a/tile/spatial/TileSpatialIOPort.java +++ b/tile/spatial/TileSpatialIOPort.java @@ -79,7 +79,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements Callable ItemStack cell = getStackInSlot( 0 ); if ( isSpatialCell( cell ) ) { - TickHandler.instance.addCallable( null, this );// this needs to be cross world sycned. + TickHandler.instance.addCallable( null, this );// this needs to be cross world synced. } } } diff --git a/transformer/AppEngCore.java b/transformer/AppEngCore.java index 0d6c2892..a112f199 100644 --- a/transformer/AppEngCore.java +++ b/transformer/AppEngCore.java @@ -33,7 +33,7 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin md.version = getVersion(); md.name = getName(); md.url = "http://ae2.ae-mod.info"; - md.description = "Embeded Coremod for Applied Energistics 2"; + md.description = "Embedded Coremod for Applied Energistics 2"; } @EventHandler diff --git a/transformer/MissingCoreMod.java b/transformer/MissingCoreMod.java index 9ee4d19e..70abc842 100644 --- a/transformer/MissingCoreMod.java +++ b/transformer/MissingCoreMod.java @@ -42,7 +42,7 @@ public class MissingCoreMod extends CustomModLoadingErrorDisplayException } else { - drawCenteredString( fontRenderer, "You're launcher may refer to this by diffrent names,", errorScreen.width / 2, offset += 15, 0xffffff ); + drawCenteredString( fontRenderer, "You're launcher may refer to this by different names,", errorScreen.width / 2, offset += 15, 0xffffff ); offset += 5; diff --git a/util/Platform.java b/util/Platform.java index e34fffab..b6c0b7d1 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -13,6 +13,7 @@ import java.util.Random; import java.util.Set; import java.util.WeakHashMap; +import appeng.util.item.OreReference; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; @@ -107,7 +108,6 @@ import appeng.me.helpers.AENetworkProxy; import appeng.util.item.AEItemStack; import appeng.util.item.AESharedNBT; import appeng.util.item.OreHelper; -import appeng.util.item.OreRefrence; import appeng.util.prioitylist.IPartitionList; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.FMLCommonHandler; @@ -342,7 +342,7 @@ public class Platform } /* - * Lots of sillyness to try and account for weird tag related junk, basically requires that two tags have at least + * Lots of silliness to try and account for weird tag related junk, basically requires that two tags have at least * something in their tags before it wasts its time comparing them. */ public static boolean sameStackStags(ItemStack a, ItemStack b) @@ -504,7 +504,7 @@ public class Platform } /* - * Orderless hash on NBT Data, used to work thought huge piles fast, but ignroes the order just in case MC decided + * Orderless hash on NBT Data, used to work thought huge piles fast, but ignores the order just in case MC decided * to change it... WHICH IS BAD... */ public static int NBTOrderlessHash(NBTBase A) @@ -666,7 +666,7 @@ public class Platform } /* - * Generates Item entiies in the world similar to how items are generally droped. + * Generates Item entities in the world similar to how items are generally dropped. */ public static void spawnDrops(World w, int x, int y, int z, List drops) { @@ -1185,8 +1185,8 @@ public class Platform } } - OreRefrence aOR = OreHelper.instance.isOre( a ); - OreRefrence bOR = OreHelper.instance.isOre( b ); + OreReference aOR = OreHelper.instance.isOre( a ); + OreReference bOR = OreHelper.instance.isOre( b ); if ( OreHelper.instance.sameOre( aOR, bOR ) ) return true; @@ -1260,7 +1260,7 @@ public class Platform Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 ); Entity entity = null; - double Closeest = 9999999.0D; + double closest = 9999999.0D; if ( hitEntities ) { List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); @@ -1286,10 +1286,10 @@ public class Platform { double nd = vec3.squareDistanceTo( movingobjectposition1.hitVec ); - if ( nd < Closeest ) + if ( nd < closest ) { entity = entity1; - Closeest = nd; + closest = nd; } } } @@ -1306,7 +1306,7 @@ public class Platform pos = w.rayTraceBlocks( vec3, vec31, true ); } - if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest ) + if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > closest ) { pos = new MovingObjectPosition( entity ); } @@ -1744,7 +1744,7 @@ public class Platform return false; } - public static Object findPrefered(ItemStack[] is) + public static Object findPreferred(ItemStack[] is) { for (ItemStack stack : is) { @@ -1835,13 +1835,13 @@ public class Platform return (float) (player.posY + player.getEyeHeight() - player.getDefaultEyeHeight()); } - public static void addStat(int playerID, Achievement achivement) + public static void addStat(int playerID, Achievement achievement) { EntityPlayer p = AEApi.instance().registries().players().findPlayer( playerID ); if ( p != null ) { p.addChatMessage( new ChatComponentText( "RWAR!" ) ); - // p.addStat( achivement, 1 ); + // p.addStat( achievement, 1 ); } } diff --git a/util/inv/WrapperInventoryRange.java b/util/inv/WrapperInventoryRange.java index e0e0cba8..4a8b8325 100644 --- a/util/inv/WrapperInventoryRange.java +++ b/util/inv/WrapperInventoryRange.java @@ -11,7 +11,7 @@ public class WrapperInventoryRange implements IInventory int[] slots; protected boolean ignoreValidItems = false; - public static String concateLines(int[] s, String separator) + public static String concatLines(int[] s, String separator) { if ( s.length > 0 ) { diff --git a/util/item/AEItemDef.java b/util/item/AEItemDef.java index 4b5a308a..d87a98b6 100644 --- a/util/item/AEItemDef.java +++ b/util/item/AEItemDef.java @@ -36,7 +36,7 @@ public class AEItemDef @SideOnly(Side.CLIENT) public UniqueIdentifier uniqueID; - public OreRefrence isOre; + public OreReference isOre; static AESharedNBT lowTag = new AESharedNBT( Integer.MIN_VALUE ); static AESharedNBT highTag = new AESharedNBT( Integer.MAX_VALUE ); diff --git a/util/item/AESharedNBT.java b/util/item/AESharedNBT.java index 4563a7d3..144f1383 100644 --- a/util/item/AESharedNBT.java +++ b/util/item/AESharedNBT.java @@ -122,14 +122,14 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound /* * Shared Tag Compound Cache. */ - private static WeakHashMap> sharedTagCompounts = new WeakHashMap(); + private static WeakHashMap> sharedTagCompounds = new WeakHashMap(); /* * Debug purposes. */ public static int sharedTagLoad() { - return sharedTagCompounts.size(); + return sharedTagCompounds.size(); } /* @@ -158,7 +158,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound SharedSearchObject sso = new SharedSearchObject( itemid, meta, tagCompound ); - WeakReference c = sharedTagCompounts.get( sso ); + WeakReference c = sharedTagCompounds.get( sso ); if ( c != null ) { SharedSearchObject cg = c.get(); @@ -176,7 +176,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound sso.shared = clone; clone.sso = sso; - sharedTagCompounts.put( sso, new WeakReference( sso ) ); + sharedTagCompounds.put( sso, new WeakReference( sso ) ); return clone; } diff --git a/util/item/ItemList.java b/util/item/ItemList.java index 02319612..5965b890 100644 --- a/util/item/ItemList.java +++ b/util/item/ItemList.java @@ -156,7 +156,7 @@ public final class ItemList implements IItemList implements IItemList output = new LinkedList(); - for (IAEItemStack is : or.getAEEquivilients()) + for (IAEItemStack is : or.getAEEquivalents()) output.addAll( findFuzzyDamage( (AEItemStack) is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE ) ); return output; diff --git a/util/item/ItemModList.java b/util/item/ItemModList.java index b98a289d..0eefeb12 100644 --- a/util/item/ItemModList.java +++ b/util/item/ItemModList.java @@ -48,9 +48,7 @@ public class ItemModList implements IItemContainer @Override public Collection findFuzzy(IAEItemStack input, FuzzyMode fuzzy) { - Collection overrrides = overrides.findFuzzy( input, fuzzy ); - - return overrrides; + return overrides.findFuzzy( input, fuzzy ); } @Override diff --git a/util/item/MeanfulIterator.java b/util/item/MeaningfulIterator.java similarity index 74% rename from util/item/MeanfulIterator.java rename to util/item/MeaningfulIterator.java index 420dd6ba..c38bd197 100644 --- a/util/item/MeanfulIterator.java +++ b/util/item/MeaningfulIterator.java @@ -1,44 +1,44 @@ -package appeng.util.item; - -import java.util.Iterator; - -import appeng.api.storage.data.IAEStack; - -public class MeanfulIterator implements Iterator -{ - - final Iterator parent; - private StackType next; - - public MeanfulIterator(Iterator iterator) { - parent = iterator; - } - - @Override - public boolean hasNext() - { - while (parent.hasNext()) - { - next = parent.next(); - if ( next.isMeaningful() ) - return true; - else - parent.remove(); // self cleaning :3 - } - - return false; - } - - @Override - public Object next() - { - return next; - } - - @Override - public void remove() - { - parent.remove(); - } - -} +package appeng.util.item; + +import java.util.Iterator; + +import appeng.api.storage.data.IAEStack; + +public class MeaningfulIterator implements Iterator +{ + + final Iterator parent; + private StackType next; + + public MeaningfulIterator(Iterator iterator) { + parent = iterator; + } + + @Override + public boolean hasNext() + { + while (parent.hasNext()) + { + next = parent.next(); + if ( next.isMeaningful() ) + return true; + else + parent.remove(); // self cleaning :3 + } + + return false; + } + + @Override + public Object next() + { + return next; + } + + @Override + public void remove() + { + parent.remove(); + } + +} diff --git a/util/item/OreHelper.java b/util/item/OreHelper.java index 1d8494f5..50d47660 100644 --- a/util/item/OreHelper.java +++ b/util/item/OreHelper.java @@ -49,25 +49,25 @@ public class OreHelper class OreResult { - public OreRefrence oreValue = null; + public OreReference oreValue = null; }; - HashMap refrences = new HashMap(); + HashMap references = new HashMap(); - public OreRefrence isOre(ItemStack ItemStack) + public OreReference isOre(ItemStack ItemStack) { ItemRef ir = new ItemRef( ItemStack ); - OreResult or = refrences.get( ir ); + OreResult or = references.get( ir ); if ( or == null ) { or = new OreResult(); - refrences.put( ir, or ); + references.put( ir, or ); - OreRefrence ref = new OreRefrence(); + OreReference ref = new OreReference(); Collection ores = ref.getOres(); - Collection set = ref.getEquivilients(); + Collection set = ref.getEquivalents(); for (String ore : OreDictionary.getOreNames()) { @@ -100,8 +100,8 @@ public class OreHelper public boolean sameOre(AEItemStack aeItemStack, IAEItemStack is) { - OreRefrence a = aeItemStack.def.isOre; - OreRefrence b = ((AEItemStack) aeItemStack).def.isOre; + OreReference a = aeItemStack.def.isOre; + OreReference b = ((AEItemStack) aeItemStack).def.isOre; if ( a == b ) return true; @@ -119,7 +119,7 @@ public class OreHelper return false; } - public boolean sameOre(OreRefrence a, OreRefrence b) + public boolean sameOre(OreReference a, OreReference b) { if ( a == null || b == null ) return false; @@ -139,11 +139,11 @@ public class OreHelper public boolean sameOre(AEItemStack aeItemStack, ItemStack o) { - OreRefrence a = aeItemStack.def.isOre; + OreReference a = aeItemStack.def.isOre; if ( a == null ) return false; - for (ItemStack oreItem : a.getEquivilients()) + for (ItemStack oreItem : a.getEquivalents()) { if ( OreDictionary.itemMatches( oreItem, o, false ) ) return true; diff --git a/util/item/OreRefrence.java b/util/item/OreReference.java similarity index 86% rename from util/item/OreRefrence.java rename to util/item/OreReference.java index 44ff451a..b3609bd7 100644 --- a/util/item/OreRefrence.java +++ b/util/item/OreReference.java @@ -9,19 +9,19 @@ import java.util.List; import net.minecraft.item.ItemStack; import appeng.api.storage.data.IAEItemStack; -public class OreRefrence +public class OreReference { private LinkedList otherOptions = new LinkedList(); private ArrayList aeotherOptions = null; private HashSet ores = new HashSet(); - public Collection getEquivilients() + public Collection getEquivalents() { return otherOptions; } - public List getAEEquivilients() + public List getAEEquivalents() { if ( aeotherOptions == null ) {