From 0cb1cbd6bc66294a6c3dfbcc14f6b4e57563e06d Mon Sep 17 00:00:00 2001
From: Blood-Asp <Blood@Asp>
Date: Sat, 5 Sep 2015 00:43:17 +0200
Subject: Version 5.08.28

---
 .../machines/basic/GT_MetaTileEntity_Boxinator.java | 21 ++++++++++-----------
 .../basic/GT_MetaTileEntity_Disassembler.java       |  4 ++--
 .../machines/basic/GT_MetaTileEntity_Pump.java      |  4 +++-
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'main/java/gregtech/common/tileentities/machines/basic')

diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index a5a0e9c87f..c56f03e38e 100644
--- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -92,17 +92,16 @@ public class GT_MetaTileEntity_Boxinator
     return 0;
   }
   
-public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
-{
-    if(super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack))
-        return getInputSlot() != aIndex && ItemList.Crate_Empty.isStackEqual(aStack) || ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) || ItemList.Schematic_2by2.isStackEqual(getInputAt(1)) || ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) || gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, GT_Values.V[mTier], null, new ItemStack[] {
-            GT_Utility.copyAmount(64L, new Object[] {
-                aStack
-            }), getInputAt(1)
-        }) != null;
-    else
-        return false;
-}
+  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
+  {
+    if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack))
+    {
+      if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {
+      return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null;
+      }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}
+    }
+    return false;
+  }
 }
 
 

diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index 09389f7251..1a5d8e1a6d 100644
--- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -41,13 +41,13 @@ public class GT_MetaTileEntity_Disassembler
         {
           getInputAt(0).stackSize -= 1;
           this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1));
-          this.mMaxProgresstime = 160;
+          this.mMaxProgresstime = 80;
           for (int i = 0; i < this.mOutputItems.length; i++) {
             if (getBaseMetaTileEntity().getRandomNumber(100) < 50 + 10 * this.mTier)
             {
               this.mOutputItems[i] = GT_Utility.loadItem(tNBT, "Ingredient." + i);
               if (this.mOutputItems[i] != null) {
-                this.mMaxProgresstime *= 2;
+                this.mMaxProgresstime *= 1.7;
               }
             }
           }
diff --git a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index bdf62625e1..40020ef435 100644
--- a/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -195,9 +195,11 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
 				return y + 1;
 			}
 		} else if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord()) != GT_Utility
-				.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) {
+				.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))&&this.mInventory[0] != null&&this.mInventory[0].stackSize>0&&GT_Utility.areStacksEqual(this.mInventory[0], GT_ModHandler.getIC2Item("miningPipe", 1L))) {
 			getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getXCoord(), y, getBaseMetaTileEntity().getZCoord(),
 					GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L)));
+			getBaseMetaTileEntity().decrStackSize(0, 1);
+			
 		}
 		return y;
 	}
-- 
cgit