Merge branch '1.14-dev' into 1.14

CHANGELOG.md

@@ -1,15 +1,20 @@
 View full changelog [here](https://github.com/shedaniel/RoughlyEnoughItems/blob/1.14/CHANGELOG.md).
-## v2.9-beta+build.109 (BETA)
+## v2.9+build.110
+- Fixed: Build 109 Crash
+- Fixed: Next Page / Previous Page crash in villager recipe mode
+- Added: Scrolling in villager recipe mode
+- Added: New bad javadoc: https://shedaniel.me/RoughlyEnoughItems/
+#### v2.9-beta+build.109 (BETA)
 - Fixed [#92](https://github.com/shedaniel/RoughlyEnoughItems/issues/92): Make REI Buttons use an extra sheet
 - Adds: Support for `{item_name}` in cheating items for getting the path of the item identifier
-## v2.9-beta+build.108 (BETA)
+#### v2.9-beta+build.108 (BETA)
 - Fixed [#88](https://github.com/shedaniel/RoughlyEnoughItems/issues/88): Stupid Item Search
-## v2.9-beta+build.107 (BETA)
+#### v2.9-beta+build.107 (BETA)
 - Fixed: Crashing when clicking tabs
 - Added: Buttons to switch category page
 - Fixed: NullPointerException by geniii
 - Fixed [#58](https://github.com/shedaniel/RoughlyEnoughItems/issues/58): Keybinds (e.g. O, R, U) working even a search field is focused
-## v2.9-beta+build.106 (BETA)
+#### v2.9-beta+build.106 (BETA)
 - Using: [HammerLib](https://minecraft.curseforge.com/projects/hammer-lib) as a simple opengl scissors api
 - New: Mod Name of category new shows in category tooltips
 - New: Renderer API

build.gradle

@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJar
 
 plugins {
-    id 'fabric-loom' version '0.2.1-SNAPSHOT'
+    id 'fabric-loom' version '0.2.2-SNAPSHOT'
     id "com.github.johnrengelman.shadow" version "4.0.3"
 }
 
@@ -51,20 +51,20 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_version}"
     modCompile "net.fabricmc:fabric-loader:${project.fabricloader_version}"
 //    modCompile "net.fabricmc:fabric:${project.fabric_version}"
-    modCompile "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}"
-    modCompile "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}"
-    modCompile "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}"
-    modCompile "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}"
-    modCompile "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}"
+    modCompile "net.fabricmc.fabric-api:fabric-keybindings-v0:${project.fabric_keybindings}"
+    modCompile "net.fabricmc.fabric-api:fabric-api-base:${project.fabric_api_base}"
+    modCompile "net.fabricmc.fabric-api:fabric-networking-v0:${project.fabric_networking}"
+    modCompile "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:${project.fabric_events_lifecycle}"
+    modCompile "net.fabricmc.fabric-api:fabric-resource-loader-v0:${project.fabric_resource_loader}"
     modCompile "cloth:ClothEvents:${cloth_events_version}"
     modCompile "cloth-config:ClothConfig:${cloth_config_version}"
     if (includeDep) {
-//        include "net.fabricmc:fabric:${project.fabric_version}"
-        include "net.fabricmc.fabric-api:fabric-keybindings:${project.fabric_keybindings}"
-        include "net.fabricmc.fabric-api:fabric-lib:${project.fabric_lib}"
-        include "net.fabricmc.fabric-api:fabric-networking:${project.fabric_networking}"
-        include "net.fabricmc.fabric-api:fabric-events-lifecycle:${project.fabric_events_lifecycle}"
-        include "net.fabricmc.fabric-api:fabric-resource-loader:${project.fabric_resource_loader}"
+        include "net.fabricmc:fabric:${project.fabric_version}"
+//        include "net.fabricmc.fabric-api:fabric-keybindings-v0:${project.fabric_keybindings}"
+//        include "net.fabricmc.fabric-api:fabric-api-base:${project.fabric_api_base}"
+//        include "net.fabricmc.fabric-api:fabric-networking-v0:${project.fabric_networking}"
+//        include "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:${project.fabric_events_lifecycle}"
+//        include "net.fabricmc.fabric-api:fabric-resource-loader-v0:${project.fabric_resource_loader}"
         include "cloth:ClothEvents:${cloth_events_version}"
         include "cloth-config:ClothConfig:${cloth_config_version}"
     }

gradle.properties

@@ -1,6 +1,6 @@
-mod_version=2.9-beta+build.109
+mod_version=2.9+build.110
 minecraft_version=1.14
-yarn_version=1.14+build.5
+yarn_version=1.14+build.21
 fabricloader_version=0.4.6+build.141
 jankson_version=1.1.0
 cloth_events_version=0.3.1.23
@@ -8,8 +8,8 @@ cloth_config_version=0.2.1.14
 modmenu_version=1.4.0-71
 fabric_version=0.2.7+build.127
 
-fabric_keybindings=0.1.0+93af775a
-fabric_lib=0.1.0+93af775a
-fabric_networking=0.1.0+93af775a
-fabric_events_lifecycle=0.1.0+93af775a
-fabric_resource_loader=0.1.0+93af775a
+fabric_keybindings=0.1.0+f1618918
+fabric_networking=0.1.0+f1618918
+fabric_events_lifecycle=0.1.0+9232ac87
+fabric_resource_loader=0.1.0+f1618918
+fabric_api_base=0.1.0+f1618918

src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java

@@ -41,7 +41,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class RoughlyEnoughItemsCore implements ClientModInitializer {
-
+    
     public static final Logger LOGGER;
     private static final RecipeHelper RECIPE_HELPER = new RecipeHelperImpl();
     private static final PluginDisabler PLUGIN_DISABLER = new PluginDisablerImpl();
@@ -49,70 +49,80 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
     private static final DisplayHelper DISPLAY_HELPER = new DisplayHelperImpl();
     private static final Map<Identifier, REIPluginEntry> plugins = Maps.newHashMap();
     private static ConfigManagerImpl configManager;
-
+    
     static {
         LOGGER = LogManager.getFormatterLogger("REI");
     }
-
+    
     public static RecipeHelper getRecipeHelper() {
         return RECIPE_HELPER;
     }
-
+    
     public static me.shedaniel.rei.api.ConfigManager getConfigManager() {
         return configManager;
     }
-
+    
     public static ItemRegistry getItemRegisterer() {
         return ITEM_REGISTRY;
     }
-
+    
     public static PluginDisabler getPluginDisabler() {
         return PLUGIN_DISABLER;
     }
-
+    
     public static DisplayHelper getDisplayHelper() {
         return DISPLAY_HELPER;
     }
-
+    
     public static REIPluginEntry registerPlugin(Identifier identifier, REIPluginEntry plugin) {
         plugins.put(identifier, plugin);
         RoughlyEnoughItemsCore.LOGGER.info("[REI] Registered plugin %s from %s", identifier.toString(), plugin.getClass().getSimpleName());
         plugin.onFirstLoad(getPluginDisabler());
         return plugin;
     }
-
+    
     public static List<REIPluginEntry> getPlugins() {
         return new LinkedList<>(plugins.values());
     }
-
+    
     public static Optional<Identifier> getPluginIdentifier(REIPluginEntry plugin) {
         for(Identifier identifier : plugins.keySet())
             if (identifier != null && plugins.get(identifier).equals(plugin))
                 return Optional.of(identifier);
         return Optional.empty();
     }
-
+    
     public static boolean hasPermissionToUsePackets() {
-        return hasOperatorPermission() && canUsePackets();
+        try {
+            MinecraftClient.getInstance().getNetworkHandler().getCommandSource().hasPermissionLevel(0);
+            return hasOperatorPermission() && canUsePackets();
+        } catch (NullPointerException e) {
+            return true;
+        }
     }
-
+    
     public static boolean hasOperatorPermission() {
-        return MinecraftClient.getInstance().getNetworkHandler().getCommandSource().hasPermissionLevel(1);
+        try {
+            return MinecraftClient.getInstance().getNetworkHandler().getCommandSource().hasPermissionLevel(1);
+        } catch (NullPointerException e) {
+            return true;
+        }
     }
-
+    
     public static boolean canUsePackets() {
         return ClientSidePacketRegistry.INSTANCE.canServerReceive(RoughlyEnoughItemsNetwork.CREATE_ITEMS_PACKET) && ClientSidePacketRegistry.INSTANCE.canServerReceive(RoughlyEnoughItemsNetwork.DELETE_ITEMS_PACKET);
     }
-
+    
     @Override
     public void onInitializeClient() {
         configManager = new ConfigManagerImpl();
-
+        
         registerClothEvents();
         discoverOldPlugins();
         discoverPluginEntries();
     }
-
+    
+    @SuppressWarnings("deprecation")
     private void discoverPluginEntries() {
         for(REIPluginEntry reiPlugin : FabricLoader.getInstance().getEntrypoints("rei_plugins", REIPluginEntry.class)) {
             try {
@@ -125,7 +135,8 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
             }
         }
     }
-
+    
+    @SuppressWarnings("deprecation")
     private void discoverOldPlugins() {
         List<Pair<Identifier, String>> list = Lists.newArrayList();
         for(ModMetadata metadata : FabricLoader.getInstance().getAllMods().stream().map(ModContainer::getMetadata).filter(metadata -> metadata.containsCustomElement("roughlyenoughitems:plugins")).collect(Collectors.toList())) {
@@ -164,7 +175,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
             }
         }
     }
-
+    
     private void loadPluginFromJsonObject(List<Pair<Identifier, String>> list, ModMetadata modMetadata, JsonObject object) {
         String namespace = modMetadata.getId();
         if (object.has("namespace"))
@@ -173,7 +184,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         String className = object.get("class").getAsString();
         list.add(new Pair<>(new Identifier(namespace, id), className));
     }
-
+    
     private void registerClothEvents() {
         ClothClientHooks.SYNC_RECIPES.register((minecraftClient, recipeManager, synchronizeRecipesS2CPacket) -> {
             ((RecipeHelperImpl) RoughlyEnoughItemsCore.getRecipeHelper()).recipesLoaded(recipeManager);
@@ -232,7 +243,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
                 ScreenHelper.getLastOverlay().lateRender(i, i1, v);
         });
         ClothClientHooks.SCREEN_KEY_PRESSED.register((minecraftClient, screen, i, i1, i2) -> {
-            if (screen.getFocused() != null && screen.getFocused() instanceof TextFieldWidget || (screen.getFocused() instanceof RecipeBookGui && ((RecipeBookGuiHooks)screen.getFocused()).rei_getSearchField() != null && ((RecipeBookGuiHooks)screen.getFocused()).rei_getSearchField().isFocused()))
+            if (screen.getFocused() != null && screen.getFocused() instanceof TextFieldWidget || (screen.getFocused() instanceof RecipeBookGui && ((RecipeBookGuiHooks) screen.getFocused()).rei_getSearchField() != null && ((RecipeBookGuiHooks) screen.getFocused()).rei_getSearchField().isFocused()))
                 return ActionResult.PASS;
             if (screen instanceof ContainerScreen)
                 if (ScreenHelper.getLastOverlay().keyPressed(i, i1, i2))
@@ -240,5 +251,5 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
             return ActionResult.PASS;
         });
     }
-
+    
 }

src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java

@@ -8,12 +8,12 @@ package me.shedaniel.rei;
 import me.shedaniel.rei.gui.widget.ItemListOverlay;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
+import net.minecraft.ChatFormat;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.StringTextComponent;
-import net.minecraft.text.TextFormat;
-import net.minecraft.text.TranslatableTextComponent;
 import net.minecraft.util.Identifier;
 
 public class RoughlyEnoughItemsNetwork implements ModInitializer {
@@ -26,7 +26,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
         ServerSidePacketRegistry.INSTANCE.register(DELETE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
             ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
             if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) {
-                player.addChatMessage(new TranslatableTextComponent("text.rei.no_permission_cheat").applyFormat(TextFormat.RED), false);
+                player.addChatMessage(new TranslatableComponent("text.rei.no_permission_cheat").applyFormat(ChatFormat.RED), false);
                 return;
             }
             if (!player.inventory.getCursorStack().isEmpty())
@@ -35,14 +35,14 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
         ServerSidePacketRegistry.INSTANCE.register(CREATE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
             ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
             if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) {
-                player.addChatMessage(new TranslatableTextComponent("text.rei.no_permission_cheat").applyFormat(TextFormat.RED), false);
+                player.addChatMessage(new TranslatableComponent("text.rei.no_permission_cheat").applyFormat(ChatFormat.RED), false);
                 return;
             }
             ItemStack stack = packetByteBuf.readItemStack();
             if (player.inventory.insertStack(stack.copy()))
-                player.addChatMessage(new StringTextComponent(I18n.translate("text.rei.cheat_items").replaceAll("\\{item_name}", ItemListOverlay.tryGetItemStackName(stack.copy())).replaceAll("\\{item_count}", stack.copy().getAmount() + "").replaceAll("\\{player_name}", player.getEntityName())), false);
+                player.addChatMessage(new TextComponent(I18n.translate("text.rei.cheat_items").replaceAll("\\{item_name}", ItemListOverlay.tryGetItemStackName(stack.copy())).replaceAll("\\{item_count}", stack.copy().getAmount() + "").replaceAll("\\{player_name}", player.getEntityName())), false);
             else
-                player.addChatMessage(new TranslatableTextComponent("text.rei.failed_cheat_items"), false);
+                player.addChatMessage(new TranslatableComponent("text.rei.failed_cheat_items"), false);
         });
     }
     

src/main/java/me/shedaniel/rei/api/BaseBoundsHandler.java

@@ -11,11 +11,30 @@ import java.awt.*;
 import java.util.List;
 
 public interface BaseBoundsHandler extends DisplayHelper.DisplayBoundsHandler<Screen> {
+    /**
+     * Gets the exclusion zones by the screen class
+     *
+     * @param currentScreenClass the current screen class
+     * @param isOnRightSide      whether the user has set the overlay to the right
+     * @return the list of exclusion zones
+     */
     List<Rectangle> getCurrentExclusionZones(Class<? extends Screen> currentScreenClass, boolean isOnRightSide);
     
+    /**
+     * Register an exclusion zone
+     *
+     * @param screenClass the screen
+     * @param supplier    the exclusion zone supplier
+     */
     void registerExclusionZones(Class<? extends Screen> screenClass, ExclusionZoneSupplier supplier);
     
     public static interface ExclusionZoneSupplier {
+        /**
+         * Gets the current exclusion zones
+         *
+         * @param isOnRightSide whether the user has set the overlay to the right
+         * @return the list of exclusion zones
+         */
         List<Rectangle> apply(boolean isOnRightSide);
     }
 }

src/main/java/me/shedaniel/rei/api/ClientHelper.java

@@ -41,9 +41,9 @@ public interface ClientHelper {
     
     /**
      * Opens a recipe viewing screen:
-     * {@link me.shedaniel.rei.gui.PreRecipeViewingScreen} if not set
-     * {@link me.shedaniel.rei.gui.RecipeViewingScreen} if set to default
-     * {@link me.shedaniel.rei.gui.VillagerRecipeViewingScreen} if set to villager
+     * Opens {@link me.shedaniel.rei.gui.PreRecipeViewingScreen} if not set
+     * Opens {@link me.shedaniel.rei.gui.RecipeViewingScreen} if set to default
+     * Opens {@link me.shedaniel.rei.gui.VillagerRecipeViewingScreen} if set to villager
      *
      * @param map the map of recipes
      */
@@ -115,14 +115,29 @@ public interface ClientHelper {
      */
     String getModFromIdentifier(Identifier identifier);
     
+    /**
+     * @return the recipe keybind, defaulted R
+     */
     FabricKeyBinding getRecipeKeyBinding();
     
+    /**
+     * @return the usage keybind, defaulted U
+     */
     FabricKeyBinding getUsageKeyBinding();
     
+    /**
+     * @return the hide keybind, defaulted O
+     */
     FabricKeyBinding getHideKeyBinding();
     
+    /**
+     * @return the previous page keybind, defaulted not set
+     */
     FabricKeyBinding getPreviousPageKeyBinding();
     
+    /**
+     * @return the next page keybind, defaulted not set
+     */
     FabricKeyBinding getNextPageKeyBinding();
     
     /**

src/main/java/me/shedaniel/rei/api/DisplayHelper.java

@@ -55,11 +55,6 @@ public interface DisplayHelper {
     BaseBoundsHandler getBaseBoundsHandler();
     
     public static interface DisplayBoundsHandler<T> {
-        /**
-         * An empty rectangle
-         */
-        public static final Rectangle EMPTY = new Rectangle();
-        
         /**
          * Gets the base supported class for the bounds handler
          *

src/main/java/me/shedaniel/rei/api/ItemRegistry.java

@@ -27,6 +27,12 @@ public interface ItemRegistry {
     @Deprecated
     List<ItemStack> getModifiableItemList();
     
+    /**
+     * Gets all possible stacks from an item
+     *
+     * @param item the item to find
+     * @return the array of possible stacks
+     */
     ItemStack[] getAllStacksFromItem(Item item);
     
     /**
@@ -37,12 +43,23 @@ public interface ItemRegistry {
      */
     void registerItemStack(Item afterItem, ItemStack stack);
     
+    /**
+     * Registers multiple stacks to the item list
+     *
+     * @param afterItem the stack to put after
+     * @param stacks    the stacks to register
+     */
     default void registerItemStack(Item afterItem, ItemStack... stacks) {
         for(ItemStack stack : stacks)
             if (stack != null && !stack.isEmpty())
                 registerItemStack(afterItem, stack);
     }
     
+    /**
+     * Registers multiple stacks to the item list
+     *
+     * @param stacks the stacks to register
+     */
     default void registerItemStack(ItemStack... stacks) {
         for(ItemStack stack : stacks)
             if (stack != null && !stack.isEmpty())

src/main/java/me/shedaniel/rei/api/PluginDisabler.java

@@ -9,20 +9,51 @@ import net.minecraft.util.Identifier;
 
 public interface PluginDisabler {
     
+    /**
+     * Disables multiple functions from a plugin
+     *
+     * @param plugin    the identifier of the plugin
+     * @param functions the array of functions to be disabled
+     */
     default void disablePluginFunctions(Identifier plugin, PluginFunction... functions) {
         for(PluginFunction function : functions)
             disablePluginFunction(plugin, function);
     }
     
+    /**
+     * Enables multiple functions from a plugin
+     *
+     * @param plugin    the identifier of the plugin
+     * @param functions the array of functions to be enabled
+     */
     default void enablePluginFunctions(Identifier plugin, PluginFunction... functions) {
         for(PluginFunction function : functions)
             enablePluginFunction(plugin, function);
     }
     
+    /**
+     * Disables a function from a plugin
+     *
+     * @param plugin    the identifier of the plugin
+     * @param function the function to be disabled
+     */
     void disablePluginFunction(Identifier plugin, PluginFunction function);
     
+    /**
+     * Enables a function from a plugin
+     *
+     * @param plugin    the identifier of the plugin
+     * @param function the function to be enabled
+     */
     void enablePluginFunction(Identifier plugin, PluginFunction function);
     
+    /**
+     * Checks if a plugin function has been disabled
+     *
+     * @param plugin   the identifier of the plugin
+     * @param function the function to check
+     * @return whether if it has been disabled
+     */
     boolean isFunctionEnabled(Identifier plugin, PluginFunction function);
     
 }

src/main/java/me/shedaniel/rei/api/RecipeDisplay.java

@@ -15,16 +15,35 @@ import java.util.Optional;
 
 public interface RecipeDisplay<T extends Recipe> {
     
+    /**
+     * @return the optional recipe
+     */
     Optional<T> getRecipe();
     
+    /**
+     * @return a list of items
+     */
     List<List<ItemStack>> getInput();
     
+    /**
+     * @return a list of outputs
+     */
     List<ItemStack> getOutput();
     
+    /**
+     * Gets the required items used in craftable filters
+     *
+     * @return the list of required items
+     */
     default List<List<ItemStack>> getRequiredItems() {
         return Lists.newArrayList();
     }
     
+    /**
+     * Gets the recipe display category identifier
+     *
+     * @return the identifier of the category
+     */
     Identifier getRecipeCategory();
     
 }

src/main/java/me/shedaniel/rei/api/RecipeHelper.java

@@ -24,10 +24,24 @@ public interface RecipeHelper {
         return RoughlyEnoughItemsCore.getRecipeHelper();
     }
     
+    /**
+     * Gets the total recipe count registered
+     *
+     * @return the recipe count
+     */
     int getRecipeCount();
     
-    List<Recipe> getVanillaSortedRecipes();
+    /**
+     * @return a list of sorted recipes
+     */
+    List<Recipe> getAllSortedRecipes();
     
+    /**
+     * Gets all craftable items from materials.
+     *
+     * @param inventoryItems the materials
+     * @return the list of craftable items
+     */
     List<ItemStack> findCraftableByItems(List<ItemStack> inventoryItems);
     
     /**
@@ -45,6 +59,12 @@ public interface RecipeHelper {
      */
     void registerDisplay(Identifier categoryIdentifier, RecipeDisplay display);
     
+    /**
+     * Gets a map of recipes for an itemstack
+     *
+     * @param stack the stack to be crafted
+     * @return the map of recipes
+     */
     Map<RecipeCategory, List<RecipeDisplay>> getRecipesFor(ItemStack stack);
     
     /**
@@ -56,32 +76,101 @@ public interface RecipeHelper {
     
     /**
      * Gets all registered categories
+     *
      * @return the list of categories
      */
     List<RecipeCategory> getAllCategories();
     
+    /**
+     * Gets a map of usages for an itemstack
+     *
+     * @param stack the stack to be used
+     * @return the map of recipes
+     */
     Map<RecipeCategory, List<RecipeDisplay>> getUsagesFor(ItemStack stack);
     
+    /**
+     * Gets the optional of the speed crafting button area from a category
+     *
+     * @param category the category of the display
+     * @return the optional of speed crafting button area
+     */
     Optional<ButtonAreaSupplier> getSpeedCraftButtonArea(RecipeCategory category);
     
+    /**
+     * Registers a speed crafting button area
+     *
+     * @param category  the category of the button area
+     * @param rectangle the button area
+     */
     void registerSpeedCraftButtonArea(Identifier category, ButtonAreaSupplier rectangle);
     
+    /**
+     * Registers a default speed crafting button area, which is bottom right
+     *
+     * @param category the category of the button area
+     */
     void registerDefaultSpeedCraftButtonArea(Identifier category);
     
+    /**
+     * Gets the speed crafting functional from a category
+     *
+     * @param category the category of the speed crafting functional
+     * @return the list of speed crafting functionals
+     */
     List<SpeedCraftFunctional> getSpeedCraftFunctional(RecipeCategory category);
     
+    /**
+     * Registers a speed crafting functional
+     *
+     * @param category   the category of the speed crafting functional
+     * @param functional the functional to be registered
+     */
     void registerSpeedCraftFunctional(Identifier category, SpeedCraftFunctional functional);
     
+    /**
+     * Gets the map of all recipes visible to the player
+     *
+     * @return the map of recipes
+     */
     Map<RecipeCategory, List<RecipeDisplay>> getAllRecipes();
     
+    /**
+     * Registers a recipe visibility handler
+     *
+     * @param visibilityHandler the handler to be registered
+     */
     void registerRecipeVisibilityHandler(DisplayVisibilityHandler visibilityHandler);
     
+    /**
+     * Unregisters a recipe visibility handler
+     *
+     * @param visibilityHandler the handler to be unregistered
+     */
     void unregisterRecipeVisibilityHandler(DisplayVisibilityHandler visibilityHandler);
     
+    /**
+     * Gets an unmodifiable list of recipe visibility handlers
+     *
+     * @return the unmodifiable list of handlers
+     */
     List<DisplayVisibilityHandler> getDisplayVisibilityHandlers();
     
+    /**
+     * Checks if the display is visible by asking recipe visibility handlers
+     *
+     * @param display       the display to be checked
+     * @param respectConfig whether it should respect the user's config
+     * @return whether the display should be visible
+     */
     boolean isDisplayVisible(RecipeDisplay display, boolean respectConfig);
     
+    /**
+     * Gets the cached category setting by the category identifier
+     *
+     * @param category the identifier of the category
+     * @return the optional of the category settings
+     */
     Optional<DisplaySettings> getCachedCategorySettings(Identifier category);
     
 }

src/main/java/me/shedaniel/rei/api/Renderable.java

@@ -19,6 +19,12 @@ import java.util.function.Supplier;
  */
 public interface Renderable {
     
+    /**
+     * Gets an item stack renderer by an item stack supplier
+     *
+     * @param supplier the supplier for getting the item stack
+     * @return the item stack renderer
+     */
     static ItemStackRenderer fromItemStackSupplier(Supplier<ItemStack> supplier) {
         return new ItemStackRenderer() {
             @Override
@@ -28,19 +34,32 @@ public interface Renderable {
         };
     }
     
+    /**
+     * Gets an item stack renderer by an item stack
+     *
+     * @param stack the item stack to be displayed
+     * @return the item stack renderer
+     */
     static ItemStackRenderer fromItemStack(ItemStack stack) {
-        return new ItemStackRenderer() {
-            @Override
-            public ItemStack getItemStack() {
-                return stack;
-            }
-        };
+        return fromItemStackSupplier(() -> stack);
     }
     
+    /**
+     * Gets an empty renderer
+     *
+     * @return an empty renderer
+     */
     static EmptyRenderer empty() {
         return EmptyRenderer.INSTANCE;
     }
     
+    /**
+     * Gets a simple recipe renderer from inputs and outputs
+     *
+     * @param input  the list of input items
+     * @param output the list of output items
+     * @return the recipe renderer
+     */
     static SimpleRecipeRenderer fromRecipe(Supplier<List<List<ItemStack>>> input, Supplier<List<ItemStack>> output) {
         return new SimpleRecipeRenderer(input, output);
     }
@@ -56,5 +75,14 @@ public interface Renderable {
         };
     }
     
+    /**
+     * Renders of the renderable
+     *
+     * @param x      the x coordinate of the renderable
+     * @param y      the y coordinate of the renderable
+     * @param mouseX the x coordinate of the mouse
+     * @param mouseY the y coordinate of the mouse
+     * @param delta  the delta
+     */
     void render(int x, int y, double mouseX, double mouseY, float delta);
 }

src/main/java/me/shedaniel/rei/api/Renderer.java

@@ -8,10 +8,20 @@ package me.shedaniel.rei.api;
 import net.minecraft.client.gui.DrawableHelper;
 
 public abstract class Renderer extends DrawableHelper implements Renderable {
+    /**
+     * Gets the current blit offset
+     *
+     * @return the blit offset
+     */
     public int getBlitOffset() {
         return this.blitOffset;
     }
     
+    /**
+     * Sets the current blit offset
+     *
+     * @param offset the new blit offset
+     */
     public void setBlitOffset(int offset) {
         this.blitOffset = offset;
     }

src/main/java/me/shedaniel/rei/api/SpeedCraftFunctional.java

@@ -9,10 +9,29 @@ import net.minecraft.client.gui.Screen;
 
 public interface SpeedCraftFunctional<T extends RecipeDisplay> {
     
+    /**
+     * Gets the classes that it is functioning for
+     *
+     * @return the array of classes
+     */
     Class[] getFunctioningFor();
     
+    /**
+     * Performs the auto crafting
+     *
+     * @param screen the current screen
+     * @param recipe the current recipe
+     * @return whether it worked
+     */
     boolean performAutoCraft(Screen screen, T recipe);
     
+    /**
+     * Gets if this functional accepts the auto crafting
+     *
+     * @param screen the current screen
+     * @param recipe the current recipe
+     * @return whether it is accepted
+     */
     boolean acceptRecipe(Screen screen, T recipe);
     
 }

src/main/java/me/shedaniel/rei/client/BaseBoundsHandlerImpl.java

@@ -43,12 +43,12 @@ public class BaseBoundsHandlerImpl implements BaseBoundsHandler {
     
     @Override
     public Rectangle getLeftBounds(Screen screen) {
-        return DisplayHelper.DisplayBoundsHandler.EMPTY;
+        return new Rectangle();
     }
     
     @Override
     public Rectangle getRightBounds(Screen screen) {
-        return DisplayHelper.DisplayBoundsHandler.EMPTY;
+        return new Rectangle();
     }
     
     @Override

src/main/java/me/shedaniel/rei/client/ClientHelperImpl.java

@@ -30,7 +30,7 @@ import net.minecraft.client.util.InputUtil;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.text.TranslatableTextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.DefaultedList;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.PacketByteBuf;
@@ -154,7 +154,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
             String madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", tagMessage).replaceAll("\\{count}", String.valueOf(cheatedStack.getAmount()));
             if (madeUpCommand.length() > 256) {
                 madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", "").replaceAll("\\{count}", String.valueOf(cheatedStack.getAmount()));
-                MinecraftClient.getInstance().player.addChatMessage(new TranslatableTextComponent("text.rei.too_long_nbt"), false);
+                MinecraftClient.getInstance().player.addChatMessage(new TranslatableComponent("text.rei.too_long_nbt"), false);
             }
             MinecraftClient.getInstance().player.sendChatMessage(madeUpCommand);
             return true;

src/main/java/me/shedaniel/rei/client/ConfigManagerImpl.java

@@ -15,7 +15,7 @@ import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.text.StringTextComponent;
+import net.minecraft.network.chat.TextComponent;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -143,7 +143,7 @@ public class ConfigManagerImpl implements ConfigManager {
                 e.printStackTrace();
             }
         }
-        return new Screen(new StringTextComponent("")) {
+        return new Screen(new TextComponent("")) {
             @Override
             public void render(int int_1, int int_2, float float_1) {
                 renderDirtBackground(0);

src/main/java/me/shedaniel/rei/client/DisplayHelperImpl.java

@@ -28,12 +28,12 @@ public class DisplayHelperImpl implements DisplayHelper {
         
         @Override
         public Rectangle getLeftBounds(Object screen) {
-            return DisplayBoundsHandler.EMPTY;
+            return new Rectangle();
         }
         
         @Override
         public Rectangle getRightBounds(Object screen) {
-            return DisplayBoundsHandler.EMPTY;
+            return new Rectangle();
         }
         
         @Override

src/main/java/me/shedaniel/rei/client/ItemRegistryImpl.java

@@ -26,6 +26,7 @@ public class ItemRegistryImpl implements ItemRegistry {
         return Collections.unmodifiableList(itemList);
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public List<ItemStack> getModifiableItemList() {
         return itemList;

src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java

@@ -250,7 +250,7 @@ public class RecipeHelperImpl implements RecipeHelper {
     }
     
     @Override
-    public List<Recipe> getVanillaSortedRecipes() {
+    public List<Recipe> getAllSortedRecipes() {
         return getRecipeManager().values().stream().sorted(RECIPE_COMPARATOR).collect(Collectors.toList());
     }
     

src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java

@@ -16,17 +16,17 @@ import me.shedaniel.rei.client.Weather;
 import me.shedaniel.rei.gui.widget.*;
 import me.shedaniel.rei.listeners.ContainerScreenHooks;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.audio.PositionedSoundInstance;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.*;
 import net.minecraft.client.render.GuiLighting;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.Window;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.TranslatableTextComponent;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -69,7 +69,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
         widgets.add(itemListOverlay = new ItemListOverlay(page));
         itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm, false);
         
-        widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, new TranslatableTextComponent("text.rei.left_arrow")) {
+        widgets.add(buttonLeft = new ButtonWidget(rectangle.x, rectangle.y + 5, 16, 16, new TranslatableComponent("text.rei.left_arrow")) {
             @Override
             public void onPressed() {
                 page--;
@@ -88,7 +88,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
                 return false;
             }
         });
-        widgets.add(buttonRight = new ButtonWidget(rectangle.x + rectangle.width - 18, rectangle.y + 5, 16, 16, new TranslatableTextComponent("text.rei.right_arrow")) {
+        widgets.add(buttonRight = new ButtonWidget(rectangle.x + rectangle.width - 18, rectangle.y + 5, 16, 16, new TranslatableComponent("text.rei.right_arrow")) {
             @Override
             public void onPressed() {
                 page++;

src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java

@@ -16,13 +16,13 @@ import me.shedaniel.rei.gui.widget.ButtonWidget;
 import me.shedaniel.rei.gui.widget.HighlightableWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.audio.PositionedSoundInstance;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.render.GuiLighting;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.network.chat.TextComponent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.TranslatableTextComponent;
 import net.minecraft.util.Identifier;
 
 import java.awt.*;
@@ -39,7 +39,7 @@ public class PreRecipeViewingScreen extends Screen {
     private Map<RecipeCategory, List<RecipeDisplay>> map;
     
     public PreRecipeViewingScreen(Map<RecipeCategory, List<RecipeDisplay>> map) {
-        super(new TranslatableTextComponent("text.rei.recipe_screen_type.selection"));
+        super(new TextComponent("text.rei.recipe_screen_type.selection"));
         this.widgets = Lists.newArrayList();
         this.original = true;
         this.map = map;

src/main/java/me/shedaniel/rei/gui/RecipeViewingScreen.java

@@ -13,16 +13,16 @@ import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.client.ScreenHelper;
 import me.shedaniel.rei.gui.widget.*;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.audio.PositionedSoundInstance;
 import net.minecraft.client.gui.ContainerScreen;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.render.GuiLighting;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.Window;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.StringTextComponent;
-import net.minecraft.text.TranslatableTextComponent;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 
@@ -52,7 +52,7 @@ public class RecipeViewingScreen extends Screen {
     private ButtonWidget recipeBack, recipeNext, categoryBack, categoryNext;
     
     public RecipeViewingScreen(Map<RecipeCategory, List<RecipeDisplay>> categoriesMap) {
-        super(new StringTextComponent(""));
+        super(new TextComponent(""));
         this.categoryPages = 0;
         this.widgets = Lists.newArrayList();
         Window window = MinecraftClient.getInstance().window;
@@ -129,7 +129,7 @@ public class RecipeViewingScreen extends Screen {
         this.bounds = new Rectangle(width / 2 - guiWidth / 2, height / 2 - guiHeight / 2, guiWidth, guiHeight);
         this.page = MathHelper.clamp(page, 0, getTotalPages(selectedCategory) - 1);
         
-        widgets.add(categoryBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 5, 12, 12, new TranslatableTextComponent("text.rei.left_arrow")) {
+        widgets.add(categoryBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 5, 12, 12, new TranslatableComponent("text.rei.left_arrow")) {
             @Override
             public void onPressed() {
                 int currentCategoryIndex = categories.indexOf(selectedCategory);
@@ -165,7 +165,7 @@ public class RecipeViewingScreen extends Screen {
                 ClientHelper.getInstance().executeViewAllRecipesKeyBind();
             }
         });
-        widgets.add(categoryNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 5, 12, 12, new TranslatableTextComponent("text.rei.right_arrow")) {
+        widgets.add(categoryNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 5, 12, 12, new TranslatableComponent("text.rei.right_arrow")) {
             @Override
             public void onPressed() {
                 int currentCategoryIndex = categories.indexOf(selectedCategory);
@@ -186,7 +186,7 @@ public class RecipeViewingScreen extends Screen {
         categoryBack.enabled = categories.size() > 1;
         categoryNext.enabled = categories.size() > 1;
         
-        widgets.add(recipeBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 21, 12, 12, new TranslatableTextComponent("text.rei.left_arrow")) {
+        widgets.add(recipeBack = new ButtonWidget((int) bounds.getX() + 5, (int) bounds.getY() + 21, 12, 12, new TranslatableComponent("text.rei.left_arrow")) {
             @Override
             public void onPressed() {
                 page--;
@@ -219,7 +219,7 @@ public class RecipeViewingScreen extends Screen {
                 RecipeViewingScreen.this.init();
             }
         });
-        widgets.add(recipeNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 21, 12, 12, new TranslatableTextComponent("text.rei.right_arrow")) {
+        widgets.add(recipeNext = new ButtonWidget((int) bounds.getMaxX() - 17, (int) bounds.getY() + 21, 12, 12, new TranslatableComponent("text.rei.right_arrow")) {
             @Override
             public void onPressed() {
                 page++;

src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java

@@ -9,26 +9,23 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.zeitheron.hammercore.client.utils.Scissors;
+import me.shedaniel.cloth.api.ClientUtils;
 import me.shedaniel.rei.api.*;
 import me.shedaniel.rei.client.ScreenHelper;
 import me.shedaniel.rei.gui.renderables.RecipeRenderer;
 import me.shedaniel.rei.gui.widget.*;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.audio.PositionedSoundInstance;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.render.GuiLighting;
 import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.StringTextComponent;
-import net.minecraft.text.TranslatableTextComponent;
 import net.minecraft.util.math.MathHelper;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
-import java.nio.IntBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -51,7 +48,7 @@ public class VillagerRecipeViewingScreen extends Screen {
     private int tabsPage;
     
     public VillagerRecipeViewingScreen(Map<RecipeCategory, List<RecipeDisplay>> map) {
-        super(new StringTextComponent(""));
+        super(new TextComponent(""));
         this.widgets = Lists.newArrayList();
         this.categoryMap = Maps.newLinkedHashMap();
         this.selectedCategoryIndex = 0;
@@ -140,7 +137,7 @@ public class VillagerRecipeViewingScreen extends Screen {
             }
         }
         ButtonWidget w, w2;
-        this.widgets.add(w = new ButtonWidget(bounds.x + 2, bounds.y - 16, 10, 10, new TranslatableTextComponent("text.rei.left_arrow")) {
+        this.widgets.add(w = new ButtonWidget(bounds.x + 2, bounds.y - 16, 10, 10, new TranslatableComponent("text.rei.left_arrow")) {
             @Override
             public void onPressed() {
                 tabsPage--;
@@ -149,7 +146,7 @@ public class VillagerRecipeViewingScreen extends Screen {
                 VillagerRecipeViewingScreen.this.init();
             }
         });
-        this.widgets.add(w2 = new ButtonWidget(bounds.x + bounds.width - 12, bounds.y - 16, 10, 10, new TranslatableTextComponent("text.rei.right_arrow")) {
+        this.widgets.add(w2 = new ButtonWidget(bounds.x + bounds.width - 12, bounds.y - 16, 10, 10, new TranslatableComponent("text.rei.right_arrow")) {
             @Override
             public void onPressed() {
                 tabsPage++;
@@ -206,6 +203,23 @@ public class VillagerRecipeViewingScreen extends Screen {
             scroll = MathHelper.clamp(scroll, 0, height - scrollListBounds.height + 2);
             return true;
         }
+        for(Element listener : children())
+            if (listener.mouseScrolled(double_1, double_2, double_3))
+                return true;
+        if (bounds.contains(ClientUtils.getMouseLocation())) {
+            if (double_3 < 0 && categoryMap.get(categories.get(selectedCategoryIndex)).size() > 1) {
+                selectedRecipeIndex++;
+                if (selectedRecipeIndex >= categoryMap.get(categories.get(selectedCategoryIndex)).size())
+                    selectedRecipeIndex = 0;
+                init();
+            } else if (categoryMap.get(categories.get(selectedCategoryIndex)).size() > 1) {
+                selectedRecipeIndex--;
+                if (selectedRecipeIndex < 0)
+                    selectedRecipeIndex = categoryMap.get(categories.get(selectedCategoryIndex)).size() - 1;
+                init();
+                return true;
+            }
+        }
         return super.mouseScrolled(double_1, double_2, double_3);
     }
     
@@ -219,7 +233,7 @@ public class VillagerRecipeViewingScreen extends Screen {
         });
         GuiLighting.disable();
         ScreenHelper.getLastOverlay().render(mouseX, mouseY, delta);
-        GL11.glPushMatrix();
+        GlStateManager.pushMatrix();
         Scissors.begin();
         Scissors.scissor(0, scrollListBounds.y + 1, width, scrollListBounds.height - 2);
         for(int i = 0; i < buttonWidgets.size(); i++) {
@@ -239,17 +253,10 @@ public class VillagerRecipeViewingScreen extends Screen {
             }
         }
         Scissors.end();
-        GL11.glPopMatrix();
+        GlStateManager.popMatrix();
         ScreenHelper.getLastOverlay().lateRender(mouseX, mouseY, delta);
     }
     
-    private int getTitleBarHeight() {
-        IntBuffer useless = BufferUtils.createIntBuffer(3), top = BufferUtils.createIntBuffer(1);
-        GLFW.glfwGetWindowFrameSize(minecraft.window.getHandle(), useless, top, useless, useless);
-        System.out.println(top.get(0));
-        return top.get(0) / 3 * 2;
-    }
-    
     private int getReal(int i) {
         return (int) (i / ((double) minecraft.window.getScaledWidth() / (double) minecraft.window.getWidth()));
     }
@@ -269,18 +276,18 @@ public class VillagerRecipeViewingScreen extends Screen {
         }
         if (ClientHelper.getInstance().getNextPageKeyBinding().matchesKey(int_1, int_2)) {
             if (categoryMap.get(categories.get(selectedCategoryIndex)).size() > 1) {
-                selectedCategoryIndex++;
-                if (selectedCategoryIndex >= categoryMap.get(categories.get(selectedCategoryIndex)).size())
-                    selectedCategoryIndex = 0;
+                selectedRecipeIndex ++;
+                if (selectedRecipeIndex >= categoryMap.get(categories.get(selectedCategoryIndex)).size())
+                    selectedRecipeIndex = 0;
                 init();
                 return true;
             }
             return false;
         } else if (ClientHelper.getInstance().getPreviousPageKeyBinding().matchesKey(int_1, int_2)) {
             if (categoryMap.get(categories.get(selectedCategoryIndex)).size() > 1) {
-                selectedCategoryIndex--;
-                if (selectedCategoryIndex < 0)
-                    selectedCategoryIndex = categoryMap.get(categories.get(selectedCategoryIndex)).size() - 1;
+                selectedRecipeIndex--;
+                if (selectedRecipeIndex < 0)
+                    selectedRecipeIndex = categoryMap.get(categories.get(selectedCategoryIndex)).size() - 1;
                 init();
                 return true;
             }

src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java

@@ -7,7 +7,7 @@ package me.shedaniel.rei.gui.credits;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.menu.AlwaysSelectedEntryListWidget;
-import net.minecraft.text.TextComponent;
+import net.minecraft.network.chat.Component;
 
 public class CreditsEntryListWidget extends AlwaysSelectedEntryListWidget<CreditsEntryListWidget.CreditsItem> {
     
@@ -40,7 +40,7 @@ public class CreditsEntryListWidget extends AlwaysSelectedEntryListWidget<Credit
     public static class CreditsItem extends AlwaysSelectedEntryListWidget.Entry<CreditsItem> {
         private String text;
         
-        public CreditsItem(TextComponent textComponent) {
+        public CreditsItem(Component textComponent) {
             this(textComponent.getFormattedText());
         }
         

src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java

@@ -11,7 +11,7 @@ import me.shedaniel.rei.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.ContainerScreen;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.text.StringTextComponent;
+import net.minecraft.network.chat.TextComponent;
 
 public class CreditsScreen extends Screen {
     
@@ -20,7 +20,7 @@ public class CreditsScreen extends Screen {
     private CreditsEntryListWidget entryListWidget;
     
     public CreditsScreen(Screen parent) {
-        super(new StringTextComponent(""));
+        super(new TextComponent(""));
         this.parent = parent;
     }
     
@@ -40,8 +40,8 @@ public class CreditsScreen extends Screen {
         children.add(entryListWidget = new CreditsEntryListWidget(minecraft, width, height, 32, height - 32, 12));
         entryListWidget.creditsClearEntries();
         for(String line : I18n.translate("text.rei.credit.text").split("\n"))
-            entryListWidget.creditsAddEntry(new CreditsItem(new StringTextComponent(line)));
-        entryListWidget.creditsAddEntry(new CreditsItem(new StringTextComponent("")));
+            entryListWidget.creditsAddEntry(new CreditsItem(new TextComponent(line)));
+        entryListWidget.creditsAddEntry(new CreditsItem(new TextComponent("")));
         children.add(buttonDone = new ButtonWidget(width / 2 - 100, height - 26, 200, 20, I18n.translate("gui.done")) {
             @Override
             public void onPressed() {

src/main/java/me/shedaniel/rei/gui/widget/ButtonWidget.java

@@ -7,10 +7,10 @@ package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.client.ScreenHelper;
-import net.minecraft.client.audio.PositionedSoundInstance;
 import net.minecraft.client.gui.Element;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.network.chat.Component;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.text.TextComponent;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 
@@ -27,7 +27,7 @@ public abstract class ButtonWidget extends HighlightableWidget {
     public boolean focused;
     private Rectangle bounds;
     
-    public ButtonWidget(Rectangle rectangle, TextComponent text) {
+    public ButtonWidget(Rectangle rectangle, Component text) {
         this(rectangle, text.getFormattedText());
     }
     
@@ -41,7 +41,7 @@ public abstract class ButtonWidget extends HighlightableWidget {
         this(new Rectangle(x, y, width, height), text);
     }
     
-    public ButtonWidget(int x, int y, int width, int height, TextComponent text) {
+    public ButtonWidget(int x, int y, int width, int height, Component text) {
         this(new Rectangle(x, y, width, height), text);
     }
     

src/main/java/me/shedaniel/rei/gui/widget/DetailedButtonWidget.java

@@ -5,7 +5,7 @@
 
 package me.shedaniel.rei.gui.widget;
 
-import net.minecraft.text.TextComponent;
+import net.minecraft.network.chat.Component;
 
 import java.awt.*;
 
@@ -13,7 +13,7 @@ public class DetailedButtonWidget extends ButtonWidget {
     
     private DetailedButtonWidget.PressAction pressAction;
     
-    public DetailedButtonWidget(Rectangle rectangle, TextComponent text, PressAction pressAction) {
+    public DetailedButtonWidget(Rectangle rectangle, Component text, PressAction pressAction) {
         super(rectangle, text);
         this.pressAction = pressAction;
     }
@@ -28,7 +28,7 @@ public class DetailedButtonWidget extends ButtonWidget {
         this.pressAction = pressAction;
     }
     
-    public DetailedButtonWidget(int x, int y, int width, int height, TextComponent text, PressAction pressAction) {
+    public DetailedButtonWidget(int x, int y, int width, int height, Component text, PressAction pressAction) {
         super(x, y, width, height, text);
         this.pressAction = pressAction;
     }

src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java

@@ -23,7 +23,7 @@ import net.minecraft.client.resource.language.I18n;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
-import net.minecraft.text.TextComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
@@ -73,7 +73,7 @@ public class ItemListOverlay extends Widget {
     public static List<String> tryGetItemStackToolTip(ItemStack itemStack, boolean careAboutAdvanced) {
         if (!searchBlacklisted.contains(itemStack.getItem()))
             try {
-                return itemStack.getTooltipText(MinecraftClient.getInstance().player, MinecraftClient.getInstance().options.advancedItemTooltips && careAboutAdvanced ? TooltipContext.Default.ADVANCED : TooltipContext.Default.NORMAL).stream().map(TextComponent::getFormattedText).collect(Collectors.toList());
+                return itemStack.getTooltipText(MinecraftClient.getInstance().player, MinecraftClient.getInstance().options.advancedItemTooltips && careAboutAdvanced ? TooltipContext.Default.ADVANCED : TooltipContext.Default.NORMAL).stream().map(Component::getFormattedText).collect(Collectors.toList());
             } catch (Throwable e) {
                 e.printStackTrace();
                 searchBlacklisted.add(itemStack.getItem());
@@ -238,7 +238,8 @@ public class ItemListOverlay extends Widget {
             }
             if (arguments.length > 0)
                 lastSearchArgument.add(arguments);
-            else lastSearchArgument.add(new SearchArgument[]{SearchArgument.ALWAYS});
+            else
+                lastSearchArgument.add(new SearchArgument[]{SearchArgument.ALWAYS});
         });
         os.stream().filter(itemStack -> filterItem(itemStack, lastSearchArgument)).forEachOrdered(stacks::add);
         List<ItemStack> workingItems = RoughlyEnoughItemsCore.getConfigManager().isCraftableOnlyEnabled() && !stacks.isEmpty() && !inventoryItems.isEmpty() ? Lists.newArrayList() : Lists.newArrayList(ol);

src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java

@@ -6,8 +6,8 @@
 package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.platform.GlStateManager;
-import net.minecraft.client.audio.PositionedSoundInstance;
 import net.minecraft.client.render.GuiLighting;
+import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.sound.SoundEvents;
 
 public class SearchFieldWidget extends TextFieldWidget {

src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java

@@ -10,7 +10,7 @@ import me.shedaniel.rei.plugin.BrewingRecipe;
 import me.shedaniel.rei.plugin.DefaultBrewingDisplay;
 import me.shedaniel.rei.plugin.DefaultPlugin;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemProvider;
+import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.PotionItem;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionUtil;
@@ -34,13 +34,13 @@ public class MixinBrewingRecipeRegistry {
     @Inject(method = "registerPotionType", at = @At("RETURN"))
     private static void method_8080(Item item_1, CallbackInfo ci) {
         if (item_1 instanceof PotionItem)
-            SELF_POTION_TYPES.add(Ingredient.ofItems(new ItemProvider[]{item_1}));
+            SELF_POTION_TYPES.add(Ingredient.ofItems(new ItemConvertible[]{item_1}));
     }
     
     @Inject(method = "registerItemRecipe", at = @At("RETURN"))
     private static void method_8071(Item item_1, Item item_2, Item item_3, CallbackInfo ci) {
         if (item_1 instanceof PotionItem && item_3 instanceof PotionItem)
-            SELF_ITEM_RECIPES.add(new BrewingRecipe(item_1, Ingredient.ofItems(new ItemProvider[]{item_2}), item_3));
+            SELF_ITEM_RECIPES.add(new BrewingRecipe(item_1, Ingredient.ofItems(new ItemConvertible[]{item_2}), item_3));
     }
     
     @Inject(method = "registerPotionRecipe", at = @At("RETURN"))
@@ -50,7 +50,7 @@ public class MixinBrewingRecipeRegistry {
         if (!REGISTERED_POTION_TYPES.contains(potion_2))
             rei_registerPotionType(potion_2);
         SELF_POTION_TYPES.stream().map(Ingredient::getStackArray).forEach(itemStacks -> Arrays.stream(itemStacks).forEach(stack -> {
-            DefaultPlugin.registerBrewingDisplay(new DefaultBrewingDisplay(PotionUtil.setPotion(stack.copy(), potion_1), Ingredient.ofItems(new ItemProvider[]{item_1}), PotionUtil.setPotion(stack.copy(), potion_2)));
+            DefaultPlugin.registerBrewingDisplay(new DefaultBrewingDisplay(PotionUtil.setPotion(stack.copy(), potion_1), Ingredient.ofItems(new ItemConvertible[]{item_1}), PotionUtil.setPotion(stack.copy(), potion_2)));
         }));
     }
     

src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java

@@ -8,9 +8,10 @@ package me.shedaniel.rei.plugin;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
 import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.renderables.RecipeRenderer;
-import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
+import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
@@ -36,8 +37,8 @@ public class DefaultBlastingCategory implements RecipeCategory<DefaultBlastingDi
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.BLAST_FURNACE.getItem());
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.BLAST_FURNACE));
     }
     
     @Override

src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java

@@ -7,8 +7,10 @@ package me.shedaniel.rei.plugin;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
-import me.shedaniel.rei.gui.widget.SlotWidget;
+import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
+import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
@@ -35,8 +37,8 @@ public class DefaultBrewingCategory implements RecipeCategory<DefaultBrewingDisp
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.BREWING_STAND);
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.BREWING_STAND));
     }
     
     @Override

src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java

@@ -7,8 +7,10 @@ package me.shedaniel.rei.plugin;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
-import me.shedaniel.rei.gui.widget.SlotWidget;
+import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
+import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
@@ -34,8 +36,8 @@ public class DefaultCampfireCategory implements RecipeCategory<DefaultCampfireDi
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.CAMPFIRE);
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.CAMPFIRE));
     }
     
     @Override

src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java

@@ -8,8 +8,10 @@ package me.shedaniel.rei.plugin;
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
-import me.shedaniel.rei.gui.widget.SlotWidget;
+import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
+import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
@@ -34,8 +36,8 @@ public class DefaultCraftingCategory implements RecipeCategory<DefaultCraftingDi
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.CRAFTING_TABLE.getItem());
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.CRAFTING_TABLE));
     }
     
     @Override

src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java

@@ -110,7 +110,7 @@ public class DefaultPlugin implements REIPluginEntry {
     
     @Override
     public void registerRecipeDisplays(RecipeHelper recipeHelper) {
-        for(Recipe recipe : recipeHelper.getVanillaSortedRecipes())
+        for(Recipe recipe : recipeHelper.getAllSortedRecipes())
             if (recipe instanceof ShapelessRecipe)
                 recipeHelper.registerDisplay(CRAFTING, new DefaultShapelessDisplay((ShapelessRecipe) recipe));
             else if (recipe instanceof ShapedRecipe)

src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java

@@ -8,6 +8,7 @@ package me.shedaniel.rei.plugin;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
 import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.renderables.RecipeRenderer;
 import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
@@ -36,8 +37,8 @@ public class DefaultSmeltingCategory implements RecipeCategory<DefaultSmeltingDi
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.FURNACE.getItem());
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.FURNACE));
     }
     
     @Override

src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java

@@ -8,9 +8,10 @@ package me.shedaniel.rei.plugin;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
 import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.renderables.RecipeRenderer;
-import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
+import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
@@ -36,8 +37,8 @@ public class DefaultSmokingCategory implements RecipeCategory<DefaultSmokingDisp
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.SMOKER.getItem());
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.SMOKER));
     }
     
     @Override

src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java

@@ -8,8 +8,10 @@ package me.shedaniel.rei.plugin;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.DisplaySettings;
 import me.shedaniel.rei.api.RecipeCategory;
-import me.shedaniel.rei.gui.widget.SlotWidget;
+import me.shedaniel.rei.api.Renderable;
+import me.shedaniel.rei.api.Renderer;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
+import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.MinecraftClient;
@@ -34,8 +36,8 @@ public class DefaultStoneCuttingCategory implements RecipeCategory<DefaultStoneC
     }
     
     @Override
-    public ItemStack getCategoryIcon() {
-        return new ItemStack(Blocks.STONECUTTER);
+    public Renderer getIcon() {
+        return Renderable.fromItemStack(new ItemStack(Blocks.STONECUTTER));
     }
     
     @Override