diff options
author | miozune <miozune@gmail.com> | 2022-08-27 17:48:20 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-27 10:48:20 +0200 |
commit | c3eac50decd33ee2be8703dfb2ecf9cdc31c2b67 (patch) | |
tree | 4a415f9bd15aaff8a460c8c5fd3187b9853fd357 /src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | |
parent | 735d35d5fda3d10e95ae0263c74eb8a09d3c7ef1 (diff) | |
download | GT5-Unofficial-c3eac50decd33ee2be8703dfb2ecf9cdc31c2b67.tar.gz GT5-Unofficial-c3eac50decd33ee2be8703dfb2ecf9cdc31c2b67.tar.bz2 GT5-Unofficial-c3eac50decd33ee2be8703dfb2ecf9cdc31c2b67.zip |
Delegate NEI recipe stack position placement to recipemap instead of recipe itself (#1305)
* Delegate NEI recipe stack position placement to recipemap instead of recipe itself
* maybe this is better
Diffstat (limited to 'src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java')
-rw-r--r-- | src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index ad70b27b07..8932e35710 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -771,6 +771,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { } } + @SuppressWarnings("deprecation") public CachedDefaultRecipe(GT_Recipe aRecipe) { super(); this.mRecipe = aRecipe; @@ -778,6 +779,27 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { List<PositionedStack> maybeOut; try { + maybeIn = GT_NEI_DefaultHandler.this.mRecipeMap.getInputPositionedStacks(aRecipe); + } catch (NullPointerException npe) { + maybeIn = null; + GT_Log.err.println("CachedDefaultRecipe - Invalid InputPositionedStacks " + aRecipe); + npe.printStackTrace(GT_Log.err); + } + try { + maybeOut = GT_NEI_DefaultHandler.this.mRecipeMap.getOutputPositionedStacks(aRecipe); + } catch (NullPointerException npe) { + maybeOut = null; + GT_Log.err.println("CachedDefaultRecipe - Invalid OutputPositionedStacks " + aRecipe); + npe.printStackTrace(GT_Log.err); + } + + if (maybeOut != null && maybeIn != null) { + mOutputs = maybeOut; + mInputs = maybeIn; + return; + } + + try { maybeIn = aRecipe.getInputPositionedStacks(); } catch (NullPointerException npe) { maybeIn = null; |