diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-11-07 21:21:49 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-11-07 21:42:03 +0800 |
| commit | 0be6613cad5eb71d4828118329f0d8f462c5a498 (patch) | |
| tree | 053bf10968f2de936a8d89dd362bdf3d13596a50 /runtime-frontend/overlay/src/main/java | |
| parent | 0ef0f8b21df4b9a603aaa2ab4a35d395ef6437c1 (diff) | |
| parent | 46d2c64c4303bc007055268075ea9be4e9852e5e (diff) | |
| download | RoughlyEnoughItems-0be6613cad5eb71d4828118329f0d8f462c5a498.tar.gz RoughlyEnoughItems-0be6613cad5eb71d4828118329f0d8f462c5a498.tar.bz2 RoughlyEnoughItems-0be6613cad5eb71d4828118329f0d8f462c5a498.zip | |
Merge commit '46d2c64c4303bc007055268075ea9be4e9852e5e' into modularity
Diffstat (limited to 'runtime-frontend/overlay/src/main/java')
2 files changed, 8 insertions, 3 deletions
diff --git a/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/dragging/DraggingContextImpl.java b/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/dragging/DraggingContextImpl.java index 383f13e13..e041e4daf 100644 --- a/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/dragging/DraggingContextImpl.java +++ b/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/dragging/DraggingContextImpl.java @@ -153,6 +153,9 @@ public class DraggingContextImpl extends Widget implements DraggingContext<Scree @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (button != 0) { + return false; + } drop(); DraggableComponent<?> hoveredStack = provider.getHovered(this, mouseX, mouseY); if (hoveredStack != null) { @@ -168,7 +171,7 @@ public class DraggingContextImpl extends Widget implements DraggingContext<Scree @Override public boolean mouseDragged(double mouseX1, double mouseY1, int button, double mouseX2, double mouseY2) { - return entry != null && entry.dragging; + return button == 0 && entry != null && entry.dragging; } private boolean drop() { diff --git a/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/widgets/DisplayedEntryWidget.java b/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/widgets/DisplayedEntryWidget.java index 32fc48f73..4d6c063b2 100644 --- a/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/widgets/DisplayedEntryWidget.java +++ b/runtime-frontend/overlay/src/main/java/me/shedaniel/rei/impl/client/gui/overlay/widgets/DisplayedEntryWidget.java @@ -186,9 +186,11 @@ public abstract class DisplayedEntryWidget extends GuiComponent implements Unary } try { - for (List<Display> displays : DisplayRegistry.getInstance().getAll().values()) { + DisplayRegistry displayRegistry = DisplayRegistry.getInstance(); + for (List<Display> displays : displayRegistry.getAll().values()) { for (Display display : displays) { - if (Views.getInstance().isRecipesFor(slot.getEntries(), display)) { + if ((!ConfigObject.getInstance().shouldFilterDisplays() || displayRegistry.isDisplayVisible(display)) + && Views.getInstance().isRecipesFor(slot.getEntries(), display)) { AutoCraftingEvaluator.Result result = ClientInternals.getAutoCraftingEvaluator(display).get(); if (result.isSuccessful()) { |