Add support for anvil recipe left side being a list (mezz#1419)

gradle.properties

@@ -5,4 +5,4 @@ curse_project_id=238222
 
 version_major=4
 version_minor=14
-version_patch=0
+version_patch=1

src/api/java/mezz/jei/api/recipe/IVanillaRecipeFactory.java

@@ -27,6 +27,18 @@ public interface IVanillaRecipeFactory {
 	 */
 	IRecipeWrapper createAnvilRecipe(ItemStack leftInput, List<ItemStack> rightInputs, List<ItemStack> outputs);
 
+	/**
+	 * Adds an anvil recipe for the given inputs and output.
+	 * The number of inputs in the left and right side must match.
+	 *
+	 * @param leftInputs  The itemStack(s) placed on the left slot.
+	 * @param rightInputs The itemStack(s) placed on the right slot.
+	 * @param outputs     The resulting itemStack(s).
+	 * @return the {@link IRecipeWrapper} for this recipe.
+	 * @since JEI 4.14.1
+	 */
+	IRecipeWrapper createAnvilRecipe(List<ItemStack> leftInputs, List<ItemStack> rightInputs, List<ItemStack> outputs);
+
 	/**
 	 * Create a new smelting recipe.
 	 * By default, all smelting recipes from {@link FurnaceRecipes#smeltingList} are already added by JEI.

src/main/java/mezz/jei/plugins/vanilla/VanillaRecipeFactory.java

@@ -1,5 +1,6 @@
 package mezz.jei.plugins.vanilla;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.google.common.base.Preconditions;
@@ -19,7 +20,18 @@ public IRecipeWrapper createAnvilRecipe(ItemStack leftInput, List<ItemStack> rig
 		ErrorUtil.checkNotEmpty(outputs, "outputs");
 		Preconditions.checkArgument(rightInputs.size() == outputs.size(), "Input and output sizes must match.");
 
-		return new AnvilRecipeWrapper(leftInput, rightInputs, outputs);
+		return new AnvilRecipeWrapper(Collections.singletonList(leftInput), rightInputs, outputs);
+	}
+
+	@Override
+	public IRecipeWrapper createAnvilRecipe(List<ItemStack> leftInputs, List<ItemStack> rightInputs, List<ItemStack> outputs) {
+		ErrorUtil.checkNotEmpty(leftInputs, "leftInput");
+		ErrorUtil.checkNotEmpty(rightInputs, "rightInputs");
+		ErrorUtil.checkNotEmpty(outputs, "outputs");
+		Preconditions.checkArgument(leftInputs.size() == rightInputs.size(), "Both input sizes must match.");
+		Preconditions.checkArgument(rightInputs.size() == outputs.size(), "Input and output sizes must match.");
+
+		return new AnvilRecipeWrapper(leftInputs, rightInputs, outputs);
 	}
 
 	@Override

src/main/java/mezz/jei/plugins/vanilla/anvil/AnvilRecipeWrapper.java

@@ -27,9 +27,9 @@ public class AnvilRecipeWrapper implements IRecipeWrapper {
 	private ItemStack lastRightStack;
 	private int lastCost;
 
-	public AnvilRecipeWrapper(ItemStack leftInput, List<ItemStack> rightInputs, List<ItemStack> outputs) {
+	public AnvilRecipeWrapper(List<ItemStack> leftInput, List<ItemStack> rightInputs, List<ItemStack> outputs) {
 		this.inputs = Lists.newArrayList();
-		this.inputs.add(Collections.singletonList(leftInput));
+		this.inputs.add(leftInput);
 		this.inputs.add(rightInputs);
 
 		this.output = Collections.singletonList(outputs);

src/main/java/mezz/jei/startup/ModRegistry.java

@@ -296,7 +296,7 @@ public void addAnvilRecipe(ItemStack leftInput, List<ItemStack> rightInputs, Lis
 		ErrorUtil.checkNotEmpty(outputs, "outputs");
 		Preconditions.checkArgument(rightInputs.size() == outputs.size(), "Input and output sizes must match.");
 
-		AnvilRecipeWrapper anvilRecipeWrapper = new AnvilRecipeWrapper(leftInput, rightInputs, outputs);
+		AnvilRecipeWrapper anvilRecipeWrapper = new AnvilRecipeWrapper(Collections.singletonList(leftInput), rightInputs, outputs);
 		addRecipes(Collections.singletonList(anvilRecipeWrapper), VanillaRecipeCategoryUid.ANVIL);
 	}