Merge branch 'master' into mc1.5

Conflicts:
	IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java

IronChests2/common/cpw/mods/ironchest/ChestChangerType.java

@@ -13,6 +13,7 @@ import static cpw.mods.ironchest.IronChestType.IRON;
 import static cpw.mods.ironchest.IronChestType.SILVER;
 import static cpw.mods.ironchest.IronChestType.CRYSTAL;
 import static cpw.mods.ironchest.IronChestType.WOOD;
+import static cpw.mods.ironchest.IronChestType.OBSIDIAN;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 import net.minecraft.block.Block;
@@ -28,7 +29,8 @@ public enum ChestChangerType {
     COPPERIRON(COPPER, IRON, "copperIronUpgrade", "Copper to Iron Chest Upgrade", "mGm", "GsG", "mGm"),
     DIAMONDCRYSTAL(DIAMOND, CRYSTAL, "diamondCrystalUpgrade", "Diamond to Crystal Chest Upgrade", "GGG", "GOG", "GGG"),
     WOODIRON(WOOD, IRON, "woodIronUpgrade", "Normal chest to Iron Chest Upgrade", "mmm", "msm", "mmm"),
-    WOODCOPPER(WOOD, COPPER, "woodCopperUpgrade", "Normal chest to Copper Chest Upgrade", "mmm", "msm", "mmm");
+    WOODCOPPER(WOOD, COPPER, "woodCopperUpgrade", "Normal chest to Copper Chest Upgrade", "mmm", "msm", "mmm"),
+    DIAMONDOBSIDIAN(DIAMOND, OBSIDIAN, "diamondObsidianUpgrade", "Diamond to Obsidian Chest Upgrade", "mmm", "mGm", "mmm");
 
     private IronChestType source;
     private IronChestType target;

IronChests2/common/cpw/mods/ironchest/IronChest.java

@@ -12,6 +12,7 @@ package cpw.mods.ironchest;
 
 import java.util.logging.Level;
 
+import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ForgeSubscribe;
@@ -30,8 +31,8 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
-@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[6.5,)")
+@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[6.5,);required-after:FML@[4.7.22,)")
-@NetworkMod(channels = { "IronChest" }, versionBounds = "[4.5,)", clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
+@NetworkMod(channels = { "IronChest" }, versionBounds = "[5.0,)", clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
 public class IronChest {
     public static BlockIronChest ironChestBlock;
     @SidedProxy(clientSide = "cpw.mods.ironchest.client.ClientProxy", serverSide = "cpw.mods.ironchest.CommonProxy")
@@ -73,7 +74,7 @@ public class IronChest {
         GameRegistry.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest");
         for (IronChestType typ : IronChestType.values())
         {
-            GameRegistry.registerTileEntity(typ.clazz, typ.name());
+            GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest."+typ.name(), typ.name());
             LanguageRegistry.instance().addStringLocalization(typ.name() + ".name", "en_US", typ.friendlyName);
             proxy.registerTileEntitySpecialRenderer(typ);
         }

IronChests2/common/cpw/mods/ironchest/IronChestType.java

@@ -28,8 +28,8 @@ public enum IronChestType {
     COPPER(45, 9, false, "Copper Chest", "copperchest.png", 3, Arrays.asList("ingotCopper"), TileEntityCopperChest.class, "mmmmCmmmm"),
     SILVER(72, 9, false, "Silver Chest", "silverchest.png", 4, Arrays.asList("ingotSilver"), TileEntitySilverChest.class, "mmmm3mmmm", "mGmG0GmGm"),
     CRYSTAL(108, 12, true, "Crystal Chest", "crystalchest.png", 5, Arrays.asList("blockGlass"), TileEntityCrystalChest.class, "GGGGPGGGG"),
-    OBSIDIAN(108, 12, false, "Obsidian Chest", "obsidianchest.png", 6, Arrays.asList("obsidian"), TileEntityObsidianChest.class, "OOOO4OOOO"),
+    OBSIDIAN(108, 12, false, "Obsidian Chest", "obsidianchest.png", 6, Arrays.asList("obsidian"), TileEntityObsidianChest.class, "mmmm2mmmm"),
-    WOOD(0, 0, false, "", "", -1, Arrays.asList("blockPlanks"), null);
+    WOOD(0, 0, false, "", "", -1, Arrays.asList("plankWood"), null);
     int size;
     private int rowLength;
     public String friendlyName;
@@ -118,7 +118,7 @@ public enum IronChestType {
                         'G', Block.glass, 'C', Block.chest,
                         '0', new ItemStack(blockResult, 1, 0), /* Iron Chest */
                         '1', new ItemStack(blockResult, 1, 1), /* Gold Chest */
-                        '2', new ItemStack(blockResult, 1, 1), /* Diamond Chest */
+                        '2', new ItemStack(blockResult, 1, 2), /* Diamond Chest */
                         '3', new ItemStack(blockResult, 1, 3), /* Copper Chest */
                         '4', new ItemStack(blockResult, 1, 4)/* Silver Chest */
                 );
@@ -144,14 +144,13 @@ public enum IronChestType {
         {
             return Block.glass;
         }
-        else if (mat == "blockPlanks")
+        else if (mat == "obsidian")
         {
-            return Block.planks;
+            return Block.obsidian;
         }
         return mat;
     }
 
-    @SuppressWarnings("unchecked")
     public static void addRecipe(ItemStack is, Object... parts)
     {
         ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts);

IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java

@@ -28,7 +28,7 @@ public class ItemChestChanger extends Item {
         super(id);
         setMaxStackSize(1);
         this.type = type;
-//        setIconIndex(type.ordinal());
+        setIconIndex(type.ordinal());
         setItemName(type.itemName);
         setCreativeTab(CreativeTabs.tabMisc);
     }