From a015ddaba5ba8b02e93db164d219b0c12d8bfa3a Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Wed, 14 Apr 2021 22:23:17 +0800
Subject: Apply generics to FilteringScreen

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../shedaniel/rei/impl/client/config/entries/FilteringScreen.java | 8 ++++----
 .../src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
index 9717f1cf1..032359ff1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
@@ -68,7 +68,7 @@ import static me.shedaniel.rei.impl.client.gui.widget.EntryListWidget.entrySize;
 
 @ApiStatus.Internal
 public class FilteringScreen extends Screen {
-    protected List<EntryStack> selected = Lists.newArrayList();
+    protected List<EntryStack<?>> selected = Lists.newArrayList();
     protected final ScrollingContainer scrolling = new ScrollingContainer() {
         @Override
         public int getMaxScrollHeight() {
@@ -89,7 +89,7 @@ public class FilteringScreen extends Screen {
     Screen parent;
     private FilteringEntry filteringEntry;
     private Tooltip tooltip = null;
-    private List<EntryStack> entryStacks = null;
+    private List<EntryStack<?>> entryStacks = null;
     private Rectangle innerBounds;
     private List<EntryListEntry> entries = Collections.emptyList();
     private List<GuiEventListener> elements = Collections.emptyList();
@@ -129,7 +129,7 @@ public class FilteringScreen extends Screen {
             Component hideText = new TranslatableComponent("config.roughlyenoughitems.filteredEntries.hide");
             this.hideButton = new Button(0, 0, Minecraft.getInstance().font.width(hideText) + 10, 20, hideText, button -> {
                 for (int i = 0; i < entryStacks.size(); i++) {
-                    EntryStack stack = entryStacks.get(i);
+                    EntryStack<?> stack = entryStacks.get(i);
                     EntryListEntry entry = entries.get(i);
                     entry.getBounds().y = (int) (entry.backupY - scrolling.scrollAmount);
                     if (entry.isSelected() && !entry.isFiltered()) {
@@ -144,7 +144,7 @@ public class FilteringScreen extends Screen {
             Component showText = new TranslatableComponent("config.roughlyenoughitems.filteredEntries.show");
             this.showButton = new Button(0, 0, Minecraft.getInstance().font.width(showText) + 10, 20, showText, button -> {
                 for (int i = 0; i < entryStacks.size(); i++) {
-                    EntryStack stack = entryStacks.get(i);
+                    EntryStack<?> stack = entryStacks.get(i);
                     EntryListEntry entry = entries.get(i);
                     entry.getBounds().y = (int) (entry.backupY - scrolling.scrollAmount);
                     if (entry.isSelected() && filteringEntry.configFiltered.remove(stack)) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
index f0f1dae76..c31c1e864 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
@@ -53,7 +53,7 @@ public class REITestPlugin implements REIClientPlugin {
     
     @Override
     public void registerEntries(EntryRegistry registry) {
-        int times = 1000;
+        int times = 100;
         for (Item item : Registry.ITEM) {
             EntryStack<ItemStack> base = EntryStacks.of(item);
             registry.addEntriesAfter(base, IntStream.range(0, times).mapToObj(value -> transformStack(EntryStacks.of(item))).collect(Collectors.toList()));
-- 
cgit