Support exact items in shapeless recipes on Paper

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/MCShapelessRecipe.java

@@ -8,5 +8,6 @@ public interface MCShapelessRecipe extends MCRecipe {
 	void addIngredient(MCItemStack ingredient);
 	void addIngredient(MCMaterial ingredient);
 	void addIngredient(MCMaterial... ingredients);
+	void addIngredient(MCItemStack... ingredients);
 	List<MCMaterial[]> getIngredients();
 }

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCShapelessRecipe.java

@@ -85,4 +85,13 @@ public void addIngredient(MCMaterial... ingredients) {
 		}
 		recipe.addIngredient(new RecipeChoice.MaterialChoice(concrete));
 	}
+
+	@Override
+	public void addIngredient(MCItemStack... ingredients) {
+		ItemStack[] concrete = new ItemStack[ingredients.length];
+		for(int i = 0; i < ingredients.length; i++) {
+			concrete[i] = (ItemStack) ingredients[i].getHandle();
+		}
+		recipe.addIngredient(new RecipeChoice.ExactChoice(concrete));
+	}
 }

src/main/java/com/laytonsmith/core/ObjectGenerator.java

@@ -2363,11 +2363,44 @@ public MCRecipe recipe(Mixed c, Target t) {
 				for(Mixed ingredient : ingredients.asList()) {
 					if(ingredient.isInstanceOf(CArray.TYPE)) {
 						if(((CArray) ingredient).isAssociative()) {
-							((MCShapelessRecipe) ret).addIngredient(recipeItem(ingredient, t));
+							// Single ingredient item array
+							if(((CArray) ingredient).containsKey("meta")) {
+								// Single exact ingredient item choice
+								((MCShapelessRecipe) ret).addIngredient(new MCItemStack[]{recipeItem(ingredient, t)});
+							} else {
+								// Single ingredient material with optional qty
+								((MCShapelessRecipe) ret).addIngredient(recipeItem(ingredient, t));
+							}
 						} else {
-							((MCShapelessRecipe) ret).addIngredient(recipeMaterialChoice((CArray) ingredient, t));
+							// Multiple ingredient choices
+							CArray list = (CArray) ingredient;
+							MCMaterial[] mats = new MCMaterial[(int) list.size()];
+							MCItemStack[] items = new MCItemStack[(int) list.size()];
+							boolean exactItemMatch = false;
+							for(int index = 0; index < list.size(); index++) {
+								Mixed choice = list.get(index, t);
+								if(choice.isInstanceOf(CArray.TYPE)) {
+									exactItemMatch = true;
+									items[index] = recipeItem(choice, t);
+								} else {
+									mats[index] = recipeMaterial(choice, t);
+								}
+							}
+							if(exactItemMatch) {
+								// Multiple exact item ingredient choices
+								for(int index = 0; index < items.length; index++) {
+									if(items[index] == null) {
+										items[index] = StaticLayer.GetItemStack(mats[index], 1);
+									}
+								}
+								((MCShapelessRecipe) ret).addIngredient(items);
+							} else {
+								// Multiple material ingredient choices
+								((MCShapelessRecipe) ret).addIngredient(mats);
+							}
 						}
 					} else {
+						// single ingredient material
 						((MCShapelessRecipe) ret).addIngredient(recipeMaterial(ingredient, t));
 					}
 				}

src/main/java/com/laytonsmith/core/functions/Recipes.java

@@ -79,18 +79,17 @@ public Integer[] numArgs() {
 		public String docs() {
 			return "boolean {recipeArray} Adds a recipe to the server and returns whether it was added or not. ----"
 					+ " The recipeArray can contain the following keys:"
-					+ " <pre>"
-					+ "   type: (required) The type of recipe. Expected to be 'BLASTING', 'CAMPFIRE', 'FURNACE', 'SHAPED',"
-					+ " 'SHAPELESS', 'SMOKING', or 'STONECUTTING'.\n"
-					+ "   key: (required) A unique string id for this recipe.\n"
-					+ "   result: (required) The result item array of the recipe.\n"
-					+ "   group: (optional) A group id for grouping recipes in the recipe book.\n"
-					+ "   shape: (shaped) The shape of the recipe. Represented as a 3 index normal array.\n"
-					+ "   ingredients: (shaped and shapeless recipes) Ingredients array of the recipe. See examples.\n"
-					+ "   input: (cooking and stonecutting) The input item type or array of types for this recipe.\n"
-					+ "   cookingtime: (cooking) The amount of time in ticks for the input item to cook.\n"
-					+ "   experience: (cooking) The amount of experience generated by this recipe."
-					+ " </pre>"
+					+ "'''type''' : (required) The type of recipe. Expected to be 'BLASTING', 'CAMPFIRE', 'FURNACE',"
+					+ " 'SHAPED', 'SHAPELESS', 'SMOKING', or 'STONECUTTING'.\n"
+					+ "'''key''' : (required) A unique string id for this recipe.\n"
+					+ "'''result''' : (required) The result item array of the recipe.\n"
+					+ "'''group''' : (optional) A group id for grouping recipes in the recipe book.\n"
+					+ "'''shape''' : (shaped) The shape of the recipe. Represented as a 3 index normal array.\n"
+					+ "'''ingredients''' : (shaped and shapeless recipes) Ingredients array of the recipe. See examples.\n"
+					+ "'''input''' : (cooking and stonecutting) The input item type or array of types for this recipe.\n"
+					+ "'''cookingtime''' : (cooking) The amount of time in ticks for the input item to cook.\n"
+					+ "'''experience''' : (cooking) The amount of experience generated by this recipe.\n"
+					+ "\n"
 					+ " Shaped Recipe Data. Turns 9 stone into obsidian."
 					+ " <pre>{\n"
 					+ "    key: 'stone_to_obsidian',\n"
@@ -158,14 +157,14 @@ public ExampleScript[] examples() throws ConfigCompileException {
 				"add_recipe(array(\n"
 				+ "\t'key': 'regen_extended',\n"
 				+ "\t'type': 'SHAPED',\n"
-				+ "\t'result': array('name': 'POTION', 'meta': array('base': array('type': 'REGEN', 'extended': true))),\n"
+				+ "\t'result': array('name': 'POTION', 'meta': array('potiontype': 'LONG_REGENERATION')),\n"
 				+ "\t'shape': array(\n"
 				+ "\t\t'RRR',\n"
 				+ "\t\t'RPR',\n"
 				+ "\t\t'RRR'),\n"
 				+ "\t'ingredients': array(\n"
 				+ "\t\t'R': 'REDSTONE',\n"
-				+ "\t\t'P': array('name': 'POTION', 'meta': array('base': array('type': 'REGEN'))))));",
+				+ "\t\t'P': array('name': 'POTION', 'meta': array('potiontype': 'REGENERATION')))));",
 				"Turns a normal regen potion surrounded by redstone into an extended regen potion."),
 
 				new ExampleScript("Demonstrates a shaped recipe with multiple ingredient choices."
@@ -178,6 +177,19 @@ public ExampleScript[] examples() throws ConfigCompileException {
 				+ "\t'shape': array('X', 'X', 'X'),\n"
 				+ "\t'ingredients': array('X': array('RED_MUSHROOM', 'BROWN_MUSHROOM'))));",
 				"Crafts a mushroom stem block."),
+
+				new ExampleScript("Demonstrates a shapeless recipe with exact ingredients."
+				+ " This is only possible on Paper servers. On Spigot, only the item material will be considered."
+				+ " Each element in the ingredients array may be a single item/material or an array of item/material"
+				+ " choices (like how different types of planks can create a stick).",
+				"add_recipe(array(\n"
+				+ "\t'key': 'debug_stick',\n"
+				+ "\t'type': 'SHAPELESS',\n"
+				+ "\t'result': array('name': 'DEBUG_STICK'),\n"
+				+ "\t'ingredients': array(\n"
+				+ "\t\tarray('name': 'NETHER_STAR'),\n"
+				+ "\t\tarray('name': 'STICK', 'meta': array('repair': 1, 'enchants': array('silk_touch': 1))))));",
+				"Turns a nether star and a stick enchanted with silk touch into a debug stick."),
 			};
 		}
 	}