+ 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.

6 files changed, 110 insertions, 34 deletions

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;
+	}
+
 }