From 998c739e50ef56e3a4cf2c4cdd397a8cdfbeef6d Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 19 Dec 2021 15:00:59 +0000
Subject: Added pollution config values for the new multis. Added recipes for
 the new blocks. Fix Rock Breaker handling of Redstone/Obsidian.

---
 .../processing/GregtechMetaTileEntity_IndustrialChisel.java    |  2 +-
 .../GregtechMetaTileEntity_IndustrialRockBreaker.java          | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities')

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
-- 
cgit