$ Buffed all Multiblocks.

% Greatly expanded BlockPos.java.

13 files changed, 179 insertions, 71 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
index 3ccc10d4c2..d38acdd8cd 100644
--- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java
@@ -1,8 +1,13 @@
 package gtPlusPlus.api.objects.minecraft;
 
 import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 import gtPlusPlus.api.objects.data.AutoMap;
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
 
 public class BlockPos implements Serializable{
 
@@ -11,6 +16,7 @@ public class BlockPos implements Serializable{
 	public final int yPos;
 	public final int zPos;
 	public final int dim;
+	public final World world;
 
 	public BlockPos(int x, int y, int z){
 		this(x, y, z, 0);
@@ -21,6 +27,7 @@ public class BlockPos implements Serializable{
 		this.yPos = y;
 		this.zPos = z;
 		this.dim = dim;
+		this.world = DimensionManager.getWorld(dim);
 	}
 
 	public String getLocationString() {
@@ -120,4 +127,87 @@ public class BlockPos implements Serializable{
 		return sides;
 	}
 	
+	public Block getBlockAtPos() {
+		return getBlockAtPos(this);
+	}
+	
+	public Block getBlockAtPos(BlockPos pos) {
+		return getBlockAtPos(world, pos);
+	}
+	
+	public Block getBlockAtPos(World world, BlockPos pos) {
+		return world.getBlock(pos.xPos, pos.yPos, pos.zPos);
+	}
+	
+	public int getMetaAtPos() {
+		return getMetaAtPos(this);
+	}
+	
+	public int getMetaAtPos(BlockPos pos) {
+		return getMetaAtPos(world, pos);
+	}
+	
+	public int getMetaAtPos(World world, BlockPos pos) {
+		return world.getBlockMetadata(pos.xPos, pos.yPos, pos.zPos);
+	}
+	
+	public boolean hasSimilarNeighbour() {
+		return hasSimilarNeighbour(false);
+	}	
+	
+	/**
+	 * @param strict - Does this check Meta Data?
+	 * @return - Does this block have a neighbour that is the same?
+	 */
+	public boolean hasSimilarNeighbour(boolean strict) {		
+		for (BlockPos g : getSurroundingBlocks().values()) {
+			if (getBlockAtPos(g) == getBlockAtPos()) {
+				if (!strict) {
+					return true;
+				}
+				else {
+					if (getMetaAtPos() == getMetaAtPos(g)) {
+						return true;
+					}
+				}
+			}
+		}		
+		return false;
+	}
+	
+	public AutoMap<BlockPos> getSimilarNeighbour() {
+		return getSimilarNeighbour(false);
+	}	
+	
+	/**
+	 * @param strict - Does this check Meta Data?
+	 * @return - Does this block have a neighbour that is the same?
+	 */
+	public AutoMap<BlockPos> getSimilarNeighbour(boolean strict) {
+		AutoMap<BlockPos> sides = new AutoMap<BlockPos>();		
+		for (BlockPos g : getSurroundingBlocks().values()) {
+			if (getBlockAtPos(g) == getBlockAtPos()) {
+				if (!strict) {
+					sides.put(g);
+				}
+				else {
+					if (getMetaAtPos() == getMetaAtPos(g)) {
+						sides.put(g);
+					}
+				}
+			}
+		}		
+		return sides;
+	}
+	
+	public Set<BlockPos> getValidNeighboursAndSelf(){
+		AutoMap<BlockPos> h = getSimilarNeighbour(true);
+		h.put(this);		
+		Set<BlockPos> result = new HashSet<BlockPos>();
+		for (BlockPos f : h.values()) {
+			result.add(f);
+		}		
+		return result;
+	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 50ff8c061b..c93353459e 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -700,8 +700,11 @@ public final class ModItems {
 
 		//Chemistry
 		CoalTar.run();
-		
-		new ConnectedBlockFinder();
+
+		//Only used for debugging.
+		if (CORE.DEVENV) {
+			new ConnectedBlockFinder();
+		}
 
 		//Misc Items
 		@SuppressWarnings("unused")
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java b/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
index f0cc8c7344..b827f4e601 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java
@@ -7,6 +7,7 @@ import java.util.Set;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.BaseItemWithDamageValue;
@@ -74,67 +75,57 @@ public class ConnectedBlockFinder extends BaseItemWithDamageValue{
 			float hitX, float hitY, float hitZ) {
 
 		BlockPos mStartPoint = new BlockPos(x,y,z);
-
 		Block mBlockType = world.getBlock(x, y, z);
 		int mBlockMeta = mBlockType.getDamageValue(world, x, y, z);
 
+		//Return if Air.
+		if (world.isAirBlock(x, y, z)) {
+			return false;
+		}
+
+		int breaker = 0;
 		Set<BlockPos> mTotalIndex = new HashSet<BlockPos>();
+
 		Set<BlockPos> mFirstSearch = new HashSet<BlockPos>();
 		Set<BlockPos> mSearch_A = new HashSet<BlockPos>();
+
 		Set<BlockPos> mSearch_B = new HashSet<BlockPos>();
 		Set<BlockPos> mSearch_C = new HashSet<BlockPos>();
+		Set<BlockPos> mSearch_D = new HashSet<BlockPos>();
 
-		for (BlockPos b : mStartPoint.getSurroundingBlocks().values()) {
-			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
-				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
-					if (mFirstSearch.add(b)) {
-						if (mTotalIndex.add(b)) {
-							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
-						}
-					}
-				}
-			}
-		}
+		mFirstSearch.add(mStartPoint);
+		mTotalIndex.add(mStartPoint);
 
-		for (BlockPos b : mFirstSearch) {
-			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
-				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
-					if (mSearch_A.add(b)) {
-						if (mTotalIndex.add(b)) {
-							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
-						}
-					}
-				}
-			}
-		}
-
-		for (BlockPos b : mSearch_A) {
-			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
-				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
-					if (mSearch_B.add(b)) {
-						if (mTotalIndex.add(b)) {
-							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
-						}
-					}
-				}
-			}
-		}
 		
-		for (BlockPos b : mSearch_B) {
-			if (world.getBlock(b.xPos, b.yPos, b.zPos) == mBlockType) {
-				if (mBlockType.getDamageValue(world, b.xPos, b.yPos, b.zPos) == mBlockMeta) {
-					if (mSearch_C.add(b)) {
-						if (mTotalIndex.add(b)) {
-							world.setBlock(b.xPos, b.yPos, b.zPos, Blocks.emerald_ore);		
-						}
-					}
-				}
+
+
+		for (BlockPos G : mSearch_D) {
+			if (!world.isAirBlock(G.xPos, G.yPos, G.zPos)) {
+				world.setBlock(G.xPos, G.yPos, G.zPos, Blocks.diamond_ore);
 			}
 		}
 
+
+
 		return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ);
 	}	
-
+	
+	public Set<BlockPos> getValidNeighboursForSet(Set<BlockPos> set){
+		Set<BlockPos> results = set;		
+		for (BlockPos F : set) {
+			results.addAll(F.getValidNeighboursAndSelf());
+		}
+		return results;		
+	}
+	
+	public Set<BlockPos> getExtraNeighboursForSet(Set<BlockPos> set){
+		Set<BlockPos> results = set;		
+		for (BlockPos F : set) {
+			results.addAll(F.getValidNeighboursAndSelf());
+		}
+		return results;		
+	}
+	
 	@Override
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
 		// TODO Auto-generated method stub
diff --git a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
index 63ffe63314..82b45360f8 100644
--- a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -5,7 +5,9 @@ import net.minecraft.item.ItemStack;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class ArrayUtils {
 
@@ -30,5 +32,17 @@ public class ArrayUtils {
 		list.removeAll(Collections.singleton((ItemStack)null));
 		return list.toArray(new ItemStack[list.size()]);
 	}
+
+	@SuppressWarnings("unchecked")
+	public static <T> Set<T> combineSetData(Set<T> S, Set<T> J) {
+		Set<T> mData = new HashSet<T>();
+		T[] array1 = (T[]) S.toArray();		
+		Collections.addAll(mData, array1);
+		T[] array2 = (T[]) J.toArray();		
+		Collections.addAll(mData, array2);		
+		return mData;
+	}
+
+
 }
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 73bdfc66c8..f0c57c08ce 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -654,14 +654,7 @@ public class TreeFarmHelper {
 		return mConnected;
 	}
 
-	public static <T> Set<T> combineSetData(Set<T> S, Set<T> J) {
-		Set<T> mData = new HashSet<T>();
-		T[] array1 = (T[]) S.toArray();		
-		Collections.addAll(mData, array1);
-		T[] array2 = (T[]) J.toArray();		
-		Collections.addAll(mData, array2);		
-		return mData;
-	}
+	
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java
index 1546bf39ab..bd324f88b7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -12,6 +12,7 @@ import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -47,7 +48,9 @@ extends GregtechMeta_MultiBlockBase {
 	public String[] getDescription() {
 		return new String[]{
 				"Controller Block for the Industrial Centrifuge",
-				"40% faster than using single block machines of the same voltage",
+				"125% faster than using single block machines of the same voltage",
+				"Only uses 90% of the eu/t normally required",
+				"Processes six items per voltage tier",
 				"Size: 3x3x3 (Hollow)",
 				"Controller (Front Center) [Orange]",
 				"1x Maintenance Hatch (Rear Center) [Green]",
@@ -88,7 +91,7 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric(4, 100, 40);
+		return checkRecipeGeneric(6*Utils.calculateVoltageTier(this.getMaxInputVoltage()), 90, 125);
 	}
 
 	public Block getCasingBlock() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCokeOven.java
index e1a02d9cec..a9601e7484 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCokeOven.java
@@ -10,6 +10,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -37,6 +38,7 @@ extends GregtechMeta_MultiBlockBase {
 	public String[] getDescription() {
 		return new String[]{"Processes Logs and Coal into Charcoal and Coal Coke.",
 				"Controller Block for the Industrial Coke Oven",
+				"Gain 4% speed bonus per voltage tier increased",
 				"Process 12x materials with Heat Resistant Casings",
 				"Or 24x materials with Heat Proof Casings",
 				"Size: 3x3x3 (Hollow)",
@@ -94,7 +96,7 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric(this.mLevel * 12, 100, 0);
+		return checkRecipeGeneric(this.mLevel * 12, (100-(Utils.calculateVoltageTier(this.getMaxInputVoltage())*4)), 0);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java
index 32513a05ce..23b769dc8c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialElectrolyzer.java
@@ -9,6 +9,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
@@ -34,7 +35,9 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public String[] getDescription() {
 		return new String[]{"Controller Block for the Industrial Electrolyzer",
-				"40% faster than using single block machines of the same voltage",
+				"180% faster than using single block machines of the same voltage",
+				"Only uses 90% of the eu/t normally required",
+				"Processes two items per voltage tier",
 				"Size: 3x3x3 (Hollow)",
 				"Controller (front centered)",
 				"1x Input Bus (anywhere)",
@@ -78,7 +81,7 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric(2, 100, 40);
+		return checkRecipeGeneric(2*Utils.calculateVoltageTier(this.getMaxInputVoltage()), 90, 180);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java
index 357f600471..8b221a529b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -12,6 +12,7 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
@@ -41,7 +42,8 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public String[] getDescription() {
 		return new String[]{"Controller Block for the Material Press",
-				"50% faster than using single block machines of the same voltage",
+				"500% faster than using single block machines of the same voltage",
+				"Processes four items per voltage tier",
 				"Circuit for recipe goes in the Input Bus",
 				"Each Input Bus can have a different Circuit!",
 				"Size: 3x3x3 (Hollow)",
@@ -101,7 +103,7 @@ extends GregtechMeta_MultiBlockBase {
 			}
 
 			if (checkRecipeGeneric(tBusItems.toArray(new ItemStack[]{}), new FluidStack[]{},
-					2, 100, 50, 10000)) return true;
+					(4*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 100, 500, 10000)) return true;
 		}
 		return false;
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
index 519c2c3f31..84c9aa4465 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
@@ -44,7 +44,8 @@ extends GregtechMeta_MultiBlockBase {
 		return new String[]{
 				"Controller Block for the Industrial Sifter",
 				"400% faster than single-block machines of the same voltage",
-				"Processes two items per voltage tier",
+				"Only uses 75% of the eu/t normally required",
+				"Processes four items per voltage tier",
 				"Increased output chances on % outputs",
 				"Size[WxHxL]: 5x3x5",
 				"Controller (Center Bottom)",
@@ -111,7 +112,7 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric((2*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 100, 400, 8800);
+		return checkRecipeGeneric((4*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 75, 400, 8800);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
index 2add242006..f4edb63262 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -11,6 +11,7 @@ import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
@@ -37,7 +38,9 @@ extends GregtechMeta_MultiBlockBase {
 	public String[] getDescription() {
 		return new String[]{
 				"Controller Block for the Industrial Thermal Centrifuge",
-				"60% faster than using single block machines of the same voltage",
+				"150% faster than using single block machines of the same voltage",
+				"Only uses 80% of the eu/t normally required",
+				"Processes eight items per voltage tier",
 				"Size: 3x2x3 [WxHxL]", "Controller (front centered, top layer)",
 				"1x Input Bus (Any bottom layer casing)",
 				"1x Output Bus (Any bottom layer casing)",
@@ -81,7 +84,7 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric(2, 100, 60);
+		return checkRecipeGeneric((8*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 80, 150);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
index df21c4cc5c..ae17896925 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -48,8 +48,8 @@ extends GregtechMeta_MultiBlockBase {
 	public String[] getDescription() {
 		return new String[]{
 				"Controller Block for the Industrial Ore Washing Plant",
-				"80% faster than using single block machines of the same voltage",
-				"Processes one item per voltage tier",
+				"400% faster than using single block machines of the same voltage",
+				"Processes four item per voltage tier",
 				"Chance to output Sludge per process",
 				"Size: 7x3x5 [WxHxL] (open)",
 				"X     X",
@@ -96,7 +96,7 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
 		if (checkForWater()) {
-			if (checkRecipeGeneric((1*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 100, 80)) {
+			if (checkRecipeGeneric((4*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 100, 400)) {
 				return addSludge();
 			}
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWireMill.java
index 7d85324fa1..ea2c1f3269 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -13,6 +13,7 @@ import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.block.Block;
@@ -38,7 +39,9 @@ extends GregtechMeta_MultiBlockBase {
 	public String[] getDescription() {
 		return new String[]{
 				"Controller Block for the Industrial Wire Factory",
-				"60% faster than using single block machines of the same voltage",
+				"200% faster than using single block machines of the same voltage",
+				"Only uses 75% of the eu/t normally required",
+				"Processes four items per voltage tier",
 				"Size: 3x5x3 [WxLxH] (Hollow)", "Controller (front centered)",
 				"2x Input Bus (side centered)",
 				"2x Output Bus (side centered)",
@@ -84,7 +87,7 @@ extends GregtechMeta_MultiBlockBase {
 
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
-		return checkRecipeGeneric(2, 100, 60);
+		return checkRecipeGeneric((4*Utils.calculateVoltageTier(this.getMaxInputVoltage())), 75, 200);
 	}
 
 	@Override