From 14728ac0d0c1a118dc638702df78e45b6c9c4277 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 15:41:39 +1000 Subject: % Swapped FFPP checkRecipe logic to use the Fusion Reactor logic for fluid handling. $ Cleaned up some code. --- src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/Java/gtPlusPlus/nei') diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java index 0f8dcb4649..017fe3012b 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java @@ -71,7 +71,7 @@ extends TemplateRecipeHandler { public void loadCraftingRecipes(final ItemStack aResult) { final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - final ArrayList tResults = new ArrayList(); + final ArrayList tResults = new ArrayList(); tResults.add(aResult); tResults.add(GT_OreDictUnificator.get(true, aResult)); if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { @@ -99,14 +99,13 @@ extends TemplateRecipeHandler { } } } - final CachedDefaultRecipe tNEIRecipe; } @Override public void loadUsageRecipes(final ItemStack aInput) { final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - final ArrayList tInputs = new ArrayList(); + final ArrayList tInputs = new ArrayList(); tInputs.add(aInput); tInputs.add(GT_OreDictUnificator.get(false, aInput)); if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { @@ -134,7 +133,6 @@ extends TemplateRecipeHandler { } } } - final CachedDefaultRecipe tNEIRecipe; } @Override @@ -322,14 +320,14 @@ extends TemplateRecipeHandler { if (this.permutated) { return; } - final ArrayList tDisplayStacks = new ArrayList(); + final ArrayList tDisplayStacks = new ArrayList(); for (final ItemStack tStack : this.items) { if (GT_Utility.isStackValid(tStack)) { if (tStack.getItemDamage() == 32767) { final List permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); if (!permutations.isEmpty()) { ItemStack stack; - for (final Iterator i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { + for (final Iterator i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { stack = (ItemStack) i$.next(); } } else { @@ -354,8 +352,8 @@ extends TemplateRecipeHandler { public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe { public final GT_Recipe mRecipe; - public final List mOutputs = new ArrayList(); - public final List mInputs = new ArrayList(); + public final List mOutputs = new ArrayList(); + public final List mInputs = new ArrayList(); public CachedDefaultRecipe(final GT_Recipe aRecipe) { super(); -- cgit