diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-08-30 21:29:58 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-08-30 21:29:58 +0800 |
| commit | 8d77ad86b203de62aa08a5ee62f91e27fd0fbd00 (patch) | |
| tree | 72c8f0a412591fce05ba85a9a075592a0c9d4ea2 /RoughlyEnoughItems-api/src | |
| parent | 2f0e6aa2024fae2d210ed40a56435d86510ce66a (diff) | |
| download | RoughlyEnoughItems-8d77ad86b203de62aa08a5ee62f91e27fd0fbd00.tar.gz RoughlyEnoughItems-8d77ad86b203de62aa08a5ee62f91e27fd0fbd00.tar.bz2 RoughlyEnoughItems-8d77ad86b203de62aa08a5ee62f91e27fd0fbd00.zip | |
Fix brewing potions not appearing and allow scrolling in the tabs for villager like recipe viewing screen
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'RoughlyEnoughItems-api/src')
4 files changed, 17 insertions, 2 deletions
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ClientHelper.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ClientHelper.java index e6b67ff3c..73f768e8d 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ClientHelper.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/ClientHelper.java @@ -65,6 +65,8 @@ public interface ClientHelper { */ void setCheating(boolean cheating); + @Deprecated + @ApiStatus.ScheduledForRemoval List<ItemStack> getInventoryItemsTypes(); /** diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java index 126358513..6a42c90dd 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/REIHelper.java @@ -65,6 +65,8 @@ public interface REIHelper { @NotNull @ApiStatus.Internal + @Deprecated + @ApiStatus.ScheduledForRemoval List<ItemStack> getInventoryStacks(); void queueTooltip(@Nullable Tooltip tooltip); diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java index 44e655da4..ff6722e74 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java @@ -42,9 +42,10 @@ public interface RecipeDisplay { /** * @return a list of outputs + * @deprecated Use {@link RecipeDisplay#getResultingEntries()} */ @Deprecated - @ApiStatus.ScheduledForRemoval + @ApiStatus.ScheduledForRemoval(inVersion = "1.17") @NotNull default List<EntryStack> getOutputEntries() { return Collections.emptyList(); diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeHelper.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeHelper.java index 79bff2d4c..74a869474 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeHelper.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/RecipeHelper.java @@ -81,7 +81,17 @@ public interface RecipeHelper { * @param inventoryItems the materials * @return the list of craftable entries */ - List<EntryStack> findCraftableEntriesByItems(List<EntryStack> inventoryItems); + List<EntryStack> findCraftableEntriesByItems(Iterable<EntryStack> inventoryItems); + + /** + * Gets all craftable items from materials. + * + * @param inventoryItems the materials + * @return the list of craftable entries + */ + default List<EntryStack> findCraftableEntriesByItems(List<EntryStack> inventoryItems) { + return findCraftableEntriesByItems((Iterable<EntryStack>) inventoryItems); + } /** * Registers a category |