From 8d77ad86b203de62aa08a5ee62f91e27fd0fbd00 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 30 Aug 2020 21:29:58 +0800 Subject: Fix brewing potions not appearing and allow scrolling in the tabs for villager like recipe viewing screen Signed-off-by: shedaniel --- .../src/main/java/me/shedaniel/rei/impl/ScreenHelper.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java') diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java index 1352d7656..b5ef8a29e 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java @@ -58,9 +58,8 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; import static me.shedaniel.rei.impl.Internals.attachInstance; @@ -71,7 +70,7 @@ public class ScreenHelper implements ClientModInitializer, REIHelper { private static final ResourceLocation DISPLAY_TEXTURE_DARK = new ResourceLocation("roughlyenoughitems", "textures/gui/display_dark.png"); private OverlaySearchField searchField; @ApiStatus.Internal - public static List inventoryStacks = Lists.newArrayList(); + public static Set inventoryStacks = Sets.newHashSet(); private static ContainerScreenOverlay overlay; private static AbstractContainerScreen previousContainerScreen = null; private static LinkedHashSet lastRecipeScreen = Sets.newLinkedHashSetWithExpectedSize(5); @@ -101,7 +100,10 @@ public class ScreenHelper implements ClientModInitializer, REIHelper { @Override public @NotNull List getInventoryStacks() { - return inventoryStacks; + return inventoryStacks.stream() + .map(EntryStack::getItemStack) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } @Nullable -- cgit