Merge remote-tracking branch 'origin/6.x' into 6.x-1.17

# Conflicts:
#	build.gradle
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabWidget.java

12 files changed, 187 insertions, 90 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java b/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java
index 6fe923ff3..afe34317e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/REIHelper.java
@@ -27,6 +27,7 @@ import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.client.gui.config.SearchFieldLocation;
 import me.shedaniel.rei.api.client.gui.widgets.TextField;
 import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
+import me.shedaniel.rei.api.client.overlay.ScreenOverlay;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
 import me.shedaniel.rei.api.common.registry.Reloadable;
@@ -53,11 +54,11 @@ public interface REIHelper extends Reloadable<REIClientPlugin> {
     
     void toggleOverlayVisible();
     
-    default Optional<REIOverlay> getOverlay() {
+    default Optional<ScreenOverlay> getOverlay() {
         return getOverlay(false);
     }
     
-    Optional<REIOverlay> getOverlay(boolean reset);
+    Optional<ScreenOverlay> getOverlay(boolean reset);
     
     @Nullable
     AbstractContainerScreen<?> getPreviousContainerScreen();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/screen/DisplayScreen.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/screen/DisplayScreen.java
index 68c4a0205..9174d9112 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/screen/DisplayScreen.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/screen/DisplayScreen.java
@@ -29,16 +29,18 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 
+import java.util.List;
+
 public interface DisplayScreen {
     Rectangle getBounds();
     
-    void setIngredientStackToNotice(EntryStack<?> stack);
+    void addIngredientToNotice(EntryStack<?> stack);
     
-    void setResultStackToNotice(EntryStack<?> stack);
+    void addResultToNotice(EntryStack<?> stack);
     
-    EntryStack<?> getIngredientStackToNotice();
+    List<EntryStack<?>> getIngredientsToNotice();
     
-    EntryStack<?> getResultStackToNotice();
+    List<EntryStack<?>> getResultsToNotice();
     
     default CategoryIdentifier<?> getCurrentCategoryId() {
         return getCurrentCategory().getCategoryIdentifier();
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/TextField.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/TextField.java
index 0f1c55142..51f039421 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/TextField.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/TextField.java
@@ -52,9 +52,9 @@ public interface TextField {
     
     void setEditableColor(int editableColor);
     
-    void setNotEditableColor(int int_1);
+    void setNotEditableColor(int notEditableColor);
     
     boolean isFocused();
     
-    void setFocused(boolean boolean_1);
+    void setFocused(boolean focused);
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java b/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java
new file mode 100644
index 000000000..b3752af2e
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/client/overlay/OverlayListWidget.java
@@ -0,0 +1,39 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.client.overlay;
+
+import me.shedaniel.rei.api.common.entry.EntryStack;
+
+import java.util.stream.Stream;
+
+public interface OverlayListWidget {
+    /**
+     * Returns the mouse hovered stack within the overlay list widget.
+     *
+     * @return the mouse hovered stack, returns {@link EntryStack#empty()} if none is hovered
+     */
+    EntryStack<?> getFocusedStacK();
+    
+    Stream<EntryStack<?>> getEntries();
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/REIOverlay.java b/api/src/main/java/me/shedaniel/rei/api/client/overlay/ScreenOverlay.java
index 9d6778237..01aa56e38 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/REIOverlay.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/overlay/ScreenOverlay.java
@@ -21,13 +21,15 @@
  * SOFTWARE.
  */
 
-package me.shedaniel.rei.api.client;
+package me.shedaniel.rei.api.client.overlay;
 
 import me.shedaniel.rei.api.client.gui.drag.DraggingContext;
 import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds;
 import org.jetbrains.annotations.ApiStatus;
 
-public abstract class REIOverlay extends WidgetWithBounds {
+import java.util.Optional;
+
+public abstract class ScreenOverlay extends WidgetWithBounds {
     @ApiStatus.Internal
     public abstract void closeOverlayMenu();
     
@@ -36,4 +38,8 @@ public abstract class REIOverlay extends WidgetWithBounds {
     public abstract DraggingContext<?> getDraggingContext();
     
     public abstract boolean isNotInExclusionZones(double mouseX, double mouseY);
+    
+    public abstract OverlayListWidget getEntryList();
+    
+    public abstract Optional<OverlayListWidget> getFavoritesList();
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java b/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java
index 2dd4b0cff..589970db9 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java
@@ -23,6 +23,7 @@
 
 package me.shedaniel.rei.api.client.view;
 
+import me.shedaniel.rei.api.client.ClientHelper;
 import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
 import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
@@ -65,19 +66,9 @@ public interface ViewSearchBuilder {
     @Nullable
     CategoryIdentifier<?> getPreferredOpenedCategory();
     
-    ViewSearchBuilder fillPreferredOpenedCategory();
-    
-    <T> ViewSearchBuilder setInputNotice(@Nullable EntryStack<T> stack);
-    
-    @Nullable
-    EntryStack<?> getInputNotice();
-    
-    <T> ViewSearchBuilder setOutputNotice(@Nullable EntryStack<T> stack);
-    
-    @Nullable
-    EntryStack<?> getOutputNotice();
-    
     Map<DisplayCategory<?>, List<Display>> buildMap();
     
-    
+    default boolean open() {
+        return ClientHelper.getInstance().openView(this);
+    }
 }
\ No newline at end of file
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java b/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java
index 731c94f15..6ddd1b416 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/view/Views.java
@@ -24,26 +24,17 @@
 package me.shedaniel.rei.api.client.view;
 
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
-import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
-import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
 import me.shedaniel.rei.api.common.registry.Reloadable;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 public interface Views extends Reloadable<REIClientPlugin> {
     static Views getInstance() {
         return PluginManager.getClientInstance().get(Views.class);
     }
     
-    @ApiStatus.Internal
-    Map<DisplayCategory<?>, List<Display>> buildMapFor(ViewSearchBuilder builder);
-    
     /**
      * Returns all craftable items from materials.
      *
@@ -51,28 +42,4 @@ public interface Views extends Reloadable<REIClientPlugin> {
      * @return the list of craftable entries
      */
     Collection<EntryStack<?>> findCraftableEntriesByMaterials(Iterable<? extends EntryStack<?>> inventoryItems);
-    
-    /**
-     * Returns a map of recipes for an entry
-     *
-     * @param stack the stack to be crafted
-     * @return the map of recipes
-     */
-    default <T> Map<DisplayCategory<?>, List<Display>> getRecipesFor(EntryStack<T> stack) {
-        return ViewSearchBuilder.builder().addRecipesFor(stack).setInputNotice(stack).buildMap();
-    }
-    
-    /**
-     * Returns a map of usages for an entry
-     *
-     * @param stack the stack to be used
-     * @return the map of recipes
-     */
-    default <T> Map<DisplayCategory<?>, List<Display>> getUsagesFor(EntryStack<T> stack) {
-        return ViewSearchBuilder.builder().addUsagesFor(stack).setInputNotice(stack).buildMap();
-    }
-    
-    default Map<DisplayCategory<?>, List<Display>> getAllRecipes() {
-        return ViewSearchBuilder.builder().addAllCategories().buildMap();
-    }
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparator.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/EntryComparator.java
index 09c36cec6..c40966887 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparator.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/EntryComparator.java
@@ -23,6 +23,7 @@
 
 package me.shedaniel.rei.api.common.entry.comparison;
 
+import me.shedaniel.architectury.fluid.FluidStack;
 import me.shedaniel.rei.impl.Internals;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
@@ -32,15 +33,15 @@ import java.util.Objects;
 import java.util.function.ToLongFunction;
 
 /**
- * Hasher implementation for {@link ItemStack}.
+ * Hasher implementation for {@link T}.
  */
 @FunctionalInterface
-public interface ItemComparator {
-    static ItemComparator noop() {
+public interface EntryComparator<T> {
+    static <T> EntryComparator<T> noop() {
         return (context, stack) -> 1;
     }
     
-    static ItemComparator itemNbt() {
+    static EntryComparator<ItemStack> itemNbt() {
         ToLongFunction<Tag> nbtHasher = nbtHasher("Count");
         return (context, stack) -> {
             CompoundTag tag = stack.getTag();
@@ -48,23 +49,31 @@ public interface ItemComparator {
         };
     }
     
+    static EntryComparator<FluidStack> fluidNbt() {
+        ToLongFunction<Tag> nbtHasher = nbtHasher("Amount");
+        return (context, stack) -> {
+            CompoundTag tag = stack.getTag();
+            return tag == null ? 0L : nbtHasher.applyAsLong(tag);
+        };
+    }
+    
     static ToLongFunction<Tag> nbtHasher(String... ignoredKeys) {
         return Internals.getNbtHasher(ignoredKeys);
     }
     
-    long hash(ComparisonContext context, ItemStack stack);
+    long hash(ComparisonContext context, T stack);
     
-    default ItemComparator onlyExact() {
-        ItemComparator self = this;
+    default EntryComparator<T> onlyExact() {
+        EntryComparator<T> self = this;
         
         return (context, stack) -> {
             return context.isExact() ? self.hash(context, stack) : 1;
         };
     }
     
-    default ItemComparator then(ItemComparator other) {
+    default EntryComparator<T> then(EntryComparator<T> other) {
         Objects.requireNonNull(other);
-        ItemComparator self = this;
+        EntryComparator<T> self = this;
         
         return (context, stack) -> {
             long hash = 1L;
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/EntryComparatorRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/EntryComparatorRegistry.java
new file mode 100644
index 000000000..ba77326e6
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/EntryComparatorRegistry.java
@@ -0,0 +1,49 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.common.entry.comparison;
+
+import me.shedaniel.rei.api.common.plugins.REIPlugin;
+import me.shedaniel.rei.api.common.registry.Reloadable;
+
+/**
+ * Registry for registering custom methods for identifying variants of {@link T}.
+ * The default comparator is {@link EntryComparator#noop()}, which does not compare the NBT of the entries.
+ * <p>
+ * This comparator is used when the comparison context is {@link ComparisonContext#EXACT}.
+ */
+public interface EntryComparatorRegistry<T, S> extends Reloadable<REIPlugin<?>> {
+    void register(EntryComparator<T> comparator, S entry);
+    
+    default void register(EntryComparator<T> comparator, S... entries) {
+        for (S entry : entries) {
+            register(comparator, entry);
+        }
+    }
+    
+    long hashOf(ComparisonContext context, T stack);
+    
+    boolean containsComparator(S entry);
+    
+    int comparatorSize();
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/FluidComparatorRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/FluidComparatorRegistry.java
new file mode 100644
index 000000000..f8489ef2e
--- /dev/null
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/FluidComparatorRegistry.java
@@ -0,0 +1,45 @@
+/*
+ * This file is licensed under the MIT License, part of Roughly Enough Items.
+ * Copyright (c) 2018, 2019, 2020, 2021 shedaniel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package me.shedaniel.rei.api.common.entry.comparison;
+
+import me.shedaniel.architectury.fluid.FluidStack;
+import me.shedaniel.rei.api.common.plugins.PluginManager;
+import net.minecraft.world.level.material.Fluid;
+
+public interface FluidComparatorRegistry extends EntryComparatorRegistry<FluidStack, Fluid> {
+    /**
+     * @return the instance of {@link FluidComparatorRegistry}
+     */
+    static FluidComparatorRegistry getInstance() {
+        return PluginManager.getInstance().get(FluidComparatorRegistry.class);
+    }
+    
+    default void registerNbt(Fluid fluid) {
+        register(EntryComparator.fluidNbt(), fluid);
+    }
+    
+    default void registerNbt(Fluid... fluids) {
+        register(EntryComparator.fluidNbt(), fluids);
+    }
+}
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparatorRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparatorRegistry.java
index 99f8a0038..299eab648 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparatorRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/comparison/ItemComparatorRegistry.java
@@ -24,18 +24,10 @@
 package me.shedaniel.rei.api.common.entry.comparison;
 
 import me.shedaniel.rei.api.common.plugins.PluginManager;
-import me.shedaniel.rei.api.common.plugins.REIPlugin;
-import me.shedaniel.rei.api.common.registry.Reloadable;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 
-/**
- * Registry for registering custom methods for identifying variants of {@link net.minecraft.world.item.ItemStack}.
- * The default comparator is {@link ItemComparator#noop()}, which does not compare the NBT of the items.
- * <p>
- * This comparator is used when the comparison context is {@link ComparisonContext#EXACT}.
- */
-public interface ItemComparatorRegistry extends Reloadable<REIPlugin<?>> {
+public interface ItemComparatorRegistry extends EntryComparatorRegistry<ItemStack, Item> {
     /**
      * @return the instance of {@link ItemComparatorRegistry}
      */
@@ -43,25 +35,11 @@ public interface ItemComparatorRegistry extends Reloadable<REIPlugin<?>> {
         return PluginManager.getInstance().get(ItemComparatorRegistry.class);
     }
     
-    void register(ItemComparator comparator, Item item);
-    
-    default void register(ItemComparator comparator, Item... items) {
-        for (Item item : items) {
-            register(comparator, item);
-        }
-    }
-    
     default void registerNbt(Item item) {
-        register(ItemComparator.itemNbt(), item);
+        register(EntryComparator.itemNbt(), item);
     }
     
     default void registerNbt(Item... items) {
-        register(ItemComparator.itemNbt(), items);
+        register(EntryComparator.itemNbt(), items);
     }
-    
-    long hashOf(ComparisonContext context, ItemStack stack);
-    
-    boolean containsComparator(Item item);
-    
-    int comparatorSize();
 }
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIPlugin.java b/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIPlugin.java
index 0c5559f05..44998c914 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIPlugin.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/plugins/REIPlugin.java
@@ -24,6 +24,7 @@
 package me.shedaniel.rei.api.common.plugins;
 
 import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry;
+import me.shedaniel.rei.api.common.entry.comparison.FluidComparatorRegistry;
 import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry;
 import me.shedaniel.rei.api.common.entry.type.EntryTypeRegistry;
 import me.shedaniel.rei.api.common.fluid.FluidSupportProvider;
@@ -69,6 +70,15 @@ public interface REIPlugin<P extends REIPlugin<?>> extends Comparable<REIPlugin<
     }
     
     /**
+     * Registers fluid comparators for identifying variants of {@link me.shedaniel.architectury.fluid.FluidStack}.
+     *
+     * @see FluidComparatorRegistry
+     */
+    @ApiStatus.OverrideOnly
+    default void registerFluidComparators(FluidComparatorRegistry registry) {
+    }
+    
+    /**
      * Registers new item to fluid support providers.
      *
      * @param support the support registry