diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 428cbc58f..e2be58df0 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -757,11 +757,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature return hasSubtypes; } + @Override public boolean hasComparatorInputOverride() { return isInventory; } + @Override public int getComparatorInputOverride(World w, int x, int y, int z, int s) { TileEntity te = getTileEntity( w, x, y, z ); diff --git a/src/main/java/appeng/block/misc/BlockPaint.java b/src/main/java/appeng/block/misc/BlockPaint.java index 35de99a13..4e6031ccd 100644 --- a/src/main/java/appeng/block/misc/BlockPaint.java +++ b/src/main/java/appeng/block/misc/BlockPaint.java @@ -72,16 +72,19 @@ public class BlockPaint extends AEBaseBlock tp.onNeighborBlockChange(); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { return null; } + @Override public boolean canCollideCheck(int p_149678_1_, boolean p_149678_2_) { return false; } + @Override public void dropBlockAsItemWithChance(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_) { diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index b37b41033..8869af957 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -61,6 +61,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection static public Class noTesrTile; static public Class tesrTile; + @Override public T getTileEntity(IBlockAccess w, int x, int y, int z) { TileEntity te = w.getTileEntity( x, y, z ); @@ -89,6 +90,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection return 0; } + @Override @SideOnly(Side.CLIENT) public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer) { @@ -135,6 +137,7 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection return true; } + @Override @SideOnly(Side.CLIENT) public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 712c5a5b0..bda1a1775 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -414,6 +414,7 @@ public abstract class AEBaseGui extends GuiContainer super.handleMouseClick( slot, slotIdx, ctrlDown, key ); } + @Override protected void mouseClickMove(int x, int y, int c, long d) { Slot slot = this.getSlot( x, y ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java index 03ad7bcd5..ddb4ff06a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java @@ -142,6 +142,7 @@ public class GuiCellWorkbench extends GuiUpgradeable buttonList.add( copyMode ); } + @Override protected void handleButtonVisibility() { copyMode.setState( workbench.copyMode == CopyMode.CLEAR_ON_REMOVE ); @@ -160,11 +161,13 @@ public class GuiCellWorkbench extends GuiUpgradeable fuzzyMode.setVisibility( hasFuzzy ); } + @Override protected String getBackground() { return "guis/cellworkbench.png"; } + @Override protected GuiText getName() { return GuiText.CellWorkbench; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java index 0905d7c48..c01438fa2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java @@ -67,6 +67,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable reservedSpace = 73; } + @Override protected String getBackground() { return "guis/crafting.png"; diff --git a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java index 623251104..ea02e061a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java +++ b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java @@ -70,6 +70,7 @@ public class GuiFormationPlane extends GuiUpgradeable } } + @Override protected String getBackground() { return "guis/storagebus.png"; diff --git a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java index d8901d9a2..0bed5d4f2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java @@ -88,6 +88,7 @@ public class GuiIOPort extends GuiUpgradeable } } + @Override protected String getBackground() { return "guis/ioport.png"; diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index 07a88448d..55193bbe0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -81,6 +81,7 @@ public class GuiInterface extends GuiUpgradeable buttonList.add( interfaceMode ); } + @Override protected String getBackground() { return "guis/interface.png"; diff --git a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java index 9db1ba390..de48d72a0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java +++ b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java @@ -148,6 +148,7 @@ public class GuiLevelEmitter extends GuiUpgradeable } } + @Override protected void handleButtonVisibility() { craftingMode.setVisibility( bc.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 ); @@ -226,11 +227,13 @@ public class GuiLevelEmitter extends GuiUpgradeable level.drawTextBox(); } + @Override protected String getBackground() { return "guis/lvlemitter.png"; } + @Override protected GuiText getName() { return GuiText.LevelEmitter; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMAC.java b/src/main/java/appeng/client/gui/implementations/GuiMAC.java index b45d66116..ca48a286c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMAC.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMAC.java @@ -50,6 +50,7 @@ public class GuiMAC extends GuiUpgradeable buttonList.add( redstoneMode ); } + @Override protected String getBackground() { return "guis/mac.png"; @@ -61,6 +62,7 @@ public class GuiMAC extends GuiUpgradeable this.container = (ContainerMAC) this.inventorySlots; } + @Override protected GuiText getName() { return GuiText.MolecularAssembler; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 106daaf98..0130232ff 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -459,6 +459,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi repo.updateView(); } + @Override protected boolean isPowered() { return repo.hasPower(); diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index d9ed69095..0b72c77b4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -83,6 +83,7 @@ public class GuiPatternTerm extends GuiMEMonitorable // } } + @Override protected void repositionSlot(AppEngSlot s) { if ( s.isPlayerSide() ) @@ -97,6 +98,7 @@ public class GuiPatternTerm extends GuiMEMonitorable reservedSpace = 81; } + @Override protected String getBackground() { if ( container.craftingMode ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java index cc3a4f3cf..160ef8e28 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java @@ -50,6 +50,7 @@ public class GuiSecurity extends GuiMEMonitorable .getUnlocalizedName(), SecurityPermissions.SECURITY.getUnlocalizedTip() ) ); } + @Override protected void actionPerformed(net.minecraft.client.gui.GuiButton btn) { super.actionPerformed( btn ); @@ -81,6 +82,7 @@ public class GuiSecurity extends GuiMEMonitorable } + @Override protected String getBackground() { ContainerSecurity cs = (ContainerSecurity) inventorySlots; diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index 28200814e..de0f095f8 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -109,6 +109,7 @@ public class GuiStorageBus extends GuiUpgradeable } } + @Override protected String getBackground() { return "guis/storagebus.png"; diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index c8e86adde..986b44f63 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -370,6 +370,7 @@ public class BusRenderHelper implements IPartRenderHelper BusRenderer.instance.renderer.renderFaces = faces; } + @Override public void renderBlockCurrentBounds(int x, int y, int z, RenderBlocks renderer) { if ( !renderThis() ) diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 2db578925..b4959673b 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -21,6 +21,7 @@ public class CraftingFx extends EntityBreakingFX private int startBlkY; private int startBlkZ; + @Override public int getFXLayer() { return 1; @@ -50,6 +51,7 @@ public class CraftingFx extends EntityBreakingFX this.particleScale *= 0.8f; } + @Override public void onUpdate() { super.onUpdate(); @@ -57,6 +59,7 @@ public class CraftingFx extends EntityBreakingFX this.particleAlpha *= 0.51f; } + @Override public void renderParticle(Tessellator par1Tessellator, float partialTick, float x, float y, float z, float rx, float rz) { if ( partialTick < 0 || partialTick > 1 ) diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 121ca3389..82711aeb2 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -21,6 +21,7 @@ public class EnergyFx extends EntityBreakingFX private int startBlkY; private int startBlkZ; + @Override public int getFXLayer() { return 1; @@ -49,6 +50,7 @@ public class EnergyFx extends EntityBreakingFX this.particleScale *= 0.8f; } + @Override public void onUpdate() { super.onUpdate(); @@ -56,6 +58,7 @@ public class EnergyFx extends EntityBreakingFX this.particleAlpha *= 0.89f; } + @Override public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7) { float f6 = this.particleTextureIndex.getMinU(); diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index d1cd64e6f..7efc0c091 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -276,6 +276,7 @@ public abstract class AEBaseContainer extends Container return null; } + @Override public boolean canDragIntoSlot(Slot s) { return ((AppEngSlot) s).isDraggable; @@ -574,6 +575,7 @@ public abstract class AEBaseContainer extends Container super.detectAndSendChanges(); } + @Override final public void updateProgressBar(int idx, int value) { if ( syncData.containsKey( idx ) ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java index 912774660..204d78719 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java @@ -28,6 +28,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE /** * Callback for when the crafting matrix is changed. */ + @Override public void onCraftMatrixChanged(IInventory par1IInventory) { ContainerNull cn = new ContainerNull(); diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index 8281fdc7a..d71482365 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -70,6 +70,7 @@ public class ContainerInscriber extends ContainerUpgradeable setupUpgrades(); } + @Override public boolean isValidForSlot(Slot s, ItemStack is) { ItemStack PlateA = ti.getStackInSlot( 0 ); diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index d9094570d..c8bc7ad5d 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -51,12 +51,14 @@ public class ContainerInterface extends ContainerUpgradeable setupUpgrades(); } + @Override protected void loadSettingsFromHost(IConfigManager cm) { this.bMode = (YesNo) cm.getSetting( Settings.BLOCK ); this.iTermMode = (YesNo) cm.getSetting( Settings.INTERFACE_TERMINAL ); } + @Override public int availableUpgrades() { return 1; diff --git a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java index a524be916..ba8801d46 100644 --- a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java +++ b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java @@ -103,6 +103,7 @@ public class ContainerLevelEmitter extends ContainerUpgradeable standardDetectAndSendChanges(); } + @Override public void onUpdate(String field, Object oldValue, Object newValue) { if ( field.equals( "EmitterValue" ) ) diff --git a/src/main/java/appeng/container/implementations/ContainerMAC.java b/src/main/java/appeng/container/implementations/ContainerMAC.java index 3134647db..777124606 100644 --- a/src/main/java/appeng/container/implementations/ContainerMAC.java +++ b/src/main/java/appeng/container/implementations/ContainerMAC.java @@ -26,6 +26,7 @@ public class ContainerMAC extends ContainerUpgradeable tma = te; } + @Override public int availableUpgrades() { return 5; diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index 3af67db75..1347b046e 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -37,6 +37,7 @@ public class AppEngCraftingSlot extends AppEngSlot /** * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ + @Override public boolean isItemValid(ItemStack par1ItemStack) { return false; @@ -46,6 +47,7 @@ public class AppEngCraftingSlot extends AppEngSlot * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new * stack. */ + @Override public ItemStack decrStackSize(int par1) { if ( this.getHasStack() ) @@ -60,6 +62,7 @@ public class AppEngCraftingSlot extends AppEngSlot * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an * internal count then calls onCrafting(item). */ + @Override protected void onCrafting(ItemStack par1ItemStack, int par2) { this.amountCrafted += par2; @@ -69,6 +72,7 @@ public class AppEngCraftingSlot extends AppEngSlot /** * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. */ + @Override protected void onCrafting(ItemStack par1ItemStack) { par1ItemStack.onCrafting( this.thePlayer.worldObj, this.thePlayer, this.amountCrafted ); @@ -125,6 +129,7 @@ public class AppEngCraftingSlot extends AppEngSlot } } + @Override public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack par2ItemStack) { FMLCommonHandler.instance().firePlayerCraftingEvent( par1EntityPlayer, par2ItemStack, craftMatrix ); diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 1bb5916fd..304be446e 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -137,6 +137,7 @@ public class MovableTileRegistry implements IMovableRegistry blacklisted.add( blk ); } + @Override public boolean isBlacklisted(Block blk) { return blacklisted.contains( blk ); diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index d6e8ea259..3bfeb05f2 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -42,6 +42,7 @@ public class CraftingJob implements Runnable, ICraftingJob long bytes = 0; World world; + @Override public IAEItemStack getOutput() { return output; @@ -93,6 +94,7 @@ public class CraftingJob implements Runnable, ICraftingJob return new CraftingTreeNode( cc, this, what, null, -1, 0 ); } + @Override public long getByteTotal() { return bytes; @@ -237,6 +239,7 @@ public class CraftingJob implements Runnable, ICraftingJob } } + @Override public boolean isSimulation() { return simulate; diff --git a/src/main/java/appeng/entity/EntityFloatingItem.java b/src/main/java/appeng/entity/EntityFloatingItem.java index 705f42849..afc0435fa 100644 --- a/src/main/java/appeng/entity/EntityFloatingItem.java +++ b/src/main/java/appeng/entity/EntityFloatingItem.java @@ -24,6 +24,7 @@ final public class EntityFloatingItem extends EntityItem // public boolean isEntityAlive() + @Override public void onUpdate() { if ( !isDead && parent.isDead ) diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index a83f03671..89bdb4597 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -29,6 +29,7 @@ public class FacadeContainer implements IFacadeContainer storage = cbs; } + @Override public void writeToStream(ByteBuf out) throws IOException { int facadeSides = 0; @@ -52,6 +53,7 @@ public class FacadeContainer implements IFacadeContainer } } + @Override public boolean readFromStream(ByteBuf out) throws IOException { int facadeSides = out.readByte(); @@ -97,6 +99,7 @@ public class FacadeContainer implements IFacadeContainer return changed; } + @Override public void readFromNBT(NBTTagCompound c) { for (int x = 0; x < facades; x++) @@ -126,6 +129,7 @@ public class FacadeContainer implements IFacadeContainer } } + @Override public void writeToNBT(NBTTagCompound c) { for (int x = 0; x < facades; x++) @@ -170,6 +174,7 @@ public class FacadeContainer implements IFacadeContainer return storage.getFacade( s.ordinal() ); } + @Override public boolean isEmpty() { for (int x = 0; x < facades; x++) @@ -178,6 +183,7 @@ public class FacadeContainer implements IFacadeContainer return true; } + @Override public void rotateLeft() { IFacadePart newFacades[] = new FacadePart[6]; diff --git a/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java index 8129f6986..448da8582 100644 --- a/src/main/java/appeng/helpers/AEGlassMaterial.java +++ b/src/main/java/appeng/helpers/AEGlassMaterial.java @@ -10,6 +10,7 @@ public class AEGlassMaterial extends Material super( p_i2116_1_ ); } + @Override public boolean isOpaque() { return false; diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 57fc6ca1b..1513b8bca 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -690,6 +690,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return (IPart) (iHost instanceof IPart ? iHost : null); } + @Override public appeng.api.util.IConfigManager getConfigManager() { return cm; diff --git a/src/main/java/appeng/helpers/MeteoritePlacer.java b/src/main/java/appeng/helpers/MeteoritePlacer.java index 106115c62..e760837e2 100644 --- a/src/main/java/appeng/helpers/MeteoritePlacer.java +++ b/src/main/java/appeng/helpers/MeteoritePlacer.java @@ -83,6 +83,7 @@ public class MeteoritePlacer } + @Override public void getRandomFall(IMeteoriteWorld w, int x, int y, int z) { double a = Math.random(); @@ -92,6 +93,7 @@ public class MeteoritePlacer getOther( w, x, y, z, a ); } + @Override public void getRandomInset(IMeteoriteWorld w, int x, int y, int z) { double a = Math.random(); @@ -111,11 +113,13 @@ public class MeteoritePlacer super( w, x, y, z ); } + @Override public int adjustCrater() { return 2; } + @Override public void getOther(IMeteoriteWorld w, int x, int y, int z, double a) { if ( a > 0.66 ) @@ -131,11 +135,13 @@ public class MeteoritePlacer super( w, x, y, z ); } + @Override public int adjustCrater() { return 2; } + @Override public void getOther(IMeteoriteWorld w, int x, int y, int z, double a) { if ( a > 0.7 ) diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index dacb74045..73c10784c 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -206,6 +206,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable getGuiClass() { return GuiCrafting.class; @@ -70,6 +72,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadCraftingRecipes(ItemStack result) { List recipes = CraftingManager.getInstance().getRecipeList(); @@ -87,6 +90,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadUsageRecipes(ItemStack ingredient) { List recipes = CraftingManager.getInstance().getRecipeList(); @@ -109,11 +113,13 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler } } + @Override public String getGuiTexture() { return "textures/gui/container/crafting_table.png"; } + @Override public String getOverlayIdentifier() { return "crafting"; diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java index 4705f47ee..12c83ae51 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java @@ -29,11 +29,13 @@ import codechicken.nei.recipe.TemplateRecipeHandler; public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler { + @Override public void loadTransferRects() { this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle( 84, 23, 24, 18 ), "crafting", new Object[0] ) ); } + @Override public Class getGuiClass() { return GuiCrafting.class; @@ -70,6 +72,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadCraftingRecipes(ItemStack result) { List recipes = CraftingManager.getInstance().getRecipeList(); @@ -87,6 +90,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadUsageRecipes(ItemStack ingredient) { List recipes = CraftingManager.getInstance().getRecipeList(); @@ -109,11 +113,13 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler } } + @Override public String getGuiTexture() { return "textures/gui/container/crafting_table.png"; } + @Override public String getOverlayIdentifier() { return "crafting"; diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java index a06d60014..c10b4b34a 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java @@ -25,11 +25,13 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler final ItemFacade ifa = (ItemFacade) AEApi.instance().items().itemFacade.item(); final ItemStack cable_anchor = AEApi.instance().parts().partCableAnchor.stack( 1 ); + @Override public void loadTransferRects() { this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle( 84, 23, 24, 18 ), "crafting", new Object[0] ) ); } + @Override public Class getGuiClass() { return GuiCrafting.class; @@ -61,6 +63,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadCraftingRecipes(ItemStack result) { if ( result.getItem() == ifa ) @@ -71,6 +74,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadUsageRecipes(ItemStack ingredient) { List facades = ifa.getFacades(); @@ -90,11 +94,13 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler } } + @Override public String getGuiTexture() { return "textures/gui/container/crafting_table.png"; } + @Override public String getOverlayIdentifier() { return "crafting"; diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java index 9d8f0e990..82bd8ea55 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java @@ -29,6 +29,7 @@ import codechicken.nei.recipe.TemplateRecipeHandler; public class NEIGrinderRecipeHandler extends TemplateRecipeHandler { + @Override public void drawBackground(int recipe) { GL11.glColor4f( 1, 1, 1, 1 ); @@ -62,11 +63,13 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadTransferRects() { this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle( 84, 23, 24, 18 ), "grindstone", new Object[0] ) ); } + @Override public Class getGuiClass() { return GuiGrinder.class; @@ -96,6 +99,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadCraftingRecipes(ItemStack result) { for (IGrinderEntry recipe : AEApi.instance().registries().grinder().getRecipes()) @@ -109,6 +113,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadUsageRecipes(ItemStack ingredient) { for (IGrinderEntry recipe : AEApi.instance().registries().grinder().getRecipes()) @@ -127,6 +132,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler } } + @Override public String getGuiTexture() { ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/guis/grinder.png" ); @@ -134,6 +140,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler return f; } + @Override public String getOverlayIdentifier() { return "grindstone"; diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java index 03d0fccde..e48513301 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java @@ -27,6 +27,7 @@ import codechicken.nei.recipe.TemplateRecipeHandler; public class NEIInscriberRecipeHandler extends TemplateRecipeHandler { + @Override public void drawBackground(int recipe) { GL11.glColor4f( 1, 1, 1, 1 ); @@ -34,11 +35,13 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler drawTexturedModalRect( 0, 0, 5, 11, 166, 75 ); } + @Override public void loadTransferRects() { this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle( 84, 23, 24, 18 ), "inscriber", new Object[0] ) ); } + @Override public Class getGuiClass() { return GuiInscriber.class; @@ -68,6 +71,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadCraftingRecipes(ItemStack result) { for (InscriberRecipe recipe : Inscribe.recipes) @@ -81,6 +85,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler } } + @Override public void loadUsageRecipes(ItemStack ingredient) { for (InscriberRecipe recipe : Inscribe.recipes) @@ -99,6 +104,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler } } + @Override public String getGuiTexture() { ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/guis/inscriber.png" ); @@ -106,6 +112,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler return f; } + @Override public String getOverlayIdentifier() { return "inscriber"; diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java index cc5fb9766..847cce4a9 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java @@ -87,6 +87,7 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler return offsets.size(); } + @Override public void drawBackground(int recipe) { GL11.glColor4f( 1, 1, 1, 1 );// nothing. diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index 17928cea8..8145f395c 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -32,6 +32,7 @@ public class PortableCellViewer extends MEMonitorHandler implement target = is; } + @Override public ItemStack getItemStack() { return target; diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index c36eaeb75..b293131c6 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -157,6 +157,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe Collections.sort( list, new Comparator() { + @Override public int compare(IAEItemStack a, IAEItemStack b) { return ItemSorters.compareInt( a.getItemDamage(), b.getItemDamage() ); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java index 5b6bdc336..2f9ff1879 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java @@ -21,6 +21,7 @@ public class ToolQuartzAxe extends ItemAxe implements IAEFeature return feature; } + @Override public boolean getIsRepairable(ItemStack a, ItemStack b) { return Platform.canRepair( type, a, b ); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index 83b5dd344..7900c306e 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -26,6 +26,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem setMaxStackSize( 1 ); } + @Override public boolean getIsRepairable(ItemStack a, ItemStack b) { return Platform.canRepair( type, a, b ); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java index cf057a489..8b419f225 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java @@ -21,6 +21,7 @@ public class ToolQuartzHoe extends ItemHoe implements IAEFeature return feature; } + @Override public boolean getIsRepairable(ItemStack a, ItemStack b) { return Platform.canRepair( type, a, b ); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java index e7afe6604..33a82d70f 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java @@ -21,6 +21,7 @@ public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature return feature; } + @Override public boolean getIsRepairable(ItemStack a, ItemStack b) { return Platform.canRepair( type, a, b ); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java index 47788b85a..5f22805b0 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java @@ -21,6 +21,7 @@ public class ToolQuartzSpade extends ItemSpade implements IAEFeature return feature; } + @Override public boolean getIsRepairable(ItemStack a, ItemStack b) { return Platform.canRepair( type, a, b ); diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java index 551392791..871f18f2e 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java @@ -21,6 +21,7 @@ public class ToolQuartzSword extends ItemSword implements IAEFeature return feature; } + @Override public boolean getIsRepairable(ItemStack a, ItemStack b) { return Platform.canRepair( type, a, b ); diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index c7baa690d..cf42b8b7b 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -167,6 +167,7 @@ public class EnergyGridCache implements IEnergyGrid return getEnergyDemand( maxRequired, localSeen ); } + @Override public double getEnergyDemand(double maxRequired, Set seen) { if ( !seen.add( this ) ) @@ -199,6 +200,7 @@ public class EnergyGridCache implements IEnergyGrid return injectAEPower( amt, mode, localSeen ); } + @Override public double injectAEPower(double amt, Actionable mode, Set seen) { if ( !seen.add( this ) ) diff --git a/src/main/java/appeng/me/storage/CellInventoryHandler.java b/src/main/java/appeng/me/storage/CellInventoryHandler.java index 98623a019..8c9e96c8f 100644 --- a/src/main/java/appeng/me/storage/CellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/CellInventoryHandler.java @@ -94,11 +94,13 @@ public class CellInventoryHandler extends MEInventoryHandler imple } } + @Override public boolean isPreformatted() { return ! myPartitionList.isEmpty(); } + @Override public boolean isFuzzy() { return myPartitionList instanceof FuzzyPriorityList; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index d5253f88b..d488c9b64 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -403,6 +403,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I partChanged(); } + @Override public boolean canConnectRedstone(EnumSet enumSet) { for (ForgeDirection dir : enumSet) @@ -463,6 +464,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return boxes; } + @Override public void onEntityCollision(Entity entity) { for (ForgeDirection s : ForgeDirection.values()) @@ -473,6 +475,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } } + @Override public boolean isEmpty() { IFacadeContainer fc = getFacadeContainer(); @@ -492,6 +495,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return true; } + @Override public void onNeighborChanged() { hasRedstone = YesNo.UNDECIDED; @@ -510,6 +514,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I hasRedstone = te.getWorldObj().isBlockIndirectlyGettingPowered( te.xCoord, te.yCoord, te.zCoord ) ? YesNo.YES : YesNo.NO; } + @Override public boolean isSolidOnSide(ForgeDirection side) { if ( side == null || side == ForgeDirection.UNKNOWN ) @@ -525,12 +530,14 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return part != null && part.isSolid(); } + @Override public int isProvidingWeakPower(ForgeDirection side) { IPart part = getPart( side ); return part != null ? part.isProvidingWeakPower() : 0; } + @Override public int isProvidingStrongPower(ForgeDirection side) { IPart part = getPart( side ); @@ -813,6 +820,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return tcb.isBlocked( side ); } + @Override public int getLightValue() { int light = 0; @@ -842,6 +850,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return false; } + @Override public boolean activate(EntityPlayer player, Vec3 pos) { SelectedPart p = selectPart( pos ); @@ -936,6 +945,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I tcb.markForSave(); } + @Override public void randomDisplayTick(World world, int x, int y, int z, Random r) { for (ForgeDirection side : ForgeDirection.values()) @@ -957,6 +967,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return hasRedstone == YesNo.YES; } + @Override public boolean isLadder(EntityLivingBase entity) { for (ForgeDirection side : ForgeDirection.values()) diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index b512b7bf4..87fe8331e 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -216,6 +216,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab drops.add( is.getItemStack() ); } + @Override @MENetworkEventSubscribe public void chanRender(MENetworkChannelsChanged c) { @@ -223,6 +224,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab getHost().markForUpdate(); } + @Override @MENetworkEventSubscribe public void powerRender(MENetworkPowerStatusChange c) { diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index e4108fbef..3c6fe7fc5 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -303,6 +303,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I return doBusWork(); } + @Override public RedstoneMode getRSMode() { return (RedstoneMode) settings.getSetting( Settings.REDSTONE_CONTROLLED ); diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index d018bf076..604588d30 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -90,6 +90,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine return false; } + @Override protected int getUpgradeSlots() { return 5; @@ -104,6 +105,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine return super.getInventoryByName( name ); } + @Override @MENetworkEventSubscribe public void powerRender(MENetworkPowerStatusChange c) { @@ -278,6 +280,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine updateHandler(); } + @Override public void upgradesChanged() { updateHandler(); @@ -322,6 +325,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine data.setInteger( "priority", priority ); } + @Override public void readFromNBT(NBTTagCompound data) { super.readFromNBT( data ); diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index ee1163d9d..bf2a6ec4d 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -147,6 +147,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I private int itemToSend; // used in tickingRequest private boolean worked; // used in tickingRequest + @Override TickRateModulation doBusWork() { if ( !proxy.isActive() ) @@ -265,6 +266,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I return false; } + @Override public RedstoneMode getRSMode() { return (RedstoneMode) settings.getSetting( Settings.REDSTONE_CONTROLLED ); diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 8d9f0de01..ddfdaceec 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -100,6 +100,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH updateState(); } + @Override public void upgradesChanged() { configureWatchers(); @@ -127,6 +128,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } } + @Override public void writeToNBT(NBTTagCompound data) { super.writeToNBT( data ); @@ -136,6 +138,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH config.writeToNBT( data, "config" ); } + @Override public void readFromNBT(NBTTagCompound data) { super.readFromNBT( data ); diff --git a/src/main/java/appeng/parts/automation/PartSharedItemBus.java b/src/main/java/appeng/parts/automation/PartSharedItemBus.java index e4db68ad2..121a8840e 100644 --- a/src/main/java/appeng/parts/automation/PartSharedItemBus.java +++ b/src/main/java/appeng/parts/automation/PartSharedItemBus.java @@ -44,12 +44,14 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid return Math.min( 1 + getInstalledUpgrades( Upgrades.CAPACITY ) * 4, config.getSizeInventory() ); } + @Override public void writeToNBT(net.minecraft.nbt.NBTTagCompound extra) { super.writeToNBT( extra ); config.writeToNBT( extra, "config" ); } + @Override public void readFromNBT(net.minecraft.nbt.NBTTagCompound extra) { super.readFromNBT( extra ); diff --git a/src/main/java/appeng/parts/automation/PartUpgradeable.java b/src/main/java/appeng/parts/automation/PartUpgradeable.java index 7c2376cc8..4a10ad7a1 100644 --- a/src/main/java/appeng/parts/automation/PartUpgradeable.java +++ b/src/main/java/appeng/parts/automation/PartUpgradeable.java @@ -45,6 +45,7 @@ public class PartUpgradeable extends PartBasicState implements ISegmentedInvento drops.add( is ); } + @Override public void writeToNBT(net.minecraft.nbt.NBTTagCompound extra) { super.writeToNBT( extra ); @@ -52,6 +53,7 @@ public class PartUpgradeable extends PartBasicState implements ISegmentedInvento upgrades.writeToNBT( extra, "upgrades" ); } + @Override public void readFromNBT(net.minecraft.nbt.NBTTagCompound extra) { super.readFromNBT( extra ); diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index bd0794d06..82e27f224 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -91,6 +91,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC int handlerHash = 0; boolean wasActive = false; + @Override @MENetworkEventSubscribe public void powerRender(MENetworkPowerStatusChange c) { @@ -136,6 +137,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC return false; } + @Override protected int getUpgradeSlots() { return 5; @@ -446,6 +448,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC data.setInteger( "priority", priority ); } + @Override public void readFromNBT(NBTTagCompound data) { super.readFromNBT( data ); diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index ed60c474e..878f349b4 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -213,6 +213,7 @@ public class PartCable extends AEBasePart implements IPartCable return AECableType.GLASS; } + @Override public AENetworkProxy getProxy() { return proxy; diff --git a/src/main/java/appeng/parts/p2p/PartP2PBCPower.java b/src/main/java/appeng/parts/p2p/PartP2PBCPower.java index 737db1a7f..1895f2fd4 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PBCPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PBCPower.java @@ -42,6 +42,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo BaseMJPerdition pp; + @Override public TunnelType getTunnelType() { return TunnelType.BC_POWER; @@ -193,6 +194,7 @@ public class PartP2PBCPower extends PartP2PTunnel implements IPo pp.readFromNBT( tag ); } + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index 3c973d458..ae71cabfa 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -25,6 +25,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PartP2PIC2Power extends PartP2PTunnel implements ic2.api.energy.tile.IEnergySink, ic2.api.energy.tile.IEnergySource { + @Override public TunnelType getTunnelType() { return TunnelType.IC2_POWER; @@ -65,6 +66,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i OutputVoltageB = tag.getDouble( "OutputVoltageB" ); } + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index d9a184962..feaf7aaae 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -43,6 +43,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PartP2PItems extends PartP2PTunnel implements IPipeConnection, IInventory, ISidedInventory, IGridTickable { + @Override public TunnelType getTunnelType() { return TunnelType.ITEM; @@ -244,6 +245,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo } } + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PLight.java b/src/main/java/appeng/parts/p2p/PartP2PLight.java index e6cf72cb4..9303d2a1b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLight.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLight.java @@ -29,6 +29,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi super( is ); } + @Override public TunnelType getTunnelType() { return TunnelType.LIGHT; @@ -142,6 +143,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi data.writeInt( output ? lastValue : 0 ); } + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index a4e1e2d3a..27749f6cd 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -26,6 +26,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl private final static FluidTankInfo[] activeTank = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; private final static FluidTankInfo[] inactiveTank = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; + @Override public TunnelType getTunnelType() { return TunnelType.FLUID; @@ -67,6 +68,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl private int tmpUsed; + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index 6d7401772..73c24ce51 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -30,6 +30,7 @@ public class PartP2PRFPower extends PartP2PTunnel implements cof boolean cachedTarget = false; IEnergyHandler outputTarget; + @Override public TunnelType getTunnelType() { return TunnelType.RF_POWER; @@ -61,6 +62,7 @@ public class PartP2PRFPower extends PartP2PTunnel implements cof cachedTarget = false; } + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index caac99060..af3ba4d8e 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -20,6 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PartP2PRedstone extends PartP2PTunnel { + @Override public TunnelType getTunnelType() { return TunnelType.REDSTONE; @@ -137,6 +138,7 @@ public class PartP2PRedstone extends PartP2PTunnel power = tag.getInteger( "power" ); } + @Override @SideOnly(Side.CLIENT) public IIcon getTypeTexture() { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 88dcd677a..b70ee509c 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -244,6 +244,7 @@ public class PartP2PTunnel extends PartBasicState { } + @Override public ItemStack getItemStack(PartItemStack type) { if ( type == PartItemStack.World || type == PartItemStack.Network || type == PartItemStack.Wrench || type == PartItemStack.Pick ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 0e312bbd0..c84611ce7 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -30,6 +30,7 @@ import appeng.me.helpers.AENetworkProxy; public class PartP2PTunnelME extends PartP2PTunnel implements IGridTickable { + @Override public TunnelType getTunnelType() { return TunnelType.ME; diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index a600ddbac..4e5fdc306 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -89,6 +89,7 @@ public class PartConversionMonitor extends PartStorageMonitor return true; } + @Override protected void extractItem(EntityPlayer player) { IAEItemStack input = (IAEItemStack) getDisplayed(); diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java index 5bc51d941..143030dd4 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java @@ -53,6 +53,7 @@ public class PartCraftingTerminal extends PartTerminal implements IAEAppEngInven // frontSolid = CableBusTextures.PartCraftingTerm_Solid; } + @Override public GuiBridge getGui( EntityPlayer p ) { int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ; diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java index 6b51baba5..29f861c47 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java @@ -59,6 +59,7 @@ public class PartPatternTerminal extends PartTerminal implements IAEAppEngInvent frontDark = CableBusTextures.PartPatternTerm_Dark; } + @Override public GuiBridge getGui( EntityPlayer p ) { int x = (int) p.posX, y = (int) p.posY, z = (int) p.posZ; diff --git a/src/main/java/appeng/recipes/GroupIngredient.java b/src/main/java/appeng/recipes/GroupIngredient.java index 2221f54eb..8c7bcac4e 100644 --- a/src/main/java/appeng/recipes/GroupIngredient.java +++ b/src/main/java/appeng/recipes/GroupIngredient.java @@ -38,6 +38,7 @@ public class GroupIngredient implements IIngredient return gi; } + @Override public int getDamageValue() { return OreDictionary.WILDCARD_VALUE; @@ -94,6 +95,7 @@ public class GroupIngredient implements IIngredient return out.toArray( new ItemStack[out.size()] ); } + @Override public String getNameSpace() { return ""; diff --git a/src/main/java/appeng/recipes/IngredientSet.java b/src/main/java/appeng/recipes/IngredientSet.java index 4a888eeeb..fb823a331 100644 --- a/src/main/java/appeng/recipes/IngredientSet.java +++ b/src/main/java/appeng/recipes/IngredientSet.java @@ -25,6 +25,7 @@ public class IngredientSet implements IIngredient boolean isInside = false; + @Override public int getDamageValue() { return OreDictionary.WILDCARD_VALUE; @@ -63,6 +64,7 @@ public class IngredientSet implements IIngredient return out.toArray( new ItemStack[out.size()] ); } + @Override public String getNameSpace() { return ""; diff --git a/src/main/java/appeng/spatial/StorageWorldProvider.java b/src/main/java/appeng/spatial/StorageWorldProvider.java index 31721e280..707c7e4f1 100644 --- a/src/main/java/appeng/spatial/StorageWorldProvider.java +++ b/src/main/java/appeng/spatial/StorageWorldProvider.java @@ -38,7 +38,8 @@ public class StorageWorldProvider extends WorldProvider super.worldChunkMgr = new WorldChunkManagerHell( Registration.instance.storageBiome, 0.0F ); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public float[] calcSunriseSunsetColors(float p_76560_1_, float p_76560_2_) { return null; diff --git a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java index f73b3161b..ca2ca83bf 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java @@ -72,11 +72,13 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora data.setByte( "paintedColor", (byte) paintedColor.ordinal() ); } + @Override public boolean isAccelerator() { return false; } + @Override public boolean isStatus() { return true; @@ -110,6 +112,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora return getJobProgress() != null; } + @Override public AEColor getColor() { return paintedColor; diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index f4ef9c0fa..8029c92a6 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -25,16 +25,19 @@ public class TileCraftingStorageTile extends TileCraftingTile return super.getItemFromTile( obj ); } + @Override public boolean isAccelerator() { return false; } + @Override public boolean isStorage() { return true; } + @Override public int getStorageBytes() { if ( worldObj == null || notLoaded() ) diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index dd11a4c09..90cee289e 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -74,6 +74,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP calc.calculateMultiblock( worldObj, getLocation() ); } + @Override public void setName(String name) { super.setName( name ); diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 5720aaa14..f07890f07 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -77,6 +77,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn private boolean reboot = true; public ISimplifiedBundle lightCache; + @Override public boolean pushPattern(ICraftingPatternDetails patternDetails, InventoryCrafting table, ForgeDirection where) { if ( myPattern == null ) diff --git a/src/main/java/appeng/tile/misc/TileSecurity.java b/src/main/java/appeng/tile/misc/TileSecurity.java index fc25a7a79..816f08619 100644 --- a/src/main/java/appeng/tile/misc/TileSecurity.java +++ b/src/main/java/appeng/tile/misc/TileSecurity.java @@ -197,6 +197,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp } } + @Override public void readPermissions(HashMap> playerPerms) { IPlayerRegistry pr = AEApi.instance().registries().players(); @@ -229,6 +230,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp markForUpdate(); } + @Override public boolean isSecurityEnabled() { return isActive && gridProxy.isActive(); @@ -248,6 +250,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp cm.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING ); } + @Override public int getOwner() { return gridProxy.getNode().getPlayerID(); @@ -311,6 +314,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp return securityKey; } + @Override public AEColor getColor() { return paintedColor; diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index d96a75008..1a82cfd60 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -162,6 +162,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl cb.getDrops( drops ); } + @Override public void getNoDrops(World w, int x, int y, int z, ArrayList drops) { cb.getNoDrops( drops ); diff --git a/src/main/java/appeng/tile/powersink/RedstoneFlux.java b/src/main/java/appeng/tile/powersink/RedstoneFlux.java index 962e9ce5e..943b9c377 100644 --- a/src/main/java/appeng/tile/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/tile/powersink/RedstoneFlux.java @@ -45,6 +45,7 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyHandler return 0; } + @Override final public boolean canConnectEnergy(ForgeDirection from) { return internalCanAcceptPower && getPowerSides().contains( from ); diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index ef54b34c4..8b1001525 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -63,16 +63,19 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver } + @Override final public int getMachineX() { return xCoord; } + @Override final public int getMachineY() { return yCoord; } + @Override final public int getMachineZ() { return zCoord; diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 73b14df77..b1cdf7250 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -92,6 +92,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock inv.setMaxStackSize( 1 ); } + @Override public IInventory getInternalInventory() { return inv; diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 8a703ed00..24012a9a1 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -856,6 +856,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan return false; } + @Override public AEColor getColor() { return paintedColor; diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index 549bc5c47..3d32821b3 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -357,6 +357,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior } } + @Override public boolean isItemValidForSlot(int i, ItemStack itemstack) { return itemstack != null && AEApi.instance().registries().cell().isCellHandled( itemstack ); diff --git a/src/main/java/appeng/transformer/AppEngCore.java b/src/main/java/appeng/transformer/AppEngCore.java index a112f199f..4c9d7bbe2 100644 --- a/src/main/java/appeng/transformer/AppEngCore.java +++ b/src/main/java/appeng/transformer/AppEngCore.java @@ -95,6 +95,7 @@ public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin return getVersion(); } + @Override public ModMetadata getMetadata() { return md; diff --git a/src/main/java/appeng/util/SortedList.java b/src/main/java/appeng/util/SortedList.java index 52778043e..8875fbf8f 100644 --- a/src/main/java/appeng/util/SortedList.java +++ b/src/main/java/appeng/util/SortedList.java @@ -71,14 +71,17 @@ public class SortedList implements Iterable, List, Cloneable { return new Iterator() { + @Override public boolean hasNext() { return listIterator.hasPrevious(); } + @Override public T next() { return listIterator.previous(); } + @Override public void remove() { listIterator.remove(); } diff --git a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java index 67bdd79e4..f57a15f70 100644 --- a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java @@ -10,6 +10,7 @@ public class DefaultPriorityList> implements IPartitionLis final static List nullList = new ArrayList(); + @Override public boolean isListed(T input) { return false; diff --git a/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java b/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java index 967d1f7d5..49915cfc4 100644 --- a/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java @@ -17,6 +17,7 @@ public class FuzzyPriorityList> implements IPartitionList< this.mode = mode; } + @Override public boolean isListed(T input) { Collection out = list.findFuzzy( input, mode ); diff --git a/src/main/java/appeng/util/prioitylist/MergedPriorityList.java b/src/main/java/appeng/util/prioitylist/MergedPriorityList.java index f6a452fdb..f8ec53c61 100644 --- a/src/main/java/appeng/util/prioitylist/MergedPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/MergedPriorityList.java @@ -19,6 +19,7 @@ public class MergedPriorityList> implements IPartitionList negative.add( list ); } + @Override public boolean isListed(T input) { for (IPartitionList l : negative) diff --git a/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java b/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java index 102ee012e..603eca01d 100644 --- a/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java +++ b/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java @@ -12,6 +12,7 @@ public class PrecisePriorityList> implements IPartitionLis list = in; } + @Override public boolean isListed(T input) { return list.findPrecise( input ) != null;