aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/nei
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-08-24 15:41:39 +1000
committerAlkalus <draknyte1@hotmail.com>2017-08-24 15:41:39 +1000
commit14728ac0d0c1a118dc638702df78e45b6c9c4277 (patch)
tree0b67096e3dc4bfb5905fa52ede8d246bb8a397ab /src/Java/gtPlusPlus/nei
parent2ce6f51eb26de8c3b0ba86b6480438fae44fe9f5 (diff)
downloadGT5-Unofficial-14728ac0d0c1a118dc638702df78e45b6c9c4277.tar.gz
GT5-Unofficial-14728ac0d0c1a118dc638702df78e45b6c9c4277.tar.bz2
GT5-Unofficial-14728ac0d0c1a118dc638702df78e45b6c9c4277.zip
% Swapped FFPP checkRecipe logic to use the Fusion Reactor logic for fluid handling.
$ Cleaned up some code.
Diffstat (limited to 'src/Java/gtPlusPlus/nei')
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java14
1 files changed, 6 insertions, 8 deletions
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<ItemStack> tResults = new ArrayList();
+ final 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())) {
@@ -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<ItemStack> tInputs = new ArrayList();
+ final ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>();
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<ItemStack> tDisplayStacks = new ArrayList();
+ 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 i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) {
+ for (final Iterator<ItemStack> 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<PositionedStack> mOutputs = new ArrayList();
- public final List<PositionedStack> mInputs = new ArrayList();
+ public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>();
+ public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>();
public CachedDefaultRecipe(final GT_Recipe aRecipe) {
super();