Added MultiBlock Rock Breaker.

Added base work for GT Chisels.

7 files changed, 576 insertions, 1 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 8c814489f2..71d6ae1d68 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -409,6 +409,12 @@ public enum GregtechItemList implements GregtechItemContainer {
 	
 	// Big Steam Macerator
 	Controller_SteamMaceratorMulti,
+	
+	// Industrial Rock Breaker
+	Controller_IndustrialRockBreaker,
+	
+	// Industrial Chisel
+	Controller_IndustrialAutoChisel,
 
 	// Custom Machine Casings
 	Casing_Machine_Custom_1,
@@ -705,6 +711,12 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//GT RTG
 	RTG,
 	
+
+	// Chisel Machines
+	GT_Chisel_LV, 
+	GT_Chisel_MV, 
+	GT_Chisel_HV, 
+	
 	//Plasma Tank
 	/*Plasma_Tank,*/
 	
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
new file mode 100644
index 0000000000..39545daec1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
@@ -0,0 +1,5 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
+
+public class GregtechMetaTileEntity_AutoChisel {
+
+}
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
new file mode 100644
index 0000000000..871b863b22
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java
@@ -0,0 +1,5 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
+
+public class GregtechMetaTileEntity_IndustrialChisel {
+
+}
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
new file mode 100644
index 0000000000..e681069078
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
@@ -0,0 +1,527 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
+
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TAE;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+public class GregtechMetaTileEntity_IndustrialRockBreaker extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialRockBreaker> {
+
+	private static Item circuit;
+	private int mCasing;
+	private IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> STRUCTURE_DEFINITION = null;
+
+
+	public GregtechMetaTileEntity_IndustrialRockBreaker(final int aID, final String aName, final String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GregtechMetaTileEntity_IndustrialRockBreaker(final String aName) {
+		super(aName);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntity_IndustrialRockBreaker(this.mName);
+	}
+
+	@Override
+	public String getMachineType() {
+		return "Rock Breaker";
+	}
+
+	@Override
+	protected GT_Multiblock_Tooltip_Builder createTooltip() {
+		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("Circuit goes in the Input Bus or GUI slot")
+		.addInfo("1 = cobble, 2 = stone, 3 = obsidian")
+		.addInfo("Supply Water/Lava")
+		.addPollutionAmount(getPollutionPerSecond(null))
+		.addSeparator()
+		.beginStructureBlock(3, 4, 3, true)
+		.addController("Bottom Center")
+		.addCasingInfo("Thermal Processing Casing", 10)
+		.addCasingInfo("Thermal Containment Casing", 16)
+		.addInputBus("Any Casing", 1)
+		.addInputHatch("Any Casing", 1)
+		.addOutputBus("Any Casing", 1)
+		.addEnergyHatch("Any Casing", 1)
+		.addMaintenanceHatch("Any Casing", 1)
+		.addMufflerHatch("Any Casing", 1)
+		.toolTipFinisher(CORE.GT_Tooltip_Builder);
+		return tt;
+	}
+
+	@Override
+	public IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> getStructureDefinition() {
+		if (STRUCTURE_DEFINITION == null) {
+			STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialRockBreaker>builder()
+					.addShape(mName, transpose(new String[][]{
+						{"CCC", "CCC", "CCC"},
+						{"HHH", "H-H", "HHH"},
+						{"HHH", "H-H", "HHH"},
+						{"C~C", "CCC", "CCC"},
+					}))
+					.addElement(
+							'C',
+							ofChain(
+									ofHatchAdder(
+											GregtechMetaTileEntity_IndustrialRockBreaker::addRockBreakerList, TAE.GTPP_INDEX(16), 1
+											),
+									onElementPass(
+											x -> ++x.mCasing,
+											ofBlock(
+													ModBlocks.blockCasings2Misc, 0
+													)
+											)
+									)
+							)
+					.addElement(
+							'H',
+							ofBlock(
+									ModBlocks.blockCasings2Misc, 11
+									)
+							)
+					.build();
+		}
+		return STRUCTURE_DEFINITION;
+	}
+
+	@Override
+	public void construct(ItemStack stackSize, boolean hintsOnly) {
+		buildPiece(mName , stackSize, hintsOnly, 1, 3, 0);
+	}
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		mCasing = 0;
+		return checkPiece(mName, 1, 3, 0) && mCasing >= 10 && mEnergyHatches.size() == 1 && checkHatch();
+	}
+
+	public final boolean addRockBreakerList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+		if (aTileEntity == null) {
+			return false;
+		} else {
+			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			}
+		}
+		return false;
+	}
+
+
+	@Override
+	public String getSound() {
+		return GregTech_API.sSoundList.get(Integer.valueOf(208));
+	}
+
+	@Override
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(16)), new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced)};
+		}
+		return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(16))};
+	}
+
+	@Override
+	public boolean hasSlotInGUI() {
+		return true;
+	}	
+
+	@Override
+	public boolean requiresVanillaGtGUI() {
+		return true;
+	}
+
+	@Override
+	public String getCustomGUIResourceName() {
+		return "ElectricBlastFurnace";
+	}	
+
+	@Override
+	public GT_Recipe.GT_Recipe_Map getRecipeMap() {
+		return GT_Recipe_Map.sRockBreakerFakeRecipes;
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(final ItemStack aStack) {
+		return true;
+	}
+
+	private static GT_Recipe sRecipe_Cobblestone;
+	private static GT_Recipe sRecipe_SmoothStone;
+	private static GT_Recipe sRecipe_Redstone;
+
+	private static final void generateRecipes() {
+		if (sRecipe_Cobblestone == null) {
+			sRecipe_Cobblestone = new GTPP_Recipe(
+					false,
+					new ItemStack[] {
+							CI.getNumberedCircuit(1)
+					},
+					new ItemStack[] {
+							ItemUtils.getSimpleStack(Blocks.cobblestone)
+					},
+					null, 
+					new int[] {10000}, 
+					null, 
+					null, 
+					16, 
+					32, 
+					0);
+		}
+		if (sRecipe_SmoothStone == null) {
+			sRecipe_SmoothStone = new GTPP_Recipe(
+					false,
+					new ItemStack[] {
+							CI.getNumberedCircuit(2)
+					},
+					new ItemStack[] {
+							ItemUtils.getSimpleStack(Blocks.stone)
+					},
+					null, 
+					new int[] {10000}, 
+					null, 
+					null, 
+					16, 
+					32, 
+					0);
+		}
+		if (sRecipe_Redstone == null) {
+			sRecipe_Redstone = new GTPP_Recipe(
+					false,
+					new ItemStack[] {
+							CI.getNumberedCircuit(3),
+							GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)
+					},
+					new ItemStack[] {
+							ItemUtils.getSimpleStack(Blocks.obsidian)
+					},
+					null, 
+					new int[] {10000}, 
+					null, 
+					null, 
+					128, 
+					32, 
+					0);
+		}
+	}
+
+	@Override
+	public boolean checkRecipe(final ItemStack aStack) {
+		ArrayList<FluidStack> aFluids = this.getStoredFluids();
+		if (!aFluids.isEmpty()) {
+			boolean aHasWater = false;
+			boolean aHasLava = false;
+			for (FluidStack aFluid : aFluids) {
+				if (aFluid.getFluid() == FluidRegistry.WATER) {
+					aHasWater = true;
+				}
+				else if (aFluid.getFluid() == FluidRegistry.LAVA) {
+					aHasLava = true;
+				}
+			}
+			ArrayList<ItemStack> aItems = this.getStoredInputs();
+			boolean aHasRedstone = false;
+			if (!aItems.isEmpty()) {
+				for (ItemStack aItem : aItems) {
+					if (GT_Utility.areStacksEqual(aItem, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) {
+						aHasRedstone = true;
+						break;
+					}
+				}
+			}
+
+			if (!aHasWater || !aHasLava) {
+				log("BAD RETURN - 0-1");
+				return false;
+			}
+			ItemStack aGuiCircuit = this.getGUIItemStack();
+			if (aGuiCircuit == null || !ItemUtils.isControlCircuit(aGuiCircuit)) {
+				log("BAD RETURN - 0-2");
+				return false;				
+			}
+
+			generateRecipes();
+			
+			int aCircuit = aGuiCircuit.getItemDamage();
+
+			GT_Recipe tRecipe = null;
+			switch (aCircuit) {
+				case 1:
+					tRecipe = sRecipe_Cobblestone;
+					break;
+				case 2:
+					tRecipe = sRecipe_SmoothStone;
+					break;
+				case 3:
+					if (aHasRedstone) {
+						tRecipe = sRecipe_Redstone;
+					}
+					break;
+			}
+			
+			if (tRecipe == null) {
+				log("BAD RETURN - 0-3");
+				return false;	
+			}
+
+			// Based on the Processing Array. A bit overkill, but very flexible.	
+			ItemStack[] aItemInputs = aItems.toArray(new ItemStack[aItems.size()]);
+			FluidStack[] aFluidInputs = aFluids.toArray(new FluidStack[aFluids.size()]);	
+
+			// Reset outputs and progress stats
+			this.mEUt = 0;
+			this.mMaxProgresstime = 0;
+			this.mOutputItems = new ItemStack[]{};
+			this.mOutputFluids = new FluidStack[]{};
+
+			long tVoltage = getMaxInputVoltage();
+			byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+			long tEnergy = getMaxInputEnergy();
+			log("Running checkRecipeGeneric(0)");	
+
+			log("Running checkRecipeGeneric(1)");
+			// Remember last recipe - an optimization for findRecipe()
+			this.mLastRecipe = tRecipe;
+
+			int aMaxParallelRecipes = getMaxParallelRecipes();
+			int aEUPercent = getEuDiscountForParallelism();
+			int aSpeedBonusPercent = 200;
+
+			aMaxParallelRecipes = this.canBufferOutputs(tRecipe, aMaxParallelRecipes);
+			if (aMaxParallelRecipes == 0) {
+				log("BAD RETURN - 2");
+				return false;
+			}
+
+			// EU discount
+			float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f;
+			float tTotalEUt = 0.0f;
+
+			int parallelRecipes = 0;
+
+			log("parallelRecipes: "+parallelRecipes);
+			log("aMaxParallelRecipes: "+aMaxParallelRecipes);
+			log("tTotalEUt: "+tTotalEUt);
+			log("tVoltage: "+tVoltage);
+			log("tRecipeEUt: "+tRecipeEUt);
+			// 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)) {
+					log("Broke at "+parallelRecipes+".");
+					break;
+				}
+				log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+".");
+				tTotalEUt += tRecipeEUt;
+			}
+
+			if (parallelRecipes == 0) {
+				log("BAD RETURN - 3");
+				return false;
+			}
+
+			// -- Try not to fail after this point - inputs have already been consumed! --
+
+
+
+			// Convert speed bonus to duration multiplier
+			// e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration.
+			aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent);
+			float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent);
+			this.mMaxProgresstime = (int)(tRecipe.mDuration * tTimeFactor);
+
+			this.mEUt = (int)Math.ceil(tTotalEUt);
+
+			this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
+			this.mEfficiencyIncrease = 10000;		
+
+			// Overclock
+			if (this.mEUt <= 16) {
+				this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
+				this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1));
+			} else {
+				while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
+					this.mEUt *= 4;
+					this.mMaxProgresstime /= 2;
+				}
+			}
+
+			if (this.mEUt > 0) {
+				this.mEUt = (-this.mEUt);
+			}
+
+			this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+
+			// Collect fluid outputs
+			FluidStack[] tOutputFluids = new FluidStack[tRecipe.mFluidOutputs.length];
+			for (int h = 0; h < tRecipe.mFluidOutputs.length; h++) {
+				if (tRecipe.getFluidOutput(h) != null) {
+					tOutputFluids[h] = tRecipe.getFluidOutput(h).copy();
+					tOutputFluids[h].amount *= parallelRecipes;
+				}
+			}
+
+			// Collect output item types
+			ItemStack[] tOutputItems = new ItemStack[tRecipe.mOutputs.length];
+			for (int h = 0; h < tRecipe.mOutputs.length; h++) {
+				if (tRecipe.getOutput(h) != null) {
+					tOutputItems[h] = tRecipe.getOutput(h).copy();
+					tOutputItems[h].stackSize = 0;
+				}
+			}
+
+			// Set output item stack sizes (taking output chance into account)
+			for (int f = 0; f < tOutputItems.length; f++) {
+				if (tRecipe.mOutputs[f] != null && tOutputItems[f] != null) {
+					for (int g = 0; g < parallelRecipes; g++) {
+						if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(f))
+							tOutputItems[f].stackSize += tRecipe.mOutputs[f].stackSize;
+					}
+				}
+			}
+
+			tOutputItems = removeNulls(tOutputItems);
+
+			// Sanitize item stack size, splitting any stacks greater than max stack size
+			List<ItemStack> splitStacks = new ArrayList<ItemStack>();
+			for (ItemStack tItem : tOutputItems) {
+				while (tItem.getMaxStackSize() < tItem.stackSize) {
+					ItemStack tmp = tItem.copy();
+					tmp.stackSize = tmp.getMaxStackSize();
+					tItem.stackSize = tItem.stackSize - tItem.getMaxStackSize();
+					splitStacks.add(tmp);
+				}
+			}
+
+			if (splitStacks.size() > 0) {
+				ItemStack[] tmp = new ItemStack[splitStacks.size()];
+				tmp = splitStacks.toArray(tmp);
+				tOutputItems = ArrayUtils.addAll(tOutputItems, tmp);
+			}
+
+			// Strip empty stacks
+			List<ItemStack> tSList = new ArrayList<ItemStack>();
+			for (ItemStack tS : tOutputItems) {
+				if (tS.stackSize > 0) tSList.add(tS);
+			}
+			tOutputItems = tSList.toArray(new ItemStack[tSList.size()]);
+
+			// Commit outputs
+			this.mOutputItems = tOutputItems;
+			this.mOutputFluids = tOutputFluids;
+			updateSlots();
+
+			// Play sounds (GT++ addition - GT multiblocks play no sounds)
+			startProcess();
+
+			log("GOOD RETURN - 1");
+			return true;
+		}
+
+		return false;
+	}	
+
+	@Override
+	public int getMaxParallelRecipes() {
+		return (8 * GT_Utility.getTier(this.getMaxInputVoltage()));
+	}
+
+	@Override
+	public int getEuDiscountForParallelism() {
+		return 80;
+	}
+
+	@Override
+	public int getMaxEfficiency(final ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerSecond(final ItemStack aStack) {
+		return CORE.ConfigSwitches.pollutionPerSecondMultiABS;
+	}
+
+	@Override
+	public int getDamageToComponent(final ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getAmountOfOutputs() {
+		return 2;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(final ItemStack aStack) {
+		return false;
+	}
+
+	@Override
+	public ArrayList<ItemStack> getStoredInputs() {
+		ArrayList<ItemStack> aInputs = super.getStoredInputs();
+		if (this.hasSlotInGUI() && this.getGUIItemStack() != null) {
+			aInputs.add(this.getGUIItemStack());
+		}
+		return aInputs;
+	}
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java
new file mode 100644
index 0000000000..aa28faa6f9
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialRockBreaker;
+
+public class GregtechIndustrialChisel {
+
+	public static void run() {
+		// Industrial Maceration Stack Multiblock
+		/*GregtechItemList.Controller_IndustrialRockBreaker.set(new GregtechMetaTileEntity_IndustrialRockBreaker(32005,
+				"industrialrockcrusher.controller.tier.single", "Boldarnator").getStackForm(1L));*/
+	}
+	
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java
new file mode 100644
index 0000000000..45b923083e
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.xmod.gregtech.registration.gregtech;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialRockBreaker;
+
+public class GregtechIndustrialRockBreaker {
+
+	public static void run() {
+		GregtechItemList.Controller_IndustrialRockBreaker.set(new GregtechMetaTileEntity_IndustrialRockBreaker(32005,
+				"industrialrockcrusher.controller.tier.single", "Boldarnator").getStackForm(1L));
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
index 15bf42c9d4..8fa4cb6cb1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java
@@ -18,7 +18,6 @@ public class GregtechIndustrialSifter {
 	}
 
 	private static void run1() {
-		// Industrial Maceration Stack Multiblock
 		GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(840,
 				"industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L));