From 687e6503f44b504db141ed777588c2bdfa2184ca Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 16 Jul 2020 23:30:07 +0800 Subject: Added FocusedStackProvider api. Optimised item rendering. Signed-off-by: shedaniel --- .../java/me/shedaniel/rei/gui/ContainerScreenOverlay.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 7b4b9ead7..4bf587829 100644 --- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -642,14 +642,9 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl ScreenHelper.toggleOverlayVisible(); return true; } - ItemStack itemStack = null; - if (MinecraftClient.getInstance().currentScreen instanceof ContainerScreen) { - ContainerScreen containerScreen = (ContainerScreen) MinecraftClient.getInstance().currentScreen; - if (containerScreen.focusedSlot != null && !containerScreen.focusedSlot.getStack().isEmpty()) - itemStack = containerScreen.focusedSlot.getStack(); - } - if (itemStack != null && !itemStack.isEmpty()) { - EntryStack stack = EntryStack.create(itemStack.copy()); + EntryStack stack = RecipeHelper.getInstance().getScreenFocusedStack(MinecraftClient.getInstance().currentScreen); + if (stack != null && !stack.isEmpty()) { + stack = stack.copy(); if (ConfigObject.getInstance().getRecipeKeybind().matchesKey(keyCode, scanCode)) { return ClientHelper.getInstance().openView(ClientHelper.ViewSearchBuilder.builder().addRecipesFor(stack).setOutputNotice(stack).fillPreferredOpenedCategory()); } else if (ConfigObject.getInstance().getUsageKeybind().matchesKey(keyCode, scanCode)) { -- cgit