From 76566c04a14f7e57e843cd9d3d976b1dd680385b Mon Sep 17 00:00:00 2001 From: Serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Wed, 12 Jul 2023 06:31:26 -0500 Subject: Fix some recipe conflicts (#688) * Rope conflict * Ethylbenzene conflict * Rock Salt, Potash conflicts * spotless apply --- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 12 ++++- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 2 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 55 ++++++++++++---------- 3 files changed, 42 insertions(+), 27 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index d335281fd9..b542cd392e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -98,10 +98,18 @@ public class CoalTar extends ItemPackage { // C2H4 + C6H6 = C8H10 GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), + ItemUtils.getGregtechCircuit(1), + FluidUtils.getFluidStack("benzene", 2000), + FluidUtils.getFluidStack("fluid.ethylbenzene", 2000), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), + 300); + + GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), - null, + ItemUtils.getGregtechCircuit(1), + FluidUtils.getFluidStack("ethylene", 2000), FluidUtils.getFluidStack("fluid.ethylbenzene", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 300); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index a887a18145..92d1301a1d 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1137,7 +1137,7 @@ public class RECIPES_GREGTECH { */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6) }, + new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6), ItemUtils.getGregtechCircuit(6) }, null, ItemUtils.getSimpleStack(ModBlocks.blockNet, 2), 1 * 20, diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 661148aebf..211cab9b3e 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -24,6 +24,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.ModItems; @@ -832,36 +833,42 @@ public class BioRecipes { private static void recipeLithiumChloride() { if (OreDictUtils.containsValidEntries("dustRockSalt")) { - GT_Values.RA.addElectrolyzerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustRockSalt", 8), - ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 10), - FluidUtils.getFluidStack(BioRecipes.mAir, 4000), - FluidUtils.getFluidStack(BioRecipes.mChlorine, 500), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPotassium", 5), + GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe( + false, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustRockSalt", 8), + ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 10) }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallPotassium", 5) }, + null, new int[] { 7500, 8000, 8500, 9000, 7500, 8500 }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mAir, 4000) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mChlorine, 500) }, 60 * 30, - 60); + 60, + 0); } if (OreDictUtils.containsValidEntries("dustPotash")) { - GT_Values.RA.addElectrolyzerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustPotash", 10), - ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 16), - FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000), - FluidUtils.getFluidStack(BioRecipes.mChlorine, 250), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 7), - ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2), + GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe( + false, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPotash", 10), + ItemUtils.getSimpleStack(AgriculturalChem.mLithiumChloride, 16) }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLithium", 7), + ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustAsh", 2) }, + null, new int[] { 7500, 8000, 8500, 9000, 9000, 9000 }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000) }, + new FluidStack[] { FluidUtils.getFluidStack(BioRecipes.mChlorine, 250) }, 45 * 30, - 90); + 90, + 0); } } -- cgit