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

[chemicraft/chemicraft.git] / common / pcc / chemicraft / tileentity / TileEntityPyrolysisTable.java

diff --git a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
index 315aa53..dcde36e 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
@@ -11,13 +11,26 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
+<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
 import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
 import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
 import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
 import pcc.chemicraft.system.PacketHandler;
+=======
+import chemicraft.debug.DebugData;
+import chemicraft.debug.DebugTick;
+import chemicraft.inventory.InventoryPyrolysisTableFuel;
+import chemicraft.inventory.InventoryPyrolysisTableMaterial;
+import chemicraft.inventory.InventoryPyrolysisTableResult;
+import chemicraft.system.PacketHandler;
+>>>>>>> b8902d318f2a200d5d5a82e98d5377bd89c056a8:common/chemicraft/tileentity/TileEntityPyrolysisTable.java
 
 import com.google.common.io.ByteArrayDataInput;
 
+import cpw.mods.fml.common.network.PacketDispatcher;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class TileEntityPyrolysisTable extends TileEntity {
 
        private InventoryPyrolysisTableMaterial invm = new InventoryPyrolysisTableMaterial();
@@ -87,7 +100,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
                                } else if (this.worldObj.isThundering() && var1) {
                                        this.heat += 0.25F;
                                } else {
-                                       this.heat += 0.5F;
+                                       this.heat += 3F;
                                }
                        } else {
                                this.heat = 1700;
@@ -121,7 +134,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
                                                //var2 = true;
                                                if (itemstackMaterial.itemID == materialItem.itemID && itemstackMaterial.getItemDamage() == materialItem.getItemDamage()) {
                                                        this.inItem(itemstackMaterial);
-                                                       if (materialItem.stackSize > 1) {
+                                                       if (materialItem.stackSize >= 1) {
                                                                this.invm.setInventorySlotContents(0, new ItemStack(materialItem.itemID, --materialItem.stackSize, materialItem.getItemDamage()));
                                                        } else {
                                                                this.invm.setInventorySlotContents(0, null);
@@ -153,7 +166,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
                                                                        if (fuelItem != null) {
                                                                                if (itemstackFuel.itemID == fuelItem.itemID && itemstackFuel.getItemDamage() == fuelItem.getItemDamage()) {
                                                                                        this.fuelRestTime = fuelList.get(itemstackFuel);
-                                                                                       if (fuelItem.stackSize > 1) {
+                                                                                       if (fuelItem.stackSize >= 1) {
                                                                                                this.invf.setInventorySlotContents(0, new ItemStack(fuelItem.itemID, --fuelItem.stackSize, fuelItem.getItemDamage()));
                                                                                                break;
                                                                                        } else {
@@ -417,8 +430,8 @@ public class TileEntityPyrolysisTable extends TileEntity {
        public boolean isInItemCheck(ItemStack key) {
                ItemStack[] results = recipeList.get(key).clone();
                ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
-               for (int j = 0; j < this.invr.getSizeInventory(); j++) {
-                       containerResults[j] = this.invr.getStackInSlot(j);
+               for (int i = 0; i < this.invr.getSizeInventory(); i++) {
+                       containerResults[i] = this.invr.getStackInSlot(i);
                }
 
                for (int i = 0; i < results.length; i++) {
@@ -427,7 +440,6 @@ public class TileEntityPyrolysisTable extends TileEntity {
                        int var5 = results[i].stackSize;
                        for (int j = 0; j < containerResults.length; j++) {
                                if (containerResults[j] == null) {
-                                       containerResults[j] = results[i];
                                        results[i] = null;
                                        break;
                                } else {
@@ -437,7 +449,6 @@ public class TileEntityPyrolysisTable extends TileEntity {
                                        int var7 = containerResults[j].getMaxStackSize();
                                        if (var1 == var2 && var3 == var4) {
                                                if (var5 + var6 <= var7) {
-                                                       containerResults[j] = results[i];
                                                        results[i] = null;
                                                        break;
                                                } else {
@@ -457,12 +468,12 @@ public class TileEntityPyrolysisTable extends TileEntity {
 
        public void inItem(ItemStack key) {
                ItemStack[] results = recipeList.get(key);
+               ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
+               for (int i = 0; i < this.invr.getSizeInventory(); i++) {
+                       containerResults[i] = this.invr.getStackInSlot(i);
+               }
 
                for (int i = 0; i < results.length; i++) {
-                       ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
-                       for (int j = 0; j < this.invr.getSizeInventory(); j++) {
-                               containerResults[j] = this.invr.getStackInSlot(j);
-                       }
                        int var1 = results[i].itemID;
                        int var3 = results[i].getItemDamage();
                        int var5 = results[i].stackSize;
@@ -477,6 +488,11 @@ public class TileEntityPyrolysisTable extends TileEntity {
                                        int var7 = containerResults[j].getMaxStackSize();
                                        if (var1 == var2 && var3 == var4) {
                                                if (var5 + var6 <= var7) {
+                                                       System.out.println(var5);
+                                                       System.out.println(var6);
+                                                       System.out.println(var5 + var6);
+                                                       System.out.println(i);
+                                                       System.out.println(j);
                                                        this.invr.setInventorySlotContents(j, new ItemStack(results[i].itemID, var5 + var6, results[i].getItemDamage()));
                                                        break;
                                                } else {