diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-11-12 14:34:09 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-11-12 15:51:47 +0800 |
| commit | 0314b503554bd87214efd0632b1f877d7b941073 (patch) | |
| tree | a2f5d7bc60618db37622bed7e59546211c13553a /runtime/src | |
| parent | 12d411ea7f58ca62b4667194993e25cae2508672 (diff) | |
| download | RoughlyEnoughItems-0314b503554bd87214efd0632b1f877d7b941073.tar.gz RoughlyEnoughItems-0314b503554bd87214efd0632b1f877d7b941073.tar.bz2 RoughlyEnoughItems-0314b503554bd87214efd0632b1f877d7b941073.zip | |
Fix buttons not respecting exclusion zones
Diffstat (limited to 'runtime/src')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java index df33587da..8d01c05b7 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java @@ -60,6 +60,7 @@ import me.shedaniel.rei.impl.client.gui.widget.entrylist.PaginatedEntryListWidge import me.shedaniel.rei.impl.client.gui.widget.entrylist.ScrolledEntryListWidget; import me.shedaniel.rei.impl.client.gui.widget.favorites.FavoritesListWidget; import me.shedaniel.rei.impl.client.gui.widget.search.OverlaySearchField; +import me.shedaniel.rei.impl.common.util.RectangleUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; @@ -275,7 +276,17 @@ public abstract class ScreenOverlayImpl extends ScreenOverlay { bounds.width = maxWidth; } - return bounds; + return avoidButtons(bounds); + } + + private static Rectangle avoidButtons(Rectangle bounds) { + int buttonsHeight = 2; + if (REIRuntime.getInstance().getContextualSearchFieldLocation() == SearchFieldLocation.TOP_SIDE) buttonsHeight += 24; + if (!ConfigObject.getInstance().isEntryListWidgetScrolled()) buttonsHeight += 22; + Rectangle area = REIRuntime.getInstance().calculateEntryListArea(bounds).clone(); + area.height = buttonsHeight; + return RectangleUtils.excludeZones(bounds, ScreenRegistry.getInstance().exclusionZones().getExclusionZones(Minecraft.getInstance().screen).stream() + .filter(zone -> zone.intersects(area))); } public void lateRender(PoseStack matrices, int mouseX, int mouseY, float delta) { |