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

---
 .../rei/plugin/crafting/DefaultCustomDisplay.java    | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java')

diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java
index 756b1afe1..ef6b017ae 100644
--- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCustomDisplay.java
@@ -6,6 +6,8 @@
 package me.shedaniel.rei.plugin.crafting;
 
 import com.google.common.collect.Lists;
+import me.shedaniel.rei.api.EntryStack;
+import me.shedaniel.rei.utils.CollectionUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.Recipe;
 import net.minecraft.util.Identifier;
@@ -15,20 +17,24 @@ import java.util.Optional;
 
 public class DefaultCustomDisplay implements DefaultCraftingDisplay {
     
-    private List<List<ItemStack>> input;
-    private List<ItemStack> output;
+    private List<List<EntryStack>> input;
+    private List<EntryStack> output;
     private Recipe<?> possibleRecipe;
     private int width, height;
     
     public DefaultCustomDisplay(List<List<ItemStack>> input, List<ItemStack> output, Recipe<?> possibleRecipe) {
+        this(possibleRecipe, CollectionUtils.map(input, i -> CollectionUtils.map(i, EntryStack::create)), CollectionUtils.map(output, EntryStack::create));
+    }
+    
+    public DefaultCustomDisplay(Recipe<?> possibleRecipe, List<List<EntryStack>> input, List<EntryStack> output) {
         this.input = input;
         this.output = output;
         this.possibleRecipe = possibleRecipe;
         List<Boolean> row = Lists.newArrayList(false, false, false);
         List<Boolean> column = Lists.newArrayList(false, false, false);
         for (int i = 0; i < 9; i++)
-            if (i < input.size()) {
-                List<ItemStack> stacks = input.get(i);
+            if (i < this.input.size()) {
+                List<EntryStack> stacks = this.input.get(i);
                 if (stacks.stream().filter(stack -> !stack.isEmpty()).count() > 0) {
                     row.set((i - (i % 3)) / 3, true);
                     column.set(i % 3, true);
@@ -52,17 +58,17 @@ public class DefaultCustomDisplay implements DefaultCraftingDisplay {
     }
     
     @Override
-    public List<List<ItemStack>> getInput() {
+    public List<List<EntryStack>> getInputEntries() {
         return input;
     }
     
     @Override
-    public List<ItemStack> getOutput() {
+    public List<EntryStack> getOutputEntries() {
         return output;
     }
     
     @Override
-    public List<List<ItemStack>> getRequiredItems() {
+    public List<List<EntryStack>> getRequiredEntries() {
         return input;
     }
     
-- 
cgit