aboutsummaryrefslogtreecommitdiff
path: root/RoughlyEnoughItems-default-plugin/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-11-05 17:27:31 +0800
committershedaniel <daniel@shedaniel.me>2020-11-05 17:27:31 +0800
commitecf3079ca2622e538cc325fa6063401139881e12 (patch)
tree00a90fcf5af63b36f4951a598270d6d81ad6b2ed /RoughlyEnoughItems-default-plugin/src/main/java
parent19d5cc098a812d08b235dbb128746380919a4de6 (diff)
downloadRoughlyEnoughItems-ecf3079ca2622e538cc325fa6063401139881e12.tar.gz
RoughlyEnoughItems-ecf3079ca2622e538cc325fa6063401139881e12.tar.bz2
RoughlyEnoughItems-ecf3079ca2622e538cc325fa6063401139881e12.zip
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>
Diffstat (limited to 'RoughlyEnoughItems-default-plugin/src/main/java')
-rw-r--r--RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java2
-rw-r--r--RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java1
2 files changed, 3 insertions, 0 deletions
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 8da1c2072..80ee0196a 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 RecipeBookMenu))
return Result.createNotApplicable();
RecipeBookMenu<?> container = (RecipeBookMenu<?>) 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 7fdd83869..466c02b54 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(PoseStack matrices, List<Widget> widgets, Rectangle bounds, DefaultCraftingDisplay display, IntList redSlots) {
+ if (REIHelper.getInstance().getPreviousContainerScreen() == null) return;
ContainerInfo<AbstractContainerMenu> info = (ContainerInfo<AbstractContainerMenu>) ContainerInfoHandler.getContainerInfo(getIdentifier(), REIHelper.getInstance().getPreviousContainerScreen().getMenu().getClass());
if (info == null)
return;