From 3ff3bb5c11dd9d5cf40ef1777ed3b60968b7eb70 Mon Sep 17 00:00:00 2001 From: slprime Date: Fri, 28 Mar 2025 23:19:57 +0200 Subject: [PATCH] recipe tooltip refactoring --- .../java/codechicken/nei/BookmarkPanel.java | 30 ---------- .../codechicken/nei/ItemHistoryPanel.java | 26 -------- src/main/java/codechicken/nei/ItemPanel.java | 23 +------ .../nei/recipe/RecipeItemInputHandler.java | 60 +++++++++++++++++++ 4 files changed, 61 insertions(+), 78 deletions(-) diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 19dd7ab5..ee11b759 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -40,7 +40,6 @@ import codechicken.nei.recipe.BookmarkRecipeId; import codechicken.nei.recipe.Recipe; import codechicken.nei.recipe.Recipe.RecipeId; import codechicken.nei.recipe.Recipe.RecipeIngredient; -import codechicken.nei.recipe.RecipeTooltipLineHandler; import codechicken.nei.recipe.StackInfo; import codechicken.nei.recipe.chain.RecipeChainMath; import codechicken.nei.recipe.chain.RecipeChainTooltipLineHandler; @@ -91,7 +90,6 @@ public class BookmarkPanel extends PanelWidget { public SortableGroup sortableGroup; public GroupingItem groupingItem; - protected RecipeTooltipLineHandler recipeTooltipLineHandler; protected AcceptsFollowingTooltipLineHandler acceptsFollowingTooltipLineHandler; protected RecipeChainTooltipLineHandler recipeChainTooltipLineHandler; @@ -881,33 +879,6 @@ public class BookmarkPanel extends PanelWidget { if (slot != null) { - if (!slot.isIngredient() && NEIClientConfig.getRecipeTooltipsMode() != 0) { - RecipeId recipeId = null; - - if (slot.getRecipeId() != null) { - final int tooltipMode = NEIClientConfig.getRecipeTooltipsMode(); - final BookmarkViewMode viewMode = slot.getGroup().viewMode; - - if (tooltipMode == 3 || viewMode == BookmarkViewMode.DEFAULT && tooltipMode == 1 - || viewMode == BookmarkViewMode.TODO_LIST && tooltipMode == 2) { - recipeId = slot.getRecipeId(); - } - } - - if (recipeId == null) { - this.recipeTooltipLineHandler = null; - } else if (this.recipeTooltipLineHandler == null - || !this.recipeTooltipLineHandler.getRecipeId().equals(recipeId)) { - this.recipeTooltipLineHandler = new RecipeTooltipLineHandler(recipeId); - } - - if (this.recipeTooltipLineHandler != null) { - currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(this.recipeTooltipLineHandler)); - } - } else { - this.acceptsFollowingTooltipLineHandler = null; - } - if (slot.isIngredient() && slot.getRecipeId() != null && slot.getBookmarkItem().permutations.size() > 1) { RecipeId recipeId = slot.getRecipeId(); @@ -931,7 +902,6 @@ public class BookmarkPanel extends PanelWidget { } } else { - this.recipeTooltipLineHandler = null; this.acceptsFollowingTooltipLineHandler = null; } diff --git a/src/main/java/codechicken/nei/ItemHistoryPanel.java b/src/main/java/codechicken/nei/ItemHistoryPanel.java index 02adef1e..2c0261fb 100644 --- a/src/main/java/codechicken/nei/ItemHistoryPanel.java +++ b/src/main/java/codechicken/nei/ItemHistoryPanel.java @@ -15,13 +15,10 @@ import codechicken.nei.guihook.IContainerTooltipHandler; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.Recipe.RecipeId; -import codechicken.nei.recipe.RecipeTooltipLineHandler; import codechicken.nei.recipe.StackInfo; public class ItemHistoryPanel extends Widget implements IContainerTooltipHandler { - protected RecipeTooltipLineHandler recipeTooltipLineHandler = null; protected int mouseDownItemIndex = -1; protected ItemsGrid grid = new ItemsGrid<>() { @@ -217,27 +214,4 @@ public class ItemHistoryPanel extends Widget implements IContainerTooltipHandler this.mouseDownItemIndex = -1; } - @Override - public List handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey, - List currenttip) { - - if (itemstack != null && contains(mousex, mousey) && NEIClientConfig.getFavoriteRecipeTooltips()) { - final RecipeId recipeId = FavoriteRecipes.getFavorite(itemstack); - - if (recipeId == null) { - recipeTooltipLineHandler = null; - } else if (recipeTooltipLineHandler == null || !recipeTooltipLineHandler.getRecipeId().equals(recipeId)) { - recipeTooltipLineHandler = new RecipeTooltipLineHandler(recipeId); - } - - if (recipeTooltipLineHandler != null) { - currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(recipeTooltipLineHandler)); - } - } else { - recipeTooltipLineHandler = null; - } - - return currenttip; - } - } diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java index 3262a0cc..f3f6dce4 100644 --- a/src/main/java/codechicken/nei/ItemPanel.java +++ b/src/main/java/codechicken/nei/ItemPanel.java @@ -9,8 +9,6 @@ import net.minecraft.item.ItemStack; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemsPanelGrid.ItemsPanelGridSlot; -import codechicken.nei.recipe.Recipe.RecipeId; -import codechicken.nei.recipe.RecipeTooltipLineHandler; import codechicken.nei.util.NEIMouseUtils; public class ItemPanel extends PanelWidget { @@ -33,7 +31,6 @@ public class ItemPanel extends PanelWidget { return super.getStackMouseOver(mousex, mousey); } - protected RecipeTooltipLineHandler recipeTooltipLineHandler = null; public ItemHistoryPanel historyPanel = new ItemHistoryPanel(); public Button toggleGroups; @@ -207,25 +204,7 @@ public class ItemPanel extends PanelWidget { } } - currenttip = super.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip); - - if (itemstack != null && contains(mousex, mousey) && NEIClientConfig.getFavoriteRecipeTooltips()) { - RecipeId recipeId = FavoriteRecipes.getFavorite(itemstack); - - if (recipeId == null) { - recipeTooltipLineHandler = null; - } else if (recipeTooltipLineHandler == null || !recipeTooltipLineHandler.getRecipeId().equals(recipeId)) { - recipeTooltipLineHandler = new RecipeTooltipLineHandler(recipeId); - } - - if (recipeTooltipLineHandler != null) { - currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(recipeTooltipLineHandler)); - } - } else { - recipeTooltipLineHandler = null; - } - - return currenttip; + return super.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip); } @Override diff --git a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java index 0e36b163..c44ab80c 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java +++ b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java @@ -1,17 +1,27 @@ package codechicken.nei.recipe; +import java.util.List; import java.util.Map; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.BookmarkPanel.BookmarkViewMode; +import codechicken.nei.FavoriteRecipes; import codechicken.nei.ItemPanels; +import codechicken.nei.NEIClientConfig; import codechicken.nei.api.ShortcutInputHandler; +import codechicken.nei.bookmark.BookmarksGridSlot; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerTooltipHandler; +import codechicken.nei.recipe.Recipe.RecipeId; public class RecipeItemInputHandler implements IContainerInputHandler, IContainerTooltipHandler { + protected RecipeTooltipLineHandler recipeTooltipLineHandler = null; + public static void load() { RecipeItemInputHandler recipeHandler = new RecipeItemInputHandler(); GuiContainerManager.addInputHandler(recipeHandler); @@ -47,6 +57,56 @@ public class RecipeItemInputHandler implements IContainerInputHandler, IContaine return hotkeys; } + @Override + public List handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey, + List currenttip) { + + if (itemstack != null) { + final RecipeId recipeId = getHoveredRecipeId(gui, itemstack, mousex, mousey); + + if (recipeId == null) { + recipeTooltipLineHandler = null; + } else if (recipeTooltipLineHandler == null || !recipeTooltipLineHandler.getRecipeId().equals(recipeId)) { + recipeTooltipLineHandler = new RecipeTooltipLineHandler(recipeId); + } + + if (recipeTooltipLineHandler != null) { + currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(recipeTooltipLineHandler)); + } + } else { + recipeTooltipLineHandler = null; + } + + return currenttip; + } + + private RecipeId getHoveredRecipeId(GuiContainer gui, ItemStack itemstack, int mousex, int mousey) { + + if (ItemPanels.bookmarkPanel.contains(mousex, mousey)) { + final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mousex, mousey); + + if (slot != null && slot.getRecipeId() != null + && !slot.isIngredient() + && NEIClientConfig.getRecipeTooltipsMode() != 0) { + final int tooltipMode = NEIClientConfig.getRecipeTooltipsMode(); + final BookmarkViewMode viewMode = slot.getGroup().viewMode; + if (tooltipMode == 3 || viewMode == BookmarkViewMode.DEFAULT && tooltipMode == 1 + || viewMode == BookmarkViewMode.TODO_LIST && tooltipMode == 2) { + return slot.getRecipeId(); + } + } + + return null; + } + + if (ItemPanels.itemPanel.contains(mousex, mousey) + || ItemPanels.itemPanel.historyPanel.contains(mousex, mousey)) { + return NEIClientConfig.getFavoriteRecipeTooltips() ? FavoriteRecipes.getFavorite(itemstack) : null; + } + + return null; + } + @Override public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}