aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java111
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java63
2 files changed, 146 insertions, 28 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 49d3303688..8d5b22f2f3 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.item.chemistry;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.TextureSet;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
import gtPlusPlus.core.lib.CORE;
@@ -16,8 +16,6 @@ import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
-import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -64,16 +62,17 @@ public class GenericChem extends ItemPackage {
* Fluids
*/
- public Fluid Benzene;
- public Fluid NitroBenzene;
- public Fluid Aniline;
- public Fluid Polyurethane;
- public Fluid Phenol; //https://en.wikipedia.org/wiki/Phenol#Uses
- public Fluid Cyclohexane; //https://en.wikipedia.org/wiki/Cyclohexane
- public Fluid Cyclohexanone; //https://en.wikipedia.org/wiki/Cyclohexanone
-
- public Fluid Cadaverine; //https://en.wikipedia.org/wiki/Cadaverine
- public Fluid Putrescine; //https://en.wikipedia.org/wiki/Putrescine
+ public static Fluid Benzene;
+ public static Fluid NitroBenzene;
+ public static Fluid Aniline;
+ public static Fluid Polyurethane;
+ public static Fluid Phenol; //https://en.wikipedia.org/wiki/Phenol#Uses
+ public static Fluid Cyclohexane; //https://en.wikipedia.org/wiki/Cyclohexane
+ public static Fluid Cyclohexanone; //https://en.wikipedia.org/wiki/Cyclohexanone
+ public static Fluid Cadaverine; //https://en.wikipedia.org/wiki/Cadaverine
+ public static Fluid Putrescine; //https://en.wikipedia.org/wiki/Putrescine
+ public static Fluid BoricAcid;
+ public static Fluid HydrochloricAcid;
public static Fluid Ethylanthraquinone2;
@@ -158,6 +157,8 @@ public class GenericChem extends ItemPackage {
Aniline = FluidUtils.generateFluidNoPrefix("aniline", "Aniline", 266, new short[] { 100, 100, 30, 100 }, true);
+ BoricAcid = FluidUtils.generateFluidNoPrefix("boricacid", "Boric Acid", 278, new short[] { 90, 30, 120, 100 }, true);
+
Polyurethane = FluidUtils.generateFluidNoPrefix("polyurethane", "Polyurethane", 350, new short[] { 100, 70, 100, 100 }, true);
if (!FluidRegistry.isFluidRegistered("phenol")) {
@@ -165,7 +166,15 @@ public class GenericChem extends ItemPackage {
}
else {
Phenol = FluidRegistry.getFluid("phenol");
- }
+ }
+
+ // Use GT's if it exists, else make our own.
+ if (!FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) {
+ HydrochloricAcid = FluidRegistry.getFluid("hydrochloricacid_gt5u");
+ }
+ else {
+ HydrochloricAcid = FluidUtils.generateFluidNoPrefix("hydrochloricacid", "Hydrochloric Acid", 285, new short[] { 183, 200, 196, 100 }, true);
+ }
Cyclohexane = FluidUtils.generateFluidNoPrefix("cyclohexane", "Cyclohexane", 32 + 175, new short[] { 100, 70, 30, 100 }, true);
Cyclohexanone = FluidUtils.generateFluidNoPrefix("cyclohexanone", "Cyclohexanone", 32 + 175, new short[] { 100, 70, 30, 100 }, true);
@@ -221,11 +230,83 @@ public class GenericChem extends ItemPackage {
recipe2Ethylanthrahydroquinone();
recipeHydrogenPeroxide();
recipeLithiumHydroperoxide();
- recipeLithiumPeroxide();
+ recipeLithiumPeroxide();
+
+ if (!HydrochloricAcid.getName().toLowerCase().contains("gt5u")) {
+ recipeHydrochloricAcid();
+ }
return true;
}
+ private void recipeHydrochloricAcid() {
+
+ ItemStack aAcidCell = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrochloricAcid", 1);
+
+ GT_Values.RA.addChemicalRecipe(
+ ELEMENT.getInstance().CHLORINE.getCell(1),
+ GT_Utility.getIntegratedCircuit(1),
+ ELEMENT.getInstance().HYDROGEN.getFluid(1000),
+ FluidUtils.getFluidStack(HydrochloricAcid, 2000),
+ CI.emptyCells(1),
+ 60,
+ 8);
+
+ GT_Values.RA.addChemicalRecipe(
+ ELEMENT.getInstance().HYDROGEN.getCell(1),
+ GT_Utility.getIntegratedCircuit(1),
+ ELEMENT.getInstance().CHLORINE.getFluid(1000),
+ FluidUtils.getFluidStack(HydrochloricAcid, 2000),
+ CI.emptyCells(1),
+ 60,
+ 8);
+
+ GT_Values.RA.addElectrolyzerRecipe(
+ CI.emptyCells(1),
+ GT_Utility.getIntegratedCircuit(1),
+ FluidUtils.getFluidStack(HydrochloricAcid, 2000),
+ ELEMENT.getInstance().CHLORINE.getFluid(1000),
+ ELEMENT.getInstance().HYDROGEN.getCell(1),
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ null,
+ 720,
+ 30);
+
+ GT_Values.RA.addElectrolyzerRecipe(
+ CI.emptyCells(1),
+ GT_Utility.getIntegratedCircuit(11),
+ FluidUtils.getFluidStack(HydrochloricAcid, 2000),
+ ELEMENT.getInstance().HYDROGEN.getFluid(1000),
+ ELEMENT.getInstance().CHLORINE.getCell(1),
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ null,
+ 720,
+ 30);
+
+ GT_Values.RA.addElectrolyzerRecipe(
+ ItemUtils.getSimpleStack(aAcidCell, 2),
+ GT_Values.NI,
+ GT_Values.NF,
+ GT_Values.NF,
+ ELEMENT.getInstance().HYDROGEN.getCell(1),
+ ELEMENT.getInstance().CHLORINE.getCell(1),
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ GT_Values.NI,
+ null,
+ 720,
+ 30);
+ }
+
private void recipeCyclohexane() {
CORE.RA.addChemicalPlantRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index f766e8d768..2275898c7e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -11,7 +11,6 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
import gregtech.api.util.HotFuel;
import gregtech.api.util.ThermalFuel;
import gtPlusPlus.api.objects.Logger;
@@ -40,7 +39,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
-import gtPlusPlus.plugin.agrichem.BioRecipes;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -123,7 +121,7 @@ public class RECIPES_GREGTECH {
FluidUtils.getDistilledWater(5000)
},
new ItemStack[] {
-
+
},
new FluidStack[] {
FluidUtils.getFluidStack("nitricacid", 2000),
@@ -132,6 +130,52 @@ public class RECIPES_GREGTECH {
480,
3);*/
+ // Produce Boric Acid
+ CORE.RA.addChemicalPlantRecipe(
+ new ItemStack[] {
+ CI.getNumberedCircuit(21),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBorax", 4),
+ },
+ new FluidStack[] {
+ FluidUtils.getFluidStack(GenericChem.HydrochloricAcid, 2000)
+ },
+ new ItemStack[] {
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 5),
+ },
+ new FluidStack[] {
+ FluidUtils.getFluidStack("boricacid", 2000),
+ FluidUtils.getWater(5000)
+
+ },
+ 20 * 30,
+ MaterialUtils.getVoltageForTier(3),
+ 2);
+
+ // Produce Th232
+ CORE.RA.addChemicalPlantRecipe(
+ new ItemStack[] {
+ CI.getNumberedCircuit(22),
+ ELEMENT.getInstance().THORIUM.getDust(16)
+ },
+ new FluidStack[] {
+ FluidUtils.getDistilledWater(2000),
+ FluidUtils.getFluidStack("boricacid", 1500)
+ },
+ new ItemStack[] {
+ ELEMENT.getInstance().THORIUM232.getDust(4),
+ ELEMENT.getInstance().THORIUM.getSmallDust(32),
+ ELEMENT.getInstance().URANIUM232.getDust(2)
+ },
+ new FluidStack[] {
+
+ },
+ new int[] {
+ 0, 0, 20
+ },
+ 20 * 300,
+ MaterialUtils.getVoltageForTier(4),
+ 3);
+
}
private static void fluidheaterRecipes() {
@@ -597,7 +641,7 @@ public class RECIPES_GREGTECH {
ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
-
+
// Distillus Upgrade Chip
GT_Values.RA.addLaserEngraverRecipe(
GregtechItemList.Laser_Lens_WoodsGlass.get(0),
@@ -605,8 +649,8 @@ public class RECIPES_GREGTECH {
GregtechItemList.Distillus_Upgrade_Chip.get(1),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
-
-
+
+
}
@@ -1828,13 +1872,6 @@ public class RECIPES_GREGTECH {
private static void centrifugeRecipes() {
- GT_Values.RA.addCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 8), GT_Values.NI,
- GT_Values.NF, GT_Values.NF, ELEMENT.getInstance().THORIUM232.getDust(2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallThorium", 20),
- ELEMENT.getInstance().URANIUM232.getDust(1), GT_Values.NI, GT_Values.NI, GT_Values.NI,
- new int[] { 0, 0, 10 }, 500 * 20, 2000);
-
-
//Process Used Fuel Rods for Krypton
//Uranium
generated by cgit (git 2.46.0) at 2025-04-07 12:51:23 +0000