Colored medium flower pots

GardenContainers/resources/assets/gardencontainers/lang/en_US.lang

@@ -16,11 +16,27 @@ tile.largePotColored.gray.name=Gray Large Flower Pot
 tile.largePotColored.pink.name=Pink Large Flower Pot
 tile.largePotColored.lime.name=Lime Large Flower Pot
 tile.largePotColored.yellow.name=Yellow Large Flower Pot
-tile.largePotColored.lightBlue.name=Light Blue Large Flower Pot
+tile.largePotColored.light_blue.name=Light Blue Large Flower Pot
 tile.largePotColored.magenta.name=Magenta Large Flower Pot
 tile.largePotColored.orange.name=Orange Large Flower Pot
 tile.largePotColored.white.name=White Large Flower Pot
 tile.mediumPot.default.name=Medium Flower Pot
+tile.mediumPotColored.black.name=Black Medium Flower Pot
+tile.mediumPotColored.red.name=Red Medium Flower Pot
+tile.mediumPotColored.green.name=Green Medium Flower Pot
+tile.mediumPotColored.brown.name=Brown Medium Flower Pot
+tile.mediumPotColored.blue.name=Blue Medium Flower Pot
+tile.mediumPotColored.purple.name=Purple Medium Flower Pot
+tile.mediumPotColored.cyan.name=Cyan Medium Flower Pot
+tile.mediumPotColored.silver.name=Light Gray Medium Flower Pot
+tile.mediumPotColored.gray.name=Gray Medium Flower Pot
+tile.mediumPotColored.pink.name=Pink Medium Flower Pot
+tile.mediumPotColored.lime.name=Lime Medium Flower Pot
+tile.mediumPotColored.yellow.name=Yellow Medium Flower Pot
+tile.mediumPotColored.light_blue.name=Light Blue Medium Flower Pot
+tile.mediumPotColored.magenta.name=Magenta Medium Flower Pot
+tile.mediumPotColored.orange.name=Orange Medium Flower Pot
+tile.mediumPotColored.white.name=White Medium Flower Pot
 tile.woodWindowBox.oak.name=Oak Window Box
 tile.woodWindowBox.spruce.name=Spruce Window Box
 tile.woodWindowBox.birch.name=Birch Window Box

GardenContainers/src/com/jaquadro/minecraft/gardencontainers/block/BlockMediumPot.java

@@ -10,30 +10,20 @@
 import com.jaquadro.minecraft.gardencore.block.support.BasicSlotProfile;
 import com.jaquadro.minecraft.gardencore.block.support.Slot2Profile;
 import com.jaquadro.minecraft.gardencore.block.support.SlotShare0Profile;
-import com.jaquadro.minecraft.gardencore.block.tile.TileEntityGarden;
 import com.jaquadro.minecraft.gardencore.core.ModCreativeTabs;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
 
-public class BlockMediumPot extends BlockGardenContainer
+public abstract class BlockMediumPot extends BlockGardenContainer
 {
-    public static final String[] subTypes = new String[] { "default" };
-
     private class LocalSlotProfile extends Slot2Profile
     {
         public LocalSlotProfile (Slot[] slots) {
@@ -46,9 +36,6 @@ public float getPlantOffsetY (IBlockAccess blockAccess, int x, int y, int z, int
         }
     }
 
-    @SideOnly(Side.CLIENT)
-    private IIcon iconSide;
-
     public BlockMediumPot (String blockName) {
         super(blockName, Material.rock);
 
@@ -69,9 +56,7 @@ public BlockMediumPot (String blockName) {
         });
     }
 
-    public static String[] getSubTypes () {
-        return subTypes;
-    }
+    public abstract String[] getSubTypes ();
 
     @Override
     protected int getSlot (World world, int x, int y, int z, EntityPlayer player, float hitX, float hitY, float hitZ) {
@@ -134,14 +119,4 @@ public TileEntityMediumPot getTileEntity (IBlockAccess world, int x, int y, int
         TileEntity te = world.getTileEntity(x, y, z);
         return (te != null && te instanceof TileEntityMediumPot) ? (TileEntityMediumPot) te : null;
     }
-
-    @Override
-    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List blockList) {
-        blockList.add(new ItemStack(item, 1, 0));
-    }
-
-    @Override
-    public IIcon getIcon (int side, int data) {
-        return Blocks.hardened_clay.getIcon(side, 0);
-    }
 }

GardenContainers/src/com/jaquadro/minecraft/gardencontainers/block/BlockMediumPotColored.java

@@ -0,0 +1,37 @@
+package com.jaquadro.minecraft.gardencontainers.block;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemDye;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import java.util.List;
+
+public class BlockMediumPotColored extends BlockMediumPot
+{
+    public BlockMediumPotColored (String blockName) {
+        super(blockName);
+    }
+
+    @Override
+    public String[] getSubTypes () {
+        return ItemDye.field_150921_b;
+    }
+
+    @Override
+    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List blockList) {
+        for (int i = 0; i < 16; i++)
+            blockList.add(new ItemStack(item, 1, i));
+    }
+
+    @Override
+    public IIcon getIcon (int side, int data) {
+        return Blocks.stained_hardened_clay.getIcon(side, 15 - (data & 15));
+    }
+
+    public static int getBlockFromDye (int index) {
+        return index & 15;
+    }
+}

GardenContainers/src/com/jaquadro/minecraft/gardencontainers/block/BlockMediumPotStandard.java

@@ -0,0 +1,33 @@
+package com.jaquadro.minecraft.gardencontainers.block;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+import java.util.List;
+
+public class BlockMediumPotStandard extends BlockMediumPot
+{
+    public static final String[] subTypes = new String[] { "default" };
+
+    public BlockMediumPotStandard (String blockName) {
+        super(blockName);
+    }
+
+    @Override
+    public String[] getSubTypes () {
+        return subTypes;
+    }
+
+    @Override
+    public void getSubBlocks (Item item, CreativeTabs creativeTabs, List blockList) {
+        blockList.add(new ItemStack(item, 1, 0));
+    }
+
+    @Override
+    public IIcon getIcon (int side, int data) {
+        return Blocks.hardened_clay.getIcon(side, 0);
+    }
+}

GardenContainers/src/com/jaquadro/minecraft/gardencontainers/core/ModBlocks.java

@@ -23,6 +23,7 @@ public class ModBlocks
     public static BlockLargePot largePot;
     public static BlockLargePot largePotColored;
     public static BlockMediumPot mediumPot;
+    public static BlockMediumPot mediumPotColored;
     public static BlockPotteryTable potteryTable;
 
     public void init () {
@@ -31,7 +32,8 @@ public void init () {
         decorativePot = new BlockDecorativePot("decorativePot");
         largePot = new BlockLargePotStandard("largePot");
         largePotColored = new BlockLargePotColored("largePotColored");
-        mediumPot = new BlockMediumPot("mediumPot");
+        mediumPot = new BlockMediumPotStandard("mediumPot");
+        mediumPotColored = new BlockMediumPotColored("mediumPotColored");
         potteryTable = new BlockPotteryTable("potteryTable");
 
         GameRegistry.registerBlock(woodWindowBox, ItemWindowBox.class, "wood_window_box");
@@ -40,13 +42,15 @@ public void init () {
         GameRegistry.registerBlock(largePot, ItemLargePot.class, "large_pot");
         GameRegistry.registerBlock(largePotColored, ItemLargePot.class, "large_pot_colored");
         GameRegistry.registerBlock(mediumPot, ItemMediumPot.class, "medium_pot");
+        GameRegistry.registerBlock(mediumPotColored, ItemMediumPot.class, "medium_pot_colored");
         GameRegistry.registerBlock(potteryTable, "pottery_table");
 
         GameRegistry.registerTileEntity(TileEntityWindowBox.class, ModBlocks.getQualifiedName(woodWindowBox));
         GameRegistry.registerTileEntity(TileEntityDecorativePot.class, ModBlocks.getQualifiedName(decorativePot));
         GameRegistry.registerTileEntity(TileEntityLargePot.class, ModBlocks.getQualifiedName(largePot));
         GameRegistry.registerTileEntity(TileEntityLargePot.class, ModBlocks.getQualifiedName(largePotColored));
         GameRegistry.registerTileEntity(TileEntityMediumPot.class, ModBlocks.getQualifiedName(mediumPot));
+        GameRegistry.registerTileEntity(TileEntityMediumPot.class, ModBlocks.getQualifiedName(mediumPotColored));
         GameRegistry.registerTileEntity(TileEntityPotteryTable.class, ModBlocks.getQualifiedName(potteryTable));
     }