Merge branch '1.15.2/master' into 1.16.1/master

RuyaSavascisi · Jul 4, 2020 · 19af91f · 19af91f
2 parents bc01369 + 62d4703
commit 19af91f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 
-version = '3.0.2'
+version = '3.1.0'
 group = 'shadows.placebo'
 archivesBaseName = 'Placebo-1.16.1'
 

diff --git a/src/main/java/shadows/placebo/recipe/FastShapelessRecipe.java b/src/main/java/shadows/placebo/recipe/FastShapelessRecipe.java
@@ -21,6 +21,8 @@ public class FastShapelessRecipe extends ShapelessRecipe {
 	public FastShapelessRecipe(ResourceLocation id, String group, ItemStack output, NonNullList<Ingredient> ingredients) {
 		super(id, group, output, ingredients);
 		isSimple = ReflectionHelper.getPrivateValue(ShapelessRecipe.class, this, "isSimple");
+		if (isSimple) for (Ingredient i : ingredients)
+			i.getValidItemStacksPacked();
 	}
 
 	@Override