aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2020-06-19 15:19:04 +0800
committershedaniel <daniel@shedaniel.me>2020-06-19 15:19:04 +0800
commita174adf6761ea17f19ee4ee62897bd0d5914283a (patch)
tree36d0a1a1f3f409bb8d54a5ac8630768ed35f4ffa /src/main/java
parent463197999f1711ffd453b7246bdc580f9dde3390 (diff)
downloadRoughlyEnoughItems-a174adf6761ea17f19ee4ee62897bd0d5914283a.tar.gz
RoughlyEnoughItems-a174adf6761ea17f19ee4ee62897bd0d5914283a.tar.bz2
RoughlyEnoughItems-a174adf6761ea17f19ee4ee62897bd0d5914283a.zip
Bump to 1.16-rc1
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java
index 0fff256f6..e22719e8d 100644
--- a/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java
@@ -8,15 +8,19 @@ import me.shedaniel.rei.utils.CollectionUtils;
import net.minecraft.recipe.SmithingRecipe;
import net.minecraft.util.Identifier;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
+import java.util.Optional;
public class DefaultSmithingDisplay implements RecipeDisplay {
@NotNull
private List<List<EntryStack>> input;
@NotNull
private List<EntryStack> output;
+ @Nullable
+ private Identifier location;
public DefaultSmithingDisplay(@NotNull SmithingRecipe recipe) {
this(
@@ -24,14 +28,16 @@ public class DefaultSmithingDisplay implements RecipeDisplay {
CollectionUtils.map(recipe.base.getMatchingStacksClient(), EntryStack::create),
CollectionUtils.map(recipe.addition.getMatchingStacksClient(), EntryStack::create)
),
- Collections.singletonList(EntryStack.create(recipe.getOutput()))
+ Collections.singletonList(EntryStack.create(recipe.getOutput())),
+ recipe.getId()
);
}
- public DefaultSmithingDisplay(@NotNull List<List<EntryStack>> input, @NotNull List<EntryStack> output) {
+ public DefaultSmithingDisplay(@NotNull List<List<EntryStack>> input, @NotNull List<EntryStack> output, @Nullable Identifier location) {
this.input = input;
this.output = output;
if (this.input.size() != 2) throw new IllegalArgumentException("input must have 2 entries.");
+ this.location = location;
}
@Override
@@ -48,4 +54,9 @@ public class DefaultSmithingDisplay implements RecipeDisplay {
public Identifier getRecipeCategory() {
return DefaultPlugin.SMITHING;
}
+
+ @Override
+ public Optional<Identifier> getRecipeLocation() {
+ return Optional.ofNullable(location);
+ }
}