Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

no message

Browse source
This commit is contained in:
Technus 2016-11-22 21:53:48 +01:00
parent 18be853366
commit 2b854dbe1d
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtech/common/GT_RecipeAdder.java
View file

@ -836,7 +836,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
if(tItem==null)System.out.println("addAssemblylineRecipe"+aResearchItem.getDisplayName()); 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.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)); GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt));
return true; return true;
} }

18
src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
View file

@ -67,6 +67,8 @@ public class GT_NEI_AssLineHandler
for (GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) { for (GT_Recipe tRecipe : this.mRecipeMap.mRecipeList) {
if (!tRecipe.mHidden) { if (!tRecipe.mHidden) {
this.arecipes.add(new CachedDefaultRecipe(tRecipe)); this.arecipes.add(new CachedDefaultRecipe(tRecipe));
}else{
this.arecipes.remove(new CachedDefaultRecipe(tRecipe));
} }
} }
} else { } else {
@ -103,6 +105,14 @@ public class GT_NEI_AssLineHandler
break; break;
} }
} }
}else{
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tResults) {
if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) {
this.arecipes.remove(tNEIRecipe);
break;
}
}
} }
} }
CachedDefaultRecipe tNEIRecipe; CachedDefaultRecipe tNEIRecipe;
@ -137,6 +147,14 @@ public class GT_NEI_AssLineHandler
break; break;
} }
} }
}else{
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tInputs) {
if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) {
this.arecipes.remove(tNEIRecipe);
break;
}
}
} }
} }
CachedDefaultRecipe tNEIRecipe; CachedDefaultRecipe tNEIRecipe;