Added pollution config values for the new multis.

Added recipes for the new blocks.
Fix Rock Breaker handling of Redstone/Obsidian.

6 files changed, 86 insertions, 9 deletions

diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index 61610a03e9..382b63e2c3 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -225,6 +225,8 @@ public class ConfigHandler {
 		pollutionPerSecondMultiMassFabricator = config.get("pollution", "pollutionPerSecondMultiMassFabricator", pollutionPerSecondMultiMassFabricator,"pollution rate in gibbl/s for the Matter fabrication CPU").getInt(pollutionPerSecondMultiMassFabricator);
 		pollutionPerSecondMultiRefinery = config.get("pollution", "pollutionPerSecondMultiRefinery", pollutionPerSecondMultiRefinery,"pollution rate in gibbl/s for the Reactor fuel processing plant").getInt(pollutionPerSecondMultiRefinery);
 		//pollutionPerSecondMultiGeneratorArray;
+		pollutionPerSecondMultiIndustrialRockBreaker = config.get("pollution", "pollutionPerSecondMultiIndustrialRockBreaker", pollutionPerSecondMultiIndustrialRockBreaker,"pollution rate in gibbl/s for the Industrial Rock Breaker").getInt(pollutionPerSecondMultiIndustrialRockBreaker);
+		pollutionPerSecondMultiIndustrialChisel = config.get("pollution", "pollutionPerSecondMultiIndustrialChisel", pollutionPerSecondMultiIndustrialChisel,"pollution rate in gibbl/s for the Industrial Chisel").getInt(pollutionPerSecondMultiIndustrialChisel);
 		pollutionPerSecondMultiTreeFarm = config.get("pollution", "pollutionPerSecondMultiTreeFarm", pollutionPerSecondMultiTreeFarm,"pollution rate in gibbl/s for the Tree growth simulator").getInt(pollutionPerSecondMultiTreeFarm);
 		pollutionPerSecondMultiFrothFlotationCell = config.get("pollution", "pollutionPerSecondMultiFrothFlotationCell", pollutionPerSecondMultiFrothFlotationCell,"pollution rate in gibbl/s for the Flotation cell regulator").getInt(pollutionPerSecondMultiFrothFlotationCell);
 		pollutionPerSecondMultiAutoCrafter = config.get("pollution", "pollutionPerSecondMultiAutoCrafter", pollutionPerSecondMultiAutoCrafter,"pollution rate in gibbl/s for the Large-Scale auto assembler v1.01").getInt(pollutionPerSecondMultiAutoCrafter);
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 1ef04aa154..7508b9fc8f 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -300,6 +300,8 @@ public class CORE {
 		public static int pollutionPerSecondMultiAutoCrafter = 500;
 		public static int pollutionPerSecondMultiThermalBoiler = 700;
 		public static int pollutionPerSecondMultiAlgaePond = 0;
+		public static int pollutionPerSecondMultiIndustrialRockBreaker = 100;
+		public static int pollutionPerSecondMultiIndustrialChisel = 50;
 		//pollution single blocks
 		public static int basePollutionPerSecondSemiFluidGenerator = 40;
 		public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[]{0,2.0,4.0,8.0};
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 14001d86bd..e190bc67fa 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -253,7 +253,9 @@ public class RECIPES_Machines {
 		chemPlant();
 		zyngen();
 		milling();
-		sparging();
+		sparging();		
+		chisels();		
+		rockBreaker();
 
 	}
 
@@ -2637,6 +2639,78 @@ public class RECIPES_Machines {
 				60 * 20 * 2, 
 				MaterialUtils.getVoltageForTier(5));
 	}
+	
+	private static void chisels() {
+		ItemStack[] aChisels = new ItemStack[] {
+				GregtechItemList.GT_Chisel_LV.get(1),
+				GregtechItemList.GT_Chisel_MV.get(1),
+				GregtechItemList.GT_Chisel_HV.get(1),
+		};
+		for (int i=1;i<4;i++) {
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getNumberedBioCircuit(10+i),
+							CI.getTieredMachineCasing(i),
+							CI.getPlate(i, 4),
+							CI.getElectricMotor(i, 2),
+							CI.getConveyor(i, 2),
+							CI.getRobotArm(i, 1)
+					}, 
+					CI.getTieredFluid(i, 144 * 4), 
+					aChisels[i-1], 
+					20 * 20, 
+					MaterialUtils.getVoltageForTier(i));
+		}
+		
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(14),
+						aChisels[2],
+						CI.getPlate(4, 8),
+						CI.getElectricMotor(4, 8),
+						CI.getConveyor(4, 8),
+						CI.getRobotArm(4, 4)
+				}, 
+				CI.getTieredFluid(4, 144 * 8), 
+				GregtechItemList.Controller_IndustrialAutoChisel.get(1), 
+				20 * 20, 
+				MaterialUtils.getVoltageForTier(4));
+	
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(14),
+						ItemList.Casing_SolidSteel.get(2),
+						CI.getPlate(4, 2),
+						CI.getTieredComponent(OrePrefixes.plate, 3, 4),
+						CI.getTieredComponent(OrePrefixes.ring, 3, 8),
+						CI.getTieredComponent(OrePrefixes.rod, 2, 4),
+				}, 
+				CI.getTieredFluid(2, 144 * 2), 
+				GregtechItemList.Casing_IndustrialAutoChisel.get(1), 
+				20 * 20, 
+				MaterialUtils.getVoltageForTier(3));
+
+		
+		
+	}
+	
+	private static void rockBreaker() {
+
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] {
+						CI.getNumberedAdvancedCircuit(12),
+						ItemList.Machine_EV_RockBreaker.get(1),
+						ALLOY.STAINLESS_STEEL.getPlate(8),
+						ALLOY.STAINLESS_STEEL.getRing(4),
+						CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8),
+						ALLOY.EGLIN_STEEL.getScrew(8),
+				}, 
+				ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8), 
+				GregtechItemList.Controller_IndustrialRockBreaker.get(1), 
+				60 * 20 * 2, 
+				MaterialUtils.getVoltageForTier(4));
+		
+	}
 
 	private static void fakeMachineCasingCovers() {	    
 		GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index 4f84a3daca..3d15e5cf58 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -18,7 +18,8 @@ import net.minecraft.world.IBlockAccess;
 public class GregtechMetaCasingBlocks5
 extends GregtechMetaCasingBlocksAbstract {
 
-	//Free Indexes within TAE: 90, 91, 92, 94, 114, 116, 117, 118, 119, 120, 121, 124, 125, 126, 127
+	// Free Indexes within TAE: 91, 92, 94, 100, 101, 102, 103, 104, 114, 116, 117, 118, 119, 120, 121, 124, 125, 126, 127
+	// 19 Free Indexes
 	private static final TexturesGrinderMultiblock mGrinderOverlayHandler = new TexturesGrinderMultiblock();
 	
 	public GregtechMetaCasingBlocks5() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
index 51775791f4..77cc19d5d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
@@ -424,7 +424,7 @@ public class GregtechMetaTileEntity_IndustrialChisel extends GregtechMeta_MultiB
 	}
 
 	public int getPollutionPerSecond(ItemStack aStack) {
-		return CORE.ConfigSwitches.pollutionPerSecondMultiAdvImplosion;
+		return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel;
 	}
 
 	public int getDamageToComponent(ItemStack aStack) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
index 885aa05716..1b8835f289 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
@@ -82,9 +82,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends GregtechMeta_M
 		GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
 		tt.addMachineType(getMachineType())
 		.addInfo("Controller Block for the Industrial Rock Breaker")
-		.addInfo("200% Faster than the single block version")
-		.addInfo("Only uses 80% of the eu/t normally required")
-		.addInfo("Processes 8 items per voltage tier")
+		.addInfo("Speed: 200% | Eu Usage: 75% | Parallel: Tier x 8")
 		.addInfo("Circuit goes in the Input Bus or GUI slot")
 		.addInfo("1 = cobble, 2 = stone, 3 = obsidian")
 		.addInfo("Supply Water/Lava")
@@ -394,8 +392,8 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends GregtechMeta_M
 			if (aItems.size() > 0 && aCircuit == 3) {
 				// Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits
 				for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) {
-					if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
-						break;
+					if (!this.depleteInput(tRecipe.mInputs[1])) {
+						break;						
 					}
 					log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+".");
 					tTotalEUt += tRecipeEUt;
@@ -532,7 +530,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends GregtechMeta_M
 
 	@Override
 	public int getPollutionPerSecond(final ItemStack aStack) {
-		return CORE.ConfigSwitches.pollutionPerSecondMultiABS;
+		return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker;
 	}
 
 	@Override