+ Added Transmission Components.

% Adjusted recipe for Chemical Plant controller, to now use T2 Frames instead of ambiguously tiered Stainless Steel Frames.
% Adjusted a few recipes using Sensors & Emitters to now use TransComps.
% Chunkloaders now have different textures and more informative tooltips.
% Chunkloaders now have better ranges.
% Renamed Fluid Reactor to Chemical Plant.
$ Fixed Chemical Plant NEI handler.

18 files changed, 319 insertions, 243 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 7f22ac179e..6f734db111 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -58,6 +58,7 @@ import gtPlusPlus.xmod.gregtech.api.objects.GregtechBufferThread;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.GregtechMTE_ChemicalPlant;
 import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechMiniRaFusion;
@@ -291,6 +292,7 @@ public class GTplusplus implements ActionListener {
 		FishPondFakeRecipe.generateFishPondRecipes();	
 		GregtechMiniRaFusion.generateSlowFusionrecipes();
 		SemiFluidFuelHandler.generateFuels();
+		GregtechMTE_ChemicalPlant.generateRecipes();
 
 		//Large Centrifuge generation
 		mOriginalCount[0] = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size();
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 6e5b47041f..48fe145b68 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -224,7 +224,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipeCyclohexane() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
 						ItemUtils.getSimpleStack(mBrownCatalyst, 0)
@@ -247,7 +247,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipeCyclohexanone() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
 						ItemUtils.getSimpleStack(mBlueCatalyst, 0)
@@ -266,7 +266,7 @@ public class GenericChem extends ItemPackage {
 				120, 
 				2);
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),
 				}, 
@@ -382,7 +382,7 @@ public class GenericChem extends ItemPackage {
 	private void recipeCadaverineAndPutrescine() {
 		
 		// Basic Recipe
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierOneChip(),		
 						ItemUtils.getSimpleStack(Items.rotten_flesh, 64)
@@ -402,7 +402,7 @@ public class GenericChem extends ItemPackage {
 				1);
 
 		// Advanced Recipe
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
 						ItemUtils.getSimpleStack(Items.rotten_flesh, 128),		
@@ -426,7 +426,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipeAniline() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierThreeChip(),		
 						ItemUtils.getSimpleStack(mBlueCatalyst, 0)
@@ -449,7 +449,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipeNitroBenzene() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getTierThreeChip(),						
 				}, 
@@ -474,7 +474,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipe2Ethylanthraquinone() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedCircuit(4),		
 						ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),				
@@ -504,7 +504,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipe2Ethylanthrahydroquinone() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedCircuit(4),		
 						ItemUtils.getSimpleStack(mOrangeCatalyst, 0),			
@@ -553,7 +553,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipeLithiumHydroperoxide() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedCircuit(4),		
 						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
@@ -587,7 +587,7 @@ public class GenericChem extends ItemPackage {
 
 	private void recipeHydrogenPeroxide() {	
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedCircuit(4),
 				}, 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 74c8ce4202..484cf99a7b 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -511,6 +511,30 @@ public class RECIPES_GREGTECH {
 
 	private static void laserEngraverRecipes() {		
 
+		// Laser Sensors and Emitters together
+		GregtechItemList[] aTransParts = new GregtechItemList[] {
+				GregtechItemList.TransmissionComponent_ULV,
+				GregtechItemList.TransmissionComponent_LV,
+				GregtechItemList.TransmissionComponent_MV,
+				GregtechItemList.TransmissionComponent_HV,
+				GregtechItemList.TransmissionComponent_EV,
+				GregtechItemList.TransmissionComponent_IV,
+				GregtechItemList.TransmissionComponent_LuV,
+				GregtechItemList.TransmissionComponent_ZPM,
+				GregtechItemList.TransmissionComponent_UV,
+				GregtechItemList.TransmissionComponent_MAX,
+		};
+		for (int i=0;i<10;i++) {
+			GT_Values.RA.addLaserEngraverRecipe(
+					CI.getEmitter(i, 2),
+					CI.getSensor(i, 2),
+					aTransParts[i].get(1),
+					20 * 5,
+					MaterialUtils.getVoltageForTier(i));
+		}
+
+
+
 		GT_Values.RA.addLaserEngraverRecipe(
 				GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 6L),
 				GregtechItemList.Laser_Lens_Special.get(0),
@@ -646,18 +670,18 @@ public class RECIPES_GREGTECH {
 				new int[] {10000}, //Output Chance 
 				20 * 120,
 				30720);
-		
+
 		//NITINOL_60
 		CORE.RA.addBlastSmelterRecipe(
 				new ItemStack[] {
-					ELEMENT.getInstance().TITANIUM.getDust(3),
-					ELEMENT.getInstance().NICKEL.getDust(2)
+						ELEMENT.getInstance().TITANIUM.getDust(3),
+						ELEMENT.getInstance().NICKEL.getDust(2)
 				},
 				ALLOY.NITINOL_60.getFluid(20 * 144),
 				0,
 				20 * 75,
 				7680);
-		
+
 
 
 
@@ -847,13 +871,13 @@ public class RECIPES_GREGTECH {
 
 		//Gelid Cryotheum
 		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustCryotheum", 1), FluidUtils.getFluidStack("cryotheum", 250), 200, 240);
-		
+
 		//Ender Fluid
 		CORE.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), FluidUtils.getFluidStack("ender", 250), 100, 30);		
-		
+
 		//Blazing Pyrotheum
 		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), FluidUtils.getFluidStack("pyrotheum", 250), 200, 240);
-		
+
 
 	}
 
@@ -1568,10 +1592,10 @@ public class RECIPES_GREGTECH {
 				GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 8L), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 4L), GregtechItemList.Fluid_Cell_144L.get(1L, new Object[0]), 75, 32);
 			}
 		}
-		
+
 
 		if (LoadedMods.Baubles) {
-			
+
 
 
 			// Turbine Housing Research Page
@@ -1600,8 +1624,8 @@ public class RECIPES_GREGTECH {
 					ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1),
 					20 * 60 * 10,
 					(int) GT_Values.V[7]);
-			
-			
+
+
 			// Supreme Pizza Gloves
 			CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 					ItemUtils.getGregtechCircuit(19),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index d703bb9637..c30efb29eb 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -253,7 +253,7 @@ public class RECIPES_Machines {
 					CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGt, 6),
 					CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plate, 32),
 					CI.getTieredComponentOfMaterial(Materials.CobaltBrass, OrePrefixes.dust, 16),
-					ALLOY.STAINLESS_STEEL.getFrameBox(4),
+					CI.getTieredComponent(OrePrefixes.frameGt, 2, 4),
 				}, 
 				ALLOY.STEEL.getFluid(2 * (144 * 4)), 
 				GregtechItemList.ChemicalPlant_Controller.get(1), 
@@ -293,7 +293,7 @@ public class RECIPES_Machines {
 
 	private static void distillus() {
 		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedBioCircuit(19),
 						ItemList.Distillation_Tower.get(2),
@@ -338,7 +338,7 @@ public class RECIPES_Machines {
 						CI.getElectricPiston(i, 10),
 						CI.getFieldGenerator(i + 1, 6),
 						CI.getPlate(i, 16),
-						CI.getEmitter(i - 1, 24),
+						CI.getTransmissionComponent(i - 1, 8),
 						CI.getTieredComponent(OrePrefixes.cableGt08, i, 16)
 					}, 
 					ALLOY.EGLIN_STEEL.getFluid(i * (144 * 4)), 
@@ -394,7 +394,7 @@ public class RECIPES_Machines {
 		for (int i=0;i<10;i++) {			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-							CI.getNumberedBioCircuit(22),
+							CI.getNumberedBioCircuit(20),
 							CI.getTieredMachineCasing(i),
 							CI.getPlate(i, 8),
 							CI.getGear(i, 2),
@@ -1488,8 +1488,7 @@ public class RECIPES_Machines {
 										GregtechItemList.Casing_Refinery_Structural.get(4),
 										ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, GTNH ? 2 : 1),
 										CI.getTieredComponent(OrePrefixes.cableGt08, GTNH ? 7 : 6, GTNH ? 32 : 16),
-										CI.getEmitter(GTNH ? 6 : 5, 2), 
-										CI.getSensor(GTNH ? 6 : 5, 2),
+										CI.getTransmissionComponent(GTNH ? 6 : 5, 2), 
 										GregtechItemList.Gregtech_Computer_Cube.get(1),
 								},
 								CI.getTieredFluid(7, 144 * (GTNH ? 32 : 8)), GregtechItemList.GT4_Multi_Crafter.get(1),
@@ -2178,8 +2177,7 @@ public class RECIPES_Machines {
 			int aTier = (i + 1);			
 			ItemStack[] aInputs = new ItemStack[] {
 					CI.getTieredMachineHull(i, 1 * aCostMultiplier),
-					CI.getEmitter(i, 2 * aCostMultiplier),
-					CI.getSensor(i, 2 * aCostMultiplier),
+					CI.getTransmissionComponent(i, 2 * aCostMultiplier),
 					CI.getFieldGenerator(i, 1 * aCostMultiplier),
 					CI.getTieredComponent(OrePrefixes.plate, aTier, 4 * aCostMultiplier),
 					CI.getTieredComponent(OrePrefixes.circuit, aTier, 2 * aCostMultiplier),
@@ -2199,9 +2197,8 @@ public class RECIPES_Machines {
 		CORE.RA.addSixSlotAssemblingRecipe(				
 				new ItemStack[] {
 						CI.getTieredMachineHull(-1, 1 * aCostMultiplier),
-						CI.getEmitter(2, 2 * aCostMultiplier),
+						CI.getTransmissionComponent(2, 2 * aCostMultiplier),
 						CI.getElectricPiston(4, 2 * aCostMultiplier),
-						CI.getSensor(4, 1 * aCostMultiplier),
 						CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier),
 						CI.getTieredComponent(OrePrefixes.pipeSmall, 4, 1 * aCostMultiplier),
 				},					
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 6b8f992266..6fae81e85f 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -1264,4 +1264,20 @@ public class CI {
 		return ItemUtils.getOrePrefixStack(aPrefix, aMaterial, aAmount);
 	}
 
+	public static ItemStack getTransmissionComponent(int aTier, int aAmount) {
+		GregtechItemList[] aTransParts = new GregtechItemList[] {
+				GregtechItemList.TransmissionComponent_ULV,
+				GregtechItemList.TransmissionComponent_LV,
+				GregtechItemList.TransmissionComponent_MV,
+				GregtechItemList.TransmissionComponent_HV,
+				GregtechItemList.TransmissionComponent_EV,
+				GregtechItemList.TransmissionComponent_IV,
+				GregtechItemList.TransmissionComponent_LuV,
+				GregtechItemList.TransmissionComponent_ZPM,
+				GregtechItemList.TransmissionComponent_UV,
+				GregtechItemList.TransmissionComponent_MAX,
+		};
+		return aTransParts[aTier].get(aAmount);
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
index 6cd13dc209..add55b8d27 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
@@ -20,9 +20,9 @@ public class SlotChemicalPlantInput extends Slot {
 	}
 	
 	public static boolean isItemValidForChemicalPlantSlot(ItemStack aStack) {
-		boolean validItem = Gregtech_Recipe_Map.sFluidChemicalReactorRecipes.containsInput(aStack);		
+		boolean validItem = Gregtech_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack);		
 		if (!validItem) {
-			for (Recipe_GT f : Gregtech_Recipe_Map.sFluidChemicalReactorRecipes.mRecipeList) {
+			for (Recipe_GT f : Gregtech_Recipe_Map.sChemicalPlantRecipes.mRecipeList) {
 				if (f.mFluidInputs.length > 0) {
 					for (FluidStack g : f.mFluidInputs) {
 						if (g != null) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 148c6a00de..9f5f374108 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -25,11 +25,14 @@ import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique;
 import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
 import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate_OLD;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
 import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -1304,4 +1307,40 @@ public class ItemUtils {
 		}		
 	}
 
+	public static boolean isControlCircuit(ItemStack aStack) {
+		if (aStack != null) {
+			Item aItem = aStack.getItem();
+			if (aItem == CI.getNumberedBioCircuit(0).getItem() || aItem == CI.getNumberedCircuit(0).getItem()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public static boolean isCatalyst(ItemStack aStack) {
+
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
+			return true;
+		}
+		return false;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
index b150d94c25..810076743f 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
@@ -3,6 +3,7 @@ package gtPlusPlus.nei;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -26,7 +27,11 @@ 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 gregtech.api.util.Recipe_GT;
+import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.nei.GT_NEI_MultiBlockHandler.CachedDefaultRecipe;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.init.Blocks;
@@ -44,31 +49,37 @@ extends TemplateRecipeHandler {
 		GuiContainerManager.addTooltipHandler(new GT_RectHandler());
 	}
 
-	protected final GT_Recipe_Map mRecipeMap;
+	protected Gregtech_Recipe_Map mRecipeMap;
 
-	public GT_NEI_FluidReactor(final GT_Recipe_Map sfluidchemicalreactorrecipes) {
-		this.mRecipeMap = sfluidchemicalreactorrecipes;
-		this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0]));
+	public GT_NEI_FluidReactor() {
+		this.mRecipeMap = Gregtech_Recipe_Map.sChemicalPlantRecipes;
+		this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
 		if (!NEI_GT_Config.sIsAdded) {
-			FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getOverlayIdentifier());
+			FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
 			GuiCraftingRecipe.craftinghandlers.add(this);
 			GuiUsageRecipe.usagehandlers.add(this);
 		}
 	}
 
+	public List<Recipe_GT> getSortedRecipes() {
+		List<Recipe_GT> result = new ArrayList<>(this.mRecipeMap.mRecipeList);
+		Collections.sort(result);
+		return result;
+	}
+	
 	public static void drawText(final int aX, final int aY, final String aString, final int aColor) {
 		Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor);
 	}
 
 	@Override
 	public TemplateRecipeHandler newInstance() {
-		return new GT_NEI_FluidReactor(this.mRecipeMap);
+		return new GT_NEI_FluidReactor();
 	}
 
 	@Override
 	public void loadCraftingRecipes(final String outputId, final Object... results) {
-		if (outputId.equals(this.mRecipeMap.mNEIName)) {
-			for (final GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
+		if (outputId.equals(getRecipeMapName())) {
+			for (Recipe_GT tRecipe : getSortedRecipes()) {
 				if (!tRecipe.mHidden) {
 					this.arecipes.add(new CachedDefaultRecipe(tRecipe));
 				}
@@ -80,29 +91,29 @@ extends TemplateRecipeHandler {
 
 	@Override
 	public void loadCraftingRecipes(final ItemStack aResult) {
-		final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
+		ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
 
-		final ArrayList<ItemStack> tResults = new ArrayList<ItemStack>();
+		ArrayList<ItemStack> tResults = new ArrayList<ItemStack>();
 		tResults.add(aResult);
 		tResults.add(GT_OreDictUnificator.get(true, aResult));
 		if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
-			for (final OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
+			for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
 				tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
 			}
 		}
-		final FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true);
+		FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true);
 		if (tFluid != null) {
 			tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false));
-			for (final FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
+			for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
 				if (tData.fluid.isFluidEqual(tFluid)) {
 					tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer}));
 				}
 			}
 		}
-		for (final GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
+		for (Recipe_GT tRecipe : getSortedRecipes()) {
 			if (!tRecipe.mHidden) {
-				final CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
-				for (final ItemStack tStack : tResults) {
+				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
+				for (ItemStack tStack : tResults) {
 					if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) {
 						this.arecipes.add(tNEIRecipe);
 						break;
@@ -110,33 +121,33 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
+		//CachedDefaultRecipe tNEIRecipe;
 	}
 
-	@Override
-	public void loadUsageRecipes(final ItemStack aInput) {
-		final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
+	public void loadUsageRecipes(ItemStack aInput) {
+		ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
 
-		final ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>();
+		ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>();
 		tInputs.add(aInput);
 		tInputs.add(GT_OreDictUnificator.get(false, aInput));
 		if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
-			for (final OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
+			for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
 				tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
 			}
 		}
-		final FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true);
+		FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true);
 		if (tFluid != null) {
 			tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false));
-			for (final FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
+			for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
 				if (tData.fluid.isFluidEqual(tFluid)) {
 					tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer}));
 				}
 			}
 		}
-		for (final GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
+		for (Recipe_GT tRecipe : getSortedRecipes()) {
 			if (!tRecipe.mHidden) {
-				final CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
-				for (final ItemStack tStack : tInputs) {
+				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
+				for (ItemStack tStack : tInputs) {
 					if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) {
 						this.arecipes.add(tNEIRecipe);
 						break;
@@ -144,6 +155,11 @@ extends TemplateRecipeHandler {
 				}
 			}
 		}
+		//CachedDefaultRecipe tNEIRecipe;
+	}
+
+	public String getRecipeMapName() {
+		return this.mRecipeMap.mNEIName;
 	}
 
 	@Override
@@ -195,7 +211,13 @@ extends TemplateRecipeHandler {
 							(tStack.item.stackSize != 0)) {
 						break;
 					}
-					currenttip.add("Does not get consumed in the process");
+					if (ItemUtils.isCatalyst(aStack)) {
+						currenttip.add("Does not always get consumed in the process");
+						currenttip.add("Higher tier pipe casings allow this item to last longer");						
+					}
+					else if (ItemUtils.isControlCircuit(aStack)) {
+						currenttip.add("Does not get consumed in the process");					
+					}
 					break;
 				}
 			}
diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index 348b95ecb3..45d406aa96 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -20,12 +20,12 @@ implements IConfigureNEI {
 		}
 		for (final Gregtech_Recipe_Map tMap : gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map.sMappings) {
 			if (tMap.mNEIAllowed) {				
-				if (!tMap.mUnlocalizedName.equals(Gregtech_Recipe_Map.sFluidChemicalReactorRecipes.mUnlocalizedName)) {
+				if (!tMap.mUnlocalizedName.equals(Gregtech_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName)) {
 					new GT_NEI_MultiBlockHandler(tMap);					
 				}				
 			}
 		}
-		new GT_NEI_FluidReactor(GregtechMTE_ChemicalPlant.getGeneratedRecipeMap());
+		new GT_NEI_FluidReactor();
 		sIsAdded = true;
 		API.registerRecipeHandler(new DecayableRecipeHandler());
 		API.registerUsageHandler(new DecayableRecipeHandler());
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 54e2f55851..a139ec7a4d 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -339,7 +339,7 @@ public class BioRecipes {
 				ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1));
 
 		// Plastic		
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(16),
 						ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 64),
@@ -489,7 +489,7 @@ public class BioRecipes {
 						var9); // Eu
 		 */	
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 0)
 				},
@@ -583,7 +583,7 @@ public class BioRecipes {
 				continue;
 			}
 			if (ItemUtils.checkForInvalidItems(a)) {
-				CORE.RA.addFluidReactorRecipe(
+				CORE.RA.addChemicalPlantRecipe(
 						new ItemStack[] {
 								getBioChip(2),
 								ItemUtils.getSimpleStack(a, 10)
@@ -605,7 +605,7 @@ public class BioRecipes {
 		}
 		for (ItemStack a : aSeeds) {
 			if (ItemUtils.checkForInvalidItems(a)) {
-				CORE.RA.addFluidReactorRecipe(
+				CORE.RA.addChemicalPlantRecipe(
 						new ItemStack[] {
 								getBioChip(3),
 								ItemUtils.getSimpleStack(a, 20)
@@ -626,7 +626,7 @@ public class BioRecipes {
 		}
 
 		// Sugar Cane
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(4),
 						ItemUtils.getSimpleStack(Items.reeds, 16)
@@ -644,7 +644,7 @@ public class BioRecipes {
 				30,
 				1);
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(5),
 						ItemUtils.getSimpleStack(Items.reeds, 32),
@@ -666,7 +666,7 @@ public class BioRecipes {
 		// Sugar Beet
 		if (OreDictUtils.containsValidEntries("cropSugarbeet")) {
 
-			CORE.RA.addFluidReactorRecipe(
+			CORE.RA.addChemicalPlantRecipe(
 					new ItemStack[] {
 							getBioChip(4),
 							ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 8),
@@ -684,7 +684,7 @@ public class BioRecipes {
 					30,
 					1);
 
-			CORE.RA.addFluidReactorRecipe(
+			CORE.RA.addChemicalPlantRecipe(
 					new ItemStack[] {
 							getBioChip(5),
 							ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 16),
@@ -705,7 +705,7 @@ public class BioRecipes {
 		}
 
 		// Produce Acetone, Butanol and Ethanol
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(5),
 						ItemUtils.getItemStackOfAmountFromOreDict("cellFermentationBase", 48),
@@ -732,7 +732,7 @@ public class BioRecipes {
 	}
 
 	private static void recipePropionicAcid() {
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 0)
 				},
@@ -781,7 +781,7 @@ public class BioRecipes {
 	}
 
 	private static void recipeSodiumHydroxide() {
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(4)
 				},
@@ -799,7 +799,7 @@ public class BioRecipes {
 				120,
 				1);
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(5),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5)
@@ -821,7 +821,7 @@ public class BioRecipes {
 	private static void recipeSodiumCarbonate() {
 
 		if (OreDictUtils.containsValidEntries("fuelCoke")) {			
-			CORE.RA.addFluidReactorRecipe(
+			CORE.RA.addChemicalPlantRecipe(
 					new ItemStack[] {
 							getBioChip(18),
 							ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 3),
@@ -844,7 +844,7 @@ public class BioRecipes {
 
 		}	
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(18),
 						ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 6),
@@ -938,7 +938,7 @@ public class BioRecipes {
 		}
 
 		for (String aOreName : aOreNames) {
-			CORE.RA.addFluidReactorRecipe(
+			CORE.RA.addChemicalPlantRecipe(
 					new ItemStack[] {
 							CI.getNumberedBioCircuit(14),
 							ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName))
@@ -1051,7 +1051,7 @@ public class BioRecipes {
 	private static void recipeSulfuricAcid() {
 
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(7),
 						ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 10),
@@ -1070,7 +1070,7 @@ public class BioRecipes {
 				60,
 				1);
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(7),
 						ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 5),
@@ -1094,7 +1094,7 @@ public class BioRecipes {
 	private static void recipeUrea() {
 
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(9),
 				},
@@ -1113,7 +1113,7 @@ public class BioRecipes {
 				30,
 				1);
 
-		CORE.RA.addFluidReactorRecipe(
+		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(9),
 				},
@@ -1134,7 +1134,7 @@ public class BioRecipes {
 
 	private static void recipeRawBioResin() {