From 5382c0288a2f41a05255db5269213ed9e17b77ff Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 8 Mar 2019 20:56:17 +0800 Subject: Fixes #27 --- .../me/shedaniel/rei/gui/ContainerScreenOverlay.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java') diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index b295039a7..43c199fde 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -395,21 +395,8 @@ public class ContainerScreenOverlay extends ScreenComponent { return false; Point point = ClientHelper.getMouseLocation(); ItemStack itemStack = null; - for(IWidget widget : itemListOverlay.getListeners()) - if (widget instanceof ItemSlotWidget && ((ItemSlotWidget) widget).isHighlighted(point.x, point.y)) { - itemStack = ((ItemSlotWidget) widget).getCurrentStack(); - break; - } - if (itemStack == null && MinecraftClient.getInstance().currentScreen instanceof RecipeViewingScreen) { - RecipeViewingScreen recipeViewingWidget = (RecipeViewingScreen) MinecraftClient.getInstance().currentScreen; - for(IWidget widget : recipeViewingWidget.getWidgets()) - if (widget instanceof ItemSlotWidget && ((HighlightableWidget) widget).isHighlighted(point.x, point.y)) { - itemStack = ((ItemSlotWidget) widget).getCurrentStack(); - break; - } - } - if (itemStack == null && MinecraftClient.getInstance().currentScreen instanceof ContainerScreen) - if (ScreenHelper.getLastContainerScreenHooks().rei_getHoveredSlot() != null) + if (MinecraftClient.getInstance().currentScreen instanceof ContainerScreen) + if (ScreenHelper.getLastContainerScreenHooks().rei_getHoveredSlot() != null && !ScreenHelper.getLastContainerScreenHooks().rei_getHoveredSlot().getStack().isEmpty()) itemStack = ScreenHelper.getLastContainerScreenHooks().rei_getHoveredSlot().getStack(); if (itemStack != null && !itemStack.isEmpty()) { if (ClientHelper.RECIPE.matchesKey(int_1, int_2)) -- cgit