add placeholder bookmark drop

This commit is contained in:
くぁーりぃ committed 2022-09-10 04:20:17 +09:00
1 parent 7d7e3b61a6
commit 2afbe162e4
2 files changed
+38 -32

No files matched your search

@@ -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<String> handleTooltip(int mx, int my, List<String> tooltip) {
+25 -30
View File
@@ -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) {