aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2024-07-21 16:36:34 +0200
committerGitHub <noreply@github.com>2024-07-21 21:36:34 +0700
commita8b46c11f5a02608101ef33ed39f103736ba5920 (patch)
tree6daf492e524dcae9f2f5a8cb1d87c057c21a6760 /src/main/java/gtPlusPlus/core
parent8b077c28bea7bcc046be1e4b8485d69b4c245a43 (diff)
downloadGT5-Unofficial-a8b46c11f5a02608101ef33ed39f103736ba5920.tar.gz
GT5-Unofficial-a8b46c11f5a02608101ef33ed39f103736ba5920.tar.bz2
GT5-Unofficial-a8b46c11f5a02608101ef33ed39f103736ba5920.zip
full RA1 removal (#2713)
* remove addExtractionRecipes * remove addPulverisationRecipe * remove thermalcraft fake compat * deprecate addAlloySmelterRecipe * remove fake compat * remove RA1 fusion recipe usage * remove RA1 centrifuge recipe usage * remove RA1 compressor recipe usage * remove RA1 electrolyzer recipe usage * remove RA1 chemical reactor recipe usage * deprecate GT based recipes adders * obliterate RA1 entries in interfaces (1/?) * remove RA1 blast furnace recipe usage * remove RA1 canner recipe usage * remove RA1 alloy smelter recipe usage * remove RA1 circuit assembler recipe usage * obliterate RA1 entries in interfaces (2/?) * remove RA1 bender recipe usage * clean class * remove RA1 cutter recipe usage * remove RA1 fuels recipe usage * remove RA1 implosion compressor recipe usage * remove RA1 thermal centrifuge recipe usage * clean GT_ModHandler * obliterate RA1 entries in interfaces (3/?) * remove RA1 packager recipe usage * remove RA1 lathe recipe usage * remove RA1 vacuum freezer recipe usage * remove RA1 fluid heater recipe usage * remove RA1 nano forge recipe usage * remove RA1 autoclave recipe usage * obliterate RA1 entries in interfaces (4/?) * remove RA1 cracker recipe usage * remove RA1 pyrolyse recipe usage * remove RA1 pulveriser recipe usage * remove RA1 fluid extractor recipe usage * remove RA1 assembly line recipe usage * remove RA1 alloy blast smelter recipe usage * remove RA1 coke oven recipe usage * obliterate RA1 entries in interfaces (5/?) * remove RA1 dehydrator recipe usage * remove deprecated usages * obliterate RA1 entries in interfaces (6/?) * remove RA1 assembler recipe usage * obliterate RA1 entries in interfaces (7/?) * remove RA1 mixer recipe usage * remove RA1 forge hammer recipe usage * remove RA1 wiremill recipe usage * remove RA1 extruder recipe usage * remove RA1 fluid soldifier recipe usage * remove RA1 chemical bath recipe usage * remove RA1 electromagnetic separator recipe usage * remove RA1 sifter recipe usage * remove distillery recipe usage * remove distillation tower usage * remove extractor usage * obliterate RA1 entries in interfaces (8/?) * remove QFT usage * cleaning * remove packager usage * remove fluid heater usage * remove vacuum freezer usage * remove distillery usage * fix QFT chances arrays * remove fission fuel usage * remove cyclotron usage * remove molecular transformer usage * remove chemplant usage * remove coldtrap and reactor processing unit usage * obliterate RA1 entries in interfaces (9/?) * spotlessApply * fixes * remove addRecipe calls * migrate forge of gods recipes * yeet special value calls (1 / 2) * yeet special value calls (2 / 2) * migrate GG Fuel recipes * migrate all GG maps except EHE * CORE.RA is no more * clear GT_RecipeAdder * remove dead code * clean RecipeMap a bit * spotless apply * fix output chances * Update RecipeLoader.java * fix * remove buggy recipe * migrate to enum for IDs * sort enum * move to enum * fix recipes * spotless apply * fix recipe * remove useless recipes * spotless apply * remove unused blocks * fix GT++ recipe * Update RecipeLoader.java * Update RecipeLoader.java * fix imports * Spotless apply for branch remove_RA1_calls for #2713 (#2742) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix recipe (cherry picked from commit a25d3b62997f080e064369e940eaf53a96a300e6) * fix (cherry picked from commit d9af01140f3ee77de2be18be70f04f8fbe4b547f) * temporarily remove panic mode * fix recipes * Revert "temporarily remove panic mode" This reverts commit 483cfcf74371b91e7d545f058f9d25ff4fcec95a. * fix recipes --------- Co-authored-by: Dream Master <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/block/ModBlocks.java6
-rw-r--r--src/main/java/gtPlusPlus/core/common/CommonProxy.java3
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java52
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java62
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java229
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java480
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java526
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java219
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java6
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialGenerator.java21
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java1201
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java3
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java2198
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java213
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/common/CI.java10
-rw-r--r--src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java7
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java3
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java22
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java1
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java42
20 files changed, 3009 insertions, 2295 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
index 634a073b02..417b342f7e 100644
--- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java
@@ -53,12 +53,6 @@ public final class ModBlocks {
public static Block blockWitherGuard;
public static Block blockCompressedObsidian;
- public static Block blockPlayerDoorWooden;
- public static Block blockPlayerDoorIron;
- public static Block blockPlayerDoorCustom_Glass;
- public static Block blockPlayerDoorCustom_Ice;
- public static Block blockPlayerDoorCustom_Cactus;
-
public static Block blockCustomJukebox;
public static Block blockPooCollector;
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index d52b3aa112..5d93141c56 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -39,7 +39,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
-import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
import gtPlusPlus.xmod.ic2.CustomInternalName;
public class CommonProxy {
@@ -51,8 +50,6 @@ public class CommonProxy {
public void preInit(final FMLPreInitializationEvent e) {
Logger.INFO("Doing some house cleaning.");
- CORE.RA = new GregtechRecipeAdder();
- Logger.INFO("Created Gregtech recipe handler.");
if (!CORE_Preloader.DEBUG_MODE) {
Logger.WARNING("Development mode not enabled.");
} else if (CORE_Preloader.DEBUG_MODE) {
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
index 90235a18b3..3452816357 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java
@@ -1,17 +1,63 @@
package gtPlusPlus.core.item.base.ore;
+import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.millingRecipes;
+
import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class BaseItemMilledOre extends BaseOreComponent {
- public BaseItemMilledOre(final Material material, int aMaterialEU) {
+ public BaseItemMilledOre(final Material material, int materialEU) {
super(material, BaseOreComponent.ComponentTypes.MILLED);
- CORE.RA.addMillingRecipe(material, aMaterialEU);
+
+ ItemStack oreStack = material.getOre(16);
+ ItemStack crushedStack = material.getCrushed(16);
+
+ ItemStack milledStackOres1 = material.getMilled(64);
+ ItemStack milledStackCrushed1 = material.getMilled(32);
+ ItemStack milledStackOres2 = material.getMilled(48);
+ ItemStack milledStackCrushed2 = material.getMilled(16);
+
+ ItemStack millingBall_Alumina = GregtechItemList.Milling_Ball_Alumina.get(0);
+ ItemStack millingBall_Soapstone = GregtechItemList.Milling_Ball_Soapstone.get(0);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(10), oreStack, millingBall_Alumina)
+ .itemOutputs(milledStackOres1)
+ .duration(2 * MINUTES)
+ .eut(materialEU)
+ .noOptimize()
+ .addTo(millingRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(11), oreStack, millingBall_Soapstone)
+ .itemOutputs(milledStackOres2)
+ .duration(2 * MINUTES + 30 * SECONDS)
+ .eut(materialEU)
+ .noOptimize()
+ .addTo(millingRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(10), crushedStack, millingBall_Alumina)
+ .itemOutputs(milledStackCrushed1)
+ .duration(1 * MINUTES)
+ .eut(materialEU)
+ .noOptimize()
+ .addTo(millingRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(11), crushedStack, millingBall_Soapstone)
+ .itemOutputs(milledStackCrushed2)
+ .duration(1 * MINUTES + 15 * SECONDS)
+ .eut(materialEU)
+ .noOptimize()
+ .addTo(millingRecipes);
}
public static Item generate(Materials aMat, int aMaterialEU) {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index e14d9f7f08..2459e08bfc 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -7,7 +7,10 @@ import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -30,7 +33,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -555,16 +557,16 @@ public class AgriculturalChem extends ItemPackage {
Object aItemInstance = aFertField.get(aItemRegInstance);
if (aItemInstance instanceof Item aForestryFert) {
aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedCircuit(11),
- ItemUtils.getSimpleStack(aDustOrganicFert, 4) },
- null,
- null,
- new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod,
- aManureByprod },
- new int[] { 10000, 2000, 2000 },
- 20 * 20,
- 240);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_Utility.getIntegratedCircuit(11),
+ ItemUtils.getSimpleStack(aDustOrganicFert, 4))
+ .itemOutputs(ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod)
+ .outputChances(100_00, 20_00, 20_00)
+ .eut(240)
+ .duration(20 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
}
}
} catch (IllegalArgumentException | IllegalAccessException e) {
@@ -576,14 +578,13 @@ public class AgriculturalChem extends ItemPackage {
* IC2 Support
*/
aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) },
- null,
- null,
- new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, aManureByprod },
- new int[] { 10000, 2000, 2000 },
- 20 * 20,
- 240);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4))
+ .itemOutputs(ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, aManureByprod)
+ .outputChances(100_00, 20_00, 20_00)
+ .eut(240)
+ .duration(20 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
// Dirt Production
GT_Values.RA.stdBuilder()
@@ -613,9 +614,26 @@ public class AgriculturalChem extends ItemPackage {
.addTo(centrifugeRecipes);
// Add Fuel Usages
- CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(PoopJuice, 1000), 12);
- CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(ManureSlurry, 1000), 24);
- CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(FertileManureSlurry, 1000), 32);
+ GT_Values.RA.stdBuilder()
+ .fluidInputs(FluidUtils.getFluidStack(PoopJuice, 1000))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 12)
+ .addTo(semiFluidFuels);
+
+ GT_Values.RA.stdBuilder()
+ .fluidInputs(FluidUtils.getFluidStack(ManureSlurry, 1000))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 24)
+ .addTo(semiFluidFuels);
+
+ GT_Values.RA.stdBuilder()
+ .fluidInputs(FluidUtils.getFluidStack(FertileManureSlurry, 1000))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 32)
+ .addTo(semiFluidFuels);
// Red Slurry / Tailings Processing
GT_Values.RA.stdBuilder()
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 1fafbb5088..b9f5e58eef 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -2,26 +2,31 @@ package gtPlusPlus.core.item.chemistry;
import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
+import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
-import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_RecipeConstants;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.lib.CORE;
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.core.util.reflect.AddGregtechRecipe;
public class CoalTar extends ItemPackage {
@@ -43,27 +48,25 @@ public class CoalTar extends ItemPackage {
// C2H6O = C2H4 + H2O
if (bioEth1 != null) {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedBioCircuit(17),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) },
- bioEth1,
- FluidUtils.getWater(1000),
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) },
- new int[] { 10000 },
- 120 * 20,
- 80);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
+ .fluidInputs(bioEth1)
+ .fluidOutputs(FluidUtils.getWater(1000))
+ .eut(80)
+ .duration(2 * MINUTES)
+ .addTo(chemicalDehydratorRecipes);
}
if (bioEth2 != null) {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedBioCircuit(18),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) },
- bioEth2,
- FluidUtils.getWater(1000),
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) },
- new int[] { 10000 },
- 120 * 20,
- 80);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
+ .fluidInputs(bioEth2)
+ .fluidOutputs(FluidUtils.getWater(1000))
+ .eut(80)
+ .duration(2 * MINUTES)
+ .addTo(chemicalDehydratorRecipes);
}
}
@@ -82,62 +85,69 @@ public class CoalTar extends ItemPackage {
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),
- ItemUtils.getGregtechCircuit(1),
- FluidUtils.getFluidStack("ethylene", 2000),
- FluidUtils.getFluidStack("fluid.ethylbenzene", 2000),
- ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
- 300);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2),
+ GT_Utility.getIntegratedCircuit(1))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
+ .fluidInputs(FluidUtils.getFluidStack("benzene", 2000))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
+ .duration(15 * SECONDS)
+ .eut(TierEU.RECIPE_LV)
+ .addTo(UniversalChemical);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GT_Utility.getIntegratedCircuit(1))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
+ .fluidInputs(FluidUtils.getFluidStack("ethylene", 2000))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
+ .duration(15 * SECONDS)
+ .eut(TierEU.RECIPE_LV)
+ .addTo(UniversalChemical);
}
public static void recipeCoalToCoalTar() {
// Charcoal
- AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L),
- 8,
- GT_Values.NF,
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2),
- FluidUtils.getFluidStack("fluid.coaltar", 800),
- 15,
- 120);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_Utility.getIntegratedCircuit(8),
+ GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800))
+ .duration(18 * SECONDS)
+ .eut(TierEU.RECIPE_MV)
+ .addTo(pyrolyseRecipes);
+
// Lignite
- AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L),
- 8,
- GT_Values.NF,
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
- FluidUtils.getFluidStack("fluid.coaltar", 800),
- 45,
- 60);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_Utility.getIntegratedCircuit(8),
+ GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 800))
+ .duration(54 * SECONDS)
+ .eut(60)
+ .addTo(pyrolyseRecipes);
// Coal
- AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L),
- 8,
- GT_Values.NF,
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
- FluidUtils.getFluidStack("fluid.coaltar", 2200),
- 30,
- 120);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_Utility.getIntegratedCircuit(8),
+ GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 2200))
+ .duration(36 * SECONDS)
+ .eut(TierEU.RECIPE_MV)
+ .addTo(pyrolyseRecipes);
// Coke
- AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8),
- 8,
- GT_Values.NF,
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3),
- FluidUtils.getFluidStack("fluid.coaltar", 3400),
- 15,
- 240);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(8), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.coaltar", 3400))
+ .duration(18 * SECONDS)
+ .eut(240)
+ .addTo(pyrolyseRecipes);
}
private static void recipeCoalTarToCoalTarOil() {
@@ -166,21 +176,22 @@ public class CoalTar extends ItemPackage {
private static void recipeCoalTarOilToSulfuricOilToNaphthalene() {
// SulfuricCoalTarOil
- GT_Values.RA.addChemicalRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 8),
- ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8),
- null,
- null,
- ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 16),
- 20 * 16);
- GT_Values.RA.addDistilleryRecipe(
- CI.getNumberedCircuit(6), // Circuit
- FluidUtils.getFluidStack("fluid.sulfuriccoaltaroil", 1000), // aInput
- FluidUtils.getFluidStack("fluid.naphthalene", 1000), // aOutput
- 1200, // aDuration
- 30, // aEUt
- false // Hidden?
- );
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 8),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 16))
+ .duration(16 * SECONDS)
+ .eut(TierEU.RECIPE_LV)
+ .addTo(UniversalChemical);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(6))
+ .fluidInputs(FluidUtils.getFluidStack("fluid.sulfuriccoaltaroil", 1000))
+ .fluidOutputs(FluidUtils.getFluidStack("fluid.naphthalene", 1000))
+ .eut(TierEU.RECIPE_LV)
+ .duration(60 * SECONDS)
+ .addTo(distilleryRecipes);
}
private static void recipeNaphthaleneToPhthalicAcid() {
@@ -196,14 +207,13 @@ public class CoalTar extends ItemPackage {
}
private static void recipePhthalicAcidToPhthalicAnhydride() {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { CI.getNumberedBioCircuit(15) },
- Materials.PhthalicAcid.getFluid(1000),
- null,
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15) },
- new int[] { 10000 },
- 60 * 20,
- 120);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(CI.getNumberedBioCircuit(15))
+ .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15))
+ .fluidInputs(Materials.PhthalicAcid.getFluid(1000))
+ .eut(TierEU.RECIPE_MV)
+ .duration(60 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
}
@Override
@@ -224,11 +234,40 @@ public class CoalTar extends ItemPackage {
recipePhthalicAcidToPhthalicAnhydride();
// Burn the coal gas!
- GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
- CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1), 64);
- CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1), 32);
- CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1), 16);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1))
+ .metadata(FUEL_VALUE, 96)
+ .metadata(FUEL_TYPE, GT_RecipeConstants.FuelType.GasTurbine.ordinal())
+ .duration(0)
+ .eut(0)
+ .addTo(GT_RecipeConstants.Fuel);
+
+ GT_Values.RA.stdBuilder()
+ .fluidInputs(
+ FluidContainerRegistry
+ .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1)))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 64)
+ .addTo(semiFluidFuels);
+ GT_Values.RA.stdBuilder()
+ .fluidInputs(
+ FluidContainerRegistry
+ .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1)))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 32)
+ .addTo(semiFluidFuels);
+
+ GT_Values.RA.stdBuilder()
+ .fluidInputs(
+ FluidContainerRegistry
+ .getFluidForFilledItem(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1)))
+ .duration(0)
+ .eut(0)
+ .metadata(FUEL_VALUE, 16)
+ .addTo(semiFluidFuels);
return true;
}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 31ea030c64..8f3bff8a8b 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -4,17 +4,18 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.CHEMPLANT_CASING_TIER;
import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalPlantRecipes;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -29,7 +30,6 @@ import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.minecraft.ItemPackage;
import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item;
-import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.material.Material;
@@ -382,51 +382,57 @@ public class GenericChem extends ItemPackage {
private void recipeSodiumEthoxide() {
// C2H5OH + Na → C2H5ONa + H
- CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] { CI.getNumberedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1) },
- new FluidStack[] { Materials.Ethanol.getFluid(1000) },
- new ItemStack[] { ItemUtils.getSimpleStack(mSodiumEthoxide, 9) },
- new FluidStack[] { ELEMENT.getInstance().HYDROGEN.getFluidStack(1000) },
- 20 * 20,
- 120,
- 2);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(16), ELEMENT.getInstance().SODIUM.getDust(1))
+ .itemOutputs(ItemUtils.getSimpleStack(mSodiumEthoxide, 9))
+ .fluidInputs(Materials.Ethanol.getFluid(1000))
+ .fluidOutputs(ELEMENT.getInstance().HYDROGEN.getFluidStack(1000))
+ .duration(20 * SECONDS)
+ .eut(TierEU.RECIPE_MV)
+ .metadata(CHEMPLANT_CASING_TIER, 2)
+ .addTo(chemicalPlantRecipes);
}
private void recipePotassiumHydroxide() {
// Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH
- CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] { CI.getNumberedCircuit(18), Materials.Potash.getDust(3),
- ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), },
- new FluidStack[] { Materials.CarbonDioxide.getGas(1000) },
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 5),
- ItemUtils.getSimpleStack(mPotassiumHydroxide, 6) },
- new FluidStack[] {},
- 20 * 30,
- 120,
- 2);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_Utility.getIntegratedCircuit(18),
+ Materials.Potash.getDust(3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5))
+ .itemOutputs(
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 5),
+ ItemUtils.getSimpleStack(mPotassiumHydroxide, 6))
+ .fluidInputs(Materials.CarbonDioxide.getGas(1000))
+ .duration(30 * SECONDS)
+ .eut(TierEU.RECIPE_MV)
+ .metadata(CHEMPLANT_CASING_TIER, 2)
+ .addTo(chemicalPlantRecipes);
+
}
private void recipeEthylXanthates() {
// Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → C3H5KOS2 + H2O
- CORE.RA.addChemicalPlantRecipe(
- new ItemStack[] { CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3), },
- new FluidStack[] { Materials.Ethanol.getFluid(1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000), },
- new ItemStack[] { ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12) },
- new FluidStack[] { FluidUtils.getWater(1000) },
- 20 * 60,
- 120,
- 4);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(17), ItemUtils.getSimpleStack(mPotassiumHydroxide, 3))
+ .itemOutputs(ItemUtils.getSimpleStack(mPotassiumEthylXanthate, 12))
+ .fluidInputs(Materials.Ethanol.getFluid(1000), FluidUtils.getFluidStack(Carbon_Disulfide, 1000))
+ .fluidOutputs(FluidUtils.getWater(1000))
+ .duration(60 * SECONDS)
+