diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDustSmall.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDustSmall.java index 91cb52a3..63ae9311 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDustSmall.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDustSmall.java @@ -12,6 +12,7 @@ import gregtechmod.api.util.GT_Shapeless_Recipe; import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.OreDictEntry; +import gregtechmod.common.RecipeHandler; import gregtechmod.common.recipe.RecipeEntry; import gregtechmod.common.recipe.RecipeMaps; import gregtechmod.common.recipe.RecipeEntry.Match; @@ -30,7 +31,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { Materials aMaterial = this.getMaterial(aPrefix, entry); if (this.isExecutable(aPrefix, aMaterial)) { ItemStack ingot; - GameRegistry.addRecipe(new GT_Shapeless_Recipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), new Object[] { entry.oreDictName, entry.oreDictName, entry.oreDictName, entry.oreDictName })); + RecipeHandler.executeOnFinish(() -> GameRegistry.addRecipe(new GT_Shapeless_Recipe(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), new Object[] { entry.oreDictName, entry.oreDictName, entry.oreDictName, entry.oreDictName }))); if (!aMaterial.contains(SubTag.NO_SMELTING) && (ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)) != null) { if (aMaterial.mBlastFurnaceRequired) { RecipeFactory factory = RecipeMaps.BLAST_FURNANCE.factory() diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate1.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate1.java index 32dece33..233c5811 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate1.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate1.java @@ -140,7 +140,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { } for (ItemStack aStack : entry.ores) { - RecipeHandler.scheduleCraftingToRemove(rec -> rec == null || rec.getRecipeOutput() == null || rec.getRecipeOutput().isItemEqual(aStack)); + RecipeHandler.scheduleCraftingToRemove(rec -> rec != null && rec.getRecipeOutput() != null && rec.getRecipeOutput().isItemEqual(aStack)); if (!aMaterial.contains(SubTag.NO_SMELTING)) { RecipeHandler.executeOnFinish(() -> GT_ModHandler.addSmeltingRecipe(GT_Utility.copyAmount(1, aStack), diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate2.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate2.java index 519c6df8..e91d20b0 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate2.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate2.java @@ -54,7 +54,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { } for (final ItemStack tStack : entry.ores) { - RecipeHandler.scheduleCraftingToRemove(rec -> rec == null || rec.getRecipeOutput() == null || rec.getRecipeOutput().isItemEqual(tStack)); + RecipeHandler.scheduleCraftingToRemove(rec -> rec != null && rec.getRecipeOutput() != null && rec.getRecipeOutput().isItemEqual(tStack)); } } } diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate3.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate3.java index 845cbabd..4535c839 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate3.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate3.java @@ -54,7 +54,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { } for (final ItemStack tStack : entry.ores) { - RecipeHandler.scheduleCraftingToRemove(rec -> rec == null || rec.getRecipeOutput() == null || rec.getRecipeOutput().isItemEqual(tStack)); + RecipeHandler.scheduleCraftingToRemove(rec -> rec != null && rec.getRecipeOutput() != null && rec.getRecipeOutput().isItemEqual(tStack)); } } } diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate4.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate4.java index 4a1edf73..f09dda8e 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate4.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate4.java @@ -40,7 +40,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { } for (final ItemStack tStack : entry.ores) { - RecipeHandler.scheduleCraftingToRemove(rec -> rec == null || rec.getRecipeOutput() == null || rec.getRecipeOutput().isItemEqual(tStack)); + RecipeHandler.scheduleCraftingToRemove(rec -> rec != null && rec.getRecipeOutput() != null && rec.getRecipeOutput().isItemEqual(tStack)); } } } diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate5.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate5.java index e3126dcb..6a768fd8 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate5.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate5.java @@ -41,7 +41,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { } for (final ItemStack tStack : entry.ores) { - RecipeHandler.scheduleCraftingToRemove(rec -> rec == null || rec.getRecipeOutput() == null || rec.getRecipeOutput().isItemEqual(tStack)); + RecipeHandler.scheduleCraftingToRemove(rec -> rec != null && rec.getRecipeOutput() != null && rec.getRecipeOutput().isItemEqual(tStack)); } } } diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate9.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate9.java index ca27a97f..00710b8c 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate9.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingPlate9.java @@ -21,7 +21,7 @@ public void registerOre(OrePrefixes aPrefix, List entries) { Materials aMaterial = this.getMaterial(aPrefix, entry); if (this.isExecutable(aPrefix, aMaterial)) { for (final ItemStack tStack : entry.ores) { - RecipeHandler.scheduleCraftingToRemove(rec -> rec == null || rec.getRecipeOutput() == null || rec.getRecipeOutput().isItemEqual(tStack)); + RecipeHandler.scheduleCraftingToRemove(rec -> rec != null && rec.getRecipeOutput() != null && rec.getRecipeOutput().isItemEqual(tStack)); } } }