diff --git a/.gitignore b/.gitignore index e93f7ed..62b0b5c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ *.war *.ear /*.directory + +#Mac OS X +.DS_Store diff --git a/powercraft/core/gui/PCco_GuiCraftingTool.java b/powercraft/core/gui/PCco_GuiCraftingTool.java index 975b9da..5dd71de 100644 --- a/powercraft/core/gui/PCco_GuiCraftingTool.java +++ b/powercraft/core/gui/PCco_GuiCraftingTool.java @@ -81,7 +81,6 @@ protected PC_Slot[] getAllSlots() { return null; } - @SuppressWarnings("hiding") @Override public void initGui(PC_GresGuiHandler gui) { this.gui = gui; diff --git a/powercraft/energy/block/PCeg_BlockAccumulator.java b/powercraft/energy/block/PCeg_BlockAccumulator.java index 57016e2..a88ff80 100644 --- a/powercraft/energy/block/PCeg_BlockAccumulator.java +++ b/powercraft/energy/block/PCeg_BlockAccumulator.java @@ -23,7 +23,6 @@ public Class getTileEntityClass() { return PCeg_TileEntityAccumulator.class; } - @SuppressWarnings("hiding") @Override public IIcon getIcon(PC_Direction side, int metadata) { return this.side; diff --git a/powercraft/energy/block/PCeg_BlockSolarPanel.java b/powercraft/energy/block/PCeg_BlockSolarPanel.java index 9ea51a5..49686f9 100644 --- a/powercraft/energy/block/PCeg_BlockSolarPanel.java +++ b/powercraft/energy/block/PCeg_BlockSolarPanel.java @@ -35,10 +35,9 @@ public Class getTileEntityClass() { return PCeg_TileEntitySolarPanel.class; } - @SuppressWarnings("hiding") @Override public IIcon getIcon(PC_Direction side, int metadata) { - if(side==PC_Direction.UP){ + if(side == PC_Direction.UP){ return this.top; } return this.side; diff --git a/powercraft/itemstorage/gui/PCis_GuiChannelChest.java b/powercraft/itemstorage/gui/PCis_GuiChannelChest.java index 03bd5b3..8480425 100644 --- a/powercraft/itemstorage/gui/PCis_GuiChannelChest.java +++ b/powercraft/itemstorage/gui/PCis_GuiChannelChest.java @@ -18,10 +18,9 @@ public PCis_GuiChannelChest(EntityPlayer player, PCis_TileEntityChannelChest cha super(player, channelChest); } - @SuppressWarnings("hiding") @Override public void initGui(PC_GresGuiHandler gui) { - PC_GresWindow w = new PC_GresWindow(PC_Lang.translate(this.inventory.getInventoryName()+".name")); + PC_GresWindow w = new PC_GresWindow(PC_Lang.translate(this.inventory.getInventoryName() + ".name")); w.setLayout(new PC_GresLayoutVertical()); PC_GresInventory inventory = new PC_GresInventory(9, 3); inventory.setSlots(this.invSlots, 0); diff --git a/powercraft/itemstorage/gui/PCis_GuiCompressor.java b/powercraft/itemstorage/gui/PCis_GuiCompressor.java index 96a9768..6d07117 100644 --- a/powercraft/itemstorage/gui/PCis_GuiCompressor.java +++ b/powercraft/itemstorage/gui/PCis_GuiCompressor.java @@ -37,7 +37,6 @@ public PCis_GuiCompressor(EntityPlayer player, ItemStack itemStack, int slot, II super(player, itemStack, slot, inv); } - @SuppressWarnings("hiding") @Override public void initGui(PC_GresGuiHandler gui) { PC_GresWindow w = new PC_GresWindow(PC_Lang.translate(this.inventory.getInventoryName()+".name")); @@ -54,7 +53,7 @@ public void initGui(PC_GresGuiHandler gui) { this.takeStacks.addEventListener(this); this.takeStacks.check(PCis_ItemCompressor.isTakeStacks(this.itemStack)); tab.add(new PC_GresLabel(PC_Lang.translate("PCis.gui.compressor.putStacks"))); - tab.add(this.putStacks = new PC_GresTextEdit(""+PCis_ItemCompressor.getPutStacks(this.itemStack), 3, PC_GresInputType.UNSIGNED_INT)); + tab.add(this.putStacks = new PC_GresTextEdit("" + PCis_ItemCompressor.getPutStacks(this.itemStack), 3, PC_GresInputType.UNSIGNED_INT)); this.putStacks.addEventListener(this); w.addSideTab(tab); diff --git a/powercraft/itemstorage/inventory/PCis_HightCompressorInventory.java b/powercraft/itemstorage/inventory/PCis_HightCompressorInventory.java index 4b825f1..86566aa 100644 --- a/powercraft/itemstorage/inventory/PCis_HightCompressorInventory.java +++ b/powercraft/itemstorage/inventory/PCis_HightCompressorInventory.java @@ -9,16 +9,13 @@ public class PCis_HightCompressorInventory extends PCis_NormalCompressorInventory implements PC_IInventorySizeOverrider { - @SuppressWarnings("hiding") public PCis_HightCompressorInventory(IInventory inventory, int slot, String name){ super(inventory, slot, new PC_Vec2I(3, 3), name); NBTTagCompound tag = getItemStack().getTagCompound(); if(tag.hasKey("size")){ int[] size = tag.getIntArray("size"); for(int i=0; i getTileEntityClass() { return PCla_TileEntityLaserBuilder.class; } - - @SuppressWarnings("hiding") + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(PC_Direction side, int metadata) { diff --git a/powercraft/laser/block/PCla_BlockLaserDamage.java b/powercraft/laser/block/PCla_BlockLaserDamage.java index 5f4868c..ced9c68 100644 --- a/powercraft/laser/block/PCla_BlockLaserDamage.java +++ b/powercraft/laser/block/PCla_BlockLaserDamage.java @@ -9,7 +9,7 @@ import powercraft.api.block.PC_BlockType; import powercraft.api.block.PC_TileEntity; import powercraft.laser.PCla_LaserRenderer; -import powercraft.laser.tileEntity.PCla_TileEntityLaserDamage; +import powercraft.laser.tileentity.PCla_TileEntityLaserDamage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,8 +31,7 @@ public PCla_BlockLaserDamage() { public Class getTileEntityClass() { return PCla_TileEntityLaserDamage.class; } - - @SuppressWarnings("hiding") + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(PC_Direction side, int metadata) { diff --git a/powercraft/laser/block/PCla_BlockLaserHarvester.java b/powercraft/laser/block/PCla_BlockLaserHarvester.java index 0618f20..255e859 100644 --- a/powercraft/laser/block/PCla_BlockLaserHarvester.java +++ b/powercraft/laser/block/PCla_BlockLaserHarvester.java @@ -9,7 +9,7 @@ import powercraft.api.block.PC_BlockType; import powercraft.api.block.PC_TileEntity; import powercraft.laser.PCla_LaserRenderer; -import powercraft.laser.tileEntity.PCla_TileEntityLaserHarvester; +import powercraft.laser.tileentity.PCla_TileEntityLaserHarvester; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,7 +31,6 @@ public Class getTileEntityClass() { return PCla_TileEntityLaserHarvester.class; } - @SuppressWarnings("hiding") @Override @SideOnly(Side.CLIENT) public IIcon getIcon(PC_Direction side, int metadata) { diff --git a/powercraft/laser/block/PCla_BlockLaserPusher.java b/powercraft/laser/block/PCla_BlockLaserPusher.java index 514cce9..06fca2a 100644 --- a/powercraft/laser/block/PCla_BlockLaserPusher.java +++ b/powercraft/laser/block/PCla_BlockLaserPusher.java @@ -9,7 +9,7 @@ import powercraft.api.block.PC_BlockType; import powercraft.api.block.PC_TileEntity; import powercraft.laser.PCla_LaserRenderer; -import powercraft.laser.tileEntity.PCla_TileEntityLaserPusher; +import powercraft.laser.tileentity.PCla_TileEntityLaserPusher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,8 +31,7 @@ public PCla_BlockLaserPusher() { public Class getTileEntityClass() { return PCla_TileEntityLaserPusher.class; } - - @SuppressWarnings("hiding") + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(PC_Direction side, int metadata) { diff --git a/powercraft/laser/block/PCla_BlockLaserTractor.java b/powercraft/laser/block/PCla_BlockLaserTractor.java index 70bc113..d66d044 100644 --- a/powercraft/laser/block/PCla_BlockLaserTractor.java +++ b/powercraft/laser/block/PCla_BlockLaserTractor.java @@ -9,7 +9,7 @@ import powercraft.api.block.PC_BlockType; import powercraft.api.block.PC_TileEntity; import powercraft.laser.PCla_LaserRenderer; -import powercraft.laser.tileEntity.PCla_TileEntityLaserTractor; +import powercraft.laser.tileentity.PCla_TileEntityLaserTractor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,8 +31,7 @@ public PCla_BlockLaserTractor() { public Class getTileEntityClass() { return PCla_TileEntityLaserTractor.class; } - - @SuppressWarnings("hiding") + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(PC_Direction side, int metadata) { diff --git a/powercraft/laser/block/PCla_BlockMirror.java b/powercraft/laser/block/PCla_BlockMirror.java index b4ef8db..84d7975 100644 --- a/powercraft/laser/block/PCla_BlockMirror.java +++ b/powercraft/laser/block/PCla_BlockMirror.java @@ -11,7 +11,7 @@ import powercraft.api.block.PC_BlockType; import powercraft.api.block.PC_TileEntity; import powercraft.api.renderer.PC_Renderer; -import powercraft.laser.tileEntity.PCla_TileEntityMirror; +import powercraft.laser.tileentity.PCla_TileEntityMirror; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/powercraft/laser/block/PCla_BlockPrism.java b/powercraft/laser/block/PCla_BlockPrism.java index 02725a6..db7c862 100644 --- a/powercraft/laser/block/PCla_BlockPrism.java +++ b/powercraft/laser/block/PCla_BlockPrism.java @@ -11,7 +11,7 @@ import powercraft.api.block.PC_BlockType; import powercraft.api.block.PC_TileEntity; import powercraft.api.renderer.PC_Renderer; -import powercraft.laser.tileEntity.PCla_TileEntityPrism; +import powercraft.laser.tileentity.PCla_TileEntityPrism; public class PCla_BlockPrism extends PC_BlockTileEntity { diff --git a/powercraft/laser/container/PCla_ContainerLaserBuilder.java b/powercraft/laser/container/PCla_ContainerLaserBuilder.java index e397dc8..b28c35a 100644 --- a/powercraft/laser/container/PCla_ContainerLaserBuilder.java +++ b/powercraft/laser/container/PCla_ContainerLaserBuilder.java @@ -2,7 +2,7 @@ import net.minecraft.entity.player.EntityPlayer; import powercraft.api.gres.PC_GresBaseWithInventory; -import powercraft.laser.tileEntity.PCla_TileEntityLaserBuilder; +import powercraft.laser.tileentity.PCla_TileEntityLaserBuilder; public class PCla_ContainerLaserBuilder extends PC_GresBaseWithInventory { diff --git a/powercraft/laser/entity/PCla_LaserEntityFX.java b/powercraft/laser/entity/PCla_LaserEntityFX.java index fba0c4d..1b9f98e 100644 --- a/powercraft/laser/entity/PCla_LaserEntityFX.java +++ b/powercraft/laser/entity/PCla_LaserEntityFX.java @@ -45,7 +45,6 @@ public int getFXLayer() { return 3; } - @SuppressWarnings("hiding") @Override public void renderParticle(Tessellator tessellator, float patrialTickTime, float par3, float par4, float par5, float par6, float par7) { if(this.isDead) diff --git a/powercraft/laser/gui/PCla_GuiLaserBuilder.java b/powercraft/laser/gui/PCla_GuiLaserBuilder.java index d1178b0..43df2d7 100644 --- a/powercraft/laser/gui/PCla_GuiLaserBuilder.java +++ b/powercraft/laser/gui/PCla_GuiLaserBuilder.java @@ -9,7 +9,7 @@ import powercraft.api.gres.PC_IGresGui; import powercraft.api.gres.layout.PC_GresLayoutVertical; import powercraft.laser.container.PCla_ContainerLaserBuilder; -import powercraft.laser.tileEntity.PCla_TileEntityLaserBuilder; +import powercraft.laser.tileentity.PCla_TileEntityLaserBuilder; public class PCla_GuiLaserBuilder extends PCla_ContainerLaserBuilder implements PC_IGresGui { diff --git a/powercraft/laser/tileEntity/PCla_TileEntityLaserBuilder.java b/powercraft/laser/tileentity/PCla_TileEntityLaserBuilder.java similarity index 98% rename from powercraft/laser/tileEntity/PCla_TileEntityLaserBuilder.java rename to powercraft/laser/tileentity/PCla_TileEntityLaserBuilder.java index 687df51..19f8056 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityLaserBuilder.java +++ b/powercraft/laser/tileentity/PCla_TileEntityLaserBuilder.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import java.util.ArrayList; import java.util.Arrays; @@ -82,7 +82,6 @@ public PCla_TileEntityLaserBuilder() { } } - @SuppressWarnings("unused") @Override public void onTick() { super.onTick(); @@ -181,7 +180,6 @@ public boolean canRotate() { @Override @SideOnly(Side.CLIENT) public boolean renderWorldBlock(int modelId, RenderBlocks renderer) { - PC_Direction dir = get3DRotation().getSidePosition(PC_Direction.NORTH); PCla_LaserRenderer.renderLaser(this.worldObj, this.xCoord, this.yCoord, this.zCoord, dir, renderer, PCla_BlockLaserBuilder.side, PCla_BlockLaserBuilder.inside, PCla_BlockLaserBuilder.black, PCla_BlockLaserBuilder.white); diff --git a/powercraft/laser/tileEntity/PCla_TileEntityLaserDamage.java b/powercraft/laser/tileentity/PCla_TileEntityLaserDamage.java similarity index 98% rename from powercraft/laser/tileEntity/PCla_TileEntityLaserDamage.java rename to powercraft/laser/tileentity/PCla_TileEntityLaserDamage.java index 9d2a083..e174e88 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityLaserDamage.java +++ b/powercraft/laser/tileentity/PCla_TileEntityLaserDamage.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -47,8 +47,7 @@ public boolean isDifficultyScaled() { } } - - @SuppressWarnings("unused") + @Override public void onTick() { super.onTick(); diff --git a/powercraft/laser/tileEntity/PCla_TileEntityLaserHarvester.java b/powercraft/laser/tileentity/PCla_TileEntityLaserHarvester.java similarity index 97% rename from powercraft/laser/tileEntity/PCla_TileEntityLaserHarvester.java rename to powercraft/laser/tileentity/PCla_TileEntityLaserHarvester.java index 6a4a7a6..1b3ca6e 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityLaserHarvester.java +++ b/powercraft/laser/tileentity/PCla_TileEntityLaserHarvester.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -21,8 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PCla_TileEntityLaserHarvester extends PC_TileEntityRotateable implements PCla_IBeamHandler { - - @SuppressWarnings("unused") + @Override public void onTick() { super.onTick(); diff --git a/powercraft/laser/tileEntity/PCla_TileEntityLaserPusher.java b/powercraft/laser/tileentity/PCla_TileEntityLaserPusher.java similarity index 97% rename from powercraft/laser/tileEntity/PCla_TileEntityLaserPusher.java rename to powercraft/laser/tileentity/PCla_TileEntityLaserPusher.java index a009129..7804088 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityLaserPusher.java +++ b/powercraft/laser/tileentity/PCla_TileEntityLaserPusher.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -20,8 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class PCla_TileEntityLaserPusher extends PC_TileEntityRotateable implements PCla_IBeamHandler { - - @SuppressWarnings("unused") + @Override public void onTick() { super.onTick(); diff --git a/powercraft/laser/tileEntity/PCla_TileEntityLaserTractor.java b/powercraft/laser/tileentity/PCla_TileEntityLaserTractor.java similarity index 96% rename from powercraft/laser/tileEntity/PCla_TileEntityLaserTractor.java rename to powercraft/laser/tileentity/PCla_TileEntityLaserTractor.java index 2e5aa9e..d2a6d6f 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityLaserTractor.java +++ b/powercraft/laser/tileentity/PCla_TileEntityLaserTractor.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -20,12 +20,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class PCla_TileEntityLaserTractor extends PC_TileEntityRotateable implements PCla_IBeamHandler { - - @SuppressWarnings("unused") + @Override public void onTick() { super.onTick(); - if(get3DRotation()==null) + if(get3DRotation() == null) return; PC_Direction dir = get3DRotation().getSidePosition(PC_Direction.NORTH); PC_Vec3 vec = new PC_Vec3(dir.offsetX, dir.offsetY, dir.offsetZ); diff --git a/powercraft/laser/tileEntity/PCla_TileEntityMirror.java b/powercraft/laser/tileentity/PCla_TileEntityMirror.java similarity index 99% rename from powercraft/laser/tileEntity/PCla_TileEntityMirror.java rename to powercraft/laser/tileentity/PCla_TileEntityMirror.java index 19032fa..98c2f85 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityMirror.java +++ b/powercraft/laser/tileentity/PCla_TileEntityMirror.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/powercraft/laser/tileEntity/PCla_TileEntityPrism.java b/powercraft/laser/tileentity/PCla_TileEntityPrism.java similarity index 99% rename from powercraft/laser/tileEntity/PCla_TileEntityPrism.java rename to powercraft/laser/tileentity/PCla_TileEntityPrism.java index d1595c2..f1999a8 100644 --- a/powercraft/laser/tileEntity/PCla_TileEntityPrism.java +++ b/powercraft/laser/tileentity/PCla_TileEntityPrism.java @@ -1,4 +1,4 @@ -package powercraft.laser.tileEntity; +package powercraft.laser.tileentity; import java.util.ArrayList; import java.util.Arrays; diff --git a/powercraft/machines/block/PCma_BlockAutomaticWorkbench.java b/powercraft/machines/block/PCma_BlockAutomaticWorkbench.java index ce1b58e..fa7411e 100644 --- a/powercraft/machines/block/PCma_BlockAutomaticWorkbench.java +++ b/powercraft/machines/block/PCma_BlockAutomaticWorkbench.java @@ -34,7 +34,6 @@ public Class getTileEntityClass() { return PCma_TileEntityAutomaticWorkbench.class; } - @SuppressWarnings("hiding") @Override public IIcon getIcon(PC_Direction side, int metadata) { if(side==PC_Direction.EAST){ diff --git a/powercraft/machines/block/PCma_BlockFurnace.java b/powercraft/machines/block/PCma_BlockFurnace.java index dbdb8ec..a42f886 100644 --- a/powercraft/machines/block/PCma_BlockFurnace.java +++ b/powercraft/machines/block/PCma_BlockFurnace.java @@ -25,10 +25,9 @@ public Class getTileEntityClass() { return PCma_TileEntityFurnace.class; } - @SuppressWarnings("hiding") @Override public IIcon getIcon(PC_Direction side, int metadata) { - if(side==PC_Direction.EAST){ + if(side == PC_Direction.EAST){ return front; } return PCma_BlockFurnace.side; diff --git a/powercraft/machines/block/PCma_BlockRoaster.java b/powercraft/machines/block/PCma_BlockRoaster.java index 08dfea3..def8e7f 100644 --- a/powercraft/machines/block/PCma_BlockRoaster.java +++ b/powercraft/machines/block/PCma_BlockRoaster.java @@ -37,7 +37,6 @@ public Class getTileEntityClass() { return PCma_TileEntityRoaster.class; } - @SuppressWarnings("hiding") @Override public IIcon getIcon(PC_Direction side, int metadata) { if(side==PC_Direction.UP){ diff --git a/powercraft/oldlaser/PCla_LaserTypeCalculator.java b/powercraft/oldlaser/PCla_LaserTypeCalculator.java index 257856b..12137b3 100644 --- a/powercraft/oldlaser/PCla_LaserTypeCalculator.java +++ b/powercraft/oldlaser/PCla_LaserTypeCalculator.java @@ -178,7 +178,6 @@ public void performItemUpdate() { } } - @SuppressWarnings("unused") public void performBlockUpdate(PC_Direction orientation) { this.beamCalc.calculate(); switch (this.laserObj.orientation) { diff --git a/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneBundleCable.java b/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneBundleCable.java index 4fd401a..4655689 100644 --- a/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneBundleCable.java +++ b/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneBundleCable.java @@ -199,8 +199,7 @@ protected IIcon getCableCornerIcon() { protected IIcon getCableSideIcon() { return PCrs_MultiblockItemRedstoneBundleCable.icons[0]; } - - @SuppressWarnings("hiding") + @Override protected IIcon getCableLineIcon(int index) { return PCrs_MultiblockItemRedstoneBundleCable.icons[index+1]; @@ -233,8 +232,7 @@ protected int canConnectToBlock(World world, int x, int y, int z, Block block, P } return super.canConnectToBlock(world, x, y, z, block, dir, dir2); } - - @SuppressWarnings("hiding") + @Override protected int canConnectToMultiblock(PC_MultiblockObject multiblock, PC_Direction dir, PC_Direction dir2) { if(multiblock instanceof PCrs_MultiblockObjectRedstoneCable){ diff --git a/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneCable.java b/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneCable.java index c8f7d43..ec99a50 100644 --- a/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneCable.java +++ b/powercraft/redstone/multiblock/PCrs_MultiblockObjectRedstoneCable.java @@ -61,7 +61,6 @@ protected IIcon getCableSideIcon() { return PCrs_MultiblockItemRedstoneCable.icon; } - @SuppressWarnings("hiding") @Override protected IIcon getCableLineIcon(int index) { return null; @@ -143,8 +142,7 @@ protected int canConnectToBlock(World world, int x, int y, int z, Block block, P } return super.canConnectToBlock(world, x, y, z, block, dir, dir2); } - - @SuppressWarnings("hiding") + @Override protected int canConnectToMultiblock(PC_MultiblockObject multiblock, PC_Direction dir, PC_Direction dir2) { if(multiblock instanceof PCrs_MultiblockObjectRedstoneBundleCable){ diff --git a/powercraft/teleporter/tileentity/PCtp_TileEntityTeleporter.java b/powercraft/teleporter/tileentity/PCtp_TileEntityTeleporter.java index 2058ef8..4b2f75b 100644 --- a/powercraft/teleporter/tileentity/PCtp_TileEntityTeleporter.java +++ b/powercraft/teleporter/tileentity/PCtp_TileEntityTeleporter.java @@ -34,7 +34,7 @@ public void onLoadedFromNBT(Flag flag) { try{ this.endpoint = (PCtp_TeleporterEndpoint) PCtp_TeleporterGlobalNetwork.instance().getEntry(new PC_Vec4I(this.xCoord, this.yCoord, this.zCoord, PC_Utils.getDimensionID(this.worldObj))); }catch(Throwable e){ - // + ; } } } @@ -52,8 +52,7 @@ public void onTick() { } } } - - @SuppressWarnings("hiding") + private void teleport(Entity entity, String target){ PCtp_TeleporterNetworkEntry entry = PCtp_TeleporterGlobalNetwork.instance().getEntryByPath(target); if(entry instanceof PCtp_TeleporterEndpoint){ diff --git a/powercraft/traffic/PCtf_MinerController.java b/powercraft/traffic/PCtf_MinerController.java index f57979f..84558aa 100644 --- a/powercraft/traffic/PCtf_MinerController.java +++ b/powercraft/traffic/PCtf_MinerController.java @@ -45,8 +45,7 @@ public PCtf_MinerController(NBTTagCompound nbtTagCompound, Flag flag){ this.address = nbtTagCompound.getInteger("address"); registerNativeClasses(); } - - @SuppressWarnings("resource") + private void registerNativeClasses(){ ConsoleOut consoleOut = new ConsoleOut(); PrintStream ps = new PrintStream(consoleOut, true); @@ -106,14 +105,12 @@ public void setClassesAndCompile(HashMap source){ e.printStackTrace(); } } - - @SuppressWarnings("hiding") + public PCtf_EntityMiner getMiner(int address){ PC_IWeaselGridTileAddressable tile = getTileByAddress(address); return tile instanceof PCtf_EntityMiner?(PCtf_EntityMiner)tile:null; } - - @SuppressWarnings("hiding") + @Override public PC_IWeaselGridTileAddressable getTileByAddress(int address) { return this.grid.getTileByAddress(this, address); diff --git a/powercraft/transport/PCtr_BeltHelper.java b/powercraft/transport/PCtr_BeltHelper.java index 3153f40..04c0450 100644 --- a/powercraft/transport/PCtr_BeltHelper.java +++ b/powercraft/transport/PCtr_BeltHelper.java @@ -153,8 +153,7 @@ public static int tryToStoreEntity(Entity entity, World world, int x, int y, int } return 0; } - - @SuppressWarnings("unused") + public static void moveEntity(Entity entity, World world, int x, int y, int z, boolean elevator, PC_Direction dir, double speed, boolean upwards){ final double FAC = 0.5; int passing = canPassTo(world, new PC_Vec3I(x, y+(upwards?1:0), z), dir); diff --git a/powercraft/transport/block/PCtr_BlockBeltNormal.java b/powercraft/transport/block/PCtr_BlockBeltNormal.java index c1005f2..2fd1375 100644 --- a/powercraft/transport/block/PCtr_BlockBeltNormal.java +++ b/powercraft/transport/block/PCtr_BlockBeltNormal.java @@ -303,17 +303,16 @@ public void breakBlock(World world, int x, int y, int z, Block block, int metada super.breakBlock(world, x, y, z, block, metadata); } - @SuppressWarnings("hiding") @Override @SideOnly(Side.CLIENT) public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, int modelId, RenderBlocks renderer) { int metadata = PC_Utils.getMetadata(world, x, y, z); - int hill = metadata&3; + int hill = metadata & 3; if(hill==0){ super.renderWorldBlock(world, x, y, z, modelId, renderer); }else if(hill!=3){ IIcon[] icons = new IIcon[6]; - for(int i=0; i<6; i++){ + for(int i = 0; i < 6; i++){ icons[i] = getIcon(i, metadata); } icons[0] = null; diff --git a/powercraft/transport/block/PCtr_PacketSetEntitySpeed.java b/powercraft/transport/block/PCtr_PacketSetEntitySpeed.java index 2fedb95..bdea7cb 100644 --- a/powercraft/transport/block/PCtr_PacketSetEntitySpeed.java +++ b/powercraft/transport/block/PCtr_PacketSetEntitySpeed.java @@ -34,8 +34,7 @@ public PCtr_PacketSetEntitySpeed(NBTTagCompound compound, Entity entity) { public PCtr_PacketSetEntitySpeed(){ } - - @SuppressWarnings("hiding") + @Override @SideOnly(Side.CLIENT) protected PC_Packet doAndReply(NetHandlerPlayClient iNetHandler, World world, EntityPlayer player) { diff --git a/powercraft/transport/tileentity/PCtr_TileEntityBeltScriptable.java b/powercraft/transport/tileentity/PCtr_TileEntityBeltScriptable.java index bea4b78..ff9c730 100644 --- a/powercraft/transport/tileentity/PCtr_TileEntityBeltScriptable.java +++ b/powercraft/transport/tileentity/PCtr_TileEntityBeltScriptable.java @@ -130,8 +130,7 @@ protected enum REPLACEMENT{ } } } - - @SuppressWarnings("unused") + REPLACEMENT(String name, Void unused){ this.name = name; this.value = IO_SIZE.ioSize; diff --git a/powercraft/weasel/engine/PCws_WeaselContainer.java b/powercraft/weasel/engine/PCws_WeaselContainer.java index 8389c0a..52f5630 100644 --- a/powercraft/weasel/engine/PCws_WeaselContainer.java +++ b/powercraft/weasel/engine/PCws_WeaselContainer.java @@ -67,8 +67,7 @@ public PCws_WeaselContainer(String deviceName, int memSize){ this.sourceFiles.put("Main", sc); } } - - @SuppressWarnings("unused") + public PCws_WeaselContainer(NBTTagCompound tagCompound, Flag flag){ this.memSize = tagCompound.getInteger("memSize"); NBTTagList list = (NBTTagList)tagCompound.getTag("list"); @@ -400,8 +399,7 @@ public void registerNativeClass(Class c) { public void setErrorOutput(PrintStream errorStream) { this.errorStream = errorStream; } - - @SuppressWarnings("hiding") + @Override public void onThreadErrored(XVirtualMachine virtualMachine, XThread thread) { if(this.errorStream==null) @@ -420,7 +418,6 @@ public void onThreadErrored(XVirtualMachine virtualMachine, XThread thread) { interrupt.setUserData(new byte[]{1}); } - @SuppressWarnings("hiding") @Override public void onInterruptTerminated(XVirtualMachine virtualMachine, XThread thread) { byte[] userData = thread.getUserData(); diff --git a/powercraft/weasel/engine/PCws_WeaselSourceClass.java b/powercraft/weasel/engine/PCws_WeaselSourceClass.java index 243464f..d70bb0b 100644 --- a/powercraft/weasel/engine/PCws_WeaselSourceClass.java +++ b/powercraft/weasel/engine/PCws_WeaselSourceClass.java @@ -34,7 +34,6 @@ public String getSource() { return this.source; } - @SuppressWarnings("hiding") public void save(byte[] data) { this.data = data; this.dirty = false; diff --git a/powercraft/weasel/multiblock/PCws_MultiblockObjectWeaselCable.java b/powercraft/weasel/multiblock/PCws_MultiblockObjectWeaselCable.java index 5b4069f..82a817e 100644 --- a/powercraft/weasel/multiblock/PCws_MultiblockObjectWeaselCable.java +++ b/powercraft/weasel/multiblock/PCws_MultiblockObjectWeaselCable.java @@ -95,7 +95,6 @@ protected IIcon getCableSideIcon() { return PCws_Weasel.WEASEL_CABLE.side; } - @SuppressWarnings("hiding") @Override protected IIcon getCableLineIcon(int index) { return null; diff --git a/powercraft/weasel/tileentity/PCws_TileEntityCore.java b/powercraft/weasel/tileentity/PCws_TileEntityCore.java index 9b831c4..8808072 100644 --- a/powercraft/weasel/tileentity/PCws_TileEntityCore.java +++ b/powercraft/weasel/tileentity/PCws_TileEntityCore.java @@ -221,20 +221,17 @@ public void onEvent(PC_IWeaselEvent event) { this.container.onEvent(event); } - @SuppressWarnings("hiding") @Override public int getTypeUnsafe(int address) { PC_IWeaselGridTileAddressable tile = this.grid.getTileByAddress(this, address); return tile==null?0:tile.getType(); } - @SuppressWarnings("hiding") @Override public boolean isDevicePresent(int address) { return this.grid.getTileByAddress(this, address)!=null; } - @SuppressWarnings("hiding") @Override public int getRedstoneValueUnsafe(int address, int side) { PC_IWeaselGridTileAddressable tile = this.grid.getTileByAddress(this, address); @@ -277,22 +274,15 @@ public boolean shouldCheckWeakPower(PC_Direction side) { return false; } - @SuppressWarnings("hiding") @Override public PC_IWeaselGridTileAddressable getTileByAddress(int address) { return this.grid.getTileByAddress(this, address); } @Override - public void print(String out) { - // - } + public void print(String out) {} @Override - public void cls() { - // - } - - + public void cls() {} }