ソース参照

[chemicraft/chemicraft.git] / common / pcc / chemicraft / core / container / ContainerChemicalCombinationTable.java

diff --git a/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java b/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
index 5e566ac..1cd8386 100644 (file)
--- a/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
@@ -10,8 +10,8 @@ import pcc.chemicraft.core.ChemiCraftAPI;
 import pcc.chemicraft.core.ChemiCraftCore;
 import pcc.chemicraft.core.inventory.InventoryChemicalCombinationTableMaterial;
 import pcc.chemicraft.core.inventory.InventoryChemicalCombinationTableResult;
-import pcc.chemicraft.core.slot.SlotChemicalCombinationTableMaterial;
-import pcc.chemicraft.core.slot.SlotChemicalCombinationTableResult;
+import pcc.chemicraft.core.slot.SlotAtoms;
+import pcc.chemicraft.core.slot.SlotResult;
 import pcc.chemicraft.core.tileentity.TileEntityChemicalCombinationTable;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
@@ -58,10 +58,10 @@ public class ContainerChemicalCombinationTable extends Container {
 
                for(int i = 0;i < 5;i++){
                        for(int j = 0;j < 3;j++){
-                               this.addSlotToContainer(new SlotChemicalCombinationTableMaterial(this.invm, i * 3 + j, i * 18 + 16, j * 18 + 15));
+                               this.addSlotToContainer(new SlotAtoms(this.invm, i * 3 + j, i * 18 + 16, j * 18 + 15));
                        }
                }
-               this.addSlotToContainer(new SlotChemicalCombinationTableResult(invr, 0, 123, 34));
+               this.addSlotToContainer(new SlotResult(invr, 0, 123, 34));
 
 
                int var3;
@@ -92,6 +92,11 @@ public class ContainerChemicalCombinationTable extends Container {
                }
        }
 
+       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
+       {
+               super.onCraftGuiClosed(par1EntityPlayer);
+       }
+
        @Override
        public boolean canInteractWith(EntityPlayer par1EntityPlayer){
                return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraftCore.instance.chemicalConbinationTableID ? false : par1EntityPlayer.getDistanceSq((double)this.posX + 0.5D, (double)this.posY + 0.5D, (double)this.posZ + 0.5D) <= 64.0D;
@@ -148,9 +153,4 @@ public class ContainerChemicalCombinationTable extends Container {
                return super.slotClick(par1, par2, par3, par4EntityPlayer);
        }
 
-       public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
-       {
-               super.onCraftGuiClosed(par1EntityPlayer);
-       }
-
 }