diff options
3 files changed, 8 insertions, 3 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widget.java b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widget.java index ddb4d0d26..5639acf1b 100644 --- a/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widget.java +++ b/api/src/main/java/me/shedaniel/rei/api/gui/widgets/Widget.java @@ -70,8 +70,8 @@ public abstract class Widget extends AbstractContainerEventHandler implements ne } @Override - public final boolean isMouseOver(double double_1, double double_2) { - return containsMouse(double_1, double_2); + public final boolean isMouseOver(double mouseX, double mouseY) { + return containsMouse(mouseX, mouseY); } @Override diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/plugin/entry/ItemEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/gui/plugin/entry/ItemEntryDefinition.java index 2da88dfe2..91b171c73 100644 --- a/runtime/src/main/java/me/shedaniel/rei/gui/plugin/entry/ItemEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/gui/plugin/entry/ItemEntryDefinition.java @@ -223,7 +223,7 @@ public class ItemEntryDefinition implements EntryDefinition<ItemStack> { private List<Component> tryGetItemStackToolTip(EntryStack<ItemStack> entry, ItemStack value, boolean careAboutAdvanced) { if (!SEARCH_BLACKLISTED.contains(value.getItem())) try { - return value.getTooltipLines(Minecraft.getInstance().player, Minecraft.getInstance().options.advancedItemTooltips && careAboutAdvanced ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL); + return value.getTooltipLines(Minecraft.getInstance().player, careAboutAdvanced && Minecraft.getInstance().options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL); } catch (Throwable e) { e.printStackTrace(); SEARCH_BLACKLISTED.add(value.getItem()); diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java index 2947539d4..f8a042ac0 100644 --- a/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryWidget.java @@ -416,6 +416,11 @@ public class EntryWidget extends Slot { } @Override + public boolean containsMouse(double mouseX, double mouseY) { + return mouseX >= bounds.x + 1 && mouseY >= bounds.y + 1 && mouseX <= bounds.getMaxX() - 1 && mouseY <= bounds.getMaxY() - 1; + } + + @Override public boolean keyPressed(int int_1, int int_2, int int_3) { if (!interactable) return false; |