Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft

Conflicts:
	common/pcc/chemicraft/ChemiCraft.java
	common/pcc/chemicraft/client/ClientProxy.java
	common/pcc/chemicraft/container/ContainerElectrolysisTable.java
	common/pcc/chemicraft/system/CommonProxy.java
	common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java

diff --combined common/pcc/chemicraft/container/ContainerElectrolysisTable.java
index 522c85c,79c722f..493692d
--- 1/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
--- 2/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
+++ b/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
@@@ -8,13 -8,13 +8,14 @@@ import pcc.chemicraft.ChemiCraft
  import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
  import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
  import pcc.chemicraft.inventory.InventoryElectrolysisResult;
 -import pcc.chemicraft.slot.SlotPyrolysisTableFuel;
 -import pcc.chemicraft.slot.SlotPyrolysisTableMaterial;
 +import pcc.chemicraft.slot.SlotElectrolysisFuel;
 +import pcc.chemicraft.slot.SlotElectrolysisMaterial;
 +import pcc.chemicraft.slot.SlotElectrolysisResult;
+ import pcc.chemicraft.slot.SlotPyrolysisTableResult;
  import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
  
 -public class ContainerElectrolysisTable extends Container
 -{
 +
 +public class ContainerElectrolysisTable extends Container {
  
        private World worldObj;
  
@@@ -22,13 -22,13 +23,13 @@@
        private int posY;
        private int posZ;
  
 +      private TileEntityElectrolysisTable tileentity;
 +
        private InventoryElectrolysisMaterial invm;
        private InventoryElectrolysisResult invr;
        private InventoryElectrolysisFuel invf;
  
-       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2){
 -      private TileEntityElectrolysisTable tileentity;
 -
+       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
                super();
                this.tileentity = par2;
                this.worldObj = par2.worldObj;
@@@ -44,11 -44,11 +45,11 @@@
  
                for (int i = 0; i < 4; i++) {
                        for (int j = 0; j < 4; j++) {
 -                              this.addSlotToContainer(new SlotPyrolysisTableResult(this.invr, i*4 + j, 88+i*18, 17+j*18));
 +                              this.addSlotToContainer(new SlotElectrolysisResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
                        }
                }
 -              this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.invm, 0, 27, 20));
 -              this.addSlotToContainer(new SlotPyrolysisTableFuel(this.invf, 0, 27, 63));
 +              this.addSlotToContainer(new SlotElectrolysisMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
 +              this.addSlotToContainer(new SlotElectrolysisFuel(this.tileentity.getInvFuel(), 0, 27, 63));
  
                int var3;
                for (var3 = 0; var3 < 3; ++var3)
@@@ -63,11 -63,13 +64,12 @@@
                {
                        this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 179));
                }
 -
        }
  
        @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer) {
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.electrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
+       public boolean canInteractWith(EntityPlayer par1EntityPlayer)
+       {
+               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.electrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D;
        }
  
  }