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

[chemicraft/chemicraft.git] / src / chemicraft / container / ContainerDecompositionTable.java

diff --git a/src/chemicraft/container/ContainerDecompositionTable.java b/src/chemicraft/container/ContainerDecompositionTable.java
deleted file mode 100644 (file)
index 95a454a..0000000
--- a/src/chemicraft/container/ContainerDecompositionTable.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package chemicraft.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.world.World;
-import chemicraft.ChemiCraft;
-<<<<<<< HEAD:common/chemicraft/container/ContainerPyrolysisTable.java
-import chemicraft.slot.SlotPyrolysisTableFuel;
-import chemicraft.slot.SlotPyrolysisTableMaterial;
-import chemicraft.slot.SlotPyrolysisTableResult;
-import chemicraft.tileentity.TileEntityPyrolysisTable;
-=======
-import chemicraft.tileentity.TileEntityDecompositionTable;
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/container/ContainerDecompositionTable.java
-
-public class ContainerDecompositionTable extends Container {
-
-       private World worldObj;
-
-       private int posX;
-       private int posY;
-       private int posZ;
-
-<<<<<<< HEAD:common/chemicraft/container/ContainerPyrolysisTable.java
-       private TileEntityPyrolysisTable tileentity;
-
-       public ContainerPyrolysisTable(EntityPlayer par1EntityPlayer, TileEntityPyrolysisTable par2){
-=======
-       public ContainerDecompositionTable(EntityPlayer par1EntityPlayer, TileEntityDecompositionTable par2){
->>>>>>> cbf016a981df6758b057ca883a1527676a1a9ec3:src/chemicraft/container/ContainerDecompositionTable.java
-               super();
-               this.tileentity = par2;
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-
-               for (int i = 0; i < 4; i++) {
-                       for (int j = 0; j < 4; j++) {
-                               this.addSlotToContainer(new SlotPyrolysisTableResult(this.tileentity.getInvResult(), i*4 + j, 88+i*18, 17+j*18));
-                       }
-               }
-               this.addSlotToContainer(new SlotPyrolysisTableMaterial(this.tileentity.getInvMaterial(), 0, 27, 20));
-               this.addSlotToContainer(new SlotPyrolysisTableFuel(this.tileentity.getInvFuel(), 0, 27, 63));
-
-               int var3;
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 121 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       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.decompositionTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
-       }
-
-}