From 9f5a9eae9a7863412cc5eb433bf15e5ee71da616 Mon Sep 17 00:00:00 2001
From: Danielshe <shekwancheung0528@gmail.com>
Date: Sun, 3 Nov 2019 14:44:52 +0800
Subject: 3.2.1

---
 .../plugin/campfire/DefaultCampfireDisplay.java    | 31 +++++++++++++---------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java')

diff --git a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java
index aca26283a..b3ed3e2f5 100644
--- a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireDisplay.java
@@ -5,6 +5,7 @@
 
 package me.shedaniel.rei.plugin.campfire;
 
+import me.shedaniel.rei.api.EntryStack;
 import me.shedaniel.rei.api.RecipeDisplay;
 import me.shedaniel.rei.plugin.DefaultPlugin;
 import net.minecraft.item.ItemStack;
@@ -14,7 +15,7 @@ import net.minecraft.recipe.Ingredient;
 import net.minecraft.util.DefaultedList;
 import net.minecraft.util.Identifier;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -22,8 +23,8 @@ import java.util.stream.Collectors;
 
 public class DefaultCampfireDisplay implements RecipeDisplay {
     
-    private List<List<ItemStack>> inputs;
-    private List<ItemStack> output;
+    private List<List<EntryStack>> inputs;
+    private List<EntryStack> output;
     private int cookTime;
     private CampfireCookingRecipe display;
     
@@ -33,8 +34,14 @@ public class DefaultCampfireDisplay implements RecipeDisplay {
     }
     
     public DefaultCampfireDisplay(DefaultedList<Ingredient> ingredients, ItemStack output, int cookTime) {
-        this.inputs = ingredients.stream().map(i -> Arrays.asList(i.getMatchingStacksClient())).collect(Collectors.toList());
-        this.output = Collections.singletonList(output);
+        this.inputs = ingredients.stream().map(i -> {
+            List<EntryStack> entries = new ArrayList<>();
+            for (ItemStack stack : i.getStackArray()) {
+                entries.add(EntryStack.create(stack));
+            }
+            return entries;
+        }).collect(Collectors.toList());
+        this.output = Collections.singletonList(EntryStack.create(output));
         this.cookTime = cookTime;
     }
     
@@ -48,23 +55,23 @@ public class DefaultCampfireDisplay implements RecipeDisplay {
     }
     
     @Override
-    public List<List<ItemStack>> getInput() {
+    public List<List<EntryStack>> getInputEntries() {
         return inputs;
     }
     
     @Override
-    public List<ItemStack> getOutput() {
-        return this.output;
+    public List<EntryStack> getOutputEntries() {
+        return output;
     }
     
     @Override
-    public Identifier getRecipeCategory() {
-        return DefaultPlugin.CAMPFIRE;
+    public List<List<EntryStack>> getRequiredEntries() {
+        return inputs;
     }
     
     @Override
-    public List<List<ItemStack>> getRequiredItems() {
-        return getInput();
+    public Identifier getRecipeCategory() {
+        return DefaultPlugin.CAMPFIRE;
     }
     
 }
-- 
cgit