Wrap JEI custom ingredients, fix tooltips on displays

Signed-off-by: shedaniel <daniel@shedaniel.me>

2 files changed, 6 insertions, 1 deletions

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;