package pcc.chemicraft.system;
-<<<<<<< HEAD:common/pcc/chemicraft/system/CommonProxy.java
-import pcc.chemicraft.container.ContainerChemicalCombinationTable;
-import pcc.chemicraft.container.ContainerChemicalCraftingTable;
-import pcc.chemicraft.container.ContainerPyrolysisTable;
-import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-=======
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import pcc.chemicraft.container.ContainerChemicalCombinationTable;
import pcc.chemicraft.container.ContainerChemicalCraftingTable;
+import pcc.chemicraft.container.ContainerElectrolysisTable;
import pcc.chemicraft.container.ContainerPyrolysisTable;
import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
import pcc.chemicraft.debug.DebugTick;
import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/system/CommonProxy.java
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if (tileEntity instanceof TileEntityPyrolysisTable) {
return new ContainerPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
+ }else if(tileEntity instanceof TileEntityElectrolysisTable){
+ return new ContainerElectrolysisTable(player, (TileEntityElectrolysisTable) tileEntity);
}else if(tileEntity instanceof TileEntityChemicalCombinationTable){
return new ContainerChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
}else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){