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, 19 insertions, 119 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
index a63029db3e..f07af970f3 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
@@ -1,144 +1,44 @@
 package gregtech.loaders.postload.recipes;
 
-import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.loaders.postload.GT_MachineRecipeLoader.isEBXLLoaded;
+import static gregtech.api.util.GT_ModHandler.getIC2Item;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
+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 ExtractorRecipes implements Runnable {
 
     @Override
     public void run() {
-        GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.bookshelf, 1, 32767), new ItemStack(Items.book, 3, 0));
-        GT_ModHandler.addExtractionRecipe(
+        addExtractionRecipe(new ItemStack(Blocks.bookshelf, 1, WILDCARD), new ItemStack(Items.book, 3, 0));
+        addExtractionRecipe(
                 new ItemStack(Items.slime_ball, 1),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 2L));
-        GT_ModHandler.addExtractionRecipe(
+        addExtractionRecipe(
                 ItemList.IC2_Resin.get(1L),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L));
-        GT_ModHandler.addExtractionRecipe(
-                GT_ModHandler.getIC2Item("rubberSapling", 1L),
+        addExtractionRecipe(
+                getIC2Item("rubberSapling", 1L),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
-        GT_ModHandler.addExtractionRecipe(
-                GT_ModHandler.getIC2Item("rubberLeaves", 16L),
+        addExtractionRecipe(
+                getIC2Item("rubberLeaves", 16L),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
-        GT_ModHandler.addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L));
-        if (isEBXLLoaded) {
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "waterplant1", 1, 0),
-                    new ItemStack(Items.dye, 4, 2));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "vines", 1, 0),
-                    new ItemStack(Items.dye, 4, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 11),
-                    new ItemStack(Items.dye, 4, 11));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 10),
-                    new ItemStack(Items.dye, 4, 5));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 9),
-                    new ItemStack(Items.dye, 4, 14));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 8),
-                    new ItemStack(Items.dye, 4, 14));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 7),
-                    new ItemStack(Items.dye, 4, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 6),
-                    new ItemStack(Items.dye, 4, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 5),
-                    new ItemStack(Items.dye, 4, 11));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 0),
-                    new ItemStack(Items.dye, 4, 9));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 4),
-                    new ItemStack(Items.dye, 4, 11));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 3),
-                    new ItemStack(Items.dye, 4, 13));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 3),
-                    new ItemStack(Items.dye, 4, 5));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 2),
-                    new ItemStack(Items.dye, 4, 5));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 1),
-                    new ItemStack(Items.dye, 4, 12));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 15),
-                    new ItemStack(Items.dye, 4, 11));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 14),
-                    new ItemStack(Items.dye, 4, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 13),
-                    new ItemStack(Items.dye, 4, 9));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 12),
-                    new ItemStack(Items.dye, 4, 14));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 11),
-                    new ItemStack(Items.dye, 4, 7));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 7),
-                    new ItemStack(Items.dye, 4, 7));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 2),
-                    new ItemStack(Items.dye, 4, 11));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 13),
-                    new ItemStack(Items.dye, 4, 6));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 6),
-                    new ItemStack(Items.dye, 4, 12));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 5),
-                    new ItemStack(Items.dye, 4, 10));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 2),
-                    new ItemStack(Items.dye, 4, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 1),
-                    new ItemStack(Items.dye, 4, 9));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 0),
-                    new ItemStack(Items.dye, 4, 13));
 
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 7),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 0));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 1),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower3", 1, 12),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 4),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 1));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower1", 1, 6),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 2));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 8),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 3));
-            GT_ModHandler.addExtractionRecipe(
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "flower2", 1, 3),
-                    getModItem(GT_MachineRecipeLoader.aTextEBXL, "extrabiomes.dye", 1, 3));
-        }
+        addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L));
+    }
+
+    public void addExtractionRecipe(ItemStack input, ItemStack output) {
+        output = GT_OreDictUnificator.get(true, output);
+        GT_Values.RA.stdBuilder().itemInputs(input).itemOutputs(output).noFluidInputs().noFluidOutputs()
+                .duration(15 * SECONDS).eut(2).addTo(sExtractorRecipes);
     }
 }