aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/railcraft
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/xmod/railcraft
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/xmod/railcraft')
-rw-r--r--src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java101
1 files changed, 51 insertions, 50 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
index 4efa85992a..7e920565e8 100644
--- a/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
+++ b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
@@ -7,6 +7,7 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes;
import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
import net.minecraft.init.Blocks;
@@ -20,8 +21,6 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.base.BaseItemBurnable;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils;
@@ -103,56 +102,58 @@ public class HANDLER_Railcraft {
for (int i = 0; i < aOutputs.length; i++) {
// Recipes for the Charcoals and Cokes, outputting either Creosote or Charcoal Byproducts depending on the
// fluid input
- CORE.RA.addCokeOvenRecipe(
- aInputs1[i],
- CI.getNumberedCircuit(3),
- null,
- FluidUtils.getFluidStack("creosote", 100),
- aInputs2[i],
- 20,
- 16);
- CORE.RA.addCokeOvenRecipe(
- aInputs1[i],
- CI.getNumberedCircuit(4),
- FluidUtils.getFluidStack("nitrogen", 100),
- FluidUtils.getFluidStack("charcoal_byproducts", 200),
- aInputs2[i],
- 10,
- 16);
- CORE.RA.addCokeOvenRecipe(
- aInputs2[i],
- CI.getNumberedCircuit(3),
- null,
- FluidUtils.getFluidStack("creosote", 200),
- aOutputs[i],
- 40,
- 16);
- CORE.RA.addCokeOvenRecipe(
- aInputs2[i],
- CI.getNumberedCircuit(4),
- FluidUtils.getFluidStack("nitrogen", 50),
- FluidUtils.getFluidStack("charcoal_byproducts", 100),
- aOutputs[i],
- 20,
- 16);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aInputs1[i], GT_Utility.getIntegratedCircuit(3))
+ .itemOutputs(aInputs2[i])
+ .fluidOutputs(FluidUtils.getFluidStack("creosote", 100))
+ .eut(16)
+ .duration(1 * SECONDS)
+ .addTo(cokeOvenRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aInputs1[i], GT_Utility.getIntegratedCircuit(4))
+ .itemOutputs(aInputs2[i])
+ .fluidInputs(FluidUtils.getFluidStack("nitrogen", 100))
+ .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 200))
+ .eut(16)
+ .duration(10 * TICKS)
+ .addTo(cokeOvenRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(3))
+ .itemOutputs(aOutputs[i])
+ .fluidOutputs(FluidUtils.getFluidStack("creosote", 200))
+ .eut(16)
+ .duration(2 * SECONDS)
+ .addTo(cokeOvenRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aInputs2[i], GT_Utility.getIntegratedCircuit(4))
+ .itemOutputs(aOutputs[i])
+ .fluidInputs(FluidUtils.getFluidStack("nitrogen", 50))
+ .fluidOutputs(FluidUtils.getFluidStack("charcoal_byproducts", 100))
+ .eut(16)
+ .duration(1 * SECONDS)
+ .addTo(cokeOvenRecipes);
// Generate Wood Tar and Wood Gas from these Cokes
- CORE.RA.addCokeOvenRecipe(
- aOutputs[i],
- CI.getNumberedCircuit(5),
- FluidUtils.getFluidStack("steam", 100),
- Materials.WoodTar.getFluid(200),
- Materials.Ash.getDustSmall(1),
- 60,
- 240);
- CORE.RA.addCokeOvenRecipe(
- aOutputs[i],
- CI.getNumberedCircuit(6),
- FluidUtils.getFluidStack("steam", 100),
- Materials.WoodGas.getFluid(300),
- Materials.Ash.getDustSmall(1),
- 60,
- 240);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aOutputs[i], GT_Utility.getIntegratedCircuit(5))
+ .itemOutputs(Materials.Ash.getDustSmall(1))
+ .fluidInputs(FluidUtils.getFluidStack("steam", 100))
+ .fluidOutputs(Materials.WoodTar.getFluid(200))
+ .eut(240)
+ .duration(3 * SECONDS)
+ .addTo(cokeOvenRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aOutputs[i], GT_Utility.getIntegratedCircuit(6))
+ .itemOutputs(Materials.Ash.getDustSmall(1))
+ .fluidInputs(FluidUtils.getFluidStack("steam", 100))
+ .fluidOutputs(Materials.WoodGas.getGas(300))
+ .eut(3 * SECONDS)
+ .duration(240)
+ .addTo(cokeOvenRecipes);
// Fluid Extracting the Charcoals for Wood Tar
GT_Values.RA.stdBuilder()