diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 1e47e6227..460ed1320 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -21,6 +21,7 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.network.PacketBuffer; import net.minecraft.util.JSONUtils; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.crafting.CraftingHelper; @@ -31,12 +32,13 @@ import vazkii.botania.common.crafting.ModRecipeTypes; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Optional; public class RecipeElvenTrade extends AbstractElvenTradeRecipe { private final ImmutableList outputs; - private final ImmutableList inputs; + private final NonNullList inputs; public RecipeElvenTrade(ResourceLocation id, ItemStack output, Ingredient... inputs) { this(id, new ItemStack[] { output }, inputs); @@ -45,7 +47,8 @@ public class RecipeElvenTrade extends AbstractElvenTradeRecipe { public RecipeElvenTrade(ResourceLocation id, ItemStack[] outputs, Ingredient... inputs) { super(id); this.outputs = ImmutableList.copyOf(outputs); - this.inputs = ImmutableList.copyOf(inputs); + this.inputs = NonNullList.create(); + this.inputs.addAll(Arrays.asList(inputs)); } @Override @@ -98,8 +101,9 @@ public class RecipeElvenTrade extends AbstractElvenTradeRecipe { return ModRecipeTypes.ELVEN_TRADE_SERIALIZER; } + @Nonnull @Override - public List getInputs() { + public NonNullList getIngredients() { return inputs; } @@ -156,8 +160,8 @@ public class RecipeElvenTrade extends AbstractElvenTradeRecipe { @Override public void write(PacketBuffer buf, RecipeElvenTrade recipe) { - buf.writeVarInt(recipe.getInputs().size()); - for (Ingredient input : recipe.getInputs()) { + buf.writeVarInt(recipe.getIngredients().size()); + for (Ingredient input : recipe.getIngredients()) { input.write(buf); } buf.writeVarInt(recipe.getOutputs().size()); diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 838527863..d146568ab 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -89,7 +89,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory> builder = ImmutableList.builder(); - for (Ingredient i : recipe.getInputs()) { + for (Ingredient i : recipe.getIngredients()) { builder.add(Arrays.asList(i.getMatchingStacks())); } iIngredients.setInputLists(VanillaTypes.ITEM, builder.build()); diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java index 921452425..3c65ab4d3 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ElvenTradeProcessor.java @@ -41,7 +41,7 @@ public class ElvenTradeProcessor implements IComponentProcessor { } recipes = builder.build(); for (AbstractElvenTradeRecipe recipe : recipes) { - List inputs = recipe.getInputs(); + List inputs = recipe.getIngredients(); for (Ingredient ingredient : inputs) { int length = ingredient.getMatchingStacks().length; if (length > longestIngredientSize) { @@ -86,7 +86,7 @@ public class ElvenTradeProcessor implements IComponentProcessor { } private String interweaveIngredients(int inputIndex) { - List recipes = this.recipes.stream().map(AbstractElvenTradeRecipe::getInputs).map(ingredients -> { + List recipes = this.recipes.stream().map(AbstractElvenTradeRecipe::getIngredients).map(ingredients -> { if (inputIndex < ingredients.size()) { return ingredients.get(inputIndex); } else { diff --git a/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java index de264edba..48faae5e4 100644 --- a/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/AbstractElvenTradeRecipe.java @@ -6,6 +6,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; @@ -38,7 +39,9 @@ public abstract class AbstractElvenTradeRecipe implements IRecipe { /** * @return Preview of the inputs */ - public abstract List getInputs(); + @Nonnull + @Override + public abstract NonNullList getIngredients(); /** * @return Preview of the outputs diff --git a/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java index bf4666b3e..9802ef7d1 100644 --- a/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java @@ -3,11 +3,13 @@ package vazkii.botania.common.crafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -23,9 +25,10 @@ public class LexiconElvenTradeRecipe extends AbstractElvenTradeRecipe { return stack.getItem() == ModItems.lexicon && !ItemNBTHelper.getBoolean(stack, ItemLexicon.TAG_ELVEN_UNLOCK, false); } + @Nonnull @Override - public List getInputs() { - return Collections.singletonList(Ingredient.fromItems(ModItems.lexicon)); + public NonNullList getIngredients() { + return NonNullList.from(Ingredient.fromItems(ModItems.lexicon)); } @Override