Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to 1.2 minecraft

This commit is contained in:
Christian Weeks 2012-03-08 23:06:46 -05:00
parent 787d00217c
commit dd542c0c48
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IronChests2/.classpath
View File

@ -4,6 +4,6 @@
<classpathentry kind="src" path="common"/> <classpathentry kind="src" path="common"/>
<classpathentry kind="src" path="server"/> <classpathentry kind="src" path="server"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry combineaccessrules="false" kind="src" path="/forge1.3.4.33-client"/> <classpathentry combineaccessrules="false" kind="src" path="/forge-client"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
IronChests2/build.xml
View File

@ -13,7 +13,7 @@
</description> </description>
<property name="modname" value="mod_ironchests" /> <property name="modname" value="mod_ironchests" />
<property name="version" value="3.0-alpha" /> <property name="version" value="3.0" />
<property name="mcp.home" location="/home/cpw/projects/mcworkspace/forge1.3.4" /> <property name="mcp.home" location="/home/cpw/projects/mcworkspace/forge1.3.4" />
<property name="mcp.obfoutput" location="${mcp.home}/reobf" /> <property name="mcp.obfoutput" location="${mcp.home}/reobf" />
<property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" /> <property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />

4
IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
View File

@ -63,7 +63,7 @@ public class ClientProxy extends BaseModMp implements IProxy {
@Override @Override
public void registerGUI(int guiId) { public void registerGUI(int guiId) {
ModLoaderMp.RegisterGUI(this, guiId); ModLoaderMp.registerGUI(this, guiId);
} }
@Override @Override
@ -78,7 +78,7 @@ public class ClientProxy extends BaseModMp implements IProxy {
} }
@Override @Override
public GuiScreen HandleGUI(int i) { public GuiScreen handleGUI(int i) {
for (IronChestType type: IronChestType.values()) { for (IronChestType type: IronChestType.values()) {
if (type.guiId==i) { if (type.guiId==i) {
return GUIChest.GUI.buildGUI(type,ModLoader.getMinecraftInstance().thePlayer.inventory,IronChestType.makeEntity(type.ordinal())); return GUIChest.GUI.buildGUI(type,ModLoader.getMinecraftInstance().thePlayer.inventory,IronChestType.makeEntity(type.ordinal()));

2
IronChests2/common/cpw/mods/ironchest/IronChestType.java
View File

@ -15,7 +15,7 @@ public enum IronChestType {
GOLD(81, 9, true, "Gold Chest", "guiGoldChest", "goldchest.png", 1, Item.ingotGold, TileEntityGoldChest.class, "mmmmPmmmm","mGmG4GmGm"), 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"), 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"), 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"); CRYSTAL(108, 12, true, "Crystal Chest", "guiDiamondChest", "crystalchest.png", 5, Item.itemsList[Block.glass.blockID], TileEntityCrystalChest.class, "GGGGPGGGG");
int size; int size;
private int rowLength; private int rowLength;

2
IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
View File

@ -362,7 +362,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
return null; return null;
} }
public ItemStack func_48081_b(int par1) public ItemStack getStackInSlotOnClosing(int par1)
{ {
if (this.chestContents[par1] != null) if (this.chestContents[par1] != null)
{ {

6
IronChests2/common/net/minecraft/src/mod_IronChest.java
View File

@ -23,12 +23,12 @@ public class mod_IronChest extends BaseModMp {
@Override @Override
public String getVersion() { public String getVersion() {
return "2.5"; return "3.0";
} }
@Override @Override
public void load() { public void load() {
MinecraftForge.versionDetect("IronChest", 1, 3, 3); MinecraftForge.versionDetect("IronChest", 1, 3, 4);
proxy = ServerClientProxy.getProxy(); proxy = ServerClientProxy.getProxy();
File cfgFile = new File(proxy.getMinecraftDir(), "config/IronChest.cfg"); File cfgFile = new File(proxy.getMinecraftDir(), "config/IronChest.cfg");
Configuration cfg = new Configuration(cfgFile); Configuration cfg = new Configuration(cfgFile);
@ -78,7 +78,7 @@ public class mod_IronChest extends BaseModMp {
@Override @Override
public void ModsLoaded() { public void modsLoaded() {
try { try {
Class<?> equivexmaps=Class.forName("ee.EEMaps"); Class<?> equivexmaps=Class.forName("ee.EEMaps");
Method addEMC=equivexmaps.getMethod("addEMC",int.class,int.class,int.class); Method addEMC=equivexmaps.getMethod("addEMC",int.class,int.class,int.class);

6
IronChests2/server/cpw/mods/ironchest/server/ServerProxy.java
View File

@ -25,7 +25,7 @@ public class ServerProxy implements IProxy {
@Override @Override
public void registerTileEntities() { public void registerTileEntities() {
for (IronChestType typ : IronChestType.values()) { 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 @Override
public void showGUI(TileEntityIronChest te, EntityPlayer player) { 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 @Override
@ -61,7 +61,7 @@ public class ServerProxy implements IProxy {
@Override @Override
public Packet getDescriptionPacket(TileEntityIronChest tile) { 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 @Override