Merge pull request #50 from GTNewHorizons/gtnh-milling

Milling/Nuclear Sciences revamp + Lots of minor fixes

1 files changed, 43 insertions, 379 deletions

diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
index 8aea87b6d4..5d09b9003f 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
@@ -1,73 +1,20 @@
 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;
 
-import org.lwjgl.opengl.GL11;
-
-import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import codechicken.nei.guihook.IContainerTooltipHandler;
-import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
 import codechicken.nei.recipe.TemplateRecipeHandler;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.gui.GT_GUIContainer_BasicMachine;
-import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 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.GTPP_Recipe;
-import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
 
-public class GT_NEI_MillingMachine
-extends TemplateRecipeHandler {
-	public static final int sOffsetX = 5;
-	public static final int sOffsetY = 11;
-
-	static {
-		GuiContainerManager.addInputHandler(new GT_RectHandler());
-		GuiContainerManager.addTooltipHandler(new GT_RectHandler());
-	}
-
-	protected GT_Recipe_Map mRecipeMap;
+public class GT_NEI_MillingMachine extends GTPP_NEI_DefaultHandler {
 
 	public GT_NEI_MillingMachine() {
-		this.mRecipeMap = GTPP_Recipe_Map.sOreMillRecipes;
-		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.getRecipeMapName());
-			GuiCraftingRecipe.craftinghandlers.add(this);
-			GuiUsageRecipe.usagehandlers.add(this);
-		}
-	}
-
-	public List<GTPP_Recipe> getSortedRecipes() {
-		List<GTPP_Recipe> 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);
+		super(GTPP_Recipe_Map.sOreMillRecipes);
 	}
 
 	@Override
@@ -76,118 +23,10 @@ extends TemplateRecipeHandler {
 	}
 
 	@Override
-	public void loadCraftingRecipes(final String outputId, final Object... results) {
-		if (outputId.equals(getRecipeMapName())) {
-			for (GTPP_Recipe tRecipe : getSortedRecipes()) {
-				if (!tRecipe.mHidden) {
-					this.arecipes.add(new CachedDefaultRecipe(tRecipe));
-				}
-			}
-		} else {
-			super.loadCraftingRecipes(outputId, results);
-		}
-	}
-
-	@Override
-	public void loadCraftingRecipes(final ItemStack aResult) {
-		ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
-
-		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 (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
-				tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
-			}
-		}
-		FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true);
-		if (tFluid != null) {
-			tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false));
-			for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
-				if (tData.fluid.isFluidEqual(tFluid)) {
-					tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer}));
-				}
-			}
-		}
-		for (GTPP_Recipe tRecipe : getSortedRecipes()) {
-			if (!tRecipe.mHidden) {
-				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
-				for (ItemStack tStack : tResults) {
-					if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) {
-						this.arecipes.add(tNEIRecipe);
-						break;
-					}
-				}
-			}
-		}
-		//CachedDefaultRecipe tNEIRecipe;
-	}
-
-	public void loadUsageRecipes(ItemStack aInput) {
-		ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
-
-		ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>();
-		tInputs.add(aInput);
-		tInputs.add(GT_OreDictUnificator.get(false, aInput));
-		if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
-			for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
-				tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
-			}
-		}
-		FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true);
-		if (tFluid != null) {
-			tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false));
-			for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
-				if (tData.fluid.isFluidEqual(tFluid)) {
-					tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer}));
-				}
-			}
-		}
-		for (GTPP_Recipe tRecipe : getSortedRecipes()) {
-			if (!tRecipe.mHidden) {
-				CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
-				for (ItemStack tStack : tInputs) {
-					if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) {
-						this.arecipes.add(tNEIRecipe);
-						break;
-					}
-				}
-			}
-		}
-		//CachedDefaultRecipe tNEIRecipe;
-	}
-
-	public String getRecipeMapName() {
-		return this.mRecipeMap.mNEIName;
-	}
-
-	@Override
-	public String getOverlayIdentifier() {
-		return this.mRecipeMap.mNEIName;
-	}
-
-	@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, 78);
-	}
-
-	@Override
-	public int recipiesPerPage() {
-		return 1;
-	}
-
-	@Override
-	public String getRecipeName() {
-		return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName);
-	}
-
-	@Override
-	public String getGuiTexture() {
-		return this.mRecipeMap.mNEIGUIPath;
-	}
-
+    public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) {
+    	return new MillingDefaultRecipe(aRecipe);
+    }
+	
 	@Override
 	public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) {
 		final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex);
@@ -221,252 +60,77 @@ extends TemplateRecipeHandler {
 		return currenttip;
 	}
 
-	@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, 73, "Total: " + (long) (tDuration * tEUt) + " EU", -16777216);
-			//drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216);
-			if (this.mRecipeMap.mShowVoltageAmperageInNEI) {
-				drawText(10, 83, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU/t", -16777216);
-				drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216);
-			} else {
-				drawText(10, 93, "Voltage: unspecified", -16777216);
-				drawText(10, 103, "Amperage: unspecified", -16777216);
-			}
-		}
-		if (tDuration > 0) {
-			drawText(10, 103, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);
-		}
-		if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) {
-			drawText(10, 113, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216);
-		}
-	}
-
-	public static class GT_RectHandler
-	implements IContainerInputHandler, IContainerTooltipHandler {
-		@Override
-		public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) {
-			if (this.canHandle(gui)) {
-				if (button == 0) {
-					return this.transferRect(gui, false);
-				}
-				if (button == 1) {
-					return this.transferRect(gui, true);
-				}
-			}
-			return false;
-		}
-
-		@Override
-		public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) {
-			return false;
-		}
-
-		public boolean canHandle(final GuiContainer gui) {
-			return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/);
-		}
-
-		@Override
-		public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) {
-			if ((this.canHandle(gui)) && (currenttip.isEmpty())) {
-				if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) {
-					currenttip.add("Recipes");
-				} /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) {
-                    currenttip.add("Recipes");
-                }*/
-
-			}
-			return currenttip;
-		}
-
-		private boolean transferRect(final GuiContainer gui, final boolean usage) {
-			if (gui instanceof GT_GUIContainer_BasicMachine) {
-				return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]));
-			} /*else if (gui instanceof GT_GUIContainer_FusionReactor) {
-                return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]));
-            }*/
-			return false;
-		}
-
-		@Override
-		public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) {
-			return currenttip;
-		}
-
-		@Override
-		public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) {
-			return currenttip;
-		}
-
-		@Override
-		public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) {
-			return false;
-		}
-
-		@Override
-		public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) {
-		}
-
-		@Override
-		public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) {
-		}
-
-		@Override
-		public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) {
-		}
+	public class MillingDefaultRecipe extends CachedDefaultRecipe {
 
-		@Override
-		public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) {
-			return false;
+		public MillingDefaultRecipe(final GT_Recipe aRecipe) {
+			super(aRecipe);			
 		}
-
+		
 		@Override
-		public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) {
-		}
-
-		@Override
-		public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) {
-		}
-	}
-
-	public class FixedPositionedStack
-	extends PositionedStack {
-		public final int mChance;
-		public boolean permutated = false;
-
-		public FixedPositionedStack(final Object object, final int x, final int y) {
-			this(object, x, y, 0);
-		}
-
-		public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) {
-			super(object, x, y, true);
-			this.mChance = aChance;
-		}
-
-		@Override
-		public void generatePermutations() {
-			if (this.permutated) {
-				return;
-			}
-			final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>();
-			for (final ItemStack tStack : this.items) {
-				if (GT_Utility.isStackValid(tStack)) {
-					if (tStack.getItemDamage() == 32767) {
-						final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem());
-						if (!permutations.isEmpty()) {
-							ItemStack stack;
-							for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) {
-								stack = i$.next();
-							}
-						} else {
-							final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize);
-							base.stackTagCompound = tStack.stackTagCompound;
-							tDisplayStacks.add(base);
-						}
-					} else {
-						tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack}));
-					}
-				}
-			}
-			this.items = (tDisplayStacks.toArray(new ItemStack[0]));
-			if (this.items.length == 0) {
-				this.items = new ItemStack[]{new ItemStack(Blocks.fire)};
-			}
-			this.permutated = true;
-			this.setPermutationToRender(0);
-		}
-	}
+		public void handleSlots() {
+			int tStartIndex = 0;
 
-	public class CachedDefaultRecipe
-	extends TemplateRecipeHandler.CachedRecipe {
-		public final GT_Recipe mRecipe;
-		public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>();
-		public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>();
-
-		public CachedDefaultRecipe(final GT_Recipe aRecipe) {
-			super();
-			this.mRecipe = aRecipe;
-
-			int tStartIndex = 0;			
-
-			if (aRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 14));
+			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
+				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 14));
 			}
 			tStartIndex++;
-			if (aRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14));
+			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
+				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14));
 			}
 			tStartIndex++;
-			if (aRecipe.getRepresentativeInput(tStartIndex) != null) {
-				this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14));
+			if (mRecipe.getRepresentativeInput(tStartIndex) != null) {
+				this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14));
 			}
 			tStartIndex++;			
 			
-			if (aRecipe.mSpecialItems != null) {
-				this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52));
+			if (mRecipe.mSpecialItems != null) {
+				this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52));
 			}
 			tStartIndex = 0;
 			
 			//Four Output Slots
-			if (aRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex)));
+			if (mRecipe.getOutput(tStartIndex) != null) {
+				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex)));
 			}
 			tStartIndex++;
-			if (aRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex)));
+			if (mRecipe.getOutput(tStartIndex) != null) {
+				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex)));
 			}
 			tStartIndex++;
-			if (aRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex)));
+			if (mRecipe.getOutput(tStartIndex) != null) {
+				this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex)));
 			}
 			tStartIndex++;
-			if (aRecipe.getOutput(tStartIndex) != null) {
-				this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(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 (aRecipe.mFluidInputs.length >= 1) {
-				if ((aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 3, 31));
+			if (mRecipe.mFluidInputs.length >= 1) {
+				if ((mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) {
+					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 3, 31));
 				}
-				if ((aRecipe.mFluidInputs.length > 1) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 21, 31));
+				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), 21, 31));
 				}
-				if ((aRecipe.mFluidInputs.length > 2) && (aRecipe.mFluidInputs[2] != null) && (aRecipe.mFluidInputs[2].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[2], true), 39, 31));
+				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), 39, 31));
 				}
-				if ((aRecipe.mFluidInputs.length > 3) && (aRecipe.mFluidInputs[3] != null) && (aRecipe.mFluidInputs[3].getFluid() != null)) {
-					this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[3], true), 57, 31));
+				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), 57, 31));
 				}
 			}
 
-			if (aRecipe.mFluidOutputs.length > 0) {
-				if ((aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 138, 5));
+			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), 138, 5));
 				}
-				if ((aRecipe.mFluidOutputs.length > 1) && (aRecipe.mFluidOutputs[1] != null) && (aRecipe.mFluidOutputs[1].getFluid() != null)) {
-					this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 138, 23));
+				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), 138, 23));
 				}
 			}
 		}
-
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return this.getCycledIngredients(GT_NEI_MillingMachine.this.cycleticks / 10, this.mInputs);
-		}
-
-		@Override
-		public PositionedStack getResult() {
-			return null;
-		}
-
-		@Override
-		public List<PositionedStack> getOtherStacks() {
-			return this.mOutputs;
-		}
 	}
 }