OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Sat, 23 Feb 2013 10:14:03 +0000 (19:14 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sat, 23 Feb 2013 10:14:03 +0000 (19:14 +0900)
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

common/pcc/chemicraft/container/ContainerElectrolysisTable.java

index 522c85c..493692d 100644 (file)
@@ -11,6 +11,7 @@ import pcc.chemicraft.inventory.InventoryElectrolysisResult;
 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;
 
 
@@ -28,7 +29,7 @@ public class ContainerElectrolysisTable extends Container {
        private InventoryElectrolysisResult invr;
        private InventoryElectrolysisFuel invf;
 
-       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2){
+       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
                super();
                this.tileentity = par2;
                this.worldObj = par2.worldObj;
@@ -66,8 +67,9 @@ public class ContainerElectrolysisTable extends Container {
        }
 
        @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;
        }
 
 }