Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.

1792 errors. A good night's work, I think.
This commit is contained in:
Ben Spiers committed 2014-04-20 04:34:19 +01:00
1 parent ab47724473
commit db7121454a
280 files changed
+6850 -2031

No files matched your search

@@ -131,7 +131,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.config.Configuration;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
@@ -228,7 +228,7 @@ public class ClientProxy extends CommonProxy
@Override
public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z)
{
TileEntityElectricChest tileEntity = (TileEntityElectricChest)entityplayer.worldObj.getBlockTileEntity(x, y, z);
TileEntityElectricChest tileEntity = (TileEntityElectricChest)entityplayer.getWorldObj().getTileEntity(x, y, z);
if(id == 0)
{
@@ -361,7 +361,7 @@ public class ClientProxy extends CommonProxy
@Override
public GuiScreen getClientGui(int ID, EntityPlayer player, World world, int x, int y, int z)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
TileEntity tileEntity = world.getTileEntity(x, y, z);
switch(ID)
{