diff --git a/src/main/java/codechicken/nei/ItemZoom.java b/src/main/java/codechicken/nei/ItemZoom.java index 9ace7d07..ad44005f 100644 --- a/src/main/java/codechicken/nei/ItemZoom.java +++ b/src/main/java/codechicken/nei/ItemZoom.java @@ -40,7 +40,7 @@ public class ItemZoom extends Widget implements IContainerInputHandler { @Override public void draw(int mx, int my) { - if (this.stack != null + if (this.stack != null && this.availableAreaWidth >= SLOT_SIZE * 2 && (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled") || NEIClientConfig.isKeyHashDown("gui.itemzoom_hold")) && GuiContainerManager.shouldShowTooltip(NEIClientUtils.getGuiContainer())) { diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index ea2224ed..c927d64f 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -212,6 +212,10 @@ public class NEIClientConfig { .getBooleanValue(false); API.addOption(new OptionToggleButton("inventory.bookmarks.ignorePotionOverlap", true)); + tag.getTag("inventory.bookmarks.bookmarkItemsWithRecipe").setComment("Bookmark items with recipe") + .getBooleanValue(true); + API.addOption(new OptionToggleButton("inventory.bookmarks.bookmarkItemsWithRecipe", true)); + tag.getTag("inventory.guirecipe.jeiStyleTabs").setComment("Enable/disable JEI Style Tabs") .getBooleanValue(true); API.addOption(new OptionToggleButtonBoubs("inventory.guirecipe.jeiStyleTabs", true)); diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java index c5a810f5..6cbd75f6 100644 --- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java +++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java @@ -242,7 +242,8 @@ public abstract class ShortcutInputHandler { } else { final RecipeId recipeId = recipe != null ? recipe.getRecipeId() : null; final boolean existsRecipe = recipeId != null - && ItemPanels.bookmarkPanel.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID); + && ItemPanels.bookmarkPanel.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID) + || NEIClientConfig.getBooleanSetting("inventory.bookmarks.bookmarkItemsWithRecipe"); if (!ItemPanels.bookmarkPanel .removeItem(stackover, existsRecipe ? recipeId : null, BookmarkGrid.DEFAULT_GROUP_ID)) { diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 99dd24a1..cb9bd8df 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -221,8 +221,8 @@ public class GuiContainerManager { return countDetails( stack.stackSize, stack.getMaxStackSize(), - "Count: %s = %s * %s + %s", - "Count: %s = %s * %s"); + translate("inventory.tooltip.count.item", "%s = %s * %s + %s"), + translate("inventory.tooltip.count.item", "%s = %s * %s")); } } @@ -234,7 +234,11 @@ public class GuiContainerManager { @Nullable public static String fluidAmountDetails(int amount) { - return countDetails(amount, 144, "Amount: %s L = %s * %s L + %s L", "Amount: %s L = %s * %s L"); + return countDetails( + amount, + 144, + translate("inventory.tooltip.count.fluid", "%s L = %s * %s L + %s L"), + translate("inventory.tooltip.count.fluid", "%s L = %s * %s L")); } /** @@ -725,15 +729,18 @@ public class GuiContainerManager { final List currentTooltip = tooltips.get(tooltipPage); if (maxTooltipPage > 1) { + final String lastLine = currentTooltip.remove(currentTooltip.size() - 1); final String pageTooltip = EnumChatFormatting.ITALIC + NEIClientUtils.translate( "inventory.tooltip.page", tooltipPage + 1, maxTooltipPage, NEIClientConfig.getKeyName("gui.next_tooltip")); - currentTooltip.set( - currentTooltip.size() - 1, - currentTooltip.get(currentTooltip.size() - 1) + GuiDraw.TOOLTIP_LINESPACE); + if (lastLine.startsWith(GuiDraw.TOOLTIP_HANDLER)) { + currentTooltip.add(lastLine); + } else { + currentTooltip.add(lastLine + GuiDraw.TOOLTIP_LINESPACE); + } currentTooltip.add(pageTooltip); } diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 0cc035c7..89793e85 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -110,6 +110,8 @@ nei.inventory.current.gamemode.1=Current gamemode: creative nei.inventory.current.gamemode.2=Current gamemode: creative+ nei.inventory.current.gamemode.3=Current gamemode: adventure nei.inventory.tooltip.page=Page: %s / %s [Press %s to see next page] +nei.inventory.tooltip.count.item=Count: %s +nei.inventory.tooltip.count.fluid=Amount: %s nei.inventory.gamemode.0=Click: Set gamemode to survival nei.inventory.gamemode.1=Click: Set gamemode to creative @@ -214,6 +216,9 @@ nei.options.inventory.bookmarks.ignorePotionOverlap.false=No nei.options.inventory.bookmarks.worldSpecific=World Specific nei.options.inventory.bookmarks.worldSpecific.true=Yes nei.options.inventory.bookmarks.worldSpecific.false=No +nei.options.inventory.bookmarks.bookmarkItemsWithRecipe=Bookmark items with recipe +nei.options.inventory.bookmarks.bookmarkItemsWithRecipe.true=Yes +nei.options.inventory.bookmarks.bookmarkItemsWithRecipe.false=No nei.options.inventory.favorites=Favorites nei.options.inventory.favorites.enabled=Visibility nei.options.inventory.favorites.enabled.true=Visible