Merge pull request #17 from GTNewHorizons/experimental

update

2 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index 0ff9f527e5..0e8fe9e5b2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -58,7 +58,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
     public GT_MetaTileEntity_Pump(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 3,
                 new String[]{"The best way to empty Oceans! Outputs on top",
-                        getEuUsagePerTier(aTier) + " EU/operation, " + GT_Utility.safeInt(160 / (long)Math.pow(2, aTier) ) + " sec per bucket, no stuttering",
+                        getEuUsagePerTier(aTier) + " EU/operation, " + GT_Utility.safeInt(160 / 20 / (long)Math.pow(2, aTier) ) + " sec per bucket, no stuttering",
                         "Maximum pumping area: " + (getMaxDistanceForTier( aTier) * 2 + 1) + "x" + (getMaxDistanceForTier( aTier) * 2 + 1),
                         "Use Screwdriver to regulate pumping area"});
         radiusConfig = getMaxDistanceForTier(mTier);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 606c63110f..0ca2cb8a6c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -125,6 +125,18 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
 				}
 			}
 		}
+		//detect room square for filters
+		for (int i = -x+1; i < x; i++) {
+			for (int j = -z+1; j < z; j++) {
+				if (i == 0 && j == 0) continue;
+				Block tBlock = aBaseMetaTileEntity.getBlockOffset(j, 0, i);
+				int tMeta = aBaseMetaTileEntity.getMetaIDOffset(j, 0, i);
+				if (tBlock != GregTech_API.sBlockCasings3 && tMeta != 11) {
+					return false;
+				}
+			}
+		}
+		
 		for (int i = -1; i > -16; i--) {
 			Block tBlock = aBaseMetaTileEntity.getBlockOffset(x, i, z);
 			int tMeta = aBaseMetaTileEntity.getMetaIDOffset(x, i, z);