From e2c264a82dc10b8e29b08225cd5bc24e689fa332 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 14 Jul 2020 11:19:19 +0800 Subject: Optimised craftable filter and changed some api Signed-off-by: shedaniel --- .../rei/plugin/smithing/DefaultSmithingDisplay.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java') 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 05b5bbc87..97ea39ed7 100644 --- a/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/smithing/DefaultSmithingDisplay.java @@ -27,7 +27,8 @@ import com.google.common.collect.Lists; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeDisplay; import me.shedaniel.rei.plugin.DefaultPlugin; -import me.shedaniel.rei.utils.CollectionUtils; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.recipe.SmithingRecipe; import net.minecraft.util.Identifier; import org.jetbrains.annotations.NotNull; @@ -37,6 +38,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; +@Environment(EnvType.CLIENT) public class DefaultSmithingDisplay implements RecipeDisplay { @NotNull private List> input; @@ -48,8 +50,8 @@ public class DefaultSmithingDisplay implements RecipeDisplay { public DefaultSmithingDisplay(@NotNull SmithingRecipe recipe) { this( Lists.newArrayList( - EntryStack.create(recipe.base), - EntryStack.create(recipe.addition) + EntryStack.ofIngredient(recipe.base), + EntryStack.ofIngredient(recipe.addition) ), Collections.singletonList(EntryStack.create(recipe.getOutput())), recipe.getId() @@ -73,6 +75,11 @@ public class DefaultSmithingDisplay implements RecipeDisplay { return output; } + @Override + public List> getRequiredEntries() { + return getInputEntries(); + } + @Override public Identifier getRecipeCategory() { return DefaultPlugin.SMITHING; -- cgit