Merge pull request #41 from GTNewHorizons/structurelib-interation

add back LFTR and refinery

7 files changed, 292 insertions, 393 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index e45abdaa36..fc0627a0cc 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -93,7 +93,7 @@ public class COMPAT_HANDLER {
 			new RECIPES_Extruder();
 			GregtechGeneratorsULV.run();
 			GregtechEnergyBuffer.run();
-			//GregtechLFTR.run();
+			GregtechLFTR.run();
 			GregtechSteamCondenser.run();
 			GregtechSafeBlock.run();
 			//GregtechSuperConductionPoint.run();
@@ -116,7 +116,7 @@ public class COMPAT_HANDLER {
 			//GregtechIndustrialMultiTank.run();
 			GregtechGeothermalThermalGenerator.run();
 			Gregtech4Content.run();
-			//GregtechIndustrialFuelRefinery.run();
+			GregtechIndustrialFuelRefinery.run();
 			GregtechTreeFarmerTE.run();
 			//GregtechIndustrialTreeFarm.run();
 			GregtechIndustrialSifter.run();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index e9c23f9f7d..1efa09c096 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -95,7 +95,7 @@ public class RECIPES_Machines {
 	public static ItemStack RECIPE_ThermalBoilerCasing;
 
 	//Thorium Reactor
-	/*public static ItemStack RECIPE_LFTRController;*/
+	public static ItemStack RECIPE_LFTRController;
 	public static ItemStack RECIPE_LFTROuterCasing;
 	public static ItemStack RECIPE_LFTRInnerCasing;
 
@@ -1374,23 +1374,23 @@ public class RECIPES_Machines {
 			if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
 
 				//Thorium Reactor
-				/*RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);*/
+				RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
 				RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); //Zeron
 				RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); //Hastelloy
 
 				ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
 				if(!GTNH) {
-					/*RecipeUtils.addShapedGregtechRecipe(
+					RecipeUtils.addShapedGregtechRecipe(
 							controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
 							"plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN",
 							"plateThorium232", CI.machineHull_UV, "plateThorium232",
-							RECIPE_LFTRController);*/
+							RECIPE_LFTRController);
 				} else  {
-					/*RecipeUtils.addShapedGregtechRecipe(
+					RecipeUtils.addShapedGregtechRecipe(
 							controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
 							"plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN",
 							"plateThorium232", CI.machineHull_LuV, "plateThorium232",
-							RECIPE_LFTRController);*/
+							RECIPE_LFTRController);
 				}
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateDoubleZeron100", CI.craftingToolScrewdriver, "plateDoubleZeron100",
@@ -1411,11 +1411,11 @@ public class RECIPES_Machines {
 
 
 				//Fission Fuel Plant
-				/*RecipeUtils.addShapedGregtechRecipe(
+				RecipeUtils.addShapedGregtechRecipe(
 						CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5),
 						"plateDenseTungstenSteel", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDenseTungstenSteel",
 						"gearGtStellite", CI.machineHull_LuV, "gearGtStellite",
-						GregtechItemList.Industrial_FuelRefinery.get(1));*/
+						GregtechItemList.Industrial_FuelRefinery.get(1));
 
 				ItemStack mInnerTank;
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 8c780c6730..205aad3546 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -227,7 +227,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 
 	//LFTR
-	/*ThoriumReactor,*/
+	ThoriumReactor,
 	Casing_Reactor_I, 
 	Casing_Reactor_II,
 
@@ -238,7 +238,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 
 	//Fission Fuel Refinery
-	/*Industrial_FuelRefinery,*/
+	Industrial_FuelRefinery,
 	Casing_Refinery_External,
 	Casing_Refinery_Structural,
 	Casing_Refinery_Internal,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index 65e24124c6..61c2288321 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -1,9 +1,10 @@
-/*
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
@@ -11,15 +12,11 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-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_Output;
+import gregtech.api.metatileentity.implementations.*;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
 import gregtech.api.util.GTPP_Recipe;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
@@ -29,19 +26,23 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
-import gtPlusPlus.xmod.gregtech.common.blueprint.Blueprint_LFTR;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+
 public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 
-	protected long mEUStore;
 	protected int fuelConsumption = 0;
 	protected int fuelValue = 0;
 	protected int fuelRemaining = 0;
 	protected boolean boostEu = false;
 	protected boolean heliumSparging = false;
+	private int mCasing;
+	private IStructureDefinition<GregtechMTE_NuclearReactor> STRUCTURE_DEFINITION = null;
+
 
 	public GregtechMTE_NuclearReactor(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
@@ -62,25 +63,31 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 	}
 
 	@Override
-	public String[] getTooltip() {
-		return new String[]{
-				"Controller Block for the Liquid Fluoride Thorium Reactor.",
-				"Produces Heat & Energy from Radioactive Beta Decay.",
-				"Size(WxHxD): 7x4x7, Controller (Bottom, Center)",
-				"Bottom and Top layer are Hastelloy-N Reactor Casing",
-				"Middle two layers are Zeron-100 Reactor Shielding",
-				"--Hatches go in the top or bottom layer edges--",
-				"10x IV+ Output Hatches",
-				"4x IV+ Input Hatches",
-				"4x IV+ Dynamo Hatches",
-				"2x Maint. Hatch",
-				"--Mufflers go in the top 3x3--",
-				"4x IV+ Mufflers",
-				"Outputs U233 every 10 seconds, on average",
-				"Input Fluorine and Helium for bonus byproducts",
-				"Input Li2BeF4 and a molten salt as fuel.",
-				"LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235",
-				};
+	protected GT_Multiblock_Tooltip_Builder createTooltip() {
+		GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType(getMachineType())
+				.addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
+				.addInfo("Produces Heat & Energy from Radioactive Beta Decay.")
+				.addInfo("Outputs U233 every 10 seconds, on average")
+				.addInfo("Input Fluorine and Helium for bonus byproducts")
+				.addInfo("Input Li2BeF4 and a molten salt as fuel.")
+				.addInfo("LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235")
+				.addPollutionAmount(getPollutionPerTick(null) * 20)
+				.addSeparator()
+				.beginStructureBlock(7, 4, 7, true)
+				.addController("Bottom Center")
+				.addCasingInfo("Hastelloy-N Reactor Casing", 27)
+				.addCasingInfo("Zeron-100 Reactor Shielding", 26)
+				.addInputHatch("Top or bottom layer edges", 1)
+				.addOutputHatch("Top or bottom layer edges", 1)
+				.addDynamoHatch("Top or bottom layer edges", 1)
+				.addMaintenanceHatch("Top or bottom layer edges", 1)
+				.addMufflerHatch("Top 3x3", 2)
+				.addStructureInfo("All hatches must have IV+ tier.")
+				.addStructureInfo("10+ Output Hatches, 4+ Input Hatches, 4x Dynamo Hatches")
+				.addStructureInfo("2x Maintenance Hatches, 4x Mufflers")
+				.toolTipFinisher("GT++");
+		return tt;
 	}
 
 	@Override
@@ -136,16 +143,125 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 	@Override
 	public String getCustomGUIResourceName() {
 		return "MatterFabricator";
-	}	
+	}
+
+	public final boolean addNuclearReactorEdgeList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+		if (aTileEntity == null) {
+			return false;
+		} else {
+			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
+				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo && ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 5){
+				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output && ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier >= 5) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
+			}
+		}
+		return false;
+	}
+
+	public final boolean addNuclearReactorTopList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+		if (aTileEntity == null) {
+			return false;
+		} else {
+			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public IStructureDefinition<GregtechMTE_NuclearReactor> getStructureDefinition() {
+		if (STRUCTURE_DEFINITION == null) {
+			STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder()
+					.addShape(mName, transpose(new String[][]{
+							{"CCCCCCC", "COOOOOC", "COXXXOC", "COXXXOC", "COXXXOC", "COOOOOC", "CCCCCCC"},
+							{"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"},
+							{"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"},
+							{"CCC~CCC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "CCCCCCC"},
+					}))
+					.addElement(
+							'C',
+							ofChain(
+									ofHatchAdder(
+											GregtechMTE_NuclearReactor::addNuclearReactorEdgeList, TAE.GTPP_INDEX(12), 1
+									),
+									onElementPass(
+											x -> ++x.mCasing,
+											ofBlock(
+													ModBlocks.blockCasingsMisc, 12
+											)
+									)
+							)
+					)
+					.addElement(
+							'X',
+							ofChain(
+									ofHatchAdder(
+											GregtechMTE_NuclearReactor::addNuclearReactorTopList, TAE.GTPP_INDEX(12), 2
+									),
+									onElementPass(
+											x -> ++x.mCasing,
+											ofBlock(
+													ModBlocks.blockCasingsMisc, 12
+											)
+									)
+							)
+
+					)
+					.addElement(
+							'O',
+							ofBlock(
+									ModBlocks.blockCasingsMisc, 12
+							)
+					)
+					.addElement(
+							'G',
+							ofBlock(
+									ModBlocks.blockCasingsMisc, 13
+							)
+					)
+					.build();
+		}
+		return STRUCTURE_DEFINITION;
+	}
+
+	@Override
+	public void construct(ItemStack stackSize, boolean hintsOnly) {
+		buildPiece(mName , stackSize, hintsOnly, 3, 3, 0);
+	}
 
-	private Blueprint_LFTR mBlueprint;
-	
 	@Override
-	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {	
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		mCasing = 0;
+		if (checkPiece(mName, 3, 3, 0) && mCasing >= 27) {
+			if (mOutputHatches.size() >= 10 && mInputHatches.size() >= 4 && mDynamoHatches.size() == 4 &&
+					mMufflerHatches.size() == 4 && mMaintenanceHatches.size() == 2) {
+					this.mWrench = true;
+					this.mScrewdriver = true;
+					this.mSoftHammer = true;
+					this.mHardHammer = true;
+					this.mSolderingTool = true;
+					this.mCrowbar = true;
+					this.turnCasingActive(false);
+					return true;
+			}
+		}
+		return false;
+	}
 
-			// Life Lessons from Greg.
-			*/
-/**
+		// Alk's Life Lessons from Greg.
+		/*
 			[23:41:15] <GregoriusTechneticies> xdir and zdir are x2 and not x3
 			[23:41:26] <GregoriusTechneticies> thats you issue
 			[23:44:33] <Alkalus> mmm?
@@ -160,175 +276,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 			[23:45:51] <Alkalus> Ahh
 			[23:45:57] <GregoriusTechneticies> and not 2
 			[23:46:06] <Alkalus> Noted, thanks :D
-			 *//*
-
-
-			final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 3;
-			final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 3;
-
-			for (int i = -3; i <= 3; i++) {
-				for (int j = -3; j <= 3; j++) {
-					for (int h = 0; h < 4; h++) {
-						final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
-
-						// Reactor Floor/Roof inner 5x5
-						if (((i != -3) && (i != 3)) && ((j != -3) && (j != 3))) {
-
-							// Reactor Floor & Roof (Inner 5x5) + Mufflers, Dynamos and Fluid outputs.
-							if ((h == 0) || (h == 3)) {
-
-								//If not a hatch, continue, else add hatch and continue.
-								if ((!this.addMufflerToMachineList(tTileEntity, TAE.GTPP_INDEX(12))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(12))) && (!this.addDynamoToMachineList(tTileEntity, TAE.GTPP_INDEX(12)))) {
-									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
-										Logger.INFO("Hastelloy-N Reactor Casing(s) Missing from one of the top layers inner 3x3.");
-										Logger.INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-										return false;
-									}
-									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
-										Logger.INFO("Hastelloy-N Reactor Casing(s) Missing from one of the top layers inner 3x3. Wrong Meta for Casing.");
-										return false;
-									}
-								}
-							}
-
-							// Inside 2 layers, mostly air
-							else {
-
-								// Reactor Inner 5x5
-								//if ((i != -1 && i != 1) && (j != -1 && j != 1)) {
-								if (!aBaseMetaTileEntity.getAirOffset(xDir + i, h, zDir + j)) {
-									Logger.INFO("Make sure the inner 3x3 of the Multiblock is Air.");
-									return false;
-								}
-
-							}
-
-							//TODO - Add Carbon Moderation Rods
-							*/
-/*
-								else { //carbon moderation rods are at 1,1 & -1,-1 & 1,-1 & -1,1
-									if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
-										Utils.LOG_WARNING("LFTR Casing(s) Missing from one of the top layers inner 3x3.");
-										Utils.LOG_WARNING("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-										return false;
-									}
-									if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
-										Utils.LOG_WARNING("LFTR Casing(s) Missing from one of the top layers inner 3x3.");
-										return false;
-									}
-								}*//*
-
-
-						}
-
-						//Dealt with inner 5x5, now deal with the exterior.
-						else {
-
-							//Deal with all 4 sides (Reactor walls)
-							if ((h == 1) || (h == 2)) {
-								if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
-									Logger.INFO("Reactor Shielding Missing from somewhere in the second layer.");
-									Logger.INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-									return false;
-								}
-								if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) {
-									Logger.INFO("Reactor Shielding Missing from somewhere in the second layer.");
-									Logger.INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-									return false;
-								}
-							}
-
-							//Deal with top and Bottom edges (Inner 5x5)
-							else if ((h == 0) || (h == 3)) {
-								if ((!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(12))) && (!this.addInputToMachineList(tTileEntity, TAE.GTPP_INDEX(12))) && (!this.addOutputToMachineList(tTileEntity, TAE.GTPP_INDEX(12))) && (!this.addDynamoToMachineList(tTileEntity, TAE.GTPP_INDEX(12)))) {
-									if (((xDir + i) != 0) || ((zDir + j) != 0)) {//no controller
-
-										if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) {
-											Logger.INFO("Hastelloy-N Reactor Casing(s) Missing from one of the edges on the top layer.");
-											Logger.INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-											return false;
-										}
-										if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 12) {
-											Logger.INFO("Hastelloy-N Reactor Casing(s) Missing from one of the edges on the top layer. "+h);
-											Logger.INFO("Instead, found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j).getLocalizedName());
-											if (h ==0){
-												if (tTileEntity instanceof GregtechMTE_NuclearReactor){
-
-												}
-											}
-											else {
-												return false;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			
-			if (this.mDynamoHatches != null) {
-				for (int i = 0; i < this.mDynamoHatches.size(); i++) {
-					if (this.mDynamoHatches.get(i).mTier < 5){
-						Logger.INFO("You require at LEAST IV tier Dynamo Hatches.");
-						Logger.INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getXCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getZCoord());
-						return false;
-					}
-				}
-			}
-			if (this.mOutputHatches != null) {
-				for (int i = 0; i < this.mOutputHatches.size(); i++) {
-
-					if ((this.mOutputHatches.get(i).mTier < 5) && (this.mOutputHatches.get(i).getBaseMetaTileEntity() instanceof GregtechMTE_NuclearReactor)){
-						Logger.INFO("You require at LEAST IV tier Output Hatches.");
-						Logger.INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getXCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getZCoord());
-						Logger.INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getInventoryName());
-						return false;
-					}
-				}
-			}
-			if (this.mInputHatches != null) {
-				for (int i = 0; i < this.mInputHatches.size(); i++) {
-					if (this.mInputHatches.get(i).mTier < 5){
-						Logger.INFO("You require at LEAST IV tier Input Hatches.");
-						Logger.INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getXCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()+","+this.mOutputHatches.get(i).getBaseMetaTileEntity().getZCoord());
-						Logger.INFO(this.mOutputHatches.get(i).getBaseMetaTileEntity().getInventoryName());
-						return false;
-					}
-				}
-			}
-			if (this.mMufflerHatches.size() != 4){
-				Logger.INFO("You require EXACTLY 4 muffler hatches on top. FOUR. You have "+this.mMufflerHatches.size());
-				return false;
-			}
-			if (this.mInputHatches.size() < 4){
-				Logger.INFO("You require 4 or more input hatches. You have "+this.mInputHatches.size());
-				return false;
-			}
-			if (this.mOutputHatches.size() < 10){
-				Logger.INFO("You require 10 or more output hatches. You have "+this.mOutputHatches.size());
-				return false;
-			}
-			if (this.mDynamoHatches.size() != 4){
-				Logger.INFO("You require EXACTLY 4 dynamo hatches. FOUR. You have "+this.mDynamoHatches.size());
-				return false;
-			}
-			if (this.mMaintenanceHatches.size() != 2){
-				Logger.INFO("You require EXACTLY 2 Maint. hatches. TWO. You have "+this.mMaintenanceHatches.size());
-				return false;
-			}
-			this.mWrench = true;
-			this.mScrewdriver = true;
-			this.mSoftHammer = true;
-			this.mHardHammer = true;
-			this.mSolderingTool = true;
-			this.mCrowbar = true;
-			this.turnCasingActive(false);
-			Logger.INFO("Multiblock Formed.");
-			return true;
-	}
+		 */
 
 	@Override
 	public boolean isCorrectMachinePart(final ItemStack aStack) {
@@ -394,8 +342,6 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 		return true;
 	}
 
-
-
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
 		final ArrayList<FluidStack> tFluids = this.getStoredFluids();
@@ -555,8 +501,6 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 		return 0;
 	}
 
-
-
 	public int getAmountOfOutputs() {
 		return 10;
 	}
@@ -683,4 +627,4 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase {
 		super.onPostTick(aBaseMetaTileEntity, aTick);
 	}
 
-}*/
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
index b732d6df7e..590c9b49ae 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java
@@ -1,23 +1,30 @@
-/*
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 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_Input;
+import gregtech.api.metatileentity.implementations.*;
 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_Recipe.GT_Recipe_Map;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 
 public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase {
-	
+
+	private int mCasing;
+	private IStructureDefinition<GregtechMetaTileEntity_Refinery> STRUCTURE_DEFINITION = null;
+
 	public GregtechMetaTileEntity_Refinery(final int aID, final String aName, final String aNameRegional) {
 		super(aID, aName, aNameRegional);
 	}
@@ -32,21 +39,29 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
 	}
 
 	@Override
-	public String[] getTooltip() {
-		return new String[]{
-				"Controller Block for the Fission Fuel Processing Unit",
-				"Size(WxHxD): 3x9x3", "Controller (Front middle at bottom)",
-				"3x2x3 Base platform of Hastelloy-X (7x Casings)",
-				"1x5x1 Incoloy-DS Fluid Containment Block pillar (Center of base, From layer 3 upwards)",
-				"4x Zeron-100 Reactor Shielding (Each side of Second Sealant Tower layer, Surrounding Incoloy-DS Fluid Containment)",
-				"17x Hastelloy-N Sealant Blocks (Each side of Incoloy-DS Fluid Containment casings, except layer 2 and one on top)",
-				"4x Input Hatch (One of base platform)",
-				"2x Output Hatch (One of base platform)",
-				"1x Output Bus (One of base platform)",
-				"1x Maintenance Hatch (One of base platform)",
-				"1x ZPM or better Muffler (One of base platform)",
-				"1x Energy Hatch (One of base platform)",
-		};
+	protected GT_Multiblock_Tooltip_Builder createTooltip() {
+		GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
+		tt.addMachineType(getMachineType())
+				.addInfo("Controller Block for the Fission Fuel Processing Unit")
+				.addPollutionAmount(getPollutionPerTick(null) * 20)
+				.addSeparator()
+				.beginStructureBlock(3, 9, 3, false)
+				.addController("Bottom Center")
+				.addCasingInfo("Hastelloy-X Structural Casing", 7)
+				.addCasingInfo("Incoloy-DS Fluid Containment Block", 5)
+				.addCasingInfo("Zeron-100 Reactor Shielding", 4)
+				.addCasingInfo("Hastelloy-N Sealant Blocks", 17)
+				.addInputHatch("Base platform", 1)
+				.addOutputHatch("Base platform", 1)
+				.addOutputBus("Base platform", 1)
+				.addMufflerHatch("Base platform", 1)
+				.addMaintenanceHatch("Base platform", 1)
+				.addEnergyHatch("Base platform", 1)
+				.addStructureInfo("Muffler's Tier must be ZPM/ZPM+")
+				.addStructureInfo("4x Input Hatches, 2x Output Hatches, 1x Output Bus")
+				.addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch")
+				.toolTipFinisher("GT++");
+		return tt;
 	}
 
 	@Override
@@ -93,159 +108,102 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
 		return 0;
 	}
 
-	@Override
-	public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
-		final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
-		final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
-		for (int i = -1; i < 2; i++) {
-			for (int j = -1; j < 2; j++) {
-				int Y = 0;
-				if (((xDir + i) != 0) || ((zDir + j) != 0)) {
-					final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, Y, zDir + j);
-					if ((!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(18)))) {
-
-						if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) {
-							Logger.INFO("1 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j).getLocalizedName());
-							return false;
-						}
-						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) {
-							Logger.INFO("1 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j));
-							return false;
-						}
-					}
-					else {
-						//Utils.LOG_INFO("Added Hatch. "+tTileEntity.getInventoryName());
-					}
-				}
-				Y = 1;
-				//Utils.LOG_INFO("Checking at Y+1 as well.");
-				final IGregTechTileEntity tTileEntity2 = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, Y, zDir + j);
-				if ((!this.addToMachineList(tTileEntity2, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity2, TAE.GTPP_INDEX(18)))) {
-
-					if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) {
-						Logger.INFO("2 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName());
-						return false;
-					}
-					if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) {
-						Logger.INFO("2 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir));
-						return false;
-					}
-				}
-				else {
-					//Utils.LOG_INFO("Added Hatch. "+tTileEntity2.getInventoryName());
-				}
+	public final boolean addRefineryList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
+		if (aTileEntity == null) {
+			return false;
+		} else {
+			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
+				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){
+				((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 7) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity);
+			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) {
+				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
+				return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity);
 			}
 		}
+		return false;
+	}
 
-		for (int y = 2; y < 7; y++) {
-			if (y<=6){
-				if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != ModBlocks.blockCasings2Misc) { //Must Define meta for center blocks
-					Logger.INFO("3 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
-					return false;
-				}
-				if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir) != 3) {
-					Logger.INFO("3 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 3 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
-					return false;
-				}				
-			}
-			if (y==6){
-				if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 1, zDir) != ModBlocks.blockCasings2Misc) {
-					Logger.INFO("8 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y+1, zDir));
-					return false;
-				}
-				if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir) != 1) {
-					Logger.INFO("8 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | Expected Meta 1 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir));
-					return false;
-				}
-			}
-			if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) != ModBlocks.blockCasings2Misc) {
-				//Utils.LOG_INFO("4 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
-				if (y==3){
-					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
-						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
-							Logger.INFO("4 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
-							return false;
-						}
-						Logger.INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
-					}
-				}
-				else {
-					Logger.INFO("debug.1");
-					return false;
-				}
-			}
+	@Override
+	public IStructureDefinition<GregtechMetaTileEntity_Refinery> getStructureDefinition() {
+		if (STRUCTURE_DEFINITION == null) {
+			STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_Refinery>builder()
+					.addShape(mName, transpose(new String[][]{
+							{"   ", " N ", "   "},
+							{" N ", "NIN", " N "},
+							{" N ", "NIN", " N "},
+							{" N ", "NIN", " N "},
+							{" Z ", "ZIZ", " Z "},
+							{" N ", "NIN", " N "},
+							{"XXX", "XXX", "XXX"},
+							{"X~X", "XXX", "XXX"},
+					}))
+					.addElement(
+							'X',
+							ofChain(
+									ofHatchAdder(
+											GregtechMetaTileEntity_Refinery::addRefineryList, TAE.GTPP_INDEX(18), 1
+									),
+									onElementPass(
+											x -> ++x.mCasing,
+											ofBlock(
+													ModBlocks.blockCasings2Misc, 2
+											)
+									)
+							)
+					)
+					.addElement(
+							'I',
+							ofBlock(
+									ModBlocks.blockCasings2Misc, 3
+							)
+					)
+					.addElement(
+							'N',
+							ofBlock(
+									ModBlocks.blockCasings2Misc, 1
+							)
+					)
+					.addElement(
+							'Z',
+							ofBlock(
+									ModBlocks.blockCasingsMisc, 13
+							)
+					)
+					.build();
+		}
+		return STRUCTURE_DEFINITION;
+	}
 
-			if (aBaseMetaTileEntity.getBlockOffset(xDir - 1, y, zDir) != ModBlocks.blockCasings2Misc) {
-				//Utils.LOG_INFO("5 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
-				if (y==3){
-					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
-						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
-							Logger.INFO("5 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
-							return false;
-						}
-						Logger.INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
-					}
-				}
-				else {
-					Logger.INFO("debug.2");
-					return false;
-				}
-			}
+	@Override
+	public void construct(ItemStack stackSize, boolean hintsOnly) {
+		buildPiece(mName , stackSize, hintsOnly, 1, 7, 0);
+	}
 
-			if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir + 1) != ModBlocks.blockCasings2Misc) {
-				//Utils.LOG_INFO("6 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
-				if (y==3){
-					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
-						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
-							Logger.INFO("6 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
-							return false;
-						}
-						Logger.INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
-					}
-				}
-				else {
-					Logger.INFO("debug.3");
-					return false;
-				}
+	@Override
+	public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+		mCasing = 0;
+		if (checkPiece(mName, 1, 7, 0) && mCasing >= 7) {
+			if (this.mInputHatches.size() == 4 && this.mOutputHatches.size() == 2 &&
+					this.mOutputBusses.size() == 1 && this.mMufflerHatches.size() == 1 &&
+					this.mMaintenanceHatches.size() == 1 && this.mEnergyHatches.size() == 1) {
+				this.resetRecipeMapForAllInputHatches(this.getRecipeMap());
+				return true;
 			}
-			if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir - 1) != ModBlocks.blockCasings2Misc) {
-				//Utils.LOG_INFO("7 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName());
-				if (y==3){
-					if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) {
-						if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) {
-							Logger.INFO("7 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir));
-							return false;
-						}
-						Logger.INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y));
-					}
-				}
-				else {
-					Logger.INFO("debug.4");
-					return false;
-				}
-			}			
 		}
-
-		if ((this.mInputHatches.size() != 4) || (this.mOutputHatches.size() != 2) ||
-				(this.mOutputBusses.size() != 1) || (this.mMufflerHatches.size() != 1) ||
-				(this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)){
-			Logger.INFO("Wrong Hatch count.");
-			Logger.INFO("I-Hatch Count: "+this.mInputHatches.size());
-			Logger.INFO("O-Hatch Count: "+this.mOutputHatches.size());
-			Logger.INFO("O-Bus Count: "+this.mOutputBusses.size());
-			Logger.INFO("Muffler Count: "+this.mMufflerHatches.size());
-			Logger.INFO("Maint Count: "+this.mMaintenanceHatches.size());
-			Logger.INFO("Energy Count: "+this.mEnergyHatches.size());
-			return false;
-		}
-		if (this.mMufflerHatches.size() == 1){
-			if (this.mMufflerHatches.get(0).mTier < 7){
-				Logger.INFO("Your Muffler must be AT LEAST ZPM tier or higher.");
-			}
-		}		
-		Logger.INFO("Fission Fuel Production Plant Formed. "+this.getRecipeMap().mRecipeList.size());
-		this.resetRecipeMapForAllInputHatches(this.getRecipeMap());
-		return true;
+		return false;
 	}
 
 	@Override
@@ -282,4 +240,4 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase
 		return new GregtechMetaTileEntity_Refinery(this.mName);
 	}
 
-}*/
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
index f83e2966a3..0b6dcb1b94 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java
@@ -1,4 +1,3 @@
-/*
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.api.objects.Logger;
@@ -24,4 +23,4 @@ public class GregtechIndustrialFuelRefinery {
 				"industrialrefinery.controller.tier.single", "Reactor Fuel Processing Plant").getStackForm(1L));
 
 	}
-}*/
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
index a4c5316022..a9eee53a7c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java
@@ -1,4 +1,3 @@
-/*
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.api.objects.Logger;
@@ -26,4 +25,3 @@ public class GregtechLFTR {
 
 	}
 }
-*/