make the controller great again

src/main/java/storagecraft/StorageCraft.java

@@ -11,6 +11,8 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import storagecraft.item.ItemStorageCell;
 import storagecraft.proxy.CommonProxy;
 
 @Mod(modid = StorageCraft.ID, version = StorageCraft.VERSION)
@@ -33,10 +35,16 @@ public class StorageCraft
 	public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
 	public static final CreativeTabs TAB = new CreativeTabs(ID)
 	{
+		@Override
+		public ItemStack getIconItemStack()
+		{
+			return new ItemStack(StorageCraftItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K);
+		}
+
 		@Override
 		public Item getTabIconItem()
 		{
-			return Item.getItemFromBlock(StorageCraftBlocks.CONTROLLER);
+			return null;
 		}
 	};
 	@SidedProxy(clientSide = "storagecraft.proxy.ClientProxy", serverSide = "storagecraft.proxy.ServerProxy")

src/main/java/storagecraft/block/BlockController.java

@@ -13,7 +13,7 @@ import storagecraft.tile.TileController;
 public class BlockController extends BlockBase implements ITileEntityProvider
 {
 	private IIcon sideIcon;
-	private IIcon[] icons = new IIcon[8];
+	private IIcon[] icons = new IIcon[9];
 
 	public BlockController()
 	{
@@ -48,7 +48,7 @@ public class BlockController extends BlockBase implements ITileEntityProvider
 	@Override
 	public void registerBlockIcons(IIconRegister register)
 	{
-		for (int i = 0; i <= 7; ++i)
+		for (int i = 0; i <= 8; ++i)
 		{
 			icons[i] = register.registerIcon("storagecraft:controller" + i);
 		}
@@ -59,24 +59,24 @@ public class BlockController extends BlockBase implements ITileEntityProvider
 	@Override
 	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side)
 	{
-		if (side == 0 || side == 1)
+		TileController tile = (TileController) world.getTileEntity(x, y, z);
+
+		if (side == tile.getDirection().ordinal())
 		{
-			return sideIcon;
+			return icons[(int) ((float) tile.getEnergyStored(null) / (float) tile.getMaxEnergyStored(null) * 8f)];
 		}
 
-		TileController controller = (TileController) world.getTileEntity(x, y, z);
+		return sideIcon;
-
-		return icons[(int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * 7f)];
 	}
 
 	@Override
 	public IIcon getIcon(int side, int meta)
 	{
-		if (side == 0 || side == 1)
+		if (side == 3)
 		{
-			return sideIcon;
-		}
-
 			return icons[0];
 		}
+
+		return sideIcon;
+	}
 }

src/main/java/storagecraft/container/ContainerController.java

@@ -8,6 +8,6 @@ public class ContainerController extends ContainerBase
 	{
 		super(player);
 
-		addPlayerInventory(8, 108);
+		addPlayerInventory(8, 99);
 	}
 }

src/main/java/storagecraft/gui/GuiController.java

@@ -8,9 +8,14 @@ public class GuiController extends GuiBase
 {
 	private TileController controller;
 
+	private int barX = 8;
+	private int barY = 20;
+	private int barWidth = 16;
+	private int barHeight = 58;
+
 	public GuiController(ContainerController container, TileController controller)
 	{
-		super(container, 176, 190);
+		super(container, 176, 181);
 
 		this.controller = controller;
 	}
@@ -33,23 +38,22 @@ public class GuiController extends GuiBase
 
 		drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
 
-		int barX = 17;
-		int barY = 25;
-		int barWidth = 16;
-		int barHeight = 58;
-
 		int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight);
 
-		drawTexturedModalRect(x + barX, y + barY + barHeight - barHeightNew, 178, 0, barWidth, barHeightNew);
+		drawTexturedModalRect(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew);
 	}
 
 	@Override
 	public void drawForeground(int mouseX, int mouseY)
 	{
 		drawString(7, 7, t("gui.storagecraft:controller"));
-		drawString(7, 96, t("container.inventory"));
+		drawString(7, 87, t("container.inventory"));
 
-		drawString(45, 24, t("misc.storagecraft:energyStored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
+		drawString(31, 20, t("misc.storagecraft:energyUsage", controller.getEnergyUsage()));
-		drawString(45, 44, t("misc.storagecraft:energyUsage", controller.getEnergyUsage()));
+
+		if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY))
+		{
+			drawTooltip(mouseX, mouseY, t("misc.storagecraft:energyStored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
+		}
 	}
 }

src/main/java/storagecraft/gui/GuiGrid.java

@@ -119,6 +119,7 @@ public class GuiGrid extends GuiBase
 
 	public boolean isHoveringOverClear(int mouseX, int mouseY)
 	{
+		// @TODO: Use inBounds
 		return mouseX >= 81 && mouseX <= 87 && mouseY >= 105 && mouseY <= 111;
 	}