aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java
diff options
context:
space:
mode:
authorDaniel She <shekwancheung0528@gmail.com>2019-06-06 20:14:42 +0800
committerDaniel She <shekwancheung0528@gmail.com>2019-06-06 20:14:42 +0800
commitfab214806ccc3ffbfd03e4034af6cee906124b7a (patch)
treed5c1a2e108b81d3a57988d4f03ed515c991e75e4 /src/main/java/me/shedaniel/rei/api/RecipeDisplay.java
parentd414c887e0c42325cf2e7c778b32e3fb13ee2e69 (diff)
parent558504bd65af2138d73825f1ffa8066a5d70e8f5 (diff)
downloadRoughlyEnoughItems-fab214806ccc3ffbfd03e4034af6cee906124b7a.tar.gz
RoughlyEnoughItems-fab214806ccc3ffbfd03e4034af6cee906124b7a.tar.bz2
RoughlyEnoughItems-fab214806ccc3ffbfd03e4034af6cee906124b7a.zip
Merge branch 'fabric-dev' into 1.14
Diffstat (limited to 'src/main/java/me/shedaniel/rei/api/RecipeDisplay.java')
-rw-r--r--src/main/java/me/shedaniel/rei/api/RecipeDisplay.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java b/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java
index 9e17159bc..cd8ab6efb 100644
--- a/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java
+++ b/src/main/java/me/shedaniel/rei/api/RecipeDisplay.java
@@ -18,7 +18,7 @@ public interface RecipeDisplay<T extends Recipe> {
/**
* @return the optional recipe
*/
- Optional<T> getRecipe();
+ Optional<? extends Recipe> getRecipe();
/**
* @return a list of items
@@ -35,6 +35,7 @@ public interface RecipeDisplay<T extends Recipe> {
*
* @return the list of required items
*/
+ @Deprecated
default List<List<ItemStack>> getRequiredItems() {
return Lists.newArrayList();
}