Added more nuclear processing recipes.

Removed lots of useless nuclear generated items.
More NEI improvements.
Made Dehydrator and FFPP recipe handling more lenient.

6 files changed, 188 insertions, 462 deletions

diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
index dd27a19528..832ef780e0 100644
--- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
+++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
@@ -5,6 +5,7 @@ import java.awt.Rectangle;
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -30,6 +31,7 @@ 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.api.objects.data.Pair;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -37,16 +39,35 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-public class GTPP_NEI_DefaultHandler
-extends TemplateRecipeHandler {
+public class GTPP_NEI_DefaultHandler extends TemplateRecipeHandler {
 	
 	public static final int sOffsetX = 5;
 	public static final int sOffsetY = 11;
     private SoftReference<List<CachedDefaultRecipe>> mCachedRecipes = null;
+	
+	private static final HashMap<Integer, Pair<Integer, Integer>> mInputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>();
+	private static final HashMap<Integer, Pair<Integer, Integer>> mOutputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>();
 
 	static {
 		GuiContainerManager.addInputHandler(new GT_RectHandler());
 		GuiContainerManager.addTooltipHandler(new GT_RectHandler());
+		int[] aSlotX = new int[] {12, 30, 48};
+		int[] aSlotY = new int[] {5, 23, 41, 64};	
+		// Input slots
+		int aIndex = 0;
+		for (int y=0; y<aSlotY.length;y++) {
+			for (int x=0; x<aSlotX.length;x++) {
+				mInputSlotMap.put(aIndex++, new Pair<Integer, Integer>(aSlotX[x], aSlotY[y]));				
+			}
+		}
+		// Output slots
+		aSlotX = new int[] {102, 120, 138};
+		aIndex = 0;
+		for (int y=0; y<aSlotY.length;y++) {
+			for (int x=0; x<aSlotX.length;x++) {
+				mOutputSlotMap.put(aIndex++, new Pair<Integer, Integer>(aSlotX[x], aSlotY[y]));				
+			}
+		}
 	}
 
 	protected final GT_Recipe_Map mRecipeMap;
@@ -829,4 +850,88 @@ extends TemplateRecipeHandler {
 			return this.mOutputs;
 		}
 	}
+
+	public class NoCellMultiDefaultRecipe extends CachedDefaultRecipe {
+
+		public NoCellMultiDefaultRecipe(final GT_Recipe aRecipe) {
+			super(aRecipe);
+			
+		}
+
+		@Override
+		public void handleSlots() {
+
+			int aInputItemsCount = this.mRecipe.mInputs.length;
+			int aInputFluidsCount = this.mRecipe.mFluidInputs.length;			
+			int aOutputItemsCount = this.mRecipe.mOutputs.length;
+			int aOutputFluidsCount = this.mRecipe.mFluidOutputs.length;
+			int aInputSlotsUsed = 0;
+			int aOutputSlotsUsed = 0;			
+			int aSlotToCheck = 0;	
+
+			// Special Slot
+			if (mRecipe.mSpecialItems != null) {
+				this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52));
+			}
+			
+			/*
+			 * Items
+			 */
+			
+			// Upto 9 Inputs Slots
+			if (aInputItemsCount > 0) {				
+				if (aInputItemsCount > 9) {
+					aInputItemsCount = 9;
+				}				
+				for (int i=0;i<aInputItemsCount;i++) {
+					int x = mInputSlotMap.get(aSlotToCheck).getKey();
+					int y = mInputSlotMap.get(aSlotToCheck).getValue();
+					this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(aSlotToCheck), x, y));	
+					aSlotToCheck++;
+					aInputSlotsUsed++;
+				}
+			}
+			aSlotToCheck = 0;	
+			// Upto 9 Output Slots
+			if (aOutputItemsCount > 0) {			
+				if (aOutputItemsCount > 9) {
+					aOutputItemsCount = 9;
+				}		
+				for (int i=0;i<aOutputItemsCount;i++) {
+					int x = mOutputSlotMap.get(aSlotToCheck).getKey();
+					int y = mOutputSlotMap.get(aSlotToCheck).getValue();
+					this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(aSlotToCheck), x, y, mRecipe.getOutputChance(aSlotToCheck)));	
+					aSlotToCheck++;
+					aOutputSlotsUsed++;
+				}
+			}					
+			
+			/*
+			 * Fluids
+			 */
+
+			// Upto 9 Fluid Inputs Slots
+			aSlotToCheck = aInputSlotsUsed;	
+			if (aInputFluidsCount > 0) {				
+				for (int i=0;i<aInputFluidsCount;i++) {
+					int x = mInputSlotMap.get(aSlotToCheck).getKey();
+					int y = mInputSlotMap.get(aSlotToCheck).getValue();
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[i], true), x, y));
+					aSlotToCheck++;
+					aInputSlotsUsed++;
+				}
+			}
+			// Upto 9 Fluid Outputs Slots
+			aSlotToCheck = aOutputSlotsUsed;	
+			if (aOutputFluidsCount > 0) {				
+				for (int i=0;i<aOutputFluidsCount;i++) {
+					int x = mOutputSlotMap.get(aSlotToCheck).getKey();
+					int y = mOutputSlotMap.get(aSlotToCheck).getValue();
+					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[i], true), x, y));
+					aSlotToCheck++;
+					aOutputSlotsUsed++;
+				}
+			}
+		}
+	}
 }
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java b/src/Java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java
new file mode 100644
index 0000000000..448cb69dad
--- /dev/null
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java
@@ -0,0 +1,59 @@
+package gtPlusPlus.nei;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import org.lwjgl.opengl.GL11;
+
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.recipe.TemplateRecipeHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gtPlusPlus.core.util.math.MathUtils;
+
+public class GT_NEI_MultiNoCell extends GTPP_NEI_DefaultHandler {
+
+	public GT_NEI_MultiNoCell(GT_Recipe_Map aMap) {
+		super(aMap);
+	}
+
+	@Override
+	public TemplateRecipeHandler newInstance() {
+		return new GT_NEI_MultiNoCell(mRecipeMap);
+	}
+
+	@Override
+    public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) {
+    	return new NoCellMultiDefaultRecipe(aRecipe);
+    }
+
+	@Override
+	public void drawBackground(final int recipe) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		GuiDraw.changeTexture(this.getGuiTexture());
+		GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 89);
+	}
+	
+	@Override
+	public String getGuiTexture() {
+		return RES_PATH_GUI + "basicmachines/FissionFuel.png";
+	}
+
+	@Override
+	public void drawExtras(final int aRecipeIndex) {
+		final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt;
+		final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration;
+		if (tEUt != 0) {
+			drawText(10, 90, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216);
+			drawText(10, 100, "Usage: " + MathUtils.formatNumbers(tEUt) + " EU/t", -16777216);
+		}
+		if (tDuration > 0) {
+			drawText(10, 110, "Time: " + (tDuration < 20 ? "< 1" : MathUtils.formatNumbers(Integer.valueOf(tDuration / 20))) + " secs", -16777216);
+		}
+		if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) {
+			drawText(10, 120, this.mRecipeMap.mNEISpecialValuePre + MathUtils.formatNumbers((((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier)) + this.mRecipeMap.mNEISpecialValuePost, -16777216);
+		}
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java b/src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java
deleted file mode 100644
index a4926f5d7e..0000000000
--- a/src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package gtPlusPlus.nei;
-
-import codechicken.nei.recipe.TemplateRecipeHandler;
-import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-
-public class GT_NEI_RFPP extends GTPP_NEI_DefaultHandler {
-
-	public GT_NEI_RFPP() {
-		super(GTPP_Recipe_Map.sFissionFuelProcessing);
-	}
-
-	@Override
-	public TemplateRecipeHandler newInstance() {
-		return new GT_NEI_RFPP();
-	}
-
-	@Override
-    public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) {
-    	return new FFPPDefaultRecipe(aRecipe);
-    }
-
-	public class FFPPDefaultRecipe extends CachedDefaultRecipe {
-
-		public FFPPDefaultRecipe(final GT_Recipe aRecipe) {
-			super(aRecipe);			
-		}
-
-		@Override
-		public void handleSlots() {
-			int tStartIndex = 0;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 5));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 5));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 5));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 23));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 23));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 23));
-			}
-			tStartIndex++;		
-			
-			if (mRecipe.mSpecialItems != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52));
-			}
-			tStartIndex = 0;
-			
-			//Four Output Slots
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;			
-			
-			//New fluid display behaviour when 3 fluid inputs are detected. (Basically a mix of the code below for outputs an the code above for 9 input slots.)
-			if (mRecipe.mFluidInputs.length > 2) {
-				if ((mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 12, 5));
-				}
-				if ((mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 30, 5));
-				}
-				if ((mRecipe.mFluidInputs.length > 2) && (mRecipe.mFluidInputs[2] != null) && (mRecipe.mFluidInputs[2].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[2], true), 48, 5));
-				}
-				if ((mRecipe.mFluidInputs.length > 3) && (mRecipe.mFluidInputs[3] != null) && (mRecipe.mFluidInputs[3].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[3], true), 12, 23));
-				}
-				if ((mRecipe.mFluidInputs.length > 4) && (mRecipe.mFluidInputs[4] != null) && (mRecipe.mFluidInputs[4].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[4], true), 30, 23));
-				}
-				if ((mRecipe.mFluidInputs.length > 5) && (mRecipe.mFluidInputs[5] != null) && (mRecipe.mFluidInputs[5].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[5], true), 48, 23));
-				}
-				if ((mRecipe.mFluidInputs.length > 6) && (mRecipe.mFluidInputs[6] != null) && (mRecipe.mFluidInputs[6].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[6], true), 12, 41));
-				}
-				if ((mRecipe.mFluidInputs.length > 7) && (mRecipe.mFluidInputs[7] != null) && (mRecipe.mFluidInputs[7].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[7], true), 30, 41));
-				}
-				if ((mRecipe.mFluidInputs.length > 8) && (mRecipe.mFluidInputs[8] != null) && (mRecipe.mFluidInputs[8].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[8], true), 48, 41));
-				}
-			}
-			//Returns to old behaviour if fluid inputs < 3
-			else if ((mRecipe.mFluidInputs.length > 0) && (mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) {
-				this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 48, 52));
-				if ((mRecipe.mFluidInputs.length == 2) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 30, 52));
-				}
-			}
-
-			if (mRecipe.mFluidOutputs.length > 1) {
-				if ((mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 102, 5));
-				}
-				if ((mRecipe.mFluidOutputs[1] != null) && (mRecipe.mFluidOutputs[1].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 120, 5));
-				}
-				if ((mRecipe.mFluidOutputs.length > 2) && (mRecipe.mFluidOutputs[2] != null) && (mRecipe.mFluidOutputs[2].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[2], true), 138, 5));
-				}
-				if ((mRecipe.mFluidOutputs.length > 3) && (mRecipe.mFluidOutputs[3] != null) && (mRecipe.mFluidOutputs[3].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[3], true), 102, 23));
-				}
-				if ((mRecipe.mFluidOutputs.length > 4) && (mRecipe.mFluidOutputs[4] != null) && (mRecipe.mFluidOutputs[4].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[4], true), 120, 23));
-				}
-				if ((mRecipe.mFluidOutputs.length > 5) && (mRecipe.mFluidOutputs[5] != null) && (mRecipe.mFluidOutputs[5].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[5], true), 138, 23));
-				}
-				if ((mRecipe.mFluidOutputs.length > 6) && (mRecipe.mFluidOutputs[6] != null) && (mRecipe.mFluidOutputs[6].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[6], true), 102, 41));
-				}
-				if ((mRecipe.mFluidOutputs.length > 7) && (mRecipe.mFluidOutputs[7] != null) && (mRecipe.mFluidOutputs[7].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[7], true), 120, 41));
-				}
-				if ((mRecipe.mFluidOutputs.length > 8) && (mRecipe.mFluidOutputs[8] != null) && (mRecipe.mFluidOutputs[8].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[8], true), 138, 41));
-				}
-			} else if ((mRecipe.mFluidOutputs.length > 0) && (mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) {
-				this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 102, 5));
-			}
-		}
-	}
-}
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java b/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java
deleted file mode 100644
index 5fe63c4c61..0000000000
--- a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package gtPlusPlus.nei;
-
-import codechicken.nei.recipe.TemplateRecipeHandler;
-import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-
-public class GT_NEI_VacFurnace extends GTPP_NEI_DefaultHandler {
-
-	public GT_NEI_VacFurnace() {
-		super(GTPP_Recipe_Map.sVacuumFurnaceRecipes);
-	}
-
-	@Override
-	public TemplateRecipeHandler newInstance() {
-		return new GT_NEI_VacFurnace();
-	}
-
-	@Override
-    public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) {
-    	return new VacFurnaceDefaultRecipe(aRecipe);
-    }
-
-	public class VacFurnaceDefaultRecipe extends CachedDefaultRecipe {
-
-		public VacFurnaceDefaultRecipe(final GT_Recipe aRecipe) {
-			super(aRecipe);
-		}
-
-		@Override
-		public void handleSlots() {	
-			int tStartIndex = 0;
-
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 5));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 5));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 5));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 23));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 23));
-			}
-			tStartIndex++;
-			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 23));
-			}
-			tStartIndex++;		
-			
-			if (mRecipe.mSpecialItems != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52));
-			}
-			tStartIndex = 0;
-			
-			//9 Output Slots
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 101, 4, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 119, 4, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 137, 4, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 101, 22, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 119, 22, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 137, 22, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 101, 40, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 119, 40, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			if (mRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 137, 40, mRecipe.getOutputChance(tStartIndex)));
-			}
-			tStartIndex++;
-			
-			if ((mRecipe.mFluidInputs.length > 0) && (mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) {
-				this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 12, 60));
-				if ((mRecipe.mFluidInputs.length > 1) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 30, 60));
-				}
-			}
-
-			if (mRecipe.mFluidOutputs.length > 0) {
-				if ((mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 101, 60));
-				}
-				if ((mRecipe.mFluidOutputs.length > 1) && (mRecipe.mFluidOutputs[1] != null) && (mRecipe.mFluidOutputs[1].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 119, 60));
-				}
-			}
-		}
-	}
-}
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java b/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
deleted file mode 100644
index 3f22b15f3b..0000000000
--- a/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package gtPlusPlus.nei;
-
-import java.util.HashMap;
-
-import codechicken.nei.recipe.TemplateRecipeHandler;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.GT_Utility;
-import gtPlusPlus.api.objects.data.Pair;
-
-public class GT_NEI_multiCentriElectroFreezer extends GTPP_NEI_DefaultHandler {
-
-	public GT_NEI_multiCentriElectroFreezer(GT_Recipe_Map aMap) {
-		super(aMap);
-	}
-
-	@Override
-	public TemplateRecipeHandler newInstance() {
-		return new GT_NEI_multiCentriElectroFreezer(mRecipeMap);
-	}
-
-	@Override
-    public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) {
-    	return new NoCellMultiDefaultRecipe(aRecipe);
-    }
-	
-	private static final HashMap<Integer, Pair<Integer, Integer>> mInputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>();
-	private static final HashMap<Integer, Pair<Integer, Integer>> mOutputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>();
-	
-	static {
-		int aSlotX_1 = 12;
-		int aSlotX_2 = 30;
-		int aSlotX_3 = 48;
-		int aSlotY_1 = 5;
-		int aSlotY_2 = 23;
-		int aSlotY_3 = 41;
-		int aSlotY_10 = 65; // Only if 9 input items and a FLuid
-		mInputSlotMap.put(0, new Pair<Integer, Integer>(aSlotX_1, aSlotY_1));
-		mInputSlotMap.put(1, new Pair<Integer, Integer>(aSlotX_2, aSlotY_1));
-		mInputSlotMap.put(2, new Pair<Integer, Integer>(aSlotX_3, aSlotY_1));
-		mInputSlotMap.put(3, new Pair<Integer, Integer>(aSlotX_1, aSlotY_2));
-		mInputSlotMap.put(4, new Pair<Integer, Integer>(aSlotX_2, aSlotY_2));
-		mInputSlotMap.put(5, new Pair<Integer, Integer>(aSlotX_3, aSlotY_2));
-		mInputSlotMap.put(6, new Pair<Integer, Integer>(aSlotX_1, aSlotY_3));
-		mInputSlotMap.put(7, new Pair<Integer, Integer>(aSlotX_2, aSlotY_3));
-		mInputSlotMap.put(8, new Pair<Integer, Integer>(aSlotX_3, aSlotY_3));
-		mInputSlotMap.put(9, new Pair<Integer, Integer>(aSlotX_1, aSlotY_10));
-		mInputSlotMap.put(10, new Pair<Integer, Integer>(aSlotX_2, aSlotY_10));
-		mInputSlotMap.put(11, new Pair<Integer, Integer>(aSlotX_3, aSlotY_10));
-		aSlotX_1 = 102;
-		aSlotX_2 = 120;
-		aSlotX_3 = 138;
-		mOutputSlotMap.put(0, new Pair<Integer, Integer>(aSlotX_1, aSlotY_1));
-		mOutputSlotMap.put(1, new Pair<Integer, Integer>(aSlotX_2, aSlotY_1));
-		mOutputSlotMap.put(2, new Pair<Integer, Integer>(aSlotX_3, aSlotY_1));
-		mOutputSlotMap.put(3, new Pair<Integer, Integer>(aSlotX_1, aSlotY_2));
-		mOutputSlotMap.put(4, new Pair<Integer, Integer>(aSlotX_2, aSlotY_2));
-		mOutputSlotMap.put(5, new Pair<Integer, Integer>(aSlotX_3, aSlotY_2));
-		mOutputSlotMap.put(6, new Pair<Integer, Integer>(aSlotX_1, aSlotY_3));
-		mOutputSlotMap.put(7, new Pair<Integer, Integer>(aSlotX_2, aSlotY_3));
-		mOutputSlotMap.put(8, new Pair<Integer, Integer>(aSlotX_3, aSlotY_3));
-		mOutputSlotMap.put(9, new Pair<Integer, Integer>(aSlotX_1, aSlotY_10));
-		mOutputSlotMap.put(10, new Pair<Integer, Integer>(aSlotX_2, aSlotY_10));
-		mOutputSlotMap.put(11, new Pair<Integer, Integer>(aSlotX_3, aSlotY_10));
-	}
-
-	public class NoCellMultiDefaultRecipe extends CachedDefaultRecipe {
-
-		public NoCellMultiDefaultRecipe(final GT_Recipe aRecipe) {
-			super(aRecipe);
-			
-		}
-
-		@Override
-		public void handleSlots() {
-
-			int aInputItemsCount = this.mRecipe.mInputs.length;
-			int aInputFluidsCount = this.mRecipe.mFluidInputs.length;			
-			int aOutputItemsCount = this.mRecipe.mOutputs.length;
-			int aOutputFluidsCount = this.mRecipe.mFluidOutputs.length;
-			int aInputSlotsUsed = 0;
-			int aOutputSlotsUsed = 0;			
-			int aSlotToCheck = 0;	
-
-			// Special Slot
-			if (mRecipe.mSpecialItems != null) {
-				this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52));
-			}
-			
-			/*
-			 * Items
-			 */
-			
-			// Upto 9 Inputs Slots
-			if (aInputItemsCount > 0) {				
-				if (aInputItemsCount > 9) {
-					aInputItemsCount = 9;
-				}				
-				for (int i=0;i<aInputItemsCount;i++) {
-					int x = mInputSlotMap.get(aSlotToCheck).getKey();
-					int y = mInputSlotMap.get(aSlotToCheck).getValue();
-					this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(aSlotToCheck), x, y));	
-					aSlotToCheck++;
-					aInputSlotsUsed++;
-				}
-			}
-			aSlotToCheck = 0;	
-			// Upto 9 Output Slots
-			if (aOutputItemsCount > 0) {			
-				if (aOutputItemsCount > 9) {
-					aOutputItemsCount = 9;
-				}		
-				for (int i=0;i<aOutputItemsCount;i++) {
-					int x = mOutputSlotMap.get(aSlotToCheck).getKey();
-					int y = mOutputSlotMap.get(aSlotToCheck).getValue();
-					this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(aSlotToCheck), x, y, mRecipe.getOutputChance(aSlotToCheck)));	
-					aSlotToCheck++;
-					aOutputSlotsUsed++;
-				}
-			}					
-			
-			/*
-			 * Fluids
-			 */
-
-			// Upto 9 Fluid Inputs Slots
-			aSlotToCheck = aInputSlotsUsed;	
-			if (aInputFluidsCount > 0) {				
-				for (int i=0;i<aInputFluidsCount;i++) {
-					int x = mInputSlotMap.get(aSlotToCheck).getKey();
-					int y = mInputSlotMap.get(aSlotToCheck).getValue();
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[i], true), x, y));
-					aSlotToCheck++;
-					aInputSlotsUsed++;
-				}
-			}
-			// Upto 9 Fluid Outputs Slots
-			aSlotToCheck = aOutputSlotsUsed;	
-			if (aOutputFluidsCount > 0) {				
-				for (int i=0;i<aOutputFluidsCount;i++) {
-					int x = mOutputSlotMap.get(aSlotToCheck).getKey();
-					int y = mOutputSlotMap.get(aSlotToCheck).getValue();
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[i], true), x, y));
-					aSlotToCheck++;
-					aOutputSlotsUsed++;
-				}
-			}
-		}
-	}
-}
diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index 57da808f1d..8c90926396 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -2,8 +2,8 @@ package gtPlusPlus.nei;
 
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
-import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -20,8 +20,8 @@ implements IConfigureNEI {
 	@Override
 	public synchronized void loadConfig() {
 
-		mUniqueRecipeMapHandling.add(GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mUnlocalizedName);
-		mUniqueRecipeMapHandling.add(GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mUnlocalizedName);
+		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFissionFuelProcessing.mUnlocalizedName);
+		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sOreMillRecipes.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName);
@@ -32,26 +32,9 @@ implements IConfigureNEI {
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mUnlocalizedName);
 		mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.mUnlocalizedName);
 		
-		// Custom Recipe Maps
-		/*Logger.INFO("NEI Registration: "+CustomRecipeMap.sMappings.size()+" CustomRecipeMaps");
-		for (final CustomRecipeMap tMap : CustomRecipeMap.sMappings) {
-			if (tMap.mNEIAllowed) {
-				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
-					Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName);
-					new GTPP_NEI_CustomMapHandler(tMap);
-				}	
-				else {
-					Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);					
-				}
-			}
-			else {
-				Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName);				
-			}
-		}*/
-		
 		// Standard GT Recipe Maps
-		Logger.INFO("NEI Registration: "+GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx.size()+" sMappingEx");
-		for (final GT_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx) {
+		Logger.INFO("NEI Registration: "+GTPP_Recipe_Map_Internal.sMappingsEx.size()+" sMappingEx");
+		for (final GT_Recipe_Map tMap : GTPP_Recipe_Map_Internal.sMappingsEx) {
 			if (tMap.mNEIAllowed) {				
 				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
 					Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName);
@@ -65,27 +48,27 @@ implements IConfigureNEI {
 				Logger.INFO("NEI Registration: Skipping registration of NEI handler for "+tMap.mNEIName);
 			}
 		}
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mNEIName);
+		
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sChemicalPlantRecipes.mNEIName);
 		new GT_NEI_FluidReactor();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sOreMillRecipes.mNEIName);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sOreMillRecipes.mNEIName);
 		new GT_NEI_MillingMachine();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sFlotationCellRecipes.mNEIName);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sFlotationCellRecipes.mNEIName);
 		new GT_NEI_FlotationCell();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.mNEIName);
-		new GT_NEI_VacFurnace();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mNEIName);
-		new GT_NEI_RFPP();
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mNEIName);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mNEIName);
 		new GT_NEI_LFTR();
-
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mNEIName);
-		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT);					
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mNEIName);
-		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT);					
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mNEIName);
-		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT);
-		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.mNEIName);
-		new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sFissionFuelProcessing.mNEIName);
+		new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sFissionFuelProcessing);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sVacuumFurnaceRecipes.mNEIName);
+		new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sVacuumFurnaceRecipes);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mNEIName);
+		new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sAdvFreezerRecipes_GT);					
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mNEIName);
+		new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT);					
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mNEIName);
+		new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT);
+		Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.mNEIName);
+		new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sMultiblockMixerRecipes_GT);
 
 		Logger.INFO("NEI Registration: Registering NEI handler for "+DecayableRecipeHandler.mNEIName);
 		API.registerRecipeHandler(new DecayableRecipeHandler());