From c724e960f134cb8adfcf9364fb4d26f3e415655d Mon Sep 17 00:00:00 2001 From: SirSengir Date: Sat, 18 Aug 2012 11:46:48 +0200 Subject: [PATCH] Cleaned up unneeded imports. --- common/buildcraft/api/fuels/IronEngineFuel.java | 1 - common/buildcraft/api/liquids/ILiquidTank.java | 2 -- common/buildcraft/api/tools/IToolPipette.java | 1 - common/buildcraft/core/ActionMachineControl.java | 8 ++++---- common/buildcraft/core/BptBase.java | 2 -- common/buildcraft/core/DefaultActionProvider.java | 1 - common/buildcraft/core/DefaultTriggerProvider.java | 1 - common/buildcraft/core/ItemRedstoneChipset.java | 1 - common/buildcraft/core/ProxyCore.java | 1 + common/buildcraft/core/RedstonePowerFramework.java | 1 - common/buildcraft/core/TriggerLiquidContainer.java | 1 - common/buildcraft/energy/BptBlockEngine.java | 1 - common/buildcraft/energy/EngineWood.java | 4 ++-- common/buildcraft/energy/PneumaticPowerFramework.java | 1 - common/buildcraft/energy/render/RenderEngine.java | 2 +- common/buildcraft/transport/ItemGate.java | 1 - common/buildcraft/transport/ItemPipe.java | 5 ----- .../buildcraft/transport/pipes/PipeItemsStripes.java | 2 +- common/buildcraft/transport/pipes/PipeItemsWood.java | 3 --- .../buildcraft/transport/pipes/PipeLiquidsWood.java | 1 - common/buildcraft/transport/pipes/PipePowerWood.java | 1 - .../transport/render/FacadeItemRenderer.java | 5 +++-- .../buildcraft/transport/render/PipeItemRenderer.java | 4 +++- .../transport/render/PipeWorldRenderer.java | 11 ----------- common/buildcraft/transport/render/RenderPipe.java | 3 +-- 25 files changed, 16 insertions(+), 48 deletions(-) diff --git a/common/buildcraft/api/fuels/IronEngineFuel.java b/common/buildcraft/api/fuels/IronEngineFuel.java index db413070..8976d8f2 100644 --- a/common/buildcraft/api/fuels/IronEngineFuel.java +++ b/common/buildcraft/api/fuels/IronEngineFuel.java @@ -9,7 +9,6 @@ package buildcraft.api.fuels; -import java.util.HashMap; import java.util.LinkedList; import buildcraft.api.core.BuildCraftAPI; diff --git a/common/buildcraft/api/liquids/ILiquidTank.java b/common/buildcraft/api/liquids/ILiquidTank.java index 68f91597..d570e16e 100644 --- a/common/buildcraft/api/liquids/ILiquidTank.java +++ b/common/buildcraft/api/liquids/ILiquidTank.java @@ -1,7 +1,5 @@ package buildcraft.api.liquids; -import buildcraft.api.core.Orientations; - public interface ILiquidTank { /** diff --git a/common/buildcraft/api/tools/IToolPipette.java b/common/buildcraft/api/tools/IToolPipette.java index 2cc2c123..763642e0 100644 --- a/common/buildcraft/api/tools/IToolPipette.java +++ b/common/buildcraft/api/tools/IToolPipette.java @@ -1,6 +1,5 @@ package buildcraft.api.tools; -import buildcraft.api.liquids.ILiquidTank; import buildcraft.api.liquids.LiquidStack; import net.minecraft.src.ItemStack; diff --git a/common/buildcraft/core/ActionMachineControl.java b/common/buildcraft/core/ActionMachineControl.java index e469af85..6af10bab 100644 --- a/common/buildcraft/core/ActionMachineControl.java +++ b/common/buildcraft/core/ActionMachineControl.java @@ -25,9 +25,9 @@ public class ActionMachineControl extends Action { return 4 * 16 + 3; case Loop: return 4 * 16 + 4; + default: + return 0; } - - return 0; } @Override @@ -39,9 +39,9 @@ public class ActionMachineControl extends Action { return "Off"; case Loop: return "Loop"; + default: + return ""; } - - return ""; } @Override diff --git a/common/buildcraft/core/BptBase.java b/common/buildcraft/core/BptBase.java index 9884247b..cf219a25 100644 --- a/common/buildcraft/core/BptBase.java +++ b/common/buildcraft/core/BptBase.java @@ -20,8 +20,6 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; -import buildcraft.mod_BuildCraftCore; - import net.minecraft.src.ModLoader; public abstract class BptBase { diff --git a/common/buildcraft/core/DefaultActionProvider.java b/common/buildcraft/core/DefaultActionProvider.java index 83760bc4..18e1fd80 100644 --- a/common/buildcraft/core/DefaultActionProvider.java +++ b/common/buildcraft/core/DefaultActionProvider.java @@ -3,7 +3,6 @@ package buildcraft.core; import java.util.LinkedList; import buildcraft.BuildCraftCore; -import buildcraft.api.gates.Action; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionProvider; diff --git a/common/buildcraft/core/DefaultTriggerProvider.java b/common/buildcraft/core/DefaultTriggerProvider.java index a0169538..798cc553 100644 --- a/common/buildcraft/core/DefaultTriggerProvider.java +++ b/common/buildcraft/core/DefaultTriggerProvider.java @@ -6,7 +6,6 @@ import buildcraft.BuildCraftCore; import buildcraft.api.gates.IOverrideDefaultTriggers; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerProvider; -import buildcraft.api.gates.Trigger; import buildcraft.api.liquids.ITankContainer; import buildcraft.api.transport.IPipe; diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 408386c5..1b6f0f90 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -1,6 +1,5 @@ package buildcraft.core; -import java.util.ArrayList; import java.util.List; import cpw.mods.fml.common.Side; diff --git a/common/buildcraft/core/ProxyCore.java b/common/buildcraft/core/ProxyCore.java index ecb2ab56..77a0a5f6 100644 --- a/common/buildcraft/core/ProxyCore.java +++ b/common/buildcraft/core/ProxyCore.java @@ -12,6 +12,7 @@ package buildcraft.core; import java.io.File; import java.util.Random; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.SidedProxy; import buildcraft.core.network.BuildCraftPacket; diff --git a/common/buildcraft/core/RedstonePowerFramework.java b/common/buildcraft/core/RedstonePowerFramework.java index 6390e17f..0ce95580 100644 --- a/common/buildcraft/core/RedstonePowerFramework.java +++ b/common/buildcraft/core/RedstonePowerFramework.java @@ -11,7 +11,6 @@ package buildcraft.core; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.PowerFramework; -import buildcraft.api.power.PowerProvider; public class RedstonePowerFramework extends PowerFramework { diff --git a/common/buildcraft/core/TriggerLiquidContainer.java b/common/buildcraft/core/TriggerLiquidContainer.java index a046c7e2..e4251f55 100644 --- a/common/buildcraft/core/TriggerLiquidContainer.java +++ b/common/buildcraft/core/TriggerLiquidContainer.java @@ -9,7 +9,6 @@ package buildcraft.core; -import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.api.liquids.ILiquidTank; diff --git a/common/buildcraft/energy/BptBlockEngine.java b/common/buildcraft/energy/BptBlockEngine.java index c7415d3e..ff3c7396 100644 --- a/common/buildcraft/energy/BptBlockEngine.java +++ b/common/buildcraft/energy/BptBlockEngine.java @@ -9,7 +9,6 @@ package buildcraft.energy; -import buildcraft.mod_BuildCraftEnergy; import buildcraft.api.blueprints.BlockSignature; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; diff --git a/common/buildcraft/energy/EngineWood.java b/common/buildcraft/energy/EngineWood.java index b86d31f6..a01f9dff 100644 --- a/common/buildcraft/energy/EngineWood.java +++ b/common/buildcraft/energy/EngineWood.java @@ -45,9 +45,9 @@ public class EngineWood extends Engine { return 0.04F; case Red: return 0.08F; + default: + return 0; } - - return 0; } @Override diff --git a/common/buildcraft/energy/PneumaticPowerFramework.java b/common/buildcraft/energy/PneumaticPowerFramework.java index 569ea15b..a5b0256b 100644 --- a/common/buildcraft/energy/PneumaticPowerFramework.java +++ b/common/buildcraft/energy/PneumaticPowerFramework.java @@ -11,7 +11,6 @@ package buildcraft.energy; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.PowerFramework; -import buildcraft.api.power.PowerProvider; public class PneumaticPowerFramework extends PowerFramework { diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index 5a72e6fe..8f63ef65 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -14,7 +14,6 @@ import net.minecraft.src.ModelRenderer; import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.MinecraftForgeClient; import org.lwjgl.opengl.GL11; @@ -130,6 +129,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor angle[0] = (float) -Math.PI / 2; translate[2] = -1; break; + default: } box.rotateAngleX = angle[0]; diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 226c0815..c30fc545 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -1,6 +1,5 @@ package buildcraft.transport; -import java.util.ArrayList; import java.util.List; import cpw.mods.fml.common.Side; diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 9b5cfeda..a7b98236 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -9,11 +9,6 @@ package buildcraft.transport; -import java.util.LinkedList; -import java.util.List; - -import cpw.mods.fml.common.Side; -import cpw.mods.fml.common.asm.SideOnly; import buildcraft.BuildCraftTransport; import buildcraft.core.IItemPipe; import buildcraft.core.ItemBuildCraft; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index a37fb2de..1e14ce36 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -8,6 +8,7 @@ package buildcraft.transport.pipes; +/* import java.util.ArrayList; import java.util.TreeMap; @@ -34,7 +35,6 @@ import buildcraft.transport.PipeTransportItems; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; -/* public class PipeItemsStripes extends Pipe implements IItemTravelingHook, IPowerReceptor { private IPowerProvider powerProvider; diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index ccd63faf..c7605d6c 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -11,11 +11,9 @@ package buildcraft.transport.pipes; import buildcraft.api.core.Orientations; import buildcraft.api.core.Position; import buildcraft.api.inventory.ISpecialInventory; -import buildcraft.api.liquids.ITankContainer; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; -import buildcraft.api.power.PowerProvider; import buildcraft.api.transport.IPipedItem; import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; @@ -24,7 +22,6 @@ import buildcraft.core.Utils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeLogicWood; import buildcraft.transport.PipeTransportItems; -import net.minecraft.src.Block; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; import net.minecraft.src.TileEntity; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index 59fc9d34..9e968073 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -22,7 +22,6 @@ import buildcraft.core.network.TileNetworkData; import buildcraft.transport.Pipe; import buildcraft.transport.PipeLogicWood; import buildcraft.transport.PipeTransportLiquids; -import net.minecraft.src.Block; import net.minecraft.src.TileEntity; import net.minecraft.src.World; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 54a467bd..283035e5 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -12,7 +12,6 @@ import buildcraft.api.core.Orientations; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; -import buildcraft.api.power.PowerProvider; import buildcraft.core.DefaultProps; import buildcraft.core.Utils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index a2cdcdbe..e0701559 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -13,7 +13,6 @@ import net.minecraft.src.RenderBlocks; import net.minecraft.src.Tessellator; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; public class FacadeItemRenderer implements IItemRenderer { @@ -106,8 +105,9 @@ public class FacadeItemRenderer implements IItemRenderer { case ENTITY: return true; case EQUIPPED: return true; case INVENTORY: return true; + default: + return false; } - return false; } @Override @@ -130,6 +130,7 @@ public class FacadeItemRenderer implements IItemRenderer { GL11.glScalef(1.1F, 1.1F, 1.1F); renderFacadeItem((RenderBlocks) data[0], item, -0.3f, -0.35f, -0.7f); break; + default: } } diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index 0ec80f02..a9e1a36b 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -68,8 +68,9 @@ public class PipeItemRenderer implements IItemRenderer { return true; case INVENTORY: return true; + default: + return false; } - return false; } @Override @@ -89,6 +90,7 @@ public class PipeItemRenderer implements IItemRenderer { case INVENTORY: renderPipeItem((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); break; + default: } } diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 26dd5e6d..c73f70eb 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -1,16 +1,9 @@ package buildcraft.transport.render; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.TreeMap; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import buildcraft.BuildCraftTransport; -import buildcraft.mod_BuildCraftTransport; import buildcraft.api.core.Orientations; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe.WireColor; @@ -21,13 +14,9 @@ import buildcraft.transport.PipeRenderState; import net.minecraft.src.Block; import net.minecraft.src.IBlockAccess; -import net.minecraft.src.Item; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; import net.minecraft.src.RenderBlocks; import net.minecraft.src.TileEntity; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.MinecraftForgeClient; public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index ee1c49a6..42c75dcd 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -18,7 +18,6 @@ import net.minecraft.src.GLAllocation; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraft.src.RenderBlocks; -import net.minecraft.src.RenderEngine; import net.minecraft.src.RenderManager; import net.minecraft.src.Tessellator; import net.minecraft.src.TileEntity; @@ -35,7 +34,6 @@ import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.api.core.Orientations; -import buildcraft.api.liquids.ILiquidTank; import buildcraft.api.liquids.LiquidStack; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; @@ -341,6 +339,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glRotatef(angleZ[i], 0, 0, 1); list = d.sideHorizontal[stage]; break; + default: } GL11.glCallList(list);