From 9a21acd2834235d90dbe6baeba59bbf033fc7b41 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 28 Mar 2021 10:12:21 -0700 Subject: [PATCH] Default HandlerInfo if it can't be found. --- build.properties | 2 +- src/codechicken/nei/recipe/GuiRecipe.java | 7 ++++++- src/codechicken/nei/recipe/GuiRecipeTab.java | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 1fca2b43..e423c10c 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.1.0-GTNH-beta6 +mod_version=2.1.0-GTNH-beta7 diff --git a/src/codechicken/nei/recipe/GuiRecipe.java b/src/codechicken/nei/recipe/GuiRecipe.java index 14dc2a93..a35271c2 100644 --- a/src/codechicken/nei/recipe/GuiRecipe.java +++ b/src/codechicken/nei/recipe/GuiRecipe.java @@ -261,7 +261,12 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve } else { handlerID = null; } - return GuiRecipeTab.getHandlerInfo(handlerName, handlerID); + HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, handlerID); + + if (info == null) + return GuiRecipeTab.DEFAULT_HANDLER_INFO; + + return info; } diff --git a/src/codechicken/nei/recipe/GuiRecipeTab.java b/src/codechicken/nei/recipe/GuiRecipeTab.java index 689fdab7..e1fe4861 100644 --- a/src/codechicken/nei/recipe/GuiRecipeTab.java +++ b/src/codechicken/nei/recipe/GuiRecipeTab.java @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.List; public abstract class GuiRecipeTab extends Widget { + public static HandlerInfo DEFAULT_HANDLER_INFO = getDefaultHandlerInfo(); public static HashMap handlerMap = new HashMap<>(); private final GuiRecipe guiRecipe; @@ -249,6 +250,12 @@ public abstract class GuiRecipeTab extends Widget { } } + + private static HandlerInfo getDefaultHandlerInfo() { + final HandlerInfo info = new HandlerInfo("Unknown", "Unknown", "Unknown", false, ""); + info.setHandlerDimensions(HandlerInfo.DEFAULT_HEIGHT, HandlerInfo.DEFAULT_WIDTH, HandlerInfo.DEFAULT_MAX_PER_PAGE); + return info; + } private static int intOrDefault(String str, int defaultValue) { if (str == null || str.equals("")) return defaultValue;