From c3eac50decd33ee2be8703dfb2ecf9cdc31c2b67 Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 27 Aug 2022 17:48:20 +0900 Subject: 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 --- .../java/gregtech/nei/GT_NEI_DefaultHandler.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/main/java/gregtech/nei') 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,12 +771,34 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { } } + @SuppressWarnings("deprecation") public CachedDefaultRecipe(GT_Recipe aRecipe) { super(); this.mRecipe = aRecipe; List maybeIn; List 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) { -- cgit