Merge branch 'master' into mc1.14/dev

src/main/java/com/simibubi/create/modules/contraptions/processing/ProcessingRecipeSerializer.java

@@ -28,7 +28,13 @@ public class ProcessingRecipeSerializer<T extends ProcessingRecipe<?>>
 
 		List<ProcessingIngredient> ingredients = new ArrayList<>();
 		for (JsonElement e : JSONUtils.getJsonArray(json, "ingredients")) {
-			ingredients.add(ProcessingIngredient.parse(e.getAsJsonObject()));
+			int count = 1;
+			if (JSONUtils.hasField((JsonObject) e, "count")) {
+				count = JSONUtils.getInt(e.getAsJsonObject().get("count"), "count");
+			}
+			for(int i = 0; i < count; i++) {
+				ingredients.add(ProcessingIngredient.parse(e.getAsJsonObject()));
+			}
 		}
 
 		List<ProcessingOutput> results = new ArrayList<>();

src/main/resources/data/create/recipes/mixing/blazing_axe.json

@@ -8,16 +8,8 @@
     		"item": "create:obsidian_dust"
     	},
 		{
-			"item": "minecraft:blaze_powder"
+			"item": "minecraft:blaze_powder",
-		},
+			"count": 4
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
 		}
     ], 
 	"results": [

src/main/resources/data/create/recipes/mixing/blazing_pickaxe.json

@@ -8,16 +8,8 @@
     		"item": "create:obsidian_dust"
     	},
 		{
-			"item": "minecraft:blaze_powder"
+			"item": "minecraft:blaze_powder",
-		},
+			"count": 4
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
 		}
     ], 
 	"results": [

src/main/resources/data/create/recipes/mixing/blazing_shovel.json

@@ -8,16 +8,8 @@
     		"item": "create:obsidian_dust"
     	},
 		{
-			"item": "minecraft:blaze_powder"
+			"item": "minecraft:blaze_powder",
-		},
+			"count": 4
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
 		}
     ], 
 	"results": [

src/main/resources/data/create/recipes/mixing/blazing_sword.json

@@ -8,16 +8,8 @@
     		"item": "create:obsidian_dust"
     	},
 		{
-			"item": "minecraft:blaze_powder"
+			"item": "minecraft:blaze_powder",
-		},
+			"count": 4
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
-		},
-		{
-			"item": "minecraft:blaze_powder"
 		}
     ], 
 	"results": [

src/main/resources/data/create/recipes/mixing/chromatic_compound.json

@@ -2,25 +2,15 @@
     "type": "create:mixing",
     "ingredients": [
 		{
-    		"tag": "forge:dusts/glowstone"
+    		"tag": "forge:dusts/glowstone",
-    	},
+			"count": 3
-		{
-    		"tag": "forge:dusts/glowstone"
-    	},
-		{
-    		"tag": "forge:dusts/glowstone"
     	},
 		{
     		"item": "create:polished_rose_quartz"
     	},
 		{
-			"item": "create:obsidian_dust"
+			"item": "create:obsidian_dust",
-		},
+			"count": 3
-		{
-			"item": "create:obsidian_dust"
-		},
-		{
-			"item": "create:obsidian_dust"
 		},
 		{
 			"item": "minecraft:dragon_breath",