diff --git a/IronChests2/.classpath b/IronChests2/.classpath
index 597b9fe..cfe2f1b 100644
--- a/IronChests2/.classpath
+++ b/IronChests2/.classpath
@@ -3,6 +3,6 @@
-
+
diff --git a/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java b/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
index e80b6b7..79abe80 100644
--- a/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
+++ b/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
@@ -10,10 +10,10 @@
******************************************************************************/
package cpw.mods.ironchest.client;
-import net.minecraft.src.ChestItemRenderHelper;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.client.renderer.ChestItemRenderHelper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
diff --git a/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java b/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
index 2c2411e..b5f8ecc 100644
--- a/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
+++ b/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
@@ -4,15 +4,15 @@
* are made available under the terms of the GNU Public License v3.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html
- *
+ *
* Contributors:
* cpw - initial API and implementation
******************************************************************************/
package cpw.mods.ironchest.client;
-import net.minecraft.src.Container;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.IInventory;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11;
@@ -28,7 +28,7 @@ public class GUIChest extends GuiContainer {
COPPER(184,184,"/cpw/mods/ironchest/sprites/coppercontainer.png",IronChestType.COPPER),
SILVER(184,238,"/cpw/mods/ironchest/sprites/silvercontainer.png",IronChestType.SILVER),
CRYSTAL(238,256,"/cpw/mods/ironchest/sprites/diamondcontainer.png",IronChestType.CRYSTAL);
-
+
private int xSize;
private int ySize;
private String guiTexture;
@@ -40,11 +40,11 @@ public class GUIChest extends GuiContainer {
this.guiTexture=guiTexture;
this.mainType=mainType;
}
-
+
protected Container makeContainer(IInventory player, IInventory chest) {
return new ContainerIronChestBase(player,chest, mainType, xSize, ySize);
}
-
+
public static GUIChest buildGUI(IronChestType type, IInventory playerInventory, TileEntityIronChest chestInventory) {
return new GUIChest(values()[chestInventory.getType().ordinal()],playerInventory,chestInventory);
}
@@ -62,7 +62,7 @@ public class GUIChest extends GuiContainer {
this.ySize=type.ySize;
this.allowUserInput=false;
}
-
+
@Override
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
int tex = mc.renderEngine.getTexture(type.guiTexture);
diff --git a/IronChests2/client/cpw/mods/ironchest/client/IronChestRenderHelper.java b/IronChests2/client/cpw/mods/ironchest/client/IronChestRenderHelper.java
index 596be83..dcb512c 100644
--- a/IronChests2/client/cpw/mods/ironchest/client/IronChestRenderHelper.java
+++ b/IronChests2/client/cpw/mods/ironchest/client/IronChestRenderHelper.java
@@ -12,14 +12,15 @@ package cpw.mods.ironchest.client;
import java.util.Map;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.ChestItemRenderHelper;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+
import com.google.common.collect.Maps;
import cpw.mods.ironchest.IronChest;
import cpw.mods.ironchest.IronChestType;
import cpw.mods.ironchest.TileEntityIronChest;
-import net.minecraft.src.Block;
-import net.minecraft.src.ChestItemRenderHelper;
-import net.minecraft.src.TileEntityRenderer;
public class IronChestRenderHelper extends ChestItemRenderHelper {
private Map itemRenders = Maps.newHashMap();
diff --git a/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
index e449235..a5b07bf 100644
--- a/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
+++ b/IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
@@ -28,15 +28,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import net.minecraft.src.Block;
-import net.minecraft.src.EntityItem;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.ModelChest;
-import net.minecraft.src.RenderBlocks;
-import net.minecraft.src.Tessellator;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.TileEntitySpecialRenderer;
+import net.minecraft.block.Block;
+import net.minecraft.client.model.ModelChest;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.MinecraftForgeClient;
diff --git a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java
index 6eab51d..ade168d 100644
--- a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java
+++ b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java
@@ -16,19 +16,19 @@ import java.util.Random;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
-import net.minecraft.src.BlockContainer;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IBlockAccess;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Material;
-import net.minecraft.src.MathHelper;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
public class BlockIronChest extends BlockContainer {
diff --git a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java
index 6f6a73a..a677a90 100644
--- a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java
+++ b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java
@@ -14,8 +14,8 @@ import static cpw.mods.ironchest.IronChestType.SILVER;
import static cpw.mods.ironchest.IronChestType.CRYSTAL;
import static cpw.mods.ironchest.IronChestType.WOOD;
-import net.minecraft.src.Block;
-import net.minecraft.src.ItemStack;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
import net.minecraftforge.common.Configuration;
public enum ChestChangerType {
diff --git a/IronChests2/common/cpw/mods/ironchest/CommonProxy.java b/IronChests2/common/cpw/mods/ironchest/CommonProxy.java
index f48fbad..9d4a256 100644
--- a/IronChests2/common/cpw/mods/ironchest/CommonProxy.java
+++ b/IronChests2/common/cpw/mods/ironchest/CommonProxy.java
@@ -10,11 +10,10 @@
******************************************************************************/
package cpw.mods.ironchest;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
-
public class CommonProxy implements IGuiHandler {
public void registerRenderInformation()
diff --git a/IronChests2/common/cpw/mods/ironchest/ContainerIronChestBase.java b/IronChests2/common/cpw/mods/ironchest/ContainerIronChestBase.java
index 6fc6d04..28fd6d3 100644
--- a/IronChests2/common/cpw/mods/ironchest/ContainerIronChestBase.java
+++ b/IronChests2/common/cpw/mods/ironchest/ContainerIronChestBase.java
@@ -10,12 +10,12 @@
******************************************************************************/
package cpw.mods.ironchest;
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
public class ContainerIronChestBase extends Container {
private IronChestType type;
diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestAIOcelotSit.java b/IronChests2/common/cpw/mods/ironchest/IronChestAIOcelotSit.java
index 49d682b..c05cc9e 100644
--- a/IronChests2/common/cpw/mods/ironchest/IronChestAIOcelotSit.java
+++ b/IronChests2/common/cpw/mods/ironchest/IronChestAIOcelotSit.java
@@ -1,8 +1,8 @@
package cpw.mods.ironchest;
-import net.minecraft.src.EntityAIOcelotSit;
-import net.minecraft.src.EntityOcelot;
-import net.minecraft.src.World;
+import net.minecraft.entity.ai.EntityAIOcelotSit;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.world.World;
public class IronChestAIOcelotSit extends EntityAIOcelotSit {
public IronChestAIOcelotSit(EntityOcelot par1EntityOcelot, float par2) {
diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestType.java b/IronChests2/common/cpw/mods/ironchest/IronChestType.java
index 8a2ca52..4f4a2a3 100644
--- a/IronChests2/common/cpw/mods/ironchest/IronChestType.java
+++ b/IronChests2/common/cpw/mods/ironchest/IronChestType.java
@@ -14,10 +14,11 @@ import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
-import net.minecraft.src.Block;
-import net.minecraft.src.CraftingManager;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
public enum IronChestType {
@@ -129,7 +130,7 @@ public enum IronChestType {
@SuppressWarnings("unchecked")
public static void addRecipe(ItemStack is, Object... parts) {
ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts);
- CraftingManager.getInstance().getRecipeList().add(oreRecipe);
+ GameRegistry.addRecipe(oreRecipe);
}
public int getRowCount() {
diff --git a/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java b/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java
index 60460b8..bf1b85f 100644
--- a/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java
+++ b/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java
@@ -10,14 +10,14 @@
******************************************************************************/
package cpw.mods.ironchest;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.world.World;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.TileEntityChest;
-import net.minecraft.src.World;
public class ItemChestChanger extends Item {
diff --git a/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java b/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java
index 132887b..ab4a0f5 100644
--- a/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java
+++ b/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java
@@ -10,8 +10,8 @@
******************************************************************************/
package cpw.mods.ironchest;
-import net.minecraft.src.ItemBlock;
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
public class ItemIronChest extends ItemBlock {
diff --git a/IronChests2/common/cpw/mods/ironchest/MappableItemStackWrapper.java b/IronChests2/common/cpw/mods/ironchest/MappableItemStackWrapper.java
index 7dbd810..2361199 100644
--- a/IronChests2/common/cpw/mods/ironchest/MappableItemStackWrapper.java
+++ b/IronChests2/common/cpw/mods/ironchest/MappableItemStackWrapper.java
@@ -1,6 +1,6 @@
package cpw.mods.ironchest;
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
public class MappableItemStackWrapper {
private ItemStack wrap;
diff --git a/IronChests2/common/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java b/IronChests2/common/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
index 70ae41a..bc640e3 100644
--- a/IronChests2/common/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
+++ b/IronChests2/common/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
@@ -2,9 +2,9 @@ package cpw.mods.ironchest;
import java.util.List;
-import net.minecraft.src.EntityAIOcelotSit;
-import net.minecraft.src.EntityAITaskEntry;
-import net.minecraft.src.EntityOcelot;
+import net.minecraft.entity.ai.EntityAIOcelotSit;
+import net.minecraft.entity.ai.EntityAITaskEntry;
+import net.minecraft.entity.passive.EntityOcelot;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingEvent;
diff --git a/IronChests2/common/cpw/mods/ironchest/PacketHandler.java b/IronChests2/common/cpw/mods/ironchest/PacketHandler.java
index ad24493..36de47e 100644
--- a/IronChests2/common/cpw/mods/ironchest/PacketHandler.java
+++ b/IronChests2/common/cpw/mods/ironchest/PacketHandler.java
@@ -14,11 +14,11 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import net.minecraft.src.INetworkManager;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams;
diff --git a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
index 61745f8..128c9b1 100644
--- a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
+++ b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
@@ -13,13 +13,13 @@ package cpw.mods.ironchest;
import java.util.Arrays;
import java.util.Comparator;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.Packet;
-import net.minecraft.src.TileEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.tileentity.TileEntity;
public class TileEntityIronChest extends TileEntity implements IInventory {
private int ticksSinceSync;