diff --git a/IronChests2/build.xml b/IronChests2/build.xml
index 2285c6e..7cffae9 100644
--- a/IronChests2/build.xml
+++ b/IronChests2/build.xml
@@ -32,9 +32,8 @@
-
-
+
@@ -43,7 +42,7 @@
-
+
@@ -57,6 +56,7 @@
+
@@ -95,8 +95,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java b/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
index 6487c01..18cf76f 100644
--- a/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
+++ b/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
@@ -5,8 +5,7 @@ import java.io.File;
import net.minecraft.client.Minecraft;
import net.minecraft.src.ChestItemRenderHelper;
import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityPlayerSP;
-import net.minecraft.src.GuiScreen;
+import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ModLoader;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.TileEntity;
@@ -59,17 +58,17 @@ public class ClientProxy implements IProxy {
}
@Override
- public GuiScreen getGuiScreen(int ID, EntityPlayerSP player, World world, int X, int Y, int Z) {
- TileEntity te = world.getBlockTileEntity(X, Y, Z);
+ public World getCurrentWorld() {
+ return ModLoader.getMinecraftInstance().theWorld;
+ }
+
+ @Override
+ public Object getGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+ TileEntity te = world.getBlockTileEntity(x, y, z);
if (te != null && te instanceof TileEntityIronChest) {
return GUIChest.GUI.buildGUI(IronChestType.values()[ID], player.inventory, (TileEntityIronChest) te);
} else {
return null;
}
}
-
- @Override
- public World getCurrentWorld() {
- return ModLoader.getMinecraftInstance().theWorld;
- }
}
diff --git a/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java b/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
index 612b754..afadf05 100644
--- a/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
+++ b/IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
@@ -1,10 +1,8 @@
package cpw.mods.ironchest.client;
import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
import net.minecraft.src.GuiContainer;
import net.minecraft.src.IInventory;
-import net.minecraft.src.ModLoader;
import org.lwjgl.opengl.GL11;
diff --git a/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java b/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java
index 03db7c3..fb91db9 100644
--- a/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java
+++ b/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java
@@ -2,9 +2,8 @@ package cpw.mods.ironchest.server;
import java.io.File;
-import net.minecraft.src.Container;
import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityPlayerMP;
+import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ModLoader;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.TileEntity;
@@ -49,7 +48,7 @@ public class ServerProxy implements IProxy {
}
@Override
- public Container getGuiContainer(int ID, EntityPlayerMP player, World world, int X, int Y, int Z) {
+ public Object getGuiElement(int ID, EntityPlayer player, World world, int X, int Y, int Z) {
TileEntity te=world.getBlockTileEntity(X, Y, Z);
if (te!=null && te instanceof TileEntityIronChest) {
TileEntityIronChest icte=(TileEntityIronChest) te;