diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index b6f73ef1..cea77264 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -1285,12 +1285,21 @@ public class BookmarkPanel extends PanelWidget { return null; } - protected int getHoveredGroupId() { + public int getHoveredGroupId(boolean groupPanel) { final BookmarkGrid BGrid = (BookmarkGrid) grid; - final int overRowIndex = BGrid.getHoveredRowIndex(true); + final int overRowIndex = BGrid.getHoveredRowIndex(groupPanel); return overRowIndex >= 0 ? BGrid.getRowGroupId(overRowIndex) : -1; } + public void removeGroup(int groupId) { + final BookmarkGrid BGrid = (BookmarkGrid) grid; + + if (groupId >= 0 || groupId < BGrid.groups.size()) { + BGrid.removeGroup(groupId); + saveBookmarks(); + } + } + protected String getNamespaceLabelText(boolean shortFormat) { String activePage = String.valueOf(activeNamespaceIndex + 1); @@ -1951,32 +1960,6 @@ public class BookmarkPanel extends PanelWidget { return super.handleTooltip(mx, my, tooltip); } - @Override - public boolean handleKeyPress(int keyID, char keyChar) { - - if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) { - return this.pullBookmarkItems(this.getHoveredGroupId(), false); - } - - if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items_ingredients")) { - return this.pullBookmarkItems(this.getHoveredGroupId(), true); - } - - if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) { - final BookmarkGrid BGrid = (BookmarkGrid) grid; - final int overRowIndex = BGrid.getHoveredRowIndex(true); - - if (overRowIndex >= 0) { - BGrid.removeGroup(BGrid.getRowGroupId(overRowIndex)); - saveBookmarks(); - return true; - } - - } - - return super.handleKeyPress(keyID, keyChar); - } - @Override public void mouseUp(int mousex, int mousey, int button) { @@ -2092,7 +2075,7 @@ public class BookmarkPanel extends PanelWidget { * meta.factor; if (count <= Integer.MAX_VALUE) { - return StackInfo.loadFromNBT(nbTag, Math.max((int) count, 0)); + return StackInfo.loadFromNBT(nbTag, Math.max(count, 0)); } } @@ -2109,7 +2092,7 @@ public class BookmarkPanel extends PanelWidget { final BookmarkGrid BGrid = (BookmarkGrid) grid; final ArrayList items = new ArrayList<>(); - final ItemStackMap uniqueItems = new ItemStackMap<>(); + final ItemStackMap uniqueItems = new ItemStackMap<>(); final BookmarkGroup group = groupId >= 0 ? BGrid.groups.get(groupId) : null; ItemStackMetadata meta; @@ -2121,16 +2104,21 @@ public class BookmarkPanel extends PanelWidget { if (!onlyIngredients || meta.ingredient && (group == null || group.crafting == null || group.crafting.inputs.containsKey(BGrid.realItems.get(idx)))) { - final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack); - uniqueItems.put(stack, uniqueItems.getOrDefault(stack, 0) + nbTag.getInteger("Count")); + uniqueItems.put( + stack, + uniqueItems.getOrDefault(stack, 0L) + StackInfo.itemStackToNBT(stack).getInteger("Count")); } } } - for (ItemStackMap.Entry entry : uniqueItems.entries()) { - final NBTTagCompound nbTag = StackInfo.itemStackToNBT(entry.key); - items.add(StackInfo.loadFromNBT(nbTag, entry.value)); + for (ItemStackMap.Entry entry : uniqueItems.entries()) { + if (entry.value > 0) { + items.add( + StackInfo.loadFromNBT( + StackInfo.itemStackToNBT(entry.key), + Math.min(entry.value, 9 * 4 * entry.key.getMaxStackSize()))); + } } if (items.isEmpty()) { diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java index cfb4e3ca..b9cbbd8c 100644 --- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java +++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java @@ -35,6 +35,23 @@ public abstract class ShortcutInputHandler { return hideOverlayRecipe(); } + if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) { + return ItemPanels.bookmarkPanel.pullBookmarkItems(ItemPanels.bookmarkPanel.getHoveredGroupId(true), false); + } + + if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items_ingredients")) { + return ItemPanels.bookmarkPanel.pullBookmarkItems(ItemPanels.bookmarkPanel.getHoveredGroupId(true), true); + } + + if (stackover == null && NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) { + final int groupId = ItemPanels.bookmarkPanel.getHoveredGroupId(true); + + if (groupId != -1) { + ItemPanels.bookmarkPanel.removeGroup(groupId); + return true; + } + } + if (stackover == null) { return false; } diff --git a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java index f3accf19..855c61a4 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java +++ b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java @@ -12,8 +12,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; -import com.google.common.base.Objects; - import codechicken.core.TaskProfiler; import codechicken.nei.ItemList; import codechicken.nei.NEIClientConfig; @@ -91,8 +89,9 @@ class RecipeHandlerQuery { } private boolean isHidden(T handler) { - final String handlerId = Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId()); - return NEIClientConfig.hiddenHandlers.stream().anyMatch(h -> h.equals(handlerId)); + final String handlerName = handler.getHandlerId(); + final String handlerId = handler.getOverlayIdentifier(); + return NEIClientConfig.hiddenHandlers.stream().anyMatch(h -> h.equals(handlerId) || h.equals(handlerName)); } private void printLog(Throwable t) { diff --git a/src/main/java/codechicken/nei/recipe/StackInfo.java b/src/main/java/codechicken/nei/recipe/StackInfo.java index 7adabb5d..161e03f0 100644 --- a/src/main/java/codechicken/nei/recipe/StackInfo.java +++ b/src/main/java/codechicken/nei/recipe/StackInfo.java @@ -64,7 +64,7 @@ public class StackInfo { if (nbtTag != null) { nbtTag = (NBTTagCompound) nbtTag.copy(); - nbtTag.setInteger("Count", Math.max(customCount <= Integer.MAX_VALUE ? (int) customCount : 0, 0)); + nbtTag.setInteger("Count", (int) Math.max(Math.min(customCount, Integer.MAX_VALUE), 0)); return loadFromNBT(nbtTag); }