Update to forge 70/1.2.5

IronChests2/build.xml

@@ -32,9 +32,8 @@
     </tstamp>
     <property environment="env" />
     <property name="modname" value="mod_ironchests" />
-    <property name="version.file" value="cpw/mods/ironchest/Version.java" />
     <property name="version.major" value="3" />
-    <property name="version.minor" value="2" />
+    <property name="version.minor" value="3" />
     <property name="version.rev" value="0" />
     <condition property="version.build" value="${env.BUILD_NUMBER}" else="0">
       <isset property="env.BUILD_NUMBER" />
@@ -43,7 +42,7 @@
     <condition property="mcdev.home" value="${env.WORKSPACE}" else="/home/cpw/projects/mcworkspace">
       <isset property="env.WORKSPACE" />
     </condition>
-    <condition property="mcp.home" value="${env.WORKSPACE}/mcpworkspace" else="${mcdev.home}/forge67">
+    <condition property="mcp.home" value="${env.WORKSPACE}/mcpworkspace" else="${mcdev.home}/forge70">
       <isset property="env.WORKSPACE" />
     </condition>
     <property name="mcp.obfoutput" location="${mcp.home}/reobf" />
@@ -57,6 +56,7 @@
     <property name="client.src.dir" location="${basedir}/client" />
     <property name="server.src.dir" location="${basedir}/server" />
     <property name="resource.dir" location="${basedir}/resources" />
+    <property name="mfuploader.script" location="/home/cpw/mfuploader.py" />
   </target>
   <target name="clean">
     <antcall target="clean-source">
@@ -95,8 +95,24 @@
       </fileset>
     </jar>
   </target>
+
   <target name="build" depends="merge-client,merge-server,build-client,build-server" />
 
+  <target name="uploadartifacts" depends="build,domfupload"/>
+
+  <target name="domfupload" depends="-checkmfupload" if="${mfuploader.can.run}">
+    <property name="uploaddir" value="${modname}-${version}" />
+    <exec executable="/usr/bin/python">
+    	<arg value="${uploaddir}"/>
+	  	<arg value="${basedir}/target/${modname}-client-${version}.zip"/>
+	  	<arg value="${basedir}/target/${modname}-server-${version}.zip"/>
+    </exec>
+  </target>
+  
+  <target name="-checkmfupload" unless="mfuploader.can.run">
+    <available property="mfuploader.can.run" file="${mfuploader.script}"/>
+  </target>
+  
   <target name="buildandclean" depends="build">
     <antcall target="clean" />
   </target>

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.EntityPlayer;
-import net.minecraft.src.GuiScreen;
 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) {
+  public World getCurrentWorld() {
-    TileEntity te = world.getBlockTileEntity(X, Y, Z);
+    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;
-  }
 }

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;
 

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;