From c2ea5172788af9a0c66ad122c22659da599d77a9 Mon Sep 17 00:00:00 2001 From: iouter <3155186831@qq.com> Date: Sun, 14 Nov 2021 16:35:48 +0800 Subject: separate recipes of the multiblock mixer --- .../gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java index b94dbfa51f..0d76114e57 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java @@ -93,7 +93,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { if (aFoundFluid == null) { for (ItemStack aBadStack : mItemsToIgnore) { if (doesItemMatchIgnoringStackSize(aInputStack, aBadStack)) { - continue recipe; // Skip this recipe entirely if we find an item we don't like + continue recipe; // Skip this recipe entirely if we find an item we don't like } } if (!isEmptyCell(aInputStack)) { @@ -152,6 +152,10 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { aNewFluidOutputs[i] = aOutputFluidsMap.get(i); } + //Skip repeatedly recipes + if (aOutputs.findRecipe(null, false, Integer.MAX_VALUE, aNewFluidInputs, aNewItemInputs) != null) + continue recipe; + // Add Recipe to map GT_Recipe aNewRecipe = new GTPP_Recipe( false, -- cgit From 6ebf7fb8fb54b82422315d7337b257d1abf95a46 Mon Sep 17 00:00:00 2001 From: iouter <3155186831@qq.com> Date: Sun, 14 Nov 2021 19:00:27 +0800 Subject: add advanced mixer back --- src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java | 1 + .../gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java') diff --git a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java index fcb7a2b093..461678dd7a 100644 --- a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java +++ b/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java @@ -15,6 +15,7 @@ public class NEI_IMC_Sender { setNBTInfoAndSendIt("gtpp.recipe.semifluidgeneratorfuels", "gregtech:gt.blockmachines:837"); setNBTInfoAndSendIt("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829"); setNBTInfoAndSendIt("gtpp.recipe.multimixer", "gregtech:gt.blockmachines:811"); + setNBTInfoAndSendIt("gtpp.recipe.advanced.mixer", "gregtech:gt.blockmachines:811"); setNBTInfoAndSendIt("gtpp.recipe.cryogenicfreezer", "gregtech:gt.blockmachines:910"); setNBTInfoAndSendIt("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835"); setNBTInfoAndSendIt("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java index 0d76114e57..90d7aaa806 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java @@ -152,10 +152,6 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { aNewFluidOutputs[i] = aOutputFluidsMap.get(i); } - //Skip repeatedly recipes - if (aOutputs.findRecipe(null, false, Integer.MAX_VALUE, aNewFluidInputs, aNewItemInputs) != null) - continue recipe; - // Add Recipe to map GT_Recipe aNewRecipe = new GTPP_Recipe( false, -- cgit