aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java')
-rw-r--r--src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java38
1 files changed, 14 insertions, 24 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index ae9151f63..70e284cdf 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -71,7 +71,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
VertexConsumerProvider.Immediate immediate = VertexConsumerProvider.immediate(Tessellator.getInstance().getBuffer());
matrixStack_1.translate(0.0D, 0.0D, getBlitOffset());
Matrix4f matrix4f_1 = matrixStack_1.peek().getModel();
- for(int lineIndex = 0; lineIndex < tooltipLines.size(); lineIndex++) {
+ for (int lineIndex = 0; lineIndex < tooltipLines.size(); lineIndex++) {
font.draw(tooltipLines.get(lineIndex), x, currentY, -1, true, matrix4f_1, immediate, false, 0, 15728880);
currentY += lineIndex == 0 ? 12 : 10;
}
@@ -253,7 +253,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
}
});
int xxx = ConfigObject.getInstance().isLeftHandSidePanel() ? window.getScaledWidth() - 30 : 10;
- for(Weather weather : Weather.values()) {
+ for (Weather weather : Weather.values()) {
widgets.add(new ButtonWidget(new Rectangle(xxx, 35, 20, 20), "") {
@Override
public void onPressed() {
@@ -427,7 +427,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
if (shouldReInit)
init();
else {
- for(DisplayHelper.DisplayBoundsHandler<?> handler : DisplayHelper.getInstance().getSortedBoundsHandlers(minecraft.currentScreen.getClass())) {
+ for (DisplayHelper.DisplayBoundsHandler<?> handler : DisplayHelper.getInstance().getSortedBoundsHandlers(minecraft.currentScreen.getClass())) {
if (handler != null && handler.shouldRecalculateArea(!ConfigObject.getInstance().isLeftHandSidePanel(), rectangle)) {
init();
break;
@@ -444,7 +444,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen) {
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
int left = hooks.rei_getContainerLeft(), top = hooks.rei_getContainerTop();
- for(Slot slot : ((AbstractContainerScreen<?>) MinecraftClient.getInstance().currentScreen).getContainer().slotList)
+ for (Slot slot : ((AbstractContainerScreen<?>) MinecraftClient.getInstance().currentScreen).getContainer().slotList)
if (!slot.hasStack() || !ENTRY_LIST_WIDGET.canLastSearchTermsBeAppliedTo(EntryStack.create(slot.getStack())))
fillGradient(left + slot.xPosition, top + slot.yPosition, left + slot.xPosition + 16, top + slot.yPosition + 16, -601874400, -601874400);
}
@@ -455,7 +455,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
this.renderWidgets(mouseX, mouseY, delta);
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen && ConfigObject.getInstance().areClickableRecipeArrowsEnabled()) {
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
- for(RecipeHelper.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
+ for (RecipeHelper.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
if (area.getRectangle().contains(mouseX - hooks.rei_getContainerLeft(), mouseY - hooks.rei_getContainerTop())) {
String collect = CollectionUtils.mapAndJoinToString(area.getCategories(), identifier -> RecipeHelper.getInstance().getCategory(identifier).getCategoryName(), ", ");
@@ -473,7 +473,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
}
Screen currentScreen = MinecraftClient.getInstance().currentScreen;
if (!(currentScreen instanceof RecipeViewingScreen) || !((RecipeViewingScreen) currentScreen).choosePageActivated)
- for(QueuedTooltip queuedTooltip : QUEUED_TOOLTIPS) {
+ for (QueuedTooltip queuedTooltip : QUEUED_TOOLTIPS) {
if (queuedTooltip != null)
renderTooltip(queuedTooltip);
}
@@ -540,7 +540,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
if (favoritesListWidget != null && favoritesListWidget.mouseScrolled(i, j, amount))
return true;
}
- for(Widget widget : widgets)
+ for (Widget widget : widgets)
if (widget != ENTRY_LIST_WIDGET && (favoritesListWidget == null || widget != favoritesListWidget) && widget.mouseScrolled(i, j, amount))
return true;
return false;
@@ -551,7 +551,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
if (ScreenHelper.isOverlayVisible()) {
if (ScreenHelper.getSearchField().keyPressed(int_1, int_2, int_3))
return true;
- for(Element listener : widgets)
+ for (Element listener : widgets)
if (listener != ScreenHelper.getSearchField() && listener.keyPressed(int_1, int_2, int_3))
return true;
}
@@ -587,7 +587,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
return false;
if (ScreenHelper.getSearchField().charTyped(char_1, int_1))
return true;
- for(Element listener : widgets)
+ for (Element listener : widgets)
if (listener != ScreenHelper.getSearchField() && listener.charTyped(char_1, int_1))
return true;
return false;
@@ -604,7 +604,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
return false;
if (MinecraftClient.getInstance().currentScreen instanceof AbstractContainerScreen && ConfigObject.getInstance().areClickableRecipeArrowsEnabled()) {
ContainerScreenHooks hooks = (ContainerScreenHooks) MinecraftClient.getInstance().currentScreen;
- for(RecipeHelper.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
+ for (RecipeHelper.ScreenClickArea area : RecipeHelper.getInstance().getScreenClickAreas())
if (area.getScreenClass().equals(MinecraftClient.getInstance().currentScreen.getClass()))
if (area.getRectangle().contains(double_1 - hooks.rei_getContainerLeft(), double_2 - hooks.rei_getContainerTop())) {
ClientHelper.getInstance().executeViewAllRecipesFromCategories(Arrays.asList(area.getCategories()));
@@ -612,7 +612,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
return true;
}
}
- for(Element element : widgets)
+ for (Element element : widgets)
if (element.mouseClicked(double_1, double_2, int_1)) {
this.setFocused(element);
if (int_1 == 0)
@@ -630,22 +630,12 @@ public class ContainerScreenOverlay extends WidgetWithBounds {
}
public boolean isInside(double mouseX, double mouseY) {
- if (!rectangle.contains(mouseX, mouseY))
- return false;
- for(DisplayHelper.DisplayBoundsHandler<?> handler : DisplayHelper.getInstance().getSortedBoundsHandlers(MinecraftClient.getInstance().currentScreen.getClass())) {
- ActionResult in = handler.isInZone(!ConfigObject.getInstance().isLeftHandSidePanel(), mouseX, mouseY);
- if (in != ActionResult.PASS)
- return in == ActionResult.SUCCESS;
- }
- return true;
+ return rectangle.contains(mouseX, mouseY) && isNotInExclusionZones(mouseX, mouseY);
}
public boolean isNotInExclusionZones(double mouseX, double mouseY) {
- for(DisplayHelper.DisplayBoundsHandler<?> handler : DisplayHelper.getInstance().getSortedBoundsHandlers(MinecraftClient.getInstance().currentScreen.getClass())) {
- ActionResult in = handler.isInZone(true, mouseX, mouseY);
- if (in != ActionResult.PASS)
- return in == ActionResult.SUCCESS;
- in = handler.isInZone(false, mouseX, mouseY);
+ for (DisplayHelper.DisplayBoundsHandler<?> handler : DisplayHelper.getInstance().getSortedBoundsHandlers(MinecraftClient.getInstance().currentScreen.getClass())) {
+ ActionResult in = handler.isInZone(mouseX, mouseY);
if (in != ActionResult.PASS)
return in == ActionResult.SUCCESS;
}
generated by cgit (git 2.34.1) at 2026-06-22 02:13:13 +0000