diff options
author | Technus <daniel112092@gmail.com> | 2016-11-22 21:53:48 +0100 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2016-11-22 21:53:48 +0100 |
commit | 2b854dbe1d84fe1c93711d6189c235131343ec8e (patch) | |
tree | a193f861770ecd79e4ffe6993f2cafd8fb361c9f /src/main | |
parent | 18be8533663687315d6be7a301699bc25e8e364c (diff) | |
download | GT5-Unofficial-2b854dbe1d84fe1c93711d6189c235131343ec8e.tar.gz GT5-Unofficial-2b854dbe1d84fe1c93711d6189c235131343ec8e.tar.bz2 GT5-Unofficial-2b854dbe1d84fe1c93711d6189c235131343ec8e.zip |
no message
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/gregtech/common/GT_RecipeAdder.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 9f993d25d0..e8dfc4615a 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -836,7 +836,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if(tItem==null)System.out.println("addAssemblylineRecipe"+aResearchItem.getDisplayName()); } GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, null, null, aResearchTime, 30, 0); - GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.addFakeRecipe(true, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, aFluidInputs, null, aDuration, aEUt, 0,true); + GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, aFluidInputs, null, aDuration, aEUt, 0,true); GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt)); return true; } diff --git a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java index c1f0b90ad9..c917bb9e71 100644 --- a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java @@ -67,6 +67,8 @@ public class GT_NEI_AssLineHandler for (GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) { if (!tRecipe.mHidden) { this.arecipes.add(new CachedDefaultRecipe(tRecipe)); + }else{ + this.arecipes.remove(new CachedDefaultRecipe(tRecipe)); } } } else { @@ -103,6 +105,14 @@ public class GT_NEI_AssLineHandler break; } } + }else{ + CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); + for (ItemStack tStack : tResults) { + if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { + this.arecipes.remove(tNEIRecipe); + break; + } + } } } CachedDefaultRecipe tNEIRecipe; @@ -137,6 +147,14 @@ public class GT_NEI_AssLineHandler break; } } + }else{ + CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); + for (ItemStack tStack : tInputs) { + if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { + this.arecipes.remove(tNEIRecipe); + break; + } + } } } CachedDefaultRecipe tNEIRecipe; |