Refactor RecipeMap (#2345)

* Remove deprecated and unused things

* Move recipemap subclasses

* Move GT_Recipe_Map to outside and rename to RecipeMap

* Move recipemap instances to separated class & remove prepending s

* Remove useless GT_Recipe constructors

* Always use ModularUI

* Rename IGT_RecipeMap -> IRecipeMap

* Add RecipeMapBuilder

* Remove more deprecated and unused things

* Fix RecipeMap type parameters

* Use multimap for recipe index

* Fix bending recipe error in dev env

* Remove mUniqueIdentifier

* Update AE2FC

* Less edgy texture for NEI recipe background

* Add replicator fluid output slot for NEI and machine GUI

* Fix fluid fuels not having fuel value in large boilers

* Remove GT_RectHandler and NEI_TransferRectHost

* Remove RecipeMapHandler

* Move NEI energy description from RecipeMapFrontend to Power

* Refactor the way to filter fusion recipes

* Check restriction for some properties

* Remove showVoltageAmperage

* Make Power accept GT_Recipe

* Fix NPE

* Move NEI duration description to Power from Frontend

* Directly implement IRecipeProcessingAwareHatch for GT_MetaTileEntity_Hatch_InputBus_ME

* Make Power integrated with GT_OverclockCalculator

* Rename Power -> OverclockDescriber

* Don't modify recipe find logic until postload finishes

* Reformat reserved MTE ids

* Fix check for too few inputs on recipe addition

* Move replicator logic to backend

* Stop un-hiding assline recipes

* Allow setting custom recipe comparator & implement for fusion

* Update AE2FC

* Rename getRecipeList and getRecipes -> getRecipeMap

* Automatically register recipe catalysts

* Cleanup the way to detect recipe collision

* Make use of BasicUIProperties for basic machines

* Make use of BasicUIProperties for UIHelper

* Rename specialHandler -> recipeTransformer

* Add way to automatically register handler info

* Add recipe category

* Add some APIs for addons

* Rename blastRecipes ->
blastFurnaceRecipes

* Remove GT_MetaTileEntity_BasicMachine_GT_Recipe#mSharedTank and #mRequiresFluidForFiltering

* Don't require setting duration and EU/t for fuel recipes

* Don't require setting EU/t for primitive blast furnace recipes

* Revert change to addMultiblockChemicalRecipe

* Fix large boiler general desc recipe not being added

* Hide duration and EU/t from large boiler

* Cleanup recipe stacktrace draw

* Extend metadata usage of recipe builder to recipe itself

* Implement metadata handling & NEI comparator for PCB factory

* Some rename around NEIRecipeInfo

* Some toString implementations

* Add more APIs for addons & some rename

* Infer handler icon from recipe catalyst if one is not set

* Also shrink recipe title when OC is not used

* Remove rare earth centrifuge recipe

* Use metadata for replicator backend

* Adjust geothermal generator output slot

* Allow having multiple transferrects

* Store recipemap reference in backend

* Rename vacuumRecipes -> vacuumFreezerRecipes

* Add config to tweak visibility of recipe categories

* Remove mHideRecyclingRecipes in favor of recipe category config

* Fix typo fluidSolidfierRecipes -> fluidSolidifierRecipes

* Refactor findRecipe and ProcessingLogic to use Stream

* Fix BBF handler icon & remove bronze blast furnace

* Add fluent API for findRecipe

* Add way to stop adding progressbar

* Change arg order for special texture

* Avoid overwriting interesting failure with NO_RECIPE

* Some changes for FuelBackend

* Set space project icon

* Remove localization from TT

* Remove CNC recipe adder

* Move recipe extractor from AE2FC

* Minor internal change for ProcessingLogic#applyRecipe

* More javadoc on #getAvailableRecipeMaps

* Better implementation of #ofSupplier

* Move replicator exponent config to GT_Proxy

* Remove RC & IC2 macerator handling

* Rename StreamUtil -> GT_StreamUtil

* Refactor code around RecipeMetadataStorage

* Revise #compileRecipe javadoc

* Switch extreme diesel recipe loader to downstream recipe map

* Optimize #reMap

* Rename reload -> reloadNEICache

* Minor tweak for drawEnergyInfo

* a bit more doc

* Adjust recipe catalysts

* Add toString implementation for GT_Fluid for debug

* Minor revision for OilCrackerBackend

* Index replicator recipes by material

---------

Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>

1 files changed, 41 insertions, 41 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
index d05c709802..8ca67db192 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java
@@ -1,8 +1,8 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.BuildCraftTransport;
+import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
@@ -32,7 +32,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.FryingOilHot.getFluid(10))
             .duration(16 * TICKS)
             .eut(4)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_ModHandler.getIC2Item("dynamite", 1))
@@ -40,7 +40,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Glue.getFluid(10))
             .duration(16 * TICKS)
             .eut(4)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1))
@@ -48,7 +48,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Concrete.getMolten(144))
             .duration(10 * SECONDS)
             .eut(4)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1))
@@ -56,7 +56,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Water.getFluid(125))
             .duration(12 * TICKS)
             .eut(4)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         // paper creation recipes
         ItemStack[] paperSources = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L),
@@ -68,7 +68,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Water.getFluid(100))
                 .duration(10 * SECONDS)
                 .eut(4)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(paperSource)
@@ -76,7 +76,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(GT_ModHandler.getDistilledWater(100))
                 .duration(10 * SECONDS)
                 .eut(4)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
 
         GT_Values.RA.stdBuilder()
@@ -85,7 +85,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(GT_ModHandler.getDistilledWater(125))
             .duration(12 * TICKS)
             .eut(4)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         for (int i = 1; i < 16; i++) {
             // wool cleaning recipes
@@ -95,7 +95,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Chlorine.getGas(50))
                 .duration(20 * SECONDS)
                 .eut(2)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             // carpet cleaning recipes
             GT_Values.RA.stdBuilder()
@@ -104,7 +104,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Chlorine.getGas(25))
                 .duration(20 * SECONDS)
                 .eut(2)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
 
         // stained hardened clay cleaning
@@ -114,7 +114,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Chlorine.getGas(50))
             .duration(20 * SECONDS)
             .eut(2)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         // stained glass cleaning
         GT_Values.RA.stdBuilder()
@@ -123,7 +123,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Chlorine.getGas(50))
             .duration(20 * SECONDS)
             .eut(2)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         // stained glass pane cleaning
         GT_Values.RA.stdBuilder()
@@ -132,7 +132,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Chlorine.getGas(20))
             .duration(20 * SECONDS)
             .eut(2)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         // light -> dark concrete recipes
         for (int i = 0; i < 8; i++) {
@@ -142,7 +142,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Water.getFluid(250))
                 .duration(10 * SECONDS)
                 .eut(4)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8))
@@ -150,7 +150,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(GT_ModHandler.getDistilledWater(250))
                 .duration(10 * SECONDS)
                 .eut(4)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
 
         // reinforced blocks
@@ -161,7 +161,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Concrete.getMolten(144))
                 .duration(10 * SECONDS)
                 .eut(4)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1))
@@ -169,7 +169,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Steel.getMolten(288))
                 .duration(12 * SECONDS + 10 * TICKS)
                 .eut(16)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1))
@@ -177,7 +177,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Titanium.getMolten(144))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_LV)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
@@ -185,7 +185,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.TungstenSteel.getMolten(144))
                 .duration(17 * SECONDS + 10 * TICKS)
                 .eut(64)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1))
@@ -193,7 +193,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Iridium.getMolten(144))
                 .duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1))
@@ -201,7 +201,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Osmium.getMolten(144))
                 .duration(22 * SECONDS + 10 * TICKS)
                 .eut(256)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1))
@@ -209,7 +209,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Naquadria.getMolten(144))
                 .duration(25 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1))
@@ -217,7 +217,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Materials.Concrete.getMolten(144))
                 .duration(10 * SECONDS)
                 .eut(4)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
 
         for (int j = 0; j < Dyes.dyeRed.getSizeOfFluidList(); j++) {
@@ -227,7 +227,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(16)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
         for (int j = 0; j < Dyes.dyeBlue.getSizeOfFluidList(); j++) {
             GT_Values.RA.stdBuilder()
@@ -236,7 +236,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(16)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
         for (int j = 0; j < Dyes.dyeGreen.getSizeOfFluidList(); j++) {
             GT_Values.RA.stdBuilder()
@@ -245,7 +245,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(16)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
         for (int j = 0; j < Dyes.dyeYellow.getSizeOfFluidList(); j++) {
             GT_Values.RA.stdBuilder()
@@ -254,7 +254,7 @@ public class ChemicalBathRecipes implements Runnable {
                 .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72))
                 .duration(1 * SECONDS + 12 * TICKS)
                 .eut(16)
-                .addTo(sChemicalBathRecipes);
+                .addTo(chemicalBathRecipes);
         }
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) {
@@ -265,7 +265,7 @@ public class ChemicalBathRecipes implements Runnable {
                         .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 72))
                         .duration(3 * SECONDS + 4 * TICKS)
                         .eut(2)
-                        .addTo(sChemicalBathRecipes);
+                        .addTo(chemicalBathRecipes);
                 }
 
                 GT_Values.RA.stdBuilder()
@@ -274,7 +274,7 @@ public class ChemicalBathRecipes implements Runnable {
                     .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18))
                     .duration(3 * SECONDS + 4 * TICKS)
                     .eut(2)
-                    .addTo(sChemicalBathRecipes);
+                    .addTo(chemicalBathRecipes);
 
                 GT_Values.RA.stdBuilder()
                     .itemInputs(new ItemStack(Blocks.hardened_clay, 1, 0))
@@ -282,7 +282,7 @@ public class ChemicalBathRecipes implements Runnable {
                     .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18))
                     .duration(3 * SECONDS + 4 * TICKS)
                     .eut(2)
-                    .addTo(sChemicalBathRecipes);
+                    .addTo(chemicalBathRecipes);
             }
         }
 
@@ -293,7 +293,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Radon.getGas(250))
             .duration(24 * SECONDS)
             .eut(384)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1))
@@ -301,7 +301,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.Radon.getGas(1250))
             .duration(1 * MINUTES + 36 * SECONDS)
             .eut(384)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(ItemList.WovenKevlar.get(1))
@@ -309,7 +309,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000))
             .duration(60 * SECONDS)
             .eut(TierEU.RECIPE_LV)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         // Na + H2O = NaOH + H
         GT_Values.RA.stdBuilder()
@@ -319,7 +319,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidOutputs(Materials.Hydrogen.getGas(1000))
             .duration(5 * SECONDS)
             .eut(4)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         // Custom Sodium Persulfate Ore Processing Recipes
 
@@ -333,7 +333,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Pyrolusite, 1))
             .itemOutputs(
@@ -344,7 +344,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Quartzite, 1))
             .itemOutputs(
@@ -355,7 +355,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.CertusQuartz, 1))
             .itemOutputs(
@@ -366,7 +366,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 1))
             .itemOutputs(
@@ -377,7 +377,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Thorium, 1))
             .itemOutputs(
@@ -388,7 +388,7 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Stibnite, 1))
             .itemOutputs(
@@ -399,6 +399,6 @@ public class ChemicalBathRecipes implements Runnable {
             .fluidInputs(Materials.SodiumPersulfate.getFluid(100))
             .duration(40 * SECONDS)
             .eut(8)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
     }
 }