Recipe Adder v2 (#1770)

* add everything

* fixes

* migrate plasma forge recipes

* syntax update

* make chances array length differ a fatal error

* time constants + long eut overload

* migrate extruder recipes

* migrate electromagnetic separator recipes

* migrate wiremill recipes

* migrate forming press recipes

* migrate bender recipes

* add doc to clarify the three itemInputs

* migrate alloy smelter recipes

* migrate arc furnace recipes

* added ModIDs enum

* sort ModIDs

* migrate autoclave recipes

* migrated some assembler recipes

* split a bit more assembler recipes

* migrate canner recipes

* migrate brewing recipes

* ic2 mod check in canner recipes

* use some loops to reduce the amount of recipes to migrate

* add requested helper methods

* migrate vacuum freezer recipes

* migrate thermal centrifuge recipes

* format smelter recipes only, doesn't go through normal GT recipe

* migrated slicer recipes

* migrated sifter recipes

* Use proper enum now

* remove more constants

* cleaning cutting recipes before migration

* remove tons of dead commented recipes

* migrate pyrolyse recipes

* use ModIDs enum more

* migrate printer recipes

* add a less confusing way to specify value of specialItem

* migrate pulverizer recipes

* less confusing special item specification

* even more ModIDs enum usage

* fix auto * import confusing Minecraft enum value with Minecraft client object

* migrated blast furnace recipes

* migrated Centrifuge recipes

* migrated assembler recipes

* migrated implosion compressor recipes

* migrated extractor recipes

* migrated mixer recipes

* remove useless code

* mgrate universal chemical recipes

* refactor chemical recipes

* migrate single block only chem reactor recipes

* migrate chem reactor recipes

* reworked circuit assembler recipes before migrating them

* migrated circuit assembler recipes

* fix merge conflict for assembler recipes

* remove leftover of the merge conflicts

* fix weird translation glitch

* example of assembly line recipe using RA2

* bugfixes for assline

* remove specialValue usage in blast furnace recipes

* fix more bugs

* add nooptimize to where it make sense

* add recipe descriptions

* Materials.Superconductor -> Materials.SuperconductorUHV

* remove useless Object creations

* remove explicit long casts

* migrate assemblyline recipes

* migrate chemical bath recipes

* migrate compressor recipes

* move smelting recipe where it belongs

* migrated cutting machine recipes

* migrated fermenter recipes (unhide alcohol)

* remove explicit long casts

* migrate fluid canner recipes

* migrate fluid heater recipes

* migrated fusion recipes

* migrated lathe recipes

* migrated laser engraver recipes

* migrated packager recipes

* migrated forge hammer recipes

* migrated TPM recipes

* exit early and reduced indents

* migrated fluid extractor recipes

* migrated fluid solidifier recipes

* migrated electrolyzer recipes

* migrated crop processing recipes

* migrated default polymerization recipes

* migrate distillery recipes

* migrate matter amplifier recipes

* add metadata identifier for fusion ignition threshold

* migrate fuel recipes

* update bs

(cherry picked from commit c2d931c9b6caa0376e9d50591894cd849021104d)

* spotless

(cherry picked from commit 1060f5357fb95e28bfae1f052025f55dabc21a0f)

* guard against null itemstacks

* wrong translation

* fix empty arrays being accessed

* add 0 duration and 0 EU/t for fuel recipes

* fix typo in matter amplifier recipes

* spotless apply

---------

Co-authored-by: boubou19 <miisterunknown@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 77 insertions, 97 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
index c0fd11017d..b0416a0ba1 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
@@ -1,9 +1,9 @@
 package gregtech.loaders.postload.recipes;
 
-import static gregtech.api.enums.GT_Values.MOD_ID_GTPP;
+import static gregtech.api.enums.ModIDs.*;
 import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.loaders.postload.GT_MachineRecipeLoader.isEBXLLoaded;
-import static gregtech.loaders.postload.GT_MachineRecipeLoader.isRailcraftLoaded;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 import mods.railcraft.common.items.RailcraftToolItems;
@@ -12,111 +12,91 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.loaders.postload.GT_MachineRecipeLoader;
 
 public class CompressorRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_ModHandler.addCompressionRecipe(
-                getModItem(MOD_ID_GTPP, "blockRainforestOakSapling", 8, 0),
-                ItemList.IC2_Plantball.get(1));
-
-        GT_Values.RA.addCompressorRecipe(
-                ItemList.IC2_Compressed_Coal_Chunk.get(1L),
-                ItemList.IC2_Industrial_Diamond.get(1L),
-                300,
-                2);
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L),
-                GT_ModHandler.getIC2Item("Uran238", 1L));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1L),
-                GT_ModHandler.getIC2Item("Uran235", 1L));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1L),
-                GT_ModHandler.getIC2Item("Plutonium", 1L));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1L),
-                GT_ModHandler.getIC2Item("smallUran235", 1L));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1L),
-                GT_ModHandler.getIC2Item("smallPlutonium", 1L));
-        GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.ice, 2, 32767), new ItemStack(Blocks.packed_ice, 1, 0));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L),
-                new ItemStack(Blocks.ice, 1, 0));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4L),
-                getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L));
-        GT_ModHandler.addCompressionRecipe(
-                getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 10),
-                getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockQuartz", 1L));
-        GT_ModHandler.addCompressionRecipe(
-                getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 11),
-                new ItemStack(Blocks.quartz_block, 1, 0));
-        GT_ModHandler.addCompressionRecipe(
-                getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 8L, 12),
-                getModItem(GT_MachineRecipeLoader.aTextAE, "tile.BlockFluix", 1L));
-        GT_ModHandler.addCompressionRecipe(new ItemStack(Items.quartz, 4, 0), new ItemStack(Blocks.quartz_block, 1, 0));
-        // GT_ModHandler.addCompressionRecipe(new ItemStack(Items.wheat, 9, 0), new ItemStack(Blocks.hay_block, 1, 0));
-        GT_ModHandler.addCompressionRecipe(
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4L),
-                new ItemStack(Blocks.glowstone, 1));
-
-        GT_Values.RA.addCompressorRecipe(Materials.Fireclay.getDust(1), ItemList.CompressedFireclay.get(1), 80, 4);
-        GameRegistry.addSmelting(ItemList.CompressedFireclay.get(1), ItemList.Firebrick.get(1), 0);
-
-        if (isEBXLLoaded) {
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 0),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 1),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 2),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 3),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 4),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 5),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 6),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_1", 4, 7),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 0),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 1),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 2),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 3),
-                    ItemList.IC2_Plantball.get(1));
-            GT_ModHandler.addCompressionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "saplings_2", 4, 4),
-                    ItemList.IC2_Plantball.get(1));
-        }
-        if (isRailcraftLoaded) {
-            GT_Values.RA.addCompressorRecipe(RailcraftToolItems.getCoalCoke(9), EnumCube.COKE_BLOCK.getItem(), 300, 2);
+        GT_Values.RA.stdBuilder().itemInputs(getModItem(GTPlusPlus.modID, "blockRainforestOakSapling", 8, 0))
+                .itemOutputs(ItemList.IC2_Plantball.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS)
+                .eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Compressed_Coal_Chunk.get(1))
+                .itemOutputs(ItemList.IC2_Industrial_Diamond.get(1)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1))
+                .itemOutputs(GT_ModHandler.getIC2Item("Uran238", 1)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1))
+                .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1))
+                .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1))
+                .itemOutputs(GT_ModHandler.getIC2Item("smallUran235", 1)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1))
+                .itemOutputs(GT_ModHandler.getIC2Item("smallPlutonium", 1)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.ice, 2, 32767))
+                .itemOutputs(new ItemStack(Blocks.packed_ice, 1, 0)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1))
+                .itemOutputs(new ItemStack(Blocks.ice, 1, 0)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS)
+                .eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4))
+                .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)).noFluidInputs()
+                .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 10))
+                .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)).noFluidInputs()
+                .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 11))
+                .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 12))
+                .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockFluix", 1)).noFluidInputs()
+                .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.quartz, 4, 0))
+                .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes);
+
+        /*
+         * GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Items.wheat, 9, 0) ) .itemOutputs( new
+         * ItemStack(Blocks.hay_block, 1, 0) ) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) .eut(2)
+         * .addTo(sCompressorRecipes);
+         */
+
+        GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4))
+                .itemOutputs(new ItemStack(Blocks.glowstone, 1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS)
+                .eut(2).addTo(sCompressorRecipes);
+
+        GT_Values.RA.stdBuilder().itemInputs(Materials.Fireclay.getDust(1))
+                .itemOutputs(ItemList.CompressedFireclay.get(1)).noFluidInputs().noFluidOutputs().duration(4 * SECONDS)
+                .eut(4).addTo(sCompressorRecipes);
+
+        if (Railcraft.isModLoaded()) {
+            GT_Values.RA.stdBuilder().itemInputs(RailcraftToolItems.getCoalCoke(9))
+                    .itemOutputs(EnumCube.COKE_BLOCK.getItem()).noFluidInputs().noFluidOutputs().duration(15 * SECONDS)
+                    .eut(2).addTo(sCompressorRecipes);
         }
     }
 }