Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Commit

Permalink
Fix some recipe conflicts (#688)
Browse files Browse the repository at this point in the history 
* Rope conflict

* Ethylbenzene conflict

* Rock Salt, Potash conflicts

* spotless apply
  • Loading branch information
@serenibyss
serenibyss authored Jul 12, 2023
1 parent 395eec3 commit 76566c0
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 27 deletions.
12 changes: 10 additions & 2 deletions src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,18 @@ public static void recipeCreateEthylbenzene() {
// 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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ private static void assemblerRecipes() {
*/

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,
Expand Down
55 changes: 31 additions & 24 deletions src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;
Expand Down Expand Up @@ -832,36 +833,42 @@ private static void recipeCalciumCarbonate() {}
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);
}
}

Expand Down

0 comments on commit 76566c0

Please sign in to comment.