diff --git a/IronChests2/.classpath b/IronChests2/.classpath index 838ad7a..205dfb9 100644 --- a/IronChests2/.classpath +++ b/IronChests2/.classpath @@ -4,6 +4,6 @@ - + diff --git a/IronChests2/build.xml b/IronChests2/build.xml index 6604c08..501d8b1 100644 --- a/IronChests2/build.xml +++ b/IronChests2/build.xml @@ -13,7 +13,7 @@ - + diff --git a/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java b/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java index 92938f4..04557e8 100644 --- a/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java +++ b/IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java @@ -63,7 +63,7 @@ public class ClientProxy extends BaseModMp implements IProxy { @Override public void registerGUI(int guiId) { - ModLoaderMp.RegisterGUI(this, guiId); + ModLoaderMp.registerGUI(this, guiId); } @Override @@ -78,7 +78,7 @@ public class ClientProxy extends BaseModMp implements IProxy { } @Override - public GuiScreen HandleGUI(int i) { + public GuiScreen handleGUI(int i) { for (IronChestType type: IronChestType.values()) { if (type.guiId==i) { return GUIChest.GUI.buildGUI(type,ModLoader.getMinecraftInstance().thePlayer.inventory,IronChestType.makeEntity(type.ordinal())); diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestType.java b/IronChests2/common/cpw/mods/ironchest/IronChestType.java index 718f178..e1a2afc 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChestType.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChestType.java @@ -15,7 +15,7 @@ public enum IronChestType { GOLD(81, 9, true, "Gold Chest", "guiGoldChest", "goldchest.png", 1, Item.ingotGold, TileEntityGoldChest.class, "mmmmPmmmm","mGmG4GmGm"), DIAMOND(108, 12, true, "Diamond Chest", "guiDiamondChest", "diamondchest.png", 2, Item.diamond, TileEntityDiamondChest.class, "GGGmPmGGG", "GGGG4Gmmm"), COPPER(45, 9, false, "Copper Chest", "guiCopperChest", "copperchest.png", 3, null, TileEntityCopperChest.class, "mmmmCmmmm"), - SILVER(72, 9, false, "Silver Chest", "guiSilverChest", "silverchest.png", 4, null, TileEntitySilverChest.class, "mmmm0mmmm", "mmmm3mmmm"), + SILVER(72, 9, false, "Silver Chest", "guiSilverChest", "silverchest.png", 4, null, TileEntitySilverChest.class, "mmmm0mmmm", "mGmG3GmGm"), CRYSTAL(108, 12, true, "Crystal Chest", "guiDiamondChest", "crystalchest.png", 5, Item.itemsList[Block.glass.blockID], TileEntityCrystalChest.class, "GGGGPGGGG"); int size; private int rowLength; diff --git a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java index 2c5d323..d86b7d9 100644 --- a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java @@ -362,7 +362,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory { return null; } - public ItemStack func_48081_b(int par1) + public ItemStack getStackInSlotOnClosing(int par1) { if (this.chestContents[par1] != null) { diff --git a/IronChests2/common/net/minecraft/src/mod_IronChest.java b/IronChests2/common/net/minecraft/src/mod_IronChest.java index 61fc114..4ae098d 100644 --- a/IronChests2/common/net/minecraft/src/mod_IronChest.java +++ b/IronChests2/common/net/minecraft/src/mod_IronChest.java @@ -23,12 +23,12 @@ public class mod_IronChest extends BaseModMp { @Override public String getVersion() { - return "2.5"; + return "3.0"; } @Override public void load() { - MinecraftForge.versionDetect("IronChest", 1, 3, 3); + MinecraftForge.versionDetect("IronChest", 1, 3, 4); proxy = ServerClientProxy.getProxy(); File cfgFile = new File(proxy.getMinecraftDir(), "config/IronChest.cfg"); Configuration cfg = new Configuration(cfgFile); @@ -78,7 +78,7 @@ public class mod_IronChest extends BaseModMp { @Override - public void ModsLoaded() { + public void modsLoaded() { try { Class equivexmaps=Class.forName("ee.EEMaps"); Method addEMC=equivexmaps.getMethod("addEMC",int.class,int.class,int.class); diff --git a/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java b/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java index 27acd21..a46eb32 100644 --- a/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java +++ b/IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java @@ -25,7 +25,7 @@ public class ServerProxy implements IProxy { @Override public void registerTileEntities() { for (IronChestType typ : IronChestType.values()) { - ModLoader.RegisterTileEntity(typ.clazz, typ.name()); + ModLoader.registerTileEntity(typ.clazz, typ.name()); } } @@ -36,7 +36,7 @@ public class ServerProxy implements IProxy { @Override public void showGUI(TileEntityIronChest te, EntityPlayer player) { - ModLoader.OpenGUI(player, te.getType().guiId, te, new ContainerIronChestBase(player.inventory,te, te.getType(), 1, 1)); + ModLoader.openGUI(player, te.getType().guiId, te, new ContainerIronChestBase(player.inventory,te, te.getType(), 1, 1)); } @Override @@ -61,7 +61,7 @@ public class ServerProxy implements IProxy { @Override public Packet getDescriptionPacket(TileEntityIronChest tile) { - return ModLoaderMp.getTileEntityPacket(ModLoaderMp.GetModInstance(mod_IronChest.class), tile.xCoord, tile.yCoord, tile.zCoord, tile.getType().ordinal(), tile.buildIntDataList(),null,null); + return ModLoaderMp.getTileEntityPacket(ModLoaderMp.getModInstance(mod_IronChest.class), tile.xCoord, tile.yCoord, tile.zCoord, tile.getType().ordinal(), tile.buildIntDataList(),null,null); } @Override