From f4db68b7316539881542c089d1305cabd42668b7 Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Mon, 6 Feb 2012 08:43:43 -0500 Subject: [PATCH] Add equivalent exchange support New, much better sprites for the chest upgraders --- IronChests2/build.xml | 18 +++++++++++++++--- .../cpw/mods/ironchest/ChestChangerType.java | 3 ++- .../net/minecraft/src/mod_IronChest.java | 17 +++++++++++++++-- .../mods/ironchest/sprites/item_textures.png | Bin 5444 -> 2724 bytes IronChests2/resources/itemsheet.xcf | Bin 10371 -> 11427 bytes 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/IronChests2/build.xml b/IronChests2/build.xml index 6c0a867..58713d0 100644 --- a/IronChests2/build.xml +++ b/IronChests2/build.xml @@ -13,7 +13,7 @@ - + @@ -33,6 +33,12 @@ + + + + + + @@ -66,9 +72,15 @@ - + - + + + + + + + diff --git a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java index 10fbd99..2c6ba11 100644 --- a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java +++ b/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; diff --git a/IronChests2/common/net/minecraft/src/mod_IronChest.java b/IronChests2/common/net/minecraft/src/mod_IronChest.java index 5c57566..e83dfe8 100644 --- a/IronChests2/common/net/minecraft/src/mod_IronChest.java +++ b/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) { diff --git a/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png b/IronChests2/resources/cpw/mods/ironchest/sprites/item_textures.png index 65baf437a26ac8971a964e7301c3c35aef6d04ca..fb279efe61b8f951096bd3f74bcd29d283f6bdc3 100644 GIT binary patch literal 2724 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 dfnSHCheup5KnCWY z$gqr=vK=28!(aqr!t4mUhIG^x{8%WYE3RW@mUbEVEp@cu(CQJL4s9?w;TK z-1|Jgym{Zx-yc=?z9Bg}_2wzbOJRg^b`i=ujF7YfA=xp6UeF;_WJjoY9HEjqgj5lP zUQV)$5@%^U`uBNOc)>V;5Y{JV*cdmACGpZBF^1IKD`J-GV;SW;R}W6%r8D9g$j%Fj zS>9bPoM*(@Drslw9q|;TOMe$LX_`w*Yw+juEA1S0EL$f?|kskc2uUjFib}Y@#S3PEtn3{-vX$*+elWvvOuG!a-1V_|;z=L_)9j)ofiDG*#*3NFm_=%C7{os-uW z1A)caF-twf8nXL4-<;1g-lf%mRK2$2!lj{ZtF|7bG(;n**EMLsNt1OV1ScXz>U50+ z0ZxR@++pu#OpOFMF@%;Ga(TaZo^KI=uzaKS>%~YS7WT2mdgzBB9scOX#`@Zdt6d8Y zC!4+vCDyPtKDOY{XMu6*c6MK4fj-#W)Ct|l?7V+LvcS)~?F6K#Po3pFUd+p1n_%jo z$|sf)&h7EICtn%RRRd6KT8EvJ&WV0&ts1PVPZ>_1MVTYOqpQ*VNV3Rv*oDX!fJSu=0VUuD#4->@lCd*HbD0KIa2=BEPuu?O*mXc!uX6jJ_(+9Z7}r;eI-k zN&mg=D1v%NY%71I(&^M6*Q=g^7%w>+y8qz*z4_A$9O~!3*vuZ1RQ zR;UuQ!q+%i!6RHH7cPFDG+91U|^bnD#o;6^8%)?%&OB+g+WT$R-uZq?V3Da-D@)o`$lGs zZKzTpZGR9FHmvQmb5yDyH1LdA|BrW;OLHRB@16^*&TF L^?8$bX}<&j<|sa#