diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-11-05 17:27:31 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-11-15 18:57:44 +0800 |
| commit | da29cc9d38354f1cbe45ffbcfdc325b0468f13cd (patch) | |
| tree | d098bce4546caf9c8477623d1a2ec3be6fce0f29 /RoughlyEnoughItems-default-plugin/src/main | |
| parent | f402bb1719437dff1eb209ab6046727168944adc (diff) | |
| download | RoughlyEnoughItems-da29cc9d38354f1cbe45ffbcfdc325b0468f13cd.tar.gz RoughlyEnoughItems-da29cc9d38354f1cbe45ffbcfdc325b0468f13cd.tar.bz2 RoughlyEnoughItems-da29cc9d38354f1cbe45ffbcfdc325b0468f13cd.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')
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 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; |
