競合確認

[chemicraft/chemicraft.git] / common / chemicraft / tileentity / TileEntityChemicalCombinationTable.java

diff --git a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
index ff4c19d..35b2dcb 100644 (file)
--- a/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
+++ b/common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
@@ -4,14 +4,15 @@ import java.io.DataOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import net.minecraft.src.EntityItem;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.Packet;
-import net.minecraft.src.TileEntity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.tileentity.TileEntity;
 import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftData;
 import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
 import chemicraft.inventory.InventoryChemicalCombinationTableResult;
 import chemicraft.system.PacketHandler;
@@ -253,6 +254,7 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
                        this.atomsList.add(par1);
                        this.atomsAmountList.add(par2);
                }
+               PacketDispatcher.sendPacketToAllPlayers(this.getDescriptionPacket());
        }
 
        public void setDropItems(ItemStack par1ItemStack){
@@ -305,9 +307,9 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
 
                for(int i = 0;i < stacks.length;i++){
                        if(stacks[i].stackSize > 1){
-                               this.setAtoms(ChemiCraft.ATOMSLIST[stacks[i].getItemDamage()], stacks[i].stackSize);
+                               this.setAtoms(ChemiCraftData.ATOMSLIST[stacks[i].getItemDamage()], stacks[i].stackSize);
                        }else{
-                               this.setAtoms(ChemiCraft.ATOMSLIST[stacks[i].getItemDamage()], 1);
+                               this.setAtoms(ChemiCraftData.ATOMSLIST[stacks[i].getItemDamage()], 1);
                        }
                }
 
@@ -321,8 +323,8 @@ public class TileEntityChemicalCombinationTable extends TileEntity {
                ArrayList<Integer> var2 = this.getAtomsAmountList();
 
                for (int i = 0;i < var1.size();i++) {
-                       for (int j = 0;j < ChemiCraft.ATOMSLIST.length;j++) {
-                               if (var1.get(i).equals(ChemiCraft.ATOMSLIST[j])) {
+                       for (int j = 0;j < ChemiCraftData.ATOMSLIST.length;j++) {
+                               if (var1.get(i).equals(ChemiCraftData.ATOMSLIST[j])) {
                                        int var3 = var2.get(i);
                                        while(var3 > 0){
                                                if(var3 > 64){