From fb2004e163ffe131b84d784127b81a230d21ef84 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 13 Dec 2022 01:28:06 +0800 Subject: Properly drop entries if actions were done --- .../me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java | 2 +- .../main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java index 72b6b3074..570eceae5 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java @@ -179,7 +179,7 @@ public class CurrentDraggingStack extends Widget implements LateRenderable, Drag return button == 0 && entry != null && entry.dragging; } - private boolean drop() { + public boolean drop() { if (entry != null && entry.dragging) { DraggedAcceptorResult result = visitor.acceptDragged(this, entry.component); entry.component.release(result); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java index 979085034..96ffbea22 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java @@ -58,6 +58,7 @@ import me.shedaniel.rei.api.common.util.FormattingUtils; import me.shedaniel.rei.impl.client.REIRuntimeImpl; import me.shedaniel.rei.impl.client.gui.InternalTextures; import me.shedaniel.rei.impl.client.gui.ScreenOverlayImpl; +import me.shedaniel.rei.impl.client.gui.dragging.CurrentDraggingStack; import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget; import me.shedaniel.rei.impl.client.view.ViewsImpl; import net.minecraft.ChatFormatting; @@ -573,6 +574,7 @@ public class EntryWidget extends Slot implements DraggableStackProviderWidget { return false; if (wasClicked() && containsMouse(mouseX, mouseY)) { if (doAction(mouseX, mouseY, button)) { + ((CurrentDraggingStack) DraggingContext.getInstance()).drop(); return true; } } -- cgit