diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 0b4671b2..68121f64 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -84,6 +84,10 @@ public class BookmarkPanel extends PanelWidget { protected boolean[] todoSpaces; protected int todoItemsCount = 0; + public BookmarkGrid() { + this.setShowRecipeTooltips(true); + } + public void setViewMode(BookmarkViewMode mode) { if (viewMode == mode) { return; diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index 33cd942d..8dc665b0 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -51,6 +51,7 @@ public class ItemsGrid { protected int rows; protected int columns; + protected boolean showRecipeTooltips = false; protected boolean[] invalidSlotMap; @@ -158,6 +159,10 @@ public class ItemsGrid { refreshBuffer = true; } + public void setShowRecipeTooltips(boolean show) { + this.showRecipeTooltips = show; + } + public void refresh(GuiContainer gui) { updateGuiOverlapSlots(gui); shiftPage(0); @@ -440,10 +445,12 @@ public class ItemsGrid { drawSlotOutlines(mousex, mousey); drawItems(); } - try { - drawRecipeTooltip(mousex, mousey); - } catch (Exception e) { - NEIClientConfig.logger.warn("Cannot draw recipe tooltip", e); + if (NEIClientConfig.showRecipeTooltips() && showRecipeTooltips) { + try { + drawRecipeTooltip(mousex, mousey); + } catch (Exception e) { + NEIClientConfig.logger.warn("Cannot draw recipe tooltip", e); + } } } diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index a692152f..95127e65 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -242,6 +242,9 @@ public class NEIClientConfig { tag.getTag("inventory.bookmarksAnimationEnabled").setComment("REI Style Animation in Bookmarks") .getBooleanValue(true); API.addOption(new OptionToggleButton("inventory.bookmarksAnimationEnabled", true)); + tag.getTag("inventory.recipeTooltipsEnabled").setComment("Show recipe tooltips in Bookmarks") + .getBooleanValue(true); + API.addOption(new OptionToggleButton("inventory.recipeTooltipsEnabled", true)); tag.getTag("inventory.showRecipeMarker").setComment("Show Recipe Marker").getBooleanValue(false); API.addOption(new OptionToggleButton("inventory.showRecipeMarker", true)); @@ -559,6 +562,10 @@ public class NEIClientConfig { return getBooleanSetting("inventory.bookmarksAnimationEnabled"); } + public static boolean showRecipeTooltips() { + return getBooleanSetting("inventory.recipeTooltipsEnabled"); + } + public static boolean showRecipeMarker() { return getBooleanSetting("inventory.showRecipeMarker"); } diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 3eb88b9a..2b069814 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -152,6 +152,9 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=Disabled nei.options.inventory.useNBTInBookmarks=Use NBT in Bookmarks nei.options.inventory.useNBTInBookmarks.true=Yes nei.options.inventory.useNBTInBookmarks.false=No +nei.options.inventory.recipeTooltipsEnabled=Show recipe tooltips in Bookmarks +nei.options.inventory.recipeTooltipsEnabled.true=Yes +nei.options.inventory.recipeTooltipsEnabled.false=No nei.options.inventory.bookmarksAnimationEnabled=REI Style Animation in Bookmarks nei.options.inventory.bookmarksAnimationEnabled.true=Yes nei.options.inventory.bookmarksAnimationEnabled.false=No @@ -342,4 +345,4 @@ nei.presets.whitelist.tooltip=Whitelist nei.presets.textfield.tooltip.1=Enter - save nei.presets.textfield.tooltip.2=Escape - cancel nei.presets.label.tooltip=Double click to edit -nei.presets.label.selected=%s Presets \ No newline at end of file +nei.presets.label.selected=%s Presets