diff --git a/src/main/java/codechicken/nei/BookmarkContainerInfo.java b/src/main/java/codechicken/nei/BookmarkContainerInfo.java new file mode 100644 index 00000000..7b7a82ef --- /dev/null +++ b/src/main/java/codechicken/nei/BookmarkContainerInfo.java @@ -0,0 +1,31 @@ +package codechicken.nei; + +import java.util.HashMap; + +import net.minecraft.client.gui.inventory.GuiChest; +import net.minecraft.client.gui.inventory.GuiContainer; + +import codechicken.nei.api.API; +import codechicken.nei.api.IBookmarkContainerHandler; + +public class BookmarkContainerInfo { + + private static final HashMap, IBookmarkContainerHandler> handlerMap = new HashMap<>(); + + public static void registerBookmarkContainerHandler(Class classz, + IBookmarkContainerHandler handler) { + handlerMap.put(classz, handler); + } + + public static boolean hasBookmarkContainerHandler(Class classz) { + return handlerMap.containsKey(classz); + } + + public static IBookmarkContainerHandler getBookmarkContainerHandler(GuiContainer gui) { + return handlerMap.get(gui.getClass()); + } + + public static void load() { + API.registerBookmarkContainerHandler(GuiChest.class, new DefaultBookmarkContainerHandler()); + } +} diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 71198783..7aedf325 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -2,6 +2,7 @@ package codechicken.nei; import static codechicken.lib.gui.GuiDraw.drawRect; import static codechicken.lib.gui.GuiDraw.getMousePosition; +import static codechicken.nei.NEIClientUtils.getGuiContainer; import static codechicken.nei.NEIClientUtils.translate; import java.awt.Point; @@ -32,6 +33,7 @@ import com.google.gson.JsonSyntaxException; import codechicken.core.CommonUtils; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.ItemPanel.ItemPanelSlot; +import codechicken.nei.api.IBookmarkContainerHandler; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.BookmarkRecipeId; import codechicken.nei.recipe.StackInfo; @@ -47,6 +49,7 @@ public class BookmarkPanel extends PanelWidget { public Button namespacePrev; public Button namespaceNext; + public Button pullBookmarkedItems; public Label namespaceLabel; protected List namespaces = new ArrayList<>(); @@ -417,6 +420,21 @@ public class BookmarkPanel extends PanelWidget { } }; + pullBookmarkedItems = new Button("Pull") { + + public boolean onButtonPress(boolean rightclick) { + if (rightclick) { + return false; + } + return pullBookmarkItems(); + } + + @Override + public String getRenderLabel() { + return "P"; + } + }; + namespaces.add(new BookmarkGrid()); grid = namespaces.get(activeNamespaceIndex); } @@ -820,9 +838,9 @@ public class BookmarkPanel extends PanelWidget { final int center = leftBorder + Math.max(0, (rightBorder - leftBorder) / 2); int labelWidth = 2; - namespacePrev.h = namespaceNext.h = BUTTON_SIZE; - namespacePrev.w = namespaceNext.w = BUTTON_SIZE; - namespacePrev.y = namespaceNext.y = y + h - BUTTON_SIZE; + namespacePrev.h = namespaceNext.h = pullBookmarkedItems.h = BUTTON_SIZE; + namespacePrev.w = namespaceNext.w = pullBookmarkedItems.w = BUTTON_SIZE; + namespacePrev.y = namespaceNext.y = pullBookmarkedItems.y = y + h - BUTTON_SIZE; if (rightBorder - leftBorder >= 70) { labelWidth = 36; @@ -837,6 +855,7 @@ public class BookmarkPanel extends PanelWidget { namespacePrev.x = center - labelWidth / 2 - 2 - namespacePrev.w; namespaceNext.x = center + labelWidth / 2 + 2; + pullBookmarkedItems.x = center + 2 * labelWidth / 2 + 2; return BUTTON_SIZE + 2; } @@ -849,6 +868,7 @@ public class BookmarkPanel extends PanelWidget { LayoutManager.addWidget(namespacePrev); LayoutManager.addWidget(namespaceNext); LayoutManager.addWidget(namespaceLabel); + LayoutManager.addWidget(pullBookmarkedItems); } } @@ -1035,6 +1055,10 @@ public class BookmarkPanel extends PanelWidget { .contains(mx, my)) { tooltip.add(translate("bookmark.viewmode.toggle.tip")); } + if (new Rectangle4i(pullBookmarkedItems.x, pullBookmarkedItems.y, pullBookmarkedItems.w, pullBookmarkedItems.h) + .contains(mx, my)) { + tooltip.add(translate("bookmark.pullBookmarkedItems.tip")); + } return super.handleTooltip(mx, my, tooltip); } @@ -1122,4 +1146,14 @@ public class BookmarkPanel extends PanelWidget { } } } + + public boolean pullBookmarkItems() { + IBookmarkContainerHandler containerHandler = BookmarkContainerInfo + .getBookmarkContainerHandler(getGuiContainer()); + if (containerHandler == null) { + return false; + } + containerHandler.pullBookmarkItemsFromContainer(getGuiContainer(), ((BookmarkGrid) grid).realItems); + return true; + } } diff --git a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java new file mode 100644 index 00000000..9f97f1e5 --- /dev/null +++ b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java @@ -0,0 +1,47 @@ +package codechicken.nei; + +import java.util.ArrayList; +import java.util.LinkedList; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +import codechicken.nei.api.IBookmarkContainerHandler; + +public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandler { + + @Override + public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList bookmarkItems) { + FastTransferManager manager = new FastTransferManager(); + LinkedList containerStacks = manager.saveContainer(guiContainer.inventorySlots); + + for (ItemStack bookmarkItem : bookmarkItems) { + + int bookmarkSizeBackup = bookmarkItem.stackSize; + + for (int i = 0; i < containerStacks.size() - 4 * 9; i++) { // Last 36 slots are player inventory + ItemStack containerItem = containerStacks.get(i); + + if (containerItem == null) { + continue; + } + + if (bookmarkItem.isItemEqual(containerItem)) { + if (bookmarkItem.stackSize <= 0) { + break; + } + + int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize); + + manager.transferItems(guiContainer, i, transferAmount); + bookmarkItem.stackSize -= transferAmount; + + if (bookmarkItem.stackSize == 0) { + break; + } + } + } + bookmarkItem.stackSize = bookmarkSizeBackup; + } + } +} diff --git a/src/main/java/codechicken/nei/FastTransferManager.java b/src/main/java/codechicken/nei/FastTransferManager.java index b401262e..79d8cfa5 100644 --- a/src/main/java/codechicken/nei/FastTransferManager.java +++ b/src/main/java/codechicken/nei/FastTransferManager.java @@ -184,6 +184,12 @@ public class FastTransferManager { moveOutputSet(window, fromSlot, toSlot); } + public void transferItems(GuiContainer window, int fromSlot, int itemCount) { + for (int i = 0; i < itemCount; i++) { + transferItem(window, fromSlot); + } + } + public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) { if (NEIClientUtils.getHeldItem() != null) return; diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index b5dce47e..7201c20d 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -226,6 +226,10 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return true; } + if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) { + return bookmarkPanel.pullBookmarkItems(); + } + if (isEnabled() && !isHidden()) { for (Widget widget : controlWidgets) if (inputFocused == null) widget.lastKeyTyped(keyID, keyChar); } diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 95127e65..34bd9f10 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -354,6 +354,7 @@ public class NEIClientConfig { API.addHashBind( "gui.bookmark_recipe_count", Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH); + API.addHashBind("gui.bookmark_pull_items", Keyboard.KEY_V); API.addHashBind("gui.overlay", Keyboard.KEY_S); API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH); API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH); @@ -476,7 +477,7 @@ public class NEIClientConfig { LayoutManager.load(); NEIController.load(); RecipeCatalysts.loadCatalystInfo(); - + BookmarkContainerInfo.load(); mainNEIConfigLoaded = true; new Thread("NEI Plugin Loader") { diff --git a/src/main/java/codechicken/nei/api/API.java b/src/main/java/codechicken/nei/api/API.java index 775d33ed..8f8b0130 100644 --- a/src/main/java/codechicken/nei/api/API.java +++ b/src/main/java/codechicken/nei/api/API.java @@ -14,6 +14,7 @@ import org.lwjgl.input.Keyboard; import com.google.common.collect.Sets; +import codechicken.nei.BookmarkContainerInfo; import codechicken.nei.ItemList; import codechicken.nei.ItemSorter; import codechicken.nei.ItemStackSet; @@ -390,6 +391,11 @@ public class API { RecipeCatalysts.removeRecipeCatalyst(handlerID, stack); } + public static void registerBookmarkContainerHandler(Class gui, + IBookmarkContainerHandler handler) { + BookmarkContainerInfo.registerBookmarkContainerHandler(gui, handler); + } + @Deprecated public static void addRecipeCatalyst(List stacks, IRecipeHandler handler) { for (ItemStack stack : stacks) { diff --git a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java new file mode 100644 index 00000000..a08eb6c7 --- /dev/null +++ b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java @@ -0,0 +1,11 @@ +package codechicken.nei.api; + +import java.util.ArrayList; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +public interface IBookmarkContainerHandler { + + void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList realItems); +} diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index 2b069814..1b2da71c 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -9,6 +9,7 @@ nei.key.ctrl.mac=CMD nei.bookmark.toggle=Bookmarks nei.bookmark.toggle.tip=Toggle visibility of the Bookmark Panel nei.bookmark.viewmode.toggle.tip=Toggle Bookmark View Mode +nei.bookmark.pullBookmarkedItems.tip=Pull all bookmarked items from storage to inventory nei.itempanel.quantity.default=One stack nei.itempanel.loading=Loading Item List... @@ -106,6 +107,7 @@ nei.options.keys.gui.search=Focus Search Bar nei.options.keys.gui.bookmark=Add Bookmark nei.options.keys.gui.bookmark_recipe=Add Bookmark with Recipe nei.options.keys.gui.bookmark_count=Add Bookmark with Count +nei.options.keys.gui.bookmark_pull_items=Pull all Bookmarked Items nei.options.keys.gui.bookmark_recipe_count=Add Bookmark with Recipe & Count nei.options.keys.gui.hide_bookmarks=Toggle Bookmark Panel Visibility nei.options.keys.gui.overlay=Overlay Recipe