aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/net
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/net
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/net')
-rw-r--r--src/main/java/net/glease/ggfab/ComponentRecipeLoader.java56
1 files changed, 34 insertions, 22 deletions
diff --git a/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java b/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java
index 916fa92a50..4f6d790557 100644
--- a/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java
+++ b/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java
@@ -1,8 +1,13 @@
package net.glease.ggfab;
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.HOURS;
+import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
+import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
-import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -18,28 +23,35 @@ class ComponentRecipeLoader implements Runnable {
@Override
public void run() {
- Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
- ? FluidRegistry.getFluid("molten.indalloy140")
- : FluidRegistry.getFluid("molten.solderingalloy");
- RA.addAssemblylineRecipe(
- ItemList.Machine_Multi_Assemblyline.get(1L),
- 96000,
- new Object[] { ItemList.Machine_Multi_Assemblyline.get(1L),
+ Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140");
+
+ GT_Values.RA.stdBuilder()
+ .metadata(RESEARCH_ITEM, ItemList.Machine_Multi_Assemblyline.get(1L))
+ .metadata(RESEARCH_TIME, 1 * HOURS + 6 * MINUTES)
+ .itemInputs(
+ ItemList.Machine_Multi_Assemblyline.get(1L),
new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 },
new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 },
- ItemList.Automation_ChestBuffer_LuV.get(1L), },
- new FluidStack[] { new FluidStack(solderIndalloy, 1296), Materials.Lubricant.getFluid(2000) },
- GGItemList.AdvAssLine.get(1L),
- 1200,
- 6000);
- RA.addAssemblerRecipe(
- new ItemStack[] { ItemList.Hatch_Input_Bus_IV.get(1L), ItemList.Emitter_IV.get(1L),
- ItemList.Sensor_IV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
- GT_Utility.getIntegratedCircuit(12), },
- Materials.Polybenzimidazole.getMolten(144L),
- GGItemList.LinkedInputBus.get(1L),
- 600,
- (int) GT_Values.VP[5]);
+ ItemList.Automation_ChestBuffer_LuV.get(1L))
+ .fluidInputs(new FluidStack(solderIndalloy, 1296), Materials.Lubricant.getFluid(2000))
+ .itemOutputs(GGItemList.AdvAssLine.get(1L))
+ .eut(6_000)
+ .duration(10 * MINUTES)
+ .addTo(AssemblyLine);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ ItemList.Hatch_Input_Bus_IV.get(1L),
+ ItemList.Emitter_IV.get(1L),
+ ItemList.Sensor_IV.get(1L),
+ GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
+ GT_Utility.getIntegratedCircuit(12))
+ .itemOutputs(GGItemList.LinkedInputBus.get(1L))
+ .fluidInputs(Materials.Polybenzimidazole.getMolten(144L))
+ .duration(30 * SECONDS)
+ .eut(GT_Values.VP[5])
+ .addTo(assemblerRecipes);
+
}
}