diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/plugin/crafting')
3 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index a0c2320e4..0d42e509b 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java @@ -6,16 +6,14 @@ package me.shedaniel.rei.plugin.crafting; import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.math.api.Point; import me.shedaniel.math.api.Rectangle; import me.shedaniel.rei.api.EntryStack; -import com.mojang.blaze3d.systems.RenderSystem; -import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.api.TransferRecipeCategory; import me.shedaniel.rei.gui.widget.EntryWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; -import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.Widget; import me.shedaniel.rei.plugin.DefaultPlugin; import net.minecraft.block.Blocks; @@ -23,11 +21,9 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.render.GuiLighting; import net.minecraft.client.resource.language.I18n; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import java.util.Arrays; -import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; @@ -51,8 +47,8 @@ public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCr } @Override - public Renderer getIcon() { - return Renderer.fromItemStack(new ItemStack(Blocks.CRAFTING_TABLE)); + public EntryStack getLogo() { + return EntryStack.create(Blocks.CRAFTING_TABLE); } @Override diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java index c14b18e53..7858e3f31 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapedDisplay.java @@ -28,7 +28,7 @@ public class DefaultShapedDisplay implements DefaultCraftingDisplay { this.display = recipe; this.input = recipe.getPreviewInputs().stream().map(i -> { List<EntryStack> entries = new ArrayList<>(); - for (ItemStack stack : i.getStackArray()) { + for (ItemStack stack : i.getMatchingStacksClient()) { if (stack.getItem() instanceof PotionItem) entries.add(EntryStack.create(stack).setting(EntryStack.Settings.CHECK_TAGS, EntryStack.Settings.TRUE)); else entries.add(EntryStack.create(stack)); diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java index 79b2b92ab..65fbd5fd7 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultShapelessDisplay.java @@ -28,7 +28,7 @@ public class DefaultShapelessDisplay implements DefaultCraftingDisplay { this.display = recipe; this.input = recipe.getPreviewInputs().stream().map(i -> { List<EntryStack> entries = new ArrayList<>(); - for (ItemStack stack : i.getStackArray()) { + for (ItemStack stack : i.getMatchingStacksClient()) { if (stack.getItem() instanceof PotionItem) entries.add(EntryStack.create(stack).setting(EntryStack.Settings.CHECK_TAGS, EntryStack.Settings.TRUE)); else entries.add(EntryStack.create(stack)); |