Merge branch '1.14-dev' into 1.14

8 files changed, 32 insertions, 21 deletions

diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java
index 59177de1e..3ae946fee 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java
+++ b/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
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java
index 952f3e52d..0f8b75aad 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java
+++ b/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
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java
index dcc250e4d..3982009fd 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java
+++ b/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
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java
index 5218db317..3cc4e6242 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java
+++ b/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
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index 806ea8eea..e49540683 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/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)
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java
index 06d96c9d9..08dabb2cd 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java
+++ b/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
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java
index afa72d2f5..564c91e47 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java
+++ b/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
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java
index d73b0af8d..599423260 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java
+++ b/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