From f5d885343d35ddcc70683b73efa9485f87b0e14a Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 29 Nov 2014 12:58:33 +0100 Subject: [PATCH] harden source code with IntelliJ checking tools --- api/buildcraft/api/blueprints/SchematicBlock.java | 7 ++----- api/buildcraft/api/blueprints/SchematicEntity.java | 7 ++----- api/buildcraft/api/core/JavaTools.java | 9 +++------ api/buildcraft/api/statements/StatementManager.java | 2 ++ api/buildcraft/api/tiles/IControllable.java | 4 ++-- api/buildcraft/api/transport/IPipeConnection.java | 2 +- api/buildcraft/api/transport/IPipeTile.java | 2 +- common/buildcraft/BuildCraftTransport.java | 2 +- common/buildcraft/builders/TileFiller.java | 2 +- .../builders/blueprints/BlueprintDatabase.java | 7 ------- common/buildcraft/builders/blueprints/BlueprintId.java | 2 +- .../builders/schematics/SchematicMinecart.java | 4 ++-- common/buildcraft/builders/urbanism/GuiUrbanist.java | 2 +- common/buildcraft/core/InterModComms.java | 2 +- common/buildcraft/core/TileBuildCraft.java | 1 - common/buildcraft/core/Version.java | 2 +- common/buildcraft/core/builders/BuildingSlotBlock.java | 2 +- common/buildcraft/core/builders/BuildingSlotEntity.java | 5 ++--- common/buildcraft/core/gui/BuildCraftContainer.java | 2 +- common/buildcraft/core/gui/tooltips/ToolTip.java | 9 +++------ common/buildcraft/core/inventory/InventoryWrapper.java | 2 +- .../core/inventory/filters/ArrayFluidFilter.java | 6 +++++- .../inventory/filters/StatementParameterStackFilter.java | 2 +- common/buildcraft/core/network/PacketCommand.java | 2 +- common/buildcraft/core/recipes/FlexibleRecipe.java | 2 +- common/buildcraft/core/render/IconFlipped.java | 4 ++-- common/buildcraft/core/render/RenderingMarkers.java | 4 +--- common/buildcraft/core/robots/RobotRegistry.java | 2 -- common/buildcraft/core/statements/TriggerEnergy.java | 4 +--- .../core/statements/TriggerFluidContainer.java | 3 ++- .../core/statements/TriggerFluidContainerLevel.java | 2 +- common/buildcraft/core/statements/TriggerInventory.java | 3 ++- .../core/statements/TriggerInventoryLevel.java | 3 ++- common/buildcraft/core/utils/CraftingHelper.java | 3 ++- common/buildcraft/energy/TileEngine.java | 2 -- common/buildcraft/energy/worldgen/OilPopulate.java | 2 +- common/buildcraft/silicon/TileLaser.java | 2 +- .../silicon/statements/ActionRobotWorkInArea.java | 2 +- common/buildcraft/transport/BlockGenericPipe.java | 4 ---- common/buildcraft/transport/Gate.java | 2 -- common/buildcraft/transport/IEmeraldPipe.java | 2 +- common/buildcraft/transport/ItemPipe.java | 2 +- common/buildcraft/transport/PipeTransportPower.java | 2 +- common/buildcraft/transport/TileGenericPipe.java | 4 ++-- common/buildcraft/transport/TravelingItem.java | 1 - common/buildcraft/transport/gates/ActionIterator.java | 2 +- .../buildcraft/transport/gates/GateExpansionPulsar.java | 2 +- .../buildcraft/transport/gui/ContainerGateInterface.java | 4 ++-- common/buildcraft/transport/gui/GuiGateInterface.java | 4 ++-- common/buildcraft/transport/pipes/PipeItemsEmerald.java | 2 +- common/buildcraft/transport/pipes/PipePowerWood.java | 3 --- common/buildcraft/transport/render/PlugItemRenderer.java | 2 -- .../transport/render/RobotStationItemRenderer.java | 2 -- .../transport/statements/TriggerParameterSignal.java | 2 -- .../transport/statements/TriggerPipeContents.java | 3 ++- .../transport/stripes/StripesHandlerBucket.java | 2 -- 56 files changed, 67 insertions(+), 103 deletions(-) diff --git a/api/buildcraft/api/blueprints/SchematicBlock.java b/api/buildcraft/api/blueprints/SchematicBlock.java index 010455ef..a9338f89 100755 --- a/api/buildcraft/api/blueprints/SchematicBlock.java +++ b/api/buildcraft/api/blueprints/SchematicBlock.java @@ -9,6 +9,7 @@ package buildcraft.api.blueprints; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedList; import net.minecraft.block.Block; @@ -39,9 +40,7 @@ public class SchematicBlock extends SchematicBlockBase { public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { if (block != null) { if (storedRequirements.length != 0) { - for (ItemStack s : storedRequirements) { - requirements.add(s); - } + Collections.addAll(requirements, storedRequirements); } else { requirements.add(new ItemStack(block, 1, meta)); } @@ -136,11 +135,9 @@ public class SchematicBlock extends SchematicBlockBase { NBTTagList rq = nbt.getTagList("rq", Constants.NBT.TAG_COMPOUND); ArrayList rqs = new ArrayList(); - int idTEST = 0; for (int i = 0; i < rq.tagCount(); ++i) { try { NBTTagCompound sub = rq.getCompoundTagAt(i); - idTEST = sub.getInteger("id"); if (sub.getInteger("id") >= 0) { registry.stackToWorld(sub); rqs.add(ItemStack.loadItemStackFromNBT(sub)); diff --git a/api/buildcraft/api/blueprints/SchematicEntity.java b/api/buildcraft/api/blueprints/SchematicEntity.java index 94ec6a9f..bddfd842 100755 --- a/api/buildcraft/api/blueprints/SchematicEntity.java +++ b/api/buildcraft/api/blueprints/SchematicEntity.java @@ -9,6 +9,7 @@ package buildcraft.api.blueprints; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedList; import net.minecraft.entity.Entity; @@ -43,9 +44,7 @@ public class SchematicEntity extends Schematic { @Override public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { - for (ItemStack s : storedRequirements) { - requirements.add(s); - } + Collections.addAll(requirements, storedRequirements); } public void writeToWorld(IBuilderContext context) { @@ -115,8 +114,6 @@ public class SchematicEntity extends Schematic { public void writeSchematicToNBT(NBTTagCompound nbt, MappingRegistry registry) { super.writeSchematicToNBT(nbt, registry); - NBTTagList nbttaglist = entityNBT.getTagList("Pos", 6); - nbt.setInteger("entityId", registry.getIdForEntity(entity)); nbt.setTag("entity", entityNBT); diff --git a/api/buildcraft/api/core/JavaTools.java b/api/buildcraft/api/core/JavaTools.java index e83a717d..1566951b 100755 --- a/api/buildcraft/api/core/JavaTools.java +++ b/api/buildcraft/api/core/JavaTools.java @@ -13,6 +13,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class JavaTools { @@ -56,9 +57,7 @@ public class JavaTools { Class current = clas; while (current != null && current != Object.class) { - for (Field f : current.getDeclaredFields()) { - result.add(f); - } + Collections.addAll(result, current.getDeclaredFields()); current = current.getSuperclass(); } @@ -72,9 +71,7 @@ public class JavaTools { Class current = clas; while (current != null && current != Object.class) { - for (Method m : current.getDeclaredMethods()) { - result.add(m); - } + Collections.addAll(result, current.getDeclaredMethods()); current = current.getSuperclass(); } diff --git a/api/buildcraft/api/statements/StatementManager.java b/api/buildcraft/api/statements/StatementManager.java index 5718dc3b..9e85d025 100644 --- a/api/buildcraft/api/statements/StatementManager.java +++ b/api/buildcraft/api/statements/StatementManager.java @@ -92,6 +92,8 @@ public final class StatementManager { result = ((IOverrideDefaultStatements) entity).overrideActions(); if (result != null) { return result; + } else { + result = new LinkedList(); } } diff --git a/api/buildcraft/api/tiles/IControllable.java b/api/buildcraft/api/tiles/IControllable.java index c2e27aa7..b2739fa3 100644 --- a/api/buildcraft/api/tiles/IControllable.java +++ b/api/buildcraft/api/tiles/IControllable.java @@ -11,8 +11,8 @@ package buildcraft.api.tiles; public interface IControllable { public enum Mode { Unknown, On, Off, Loop - }; - + } + Mode getControlMode(); void setControlMode(Mode mode); boolean acceptsControlMode(Mode mode); diff --git a/api/buildcraft/api/transport/IPipeConnection.java b/api/buildcraft/api/transport/IPipeConnection.java index 27ca26ff..93bb0d42 100644 --- a/api/buildcraft/api/transport/IPipeConnection.java +++ b/api/buildcraft/api/transport/IPipeConnection.java @@ -17,7 +17,7 @@ public interface IPipeConnection { enum ConnectOverride { CONNECT, DISCONNECT, DEFAULT - }; + } /** * Allows you to override pipe connection logic. diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java index a37db11a..00756365 100644 --- a/api/buildcraft/api/transport/IPipeTile.java +++ b/api/buildcraft/api/transport/IPipeTile.java @@ -17,7 +17,7 @@ public interface IPipeTile { public enum PipeType { - ITEM, FLUID, POWER, STRUCTURE; + ITEM, FLUID, POWER, STRUCTURE } PipeType getPipeType(); diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 82123bac..77e7103f 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -527,7 +527,7 @@ public class BuildCraftTransport extends BuildCraftMod { try { PrintWriter writer = new PrintWriter("FacadeDebug.txt", "UTF-8"); writer.println("*** REGISTERED FACADES ***"); - for (ItemStack stack : facadeItem.allFacades) { + for (ItemStack stack : ItemFacade.allFacades) { if (facadeItem.getBlocksForFacade(stack).length > 0) { writer.println(Block.blockRegistry.getNameForObject(facadeItem.getBlocksForFacade(stack)[0]) + ":" + facadeItem.getMetaValuesForFacade(stack)[0]); } diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 2cc94086..07ad4072 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -68,7 +68,7 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro box.initialize(a); if (a instanceof TileMarker) { - ((TileMarker) a).removeFromWorld(); + a.removeFromWorld(); } sendNetworkUpdate(); diff --git a/common/buildcraft/builders/blueprints/BlueprintDatabase.java b/common/buildcraft/builders/blueprints/BlueprintDatabase.java index d832f6f0..578ca166 100644 --- a/common/buildcraft/builders/blueprints/BlueprintDatabase.java +++ b/common/buildcraft/builders/blueprints/BlueprintDatabase.java @@ -95,19 +95,12 @@ public class BlueprintDatabase { File blueprintFile = getBlueprintFile(id, outputDir); if (!blueprintFile.exists()) { - OutputStream gzOs = null; try { FileOutputStream f = new FileOutputStream(blueprintFile); f.write(blueprint.getData()); f.close(); } catch (IOException ex) { BCLog.logger.error(String.format("Failed to save Blueprint file: %s %s", blueprintFile.getName(), ex.getMessage())); - } finally { - try { - if (gzOs != null) { - gzOs.close(); - } - } catch (IOException e) { } } } diff --git a/common/buildcraft/builders/blueprints/BlueprintId.java b/common/buildcraft/builders/blueprints/BlueprintId.java index ea182c32..c2c3ca51 100644 --- a/common/buildcraft/builders/blueprints/BlueprintId.java +++ b/common/buildcraft/builders/blueprints/BlueprintId.java @@ -24,7 +24,7 @@ import buildcraft.core.utils.Utils; public final class BlueprintId implements Comparable, ISerializable { public enum Kind { Template, Blueprint - }; + } public byte[] uniqueId; public String name = ""; diff --git a/common/buildcraft/builders/schematics/SchematicMinecart.java b/common/buildcraft/builders/schematics/SchematicMinecart.java index fad96910..57119b93 100755 --- a/common/buildcraft/builders/schematics/SchematicMinecart.java +++ b/common/buildcraft/builders/schematics/SchematicMinecart.java @@ -36,7 +36,7 @@ public class SchematicMinecart extends SchematicEntity { nbttaglist.func_150309_d(1), nbttaglist.func_150309_d(2)); pos.x -= 0.5; pos.z -= 0.5; - entityNBT.setTag("Pos", this.newDoubleNBTList(new double[] {pos.x, pos.y, pos.z})); + entityNBT.setTag("Pos", this.newDoubleNBTList(pos.x, pos.y, pos.z)); } @@ -49,7 +49,7 @@ public class SchematicMinecart extends SchematicEntity { nbttaglist.func_150309_d(1), nbttaglist.func_150309_d(2)); pos.x += 0.5; pos.z += 0.5; - entityNBT.setTag("Pos", this.newDoubleNBTList(new double[] {pos.x, pos.y, pos.z})); + entityNBT.setTag("Pos", this.newDoubleNBTList(pos.x, pos.y, pos.z)); } @Override diff --git a/common/buildcraft/builders/urbanism/GuiUrbanist.java b/common/buildcraft/builders/urbanism/GuiUrbanist.java index 6f04a2f6..e5413959 100755 --- a/common/buildcraft/builders/urbanism/GuiUrbanist.java +++ b/common/buildcraft/builders/urbanism/GuiUrbanist.java @@ -207,7 +207,7 @@ public class GuiUrbanist extends GuiAdvancedInterface { int x = Mouse.getEventX() * this.width / this.mc.displayWidth; int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; - if (onInterface(x, x)) { + if (onInterface(x, y)) { return; } diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index 22cfe46a..8c115b83 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -206,7 +206,7 @@ public final class InterModComms { BuildCraftTransport.facadeItem.addFacade( "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "}", modItemStack); - } else { + } else if (block != null) { logRedundantAddFacadeMessage(m, block.toString()); } } diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index f41c2793..f6e12972 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -20,7 +20,6 @@ import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; -import cofh.api.energy.IEnergyReceiver; import buildcraft.BuildCraftCore; import buildcraft.api.core.ISerializable; import buildcraft.core.network.BuildCraftPacket; diff --git a/common/buildcraft/core/Version.java b/common/buildcraft/core/Version.java index 055b19f3..5fd15491 100644 --- a/common/buildcraft/core/Version.java +++ b/common/buildcraft/core/Version.java @@ -183,7 +183,7 @@ public class Version implements Runnable { conn.disconnect(); - return changelog.toArray(new String[0]); + return changelog.toArray(new String[changelog.size()]); } catch (Exception ex) { ex.printStackTrace(); diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index 70fe450f..3f1bc882 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -36,7 +36,7 @@ public class BuildingSlotBlock extends BuildingSlot { public enum Mode { ClearIfInvalid, Build - }; + } public Mode mode = Mode.Build; diff --git a/common/buildcraft/core/builders/BuildingSlotEntity.java b/common/buildcraft/core/builders/BuildingSlotEntity.java index a0fd817a..7b99960b 100755 --- a/common/buildcraft/core/builders/BuildingSlotEntity.java +++ b/common/buildcraft/core/builders/BuildingSlotEntity.java @@ -8,6 +8,7 @@ */ package buildcraft.core.builders; +import java.util.Collections; import java.util.LinkedList; import net.minecraft.item.ItemStack; @@ -49,9 +50,7 @@ public class BuildingSlotEntity extends BuildingSlot { public LinkedList getRequirements (IBuilderContext context) { LinkedList results = new LinkedList(); - for (ItemStack s : schematic.storedRequirements) { - results.add(s); - } + Collections.addAll(results, schematic.storedRequirements); return results; } diff --git a/common/buildcraft/core/gui/BuildCraftContainer.java b/common/buildcraft/core/gui/BuildCraftContainer.java index 5ebf808a..c6d48ca5 100644 --- a/common/buildcraft/core/gui/BuildCraftContainer.java +++ b/common/buildcraft/core/gui/BuildCraftContainer.java @@ -150,7 +150,7 @@ public abstract class BuildCraftContainer extends Container { stackSlot.stackSize = stackSize; if (stackSlot.stackSize <= 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } } diff --git a/common/buildcraft/core/gui/tooltips/ToolTip.java b/common/buildcraft/core/gui/tooltips/ToolTip.java index 8a974002..69dc6bf3 100644 --- a/common/buildcraft/core/gui/tooltips/ToolTip.java +++ b/common/buildcraft/core/gui/tooltips/ToolTip.java @@ -9,6 +9,7 @@ package buildcraft.core.gui.tooltips; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import com.google.common.collect.ForwardingList; @@ -21,16 +22,12 @@ public class ToolTip extends ForwardingList { public ToolTip(ToolTipLine... lines) { this.delay = 0; - for (ToolTipLine line: lines) { - delegate.add(line); - } + Collections.addAll(delegate, lines); } public ToolTip(int delay, ToolTipLine... lines) { this.delay = delay; - for (ToolTipLine line: lines) { - delegate.add(line); - } + Collections.addAll(delegate, lines); } @Override diff --git a/common/buildcraft/core/inventory/InventoryWrapper.java b/common/buildcraft/core/inventory/InventoryWrapper.java index f8d13566..e3d2b5e2 100644 --- a/common/buildcraft/core/inventory/InventoryWrapper.java +++ b/common/buildcraft/core/inventory/InventoryWrapper.java @@ -34,7 +34,7 @@ public abstract class InventoryWrapper implements ISidedInventory { @Override public void openInventory() { inventory.openInventory(); } @Override public void closeInventory() { inventory.closeInventory(); } @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { return inventory.isItemValidForSlot(slotIndex, itemstack); } - @Override public boolean hasCustomInventoryName() { return inventory.hasCustomInventoryName(); }; + @Override public boolean hasCustomInventoryName() { return inventory.hasCustomInventoryName(); } /* STATIC HELPER */ public static ISidedInventory getWrappedInventory(Object inventory) { diff --git a/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java b/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java index 6e763379..66146c7d 100755 --- a/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java +++ b/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; /** * Returns true if the stack matches any one one of the filter stacks. @@ -24,7 +25,10 @@ public class ArrayFluidFilter implements IFluidFilter { fluids = new Fluid[stacks.length]; for (int i = 0; i < stacks.length; ++i) { - fluids[i] = FluidContainerRegistry.getFluidForFilledItem(stacks[i]).getFluid(); + FluidStack stack = FluidContainerRegistry.getFluidForFilledItem(stacks[i]); + if (stack != null) { + fluids[i] = stack.getFluid(); + } } } diff --git a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java index 45f29b0a..07991b45 100755 --- a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java +++ b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java @@ -24,7 +24,7 @@ public class StatementParameterStackFilter extends ArrayStackOrListFilter { for (IStatementParameter s : parameters) { if (s != null) { - if (s instanceof StatementParameterItemStack || s instanceof StatementParameterItemStack) { + if (s instanceof StatementParameterItemStack) { tmp.add(s.getItemStack()); } } diff --git a/common/buildcraft/core/network/PacketCommand.java b/common/buildcraft/core/network/PacketCommand.java index 12d71cc4..413881c9 100644 --- a/common/buildcraft/core/network/PacketCommand.java +++ b/common/buildcraft/core/network/PacketCommand.java @@ -52,7 +52,7 @@ public class PacketCommand extends BuildCraftPacket { public void handle(EntityPlayer player) { if (handler != null) { - ICommandReceiver receiver = (ICommandReceiver) handler.handle(player, stream, player.worldObj); + ICommandReceiver receiver = handler.handle(player, stream, player.worldObj); if (receiver != null) { receiver.receiveCommand(command, FMLCommonHandler.instance().getEffectiveSide(), player, stream); } diff --git a/common/buildcraft/core/recipes/FlexibleRecipe.java b/common/buildcraft/core/recipes/FlexibleRecipe.java index 68085ac6..e761ee96 100644 --- a/common/buildcraft/core/recipes/FlexibleRecipe.java +++ b/common/buildcraft/core/recipes/FlexibleRecipe.java @@ -116,7 +116,7 @@ public class FlexibleRecipe implements IFlexibleRecipe, IFlexibleRecipeVie // Item stacks with alternatives consumption for (List requirements : inputItemsWithAlternatives) { - IStackFilter filter = new ArrayStackFilter(requirements.toArray(new ItemStack[0])); + IStackFilter filter = new ArrayStackFilter(requirements.toArray(new ItemStack[requirements.size()])); int amount = requirements.get(0).stackSize; if (consumeItems(crafter, result, filter, amount, preview) != 0) { diff --git a/common/buildcraft/core/render/IconFlipped.java b/common/buildcraft/core/render/IconFlipped.java index 53ce62df..6bffdee4 100644 --- a/common/buildcraft/core/render/IconFlipped.java +++ b/common/buildcraft/core/render/IconFlipped.java @@ -32,12 +32,12 @@ public class IconFlipped implements IIcon { @Override public int getIconWidth() { - return flipU ? -this.getIconWidth() : this.getIconWidth(); + return flipU ? -this.icon.getIconWidth() : this.icon.getIconWidth(); } @Override public int getIconHeight() { - return flipV ? -this.getIconHeight() : this.getIconHeight(); + return flipV ? -this.icon.getIconHeight() : this.icon.getIconHeight(); } @Override diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index 37d5c76f..a8460f1f 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -63,9 +63,7 @@ public class RenderingMarkers implements ISimpleBlockRenderingHandler { double[][] ret = new double[d.length][d[0].length]; for (int i = 0; i < d.length; ++i) { - for (int j = 0; j < d[0].length; ++j) { - ret[i][j] = d[i][j]; - } + System.arraycopy(d[i], 0, ret[i], 0, d[0].length); } return ret; diff --git a/common/buildcraft/core/robots/RobotRegistry.java b/common/buildcraft/core/robots/RobotRegistry.java index 42903549..cf6ac302 100755 --- a/common/buildcraft/core/robots/RobotRegistry.java +++ b/common/buildcraft/core/robots/RobotRegistry.java @@ -178,8 +178,6 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry { HashSet resourceSet = (HashSet) resourcesTakenByRobot.get(robot.getRobotId()) .clone(); - ResourceId mainId = null; - for (ResourceId id : resourceSet) { release(id); } diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 8a205d3e..141b0e9d 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -25,8 +25,6 @@ import buildcraft.core.utils.StringUtils; public class TriggerEnergy extends BCStatement implements ITriggerInternal, ITriggerExternal { private boolean high; - private IIcon iconEnergyLow; - private IIcon iconEnergyHigh; public TriggerEnergy(boolean high) { super("buildcraft:energyStored" + (high ? "high" : "low")); @@ -40,7 +38,7 @@ public class TriggerEnergy extends BCStatement implements ITriggerInternal, ITri } private boolean isValidEnergyHandler(IEnergyHandler handler) { - return handler instanceof IEnergyHandler; + return handler != null; } private boolean isTriggeredEnergyHandler(IEnergyHandler handler, ForgeDirection side) { diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index c0a35165..7d3612ff 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -28,7 +28,8 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern public enum State { Empty, Contains, Space, Full - }; + } + public State state; public TriggerFluidContainer(State state) { diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index c850ba58..14b54393 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -34,7 +34,7 @@ public class TriggerFluidContainerLevel extends BCStatement implements ITriggerE private TriggerType(float level) { this.level = level; } - }; + } public TriggerType type; diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index 790dbf0b..969b1c24 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -30,7 +30,8 @@ public class TriggerInventory extends BCStatement implements ITriggerExternal { public enum State { Empty, Contains, Space, Full - }; + } + public State state; public TriggerInventory(State state) { diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index f1c77e0b..03d8b824 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -34,7 +34,8 @@ public class TriggerInventoryLevel extends BCStatement implements ITriggerExtern private TriggerType(float level) { this.level = level; } - }; + } + public TriggerType type; public TriggerInventoryLevel(TriggerType type) { diff --git a/common/buildcraft/core/utils/CraftingHelper.java b/common/buildcraft/core/utils/CraftingHelper.java index 15fcd7b0..f790a570 100644 --- a/common/buildcraft/core/utils/CraftingHelper.java +++ b/common/buildcraft/core/utils/CraftingHelper.java @@ -52,7 +52,8 @@ public final class CraftingHelper { } } - if (itemNum == 2 && item1.getItem() == item2.getItem() + if (itemNum == 2 && item1 != null && item2 != null + && item1.getItem() == item2.getItem() && item1.stackSize == 1 && item2.stackSize == 1 && item1.getItem().isRepairable()) { Item itemBase = item1.getItem(); diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index 5d30749c..454fe94b 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -230,8 +230,6 @@ public abstract class TileEngine extends TileBuildCraft implements IPipeConnecti if (!isOrientationValid()) { switchOrientation(true); - } else { - TileEntity tile = getTile(orientation); } } diff --git a/common/buildcraft/energy/worldgen/OilPopulate.java b/common/buildcraft/energy/worldgen/OilPopulate.java index 31691d55..509c1a01 100644 --- a/common/buildcraft/energy/worldgen/OilPopulate.java +++ b/common/buildcraft/energy/worldgen/OilPopulate.java @@ -47,7 +47,7 @@ public final class OilPopulate { private enum GenType { LARGE, MEDIUM, LAKE, NONE - }; + } private OilPopulate() { // BuildCraftCore.debugWorldgen = true; diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 63bfc475..62039b63 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -69,7 +69,7 @@ public class TileLaser extends TileBuildCraft implements IHasWork, IControllable laser.iterateTexture(); - if (!!worldObj.isRemote) { + if (worldObj.isRemote) { return; } diff --git a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java index a3a41c29..25e6a96f 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java @@ -41,7 +41,7 @@ public class ActionRobotWorkInArea extends BCStatement implements IActionInterna return null; } - ItemStack stack = ((StatementParameterItemStack) slot.parameters[0]).getItemStack(); + ItemStack stack = slot.parameters[0].getItemStack(); if (!(stack.getItem() instanceof ItemMapLocation)) { return null; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 549e745e..946e01a3 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -1104,10 +1104,6 @@ public class BlockGenericPipe extends BlockBuildCraft { return item; } - public static boolean isPipeRegistered(int key) { - return pipes.containsKey(key); - } - public static Pipe createPipe(Item key) { try { diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 7904a751..5dbee6b9 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -571,7 +571,6 @@ public final class Gate implements IGate, IStatementContainer { for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { TileEntity tile = pipe.container.getTile(o); - Block block = pipe.container.getBlock(o); allTriggers.addAll(StatementManager.getExternalTriggers(o, tile)); } @@ -597,7 +596,6 @@ public final class Gate implements IGate, IStatementContainer { for (ForgeDirection o : ForgeDirection.VALID_DIRECTIONS) { TileEntity tile = pipe.container.getTile(o); - Block block = pipe.container.getBlock(o); allActions.addAll(StatementManager.getExternalActions(o, tile)); } diff --git a/common/buildcraft/transport/IEmeraldPipe.java b/common/buildcraft/transport/IEmeraldPipe.java index 2a171aa4..1bbecbf6 100644 --- a/common/buildcraft/transport/IEmeraldPipe.java +++ b/common/buildcraft/transport/IEmeraldPipe.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; public interface IEmeraldPipe extends IFilteredPipe { public enum FilterMode { - WHITE_LIST, BLACK_LIST, ROUND_ROBIN; + WHITE_LIST, BLACK_LIST, ROUND_ROBIN } public class EmeraldPipeSettings { diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index d93ce268..be0a663e 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -88,7 +88,7 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { Pipe pipe = BlockGenericPipe.createPipe(this); if (pipe == null) { - BCLog.logger.log(Level.WARN, "Pipe failed to create during placement at {0},{1},{2}", new Object[]{i, j, k}); + BCLog.logger.log(Level.WARN, "Pipe failed to create during placement at {0},{1},{2}", i, j, k); return true; } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 4dd1f298..aee37ce0 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -102,7 +102,7 @@ public class PipeTransportPower extends PipeTransport { } if (tile instanceof IEnergyReceiver) { IEnergyConnection handler = (IEnergyConnection) tile; - if (handler != null && handler.canConnectEnergy(side.getOpposite())) { + if (handler.canConnectEnergy(side.getOpposite())) { return true; } } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 665d2159..e1cbfb20 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -307,7 +307,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, if (pipe != null) { pipe.readFromNBT(nbt); } else { - BCLog.logger.log(Level.WARN, "Pipe failed to load from NBT at {0},{1},{2}", new Object[]{xCoord, yCoord, zCoord}); + BCLog.logger.log(Level.WARN, "Pipe failed to load from NBT at {0},{1},{2}", xCoord, yCoord, zCoord); deletePipe = true; } @@ -559,7 +559,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, this.blockType = getBlockType(); if (pipe == null) { - BCLog.logger.log(Level.WARN, "Pipe failed to initialize at {0},{1},{2}, deleting", new Object[]{xCoord, yCoord, zCoord}); + BCLog.logger.log(Level.WARN, "Pipe failed to initialize at {0},{1},{2}, deleting", xCoord, yCoord, zCoord); worldObj.setBlockToAir(xCoord, yCoord, zCoord); return; } diff --git a/common/buildcraft/transport/TravelingItem.java b/common/buildcraft/transport/TravelingItem.java index 7cd12e95..7557cc09 100644 --- a/common/buildcraft/transport/TravelingItem.java +++ b/common/buildcraft/transport/TravelingItem.java @@ -214,7 +214,6 @@ public class TravelingItem { Position motion = new Position(0, 0, 0, output); motion.moveForwards(0.1 + getSpeed() * 2F); - ItemStack stack = getItemStack(); EntityItem entity = new EntityItem(container.getWorldObj(), xCoord, yCoord, zCoord, getItemStack()); entity.lifespan = BuildCraftCore.itemLifespan; entity.delayBeforeCanPickup = 10; diff --git a/common/buildcraft/transport/gates/ActionIterator.java b/common/buildcraft/transport/gates/ActionIterator.java index 14de8a3c..c56a28de 100755 --- a/common/buildcraft/transport/gates/ActionIterator.java +++ b/common/buildcraft/transport/gates/ActionIterator.java @@ -97,5 +97,5 @@ public class ActionIterator implements Iterable { && pipe.gates[curDir.ordinal()] != null && index < pipe.gates[curDir.ordinal()].activeActions.size(); } - }; + } } diff --git a/common/buildcraft/transport/gates/GateExpansionPulsar.java b/common/buildcraft/transport/gates/GateExpansionPulsar.java index 512edfd5..a3f73918 100644 --- a/common/buildcraft/transport/gates/GateExpansionPulsar.java +++ b/common/buildcraft/transport/gates/GateExpansionPulsar.java @@ -51,7 +51,7 @@ public final class GateExpansionPulsar extends GateExpansionBuildcraft implement // one single moment would do the work at the same time. This // spreads a bit work load. Note, this is not a problem for // existing gates since tick is stored in NBT - tick = (int) Math.random() * PULSE_PERIOD; + tick = (int) (Math.random() * PULSE_PERIOD); } @Override diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index 6e86a40a..4134c5b3 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -415,7 +415,7 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm IStatement statement = null; if (tag != null && tag.length() > 0) { - statement = (IStatement) StatementManager.statements.get(tag); + statement = StatementManager.statements.get(tag); } gate.setAction(action, statement); @@ -432,7 +432,7 @@ public class ContainerGateInterface extends BuildCraftContainer implements IComm IStatement statement = null; if (tag != null && tag.length() > 0) { - statement = (IStatement) StatementManager.statements.get(tag); + statement = StatementManager.statements.get(tag); } gate.setTrigger(trigger, statement); diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index d8172ca8..a51a8844 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -178,7 +178,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { @Override public void setParameter(IStatementParameter param, boolean notifyServer) { - container.setTriggerParameter(statementSlot.slot, slot, (IStatementParameter) param, notifyServer); + container.setTriggerParameter(statementSlot.slot, slot, param, notifyServer); } } @@ -194,7 +194,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { @Override public void setParameter(IStatementParameter param, boolean notifyServer) { - container.setActionParameter(statementSlot.slot, slot, (IStatementParameter) param, notifyServer); + container.setActionParameter(statementSlot.slot, slot, param, notifyServer); } } diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index aa44b24d..3e3bf5c9 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -35,7 +35,7 @@ import buildcraft.transport.PipeIconProvider; public class PipeItemsEmerald extends PipeItemsWood implements IClientState, IGuiReturnHandler { public enum FilterMode { - WHITE_LIST, BLACK_LIST, ROUND_ROBIN; + WHITE_LIST, BLACK_LIST, ROUND_ROBIN } public class EmeraldPipeSettings { diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 509cafdd..541dee88 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -14,10 +14,7 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; -import cofh.api.energy.IEnergyProvider; -import cofh.api.energy.IEnergyReceiver; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/render/PlugItemRenderer.java b/common/buildcraft/transport/render/PlugItemRenderer.java index b37749f5..f47c03ad 100644 --- a/common/buildcraft/transport/render/PlugItemRenderer.java +++ b/common/buildcraft/transport/render/PlugItemRenderer.java @@ -27,8 +27,6 @@ public class PlugItemRenderer implements IItemRenderer { // Render StructurePipe Block block = BuildCraftTransport.genericPipeBlock; Tessellator tessellator = Tessellator.instance; - - block = BuildCraftTransport.genericPipeBlock; IIcon textureID = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeStructureCobblestone.ordinal()); // Structure pipe block.setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.375F, 0.75F); diff --git a/common/buildcraft/transport/render/RobotStationItemRenderer.java b/common/buildcraft/transport/render/RobotStationItemRenderer.java index 36fb7d1d..50584d0c 100755 --- a/common/buildcraft/transport/render/RobotStationItemRenderer.java +++ b/common/buildcraft/transport/render/RobotStationItemRenderer.java @@ -27,8 +27,6 @@ public class RobotStationItemRenderer implements IItemRenderer { // Render StructurePipe Block block = BuildCraftTransport.genericPipeBlock; Tessellator tessellator = Tessellator.instance; - - block = BuildCraftTransport.genericPipeBlock; IIcon textureID = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeRobotStation.ordinal()); // Structure pipe block.setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.375F, 0.75F); diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index 99862cf5..361abb39 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -39,8 +39,6 @@ public class TriggerParameterSignal implements IStatementParameter { @Override public IIcon getIcon() { - int id = 0; - if (color == null) { return null; } diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 79420703..0a56e422 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -41,7 +41,8 @@ public class TriggerPipeContents extends BCStatement implements ITriggerInternal requestsEnergy, tooMuchEnergy; public ITriggerInternal trigger; - }; + } + private PipeContents kind; public TriggerPipeContents(PipeContents kind) { diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index 16f6ec64..3b18a9e7 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -36,8 +36,6 @@ public class StripesHandlerBucket implements IStripesHandler { Block block = world.getBlock(x, y, z); if (block == Blocks.air) { Block underblock = world.getBlock(x, y - 1, z); - - boolean rollback = false; if (((ItemBucket) stack.getItem()).tryPlaceContainedLiquid(world, x, y - 1, z)) { stack.stackSize = 0;