Add equivalent exchange support

New, much better sprites for the chest upgraders

IronChests2/build.xml

@@ -13,7 +13,7 @@
     </description>
 
 	<property name="modname" value="mod_ironchests" />
-	<property name="version" value="2.2" />
+	<property name="version" value="2.3" />
 	<property name="mcp.home" location="/home/cpw/minecraft1dev/forge1.31" />
 	<property name="mcp.obfoutput" location="${mcp.home}/reobf" />
 	<property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />
@@ -33,6 +33,12 @@
 	  <attribute name="side"/>
 	  <sequential>
 	    <property name="@{prop}" value="${@{side}.@{src}}"/>
+	  	<condition property="is.client">
+	  		<equals arg1="@{side}" arg2="client"/>
+	  	</condition>
+	  	<condition property="is.server">
+	  		<equals arg1="@{side}" arg2="server"/>
+	  	</condition>
 	  </sequential>
 	</macrodef>
 	
@@ -68,7 +74,13 @@
 		<property name="jarname" value="${modname}-${side}-${version}" />
 		<jar destfile="${basedir}/${jarname}.zip" >
 			<fileset dir="${output}" includes="**/*.class" />
-			<fileset dir="${resource.dir}" includes="**/*.png"/>
+			<fileset dir="${resource.dir}" erroronmissingdir="false">
+				<selector if="is.client">
+					<filename name="**/*.png"/>
+				</selector>
+			</fileset>
+		</jar>
+		<jar destfile="${basedir}/${jarname}.zip" update="true">
 		</jar>
 	</target>
 	<target name="build" depends="merge-client,merge-server,build-client,build-server" />

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

@@ -14,7 +14,8 @@ public enum ChestChangerType {
 	IRONGOLD(IRON,GOLD,"ironGoldUpgrade","Iron to Gold Chest Upgrade","mmm","msm","mmm"),
 	GOLDDIAMOND(GOLD,DIAMOND,"goldDiamondUpgrade","Gold to Diamond Chest Upgrade","GGG","msm","GGG"),
 	COPPERSILVER(COPPER,SILVER,"copperSilverUpgrade","Copper to Silver Chest Upgrade","mmm","msm","mmm"),
-	SILVERGOLD(SILVER,GOLD,"silverGoldUpgrade","Silver to Gold Chest Upgrade","mGm","GsG","mGm");
+	SILVERGOLD(SILVER,GOLD,"silverGoldUpgrade","Silver to Gold Chest Upgrade","mGm","GsG","mGm"),
+	COPPERIRON(COPPER,IRON,"copperIronUpgrade","Copper to Iron Chest Upgrade","mGm","GsG","mGm");
 
 	private IronChestType source;
 	private IronChestType target;

IronChests2/common/net/minecraft/src/mod_IronChest.java

@@ -1,6 +1,7 @@
 package net.minecraft.src;
 
 import java.io.File;
+import java.lang.reflect.Method;
 
 import net.minecraft.src.forge.Configuration;
 import net.minecraft.src.forge.IOreHandler;
@@ -22,7 +23,7 @@ public class mod_IronChest extends BaseModMp {
 
 	@Override
 	public String getVersion() {
-		return "2.2";
+		return "2.3";
 	}
 
 	@Override
@@ -77,7 +78,19 @@ public class mod_IronChest extends BaseModMp {
 
 	@Override
 	public void ModsLoaded() {
-		
+		try {
+			Class<?> equivexmaps=Class.forName("ee.EEMaps");
+			Method addEMC=equivexmaps.getMethod("addEMC",int.class,int.class,int.class);
+			Method addMeta=equivexmaps.getMethod("addMeta",int.class,int.class);
+			int[] chestEMCValues=new int[] { 8*8+256*8, 8*8+256*8+2048*8, 2*8192+8*8+256*8+2048*8+6, 85*8+8*8, 85*8+8*8+512*8 };
+			for (IronChestType icType : IronChestType.values()) { 
+				addEMC.invoke(null,ironChestBlock.blockID,icType.ordinal(),chestEMCValues[icType.ordinal()]);
+			}
+			addMeta.invoke(null,ironChestBlock.blockID,IronChestType.values().length-1);
+			ModLoader.getLogger().fine("mod_IronChest registered chests with Equivalent Exchange");
+		} catch (Exception ex) {
+			ModLoader.getLogger().fine("mod_IronChest unable to load Equivalent Exchange integration");
+		}
 	}
 	
 	public static void openGUI(EntityPlayer player, TileEntityIronChest te) {