diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index f78cc1fa..c39e9348 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -54,7 +54,10 @@ import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.IRecipeHandler; +import codechicken.nei.recipe.RecipeHandlerRef; +import codechicken.nei.recipe.RecipeItemInputHandler; import codechicken.nei.recipe.StackInfo; +import codechicken.nei.recipe.debug.DebugHandlerWidget; import cpw.mods.fml.client.CustomModLoadingErrorDisplayException; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; @@ -444,6 +447,11 @@ public class ClientHandler { if (event.world == mc.theWorld) { NEIClientConfig.unloadWorld(); ItemMobSpawner.clearEntityReferences(); + RecipeItemInputHandler.instance.clearTooltipCache(); + RecipeHandlerRef.clearCache(); + ItemPanels.itemPanel.craftablesPanel.clearGuiReferences(); + DebugHandlerWidget.instance.clearGuiReferences(); + NEIController.manager = null; } } diff --git a/src/main/java/codechicken/nei/ItemCraftablesPanel.java b/src/main/java/codechicken/nei/ItemCraftablesPanel.java index 35189e91..c4859ef8 100644 --- a/src/main/java/codechicken/nei/ItemCraftablesPanel.java +++ b/src/main/java/codechicken/nei/ItemCraftablesPanel.java @@ -137,7 +137,11 @@ public class ItemCraftablesPanel @Override public void execute() { - pendingResult.set(generateCraftables(ItemCraftablesPanel.this.pendingSnapshot)); + final CraftablesSnapshot snapshot = ItemCraftablesPanel.this.pendingSnapshot; + + if (snapshot != null) { + pendingResult.set(generateCraftables(snapshot)); + } } }; @@ -298,6 +302,11 @@ public class ItemCraftablesPanel } } + public void clearGuiReferences() { + this.lastGuiContainer = null; + this.pendingSnapshot = null; + } + private GuiContainer getGuiContainer() { final GuiContainer firstGui = NEIClientUtils.getGuiContainer(); return (firstGui instanceof GuiRecipegui) ? gui.firstGui : firstGui; diff --git a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java index cb17f46a..ad950018 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java +++ b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java @@ -19,12 +19,21 @@ import codechicken.nei.recipe.Recipe.RecipeId; public class RecipeItemInputHandler implements IContainerInputHandler, IContainerTooltipHandler { + public static final RecipeItemInputHandler instance = new RecipeItemInputHandler(); + protected RecipeTooltipLineHandler recipeTooltipLineHandler = null; + protected RecipeItemInputHandler() { + + } + public static void load() { - RecipeItemInputHandler recipeHandler = new RecipeItemInputHandler(); - GuiContainerManager.addInputHandler(recipeHandler); - GuiContainerManager.addTooltipHandler(recipeHandler); + GuiContainerManager.addInputHandler(instance); + GuiContainerManager.addTooltipHandler(instance); + } + + public void clearTooltipCache() { + this.recipeTooltipLineHandler = null; } @Override @@ -64,16 +73,17 @@ public class RecipeItemInputHandler implements IContainerInputHandler, IContaine : null; if (recipeId == null) { - recipeTooltipLineHandler = null; - } else if (recipeTooltipLineHandler == null || !recipeTooltipLineHandler.getRecipeId().equals(recipeId)) { - recipeTooltipLineHandler = new RecipeTooltipLineHandler(recipeId); - } + clearTooltipCache(); + } else if (this.recipeTooltipLineHandler == null + || !this.recipeTooltipLineHandler.getRecipeId().equals(recipeId)) { + this.recipeTooltipLineHandler = new RecipeTooltipLineHandler(recipeId); + } - if (recipeTooltipLineHandler != null) { - currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(recipeTooltipLineHandler)); + if (this.recipeTooltipLineHandler != null) { + currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(this.recipeTooltipLineHandler)); } } else { - recipeTooltipLineHandler = null; + clearTooltipCache(); } return currenttip; diff --git a/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java b/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java index cdfd7ddb..78e21221 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java +++ b/src/main/java/codechicken/nei/recipe/RecipeTooltipLineHandler.java @@ -35,7 +35,6 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler { protected long lastUpdate = System.currentTimeMillis(); protected String recipeName = ""; - protected GuiRecipe gui = null; protected RecipeHandlerRef handlerRef = null; protected RecipeWidget widget = null; protected RecipeId recipeId = null; diff --git a/src/main/java/codechicken/nei/recipe/debug/DebugHandlerWidget.java b/src/main/java/codechicken/nei/recipe/debug/DebugHandlerWidget.java index 683c9029..14460ca8 100644 --- a/src/main/java/codechicken/nei/recipe/debug/DebugHandlerWidget.java +++ b/src/main/java/codechicken/nei/recipe/debug/DebugHandlerWidget.java @@ -733,6 +733,10 @@ public class DebugHandlerWidget extends Widget implements IContainerTooltipHandl }); } + public void clearGuiReferences() { + this.hoveredRecipe = null; + } + public void loadHandlerInfoPatch() { ClientHandler.loadSettingsFile("handlers.patch", lines -> {