From 2afbe162e418f1cf1464f7af6269db057024e46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8F=E3=81=81=E3=83=BC=E3=82=8A=E3=81=83?= Date: Sat, 10 Sep 2022 04:20:17 +0900 Subject: [PATCH] add placeholder bookmark drop --- .../java/codechicken/nei/BookmarkPanel.java | 15 ++++- .../java/codechicken/nei/PanelWidget.java | 55 +++++++++---------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index a1af6d5b..6bde2d08 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -1,7 +1,7 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.drawRect; -import static codechicken.lib.gui.GuiDraw.getMousePosition; +import static codechicken.lib.gui.GuiDraw.*; +import static codechicken.nei.NEIClientUtils.mc; import static codechicken.nei.NEIClientUtils.translate; import codechicken.core.CommonUtils; @@ -996,6 +996,17 @@ public class BookmarkPanel extends PanelWidget { } } + @Override + protected boolean handleDraggedClick(int mouseX, int mouseY, int button) { + if (grid.contains(mouseX, mouseY)) { + draggedStack = null; + mc().thePlayer.sendChatMessage("this will add item to bookmark"); + return true; + } + + return false; + } + @Override public List handleTooltip(int mx, int my, List tooltip) { diff --git a/src/main/java/codechicken/nei/PanelWidget.java b/src/main/java/codechicken/nei/PanelWidget.java index a705c781..7050301c 100644 --- a/src/main/java/codechicken/nei/PanelWidget.java +++ b/src/main/java/codechicken/nei/PanelWidget.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; public abstract class PanelWidget extends Widget { protected static final int PADDING = 2; - public ItemStack draggedStack; + public static ItemStack draggedStack; public int mouseDownSlot = -1; public Button pagePrev; @@ -184,7 +184,7 @@ public abstract class PanelWidget extends Widget { && draggedStack == null && NEIClientUtils.getHeldItem() == null && NEIClientConfig.hasSMPCounterPart() - && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) { + ) { ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey); if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) { @@ -241,14 +241,30 @@ public abstract class PanelWidget extends Widget { @Override public boolean handleClickExt(int mouseX, int mouseY, int button) { - if (ItemPanels.itemPanel.draggedStack != null) { - return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button); - } + if (draggedStack != null) { + boolean succeed = ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button) + || ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button); + if(succeed) + return true; - if (ItemPanels.bookmarkPanel.draggedStack != null) { - return ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button); - } + if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) { + if (draggedStack.stackSize == 0) { + draggedStack = null; + } + return true; + } + + final GuiContainer gui = NEIClientUtils.getGuiContainer(); + if (mouseX < gui.guiLeft + || mouseY < gui.guiTop + || mouseX >= gui.guiLeft + gui.xSize + || mouseY >= gui.guiTop + gui.ySize) { + draggedStack = null; + return true; + } + + } if (NEIClientUtils.getHeldItem() != null) { final ItemStack draggedStack = NEIClientUtils.getHeldItem().copy(); return handleGUIContainerClick(draggedStack, mouseX, mouseY, button); @@ -258,28 +274,7 @@ public abstract class PanelWidget extends Widget { } protected boolean handleDraggedClick(int mouseX, int mouseY, int button) { - if (draggedStack == null) { - return false; - } - - if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) { - - if (draggedStack.stackSize == 0) { - draggedStack = null; - } - - return true; - } - - final GuiContainer gui = NEIClientUtils.getGuiContainer(); - if (mouseX < gui.guiLeft - || mouseY < gui.guiTop - || mouseX >= gui.guiLeft + gui.xSize - || mouseY >= gui.guiTop + gui.ySize) { - draggedStack = null; - } - - return true; + return false; } protected boolean handleGUIContainerClick(final ItemStack draggedStack, int mouseX, int mouseY, int button) {