From da29cc9d38354f1cbe45ffbcfdc325b0468f13cd Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 5 Nov 2020 17:27:31 +0800
Subject: v5.8.0 Update - Config screen animations - Require dragging the
 favorites further before initializing the dragging phase - Require specific
 fabric modules to run instead of the whole API - Mark
 getPreviousContainerScreen as nullable - New config settings for setting
 entry list boundaries - Update fabric loader, auto config and cloth config
 versions

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 .../me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java  | 2 ++
 .../java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'RoughlyEnoughItems-default-plugin/src/main')

diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
index b3286f2c3..a6408b676 100644
--- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
+++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java
@@ -51,6 +51,8 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler {
         if (!(context.getContainer() instanceof RecipeBookContainer))
             return Result.createNotApplicable();
         RecipeBookContainer<?> container = (RecipeBookContainer<?>) context.getContainer();
+        if (container == null)
+            return Result.createNotApplicable();
         if (display instanceof DefaultCraftingDisplay) {
             DefaultCraftingDisplay craftingDisplay = (DefaultCraftingDisplay) display;
             if (craftingDisplay.getOptionalRecipe().isPresent()) {
diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java
index 2e6b06ff8..5fcb1afd8 100644
--- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java
+++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java
@@ -96,6 +96,7 @@ public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCr
     
     @Override
     public void renderRedSlots(MatrixStack matrices, List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) {
+        if (REIHelper.getInstance().getPreviousContainerScreen() == null) return;
         ContainerInfo<Container> info = (ContainerInfo<Container>) ContainerInfoHandler.getContainerInfo(getIdentifier(), REIHelper.getInstance().getPreviousContainerScreen().getMenu().getClass());
         if (info == null)
             return;
-- 
cgit