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, 20 insertions, 20 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
index 230dcad61a..80a34561e6 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java
@@ -2,8 +2,8 @@ package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.BuildCraftSilicon;
+import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
 import static gregtech.api.util.GT_ModHandler.getModItem;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
@@ -30,7 +30,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -39,7 +39,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -48,7 +48,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 2))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -57,7 +57,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 3))
                 .duration(5 * SECONDS)
                 .eut(TierEU.RECIPE_HV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -66,7 +66,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 2L, 4))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -75,7 +75,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 5))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -84,7 +84,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 6))
                 .duration(15 * SECONDS)
                 .eut(TierEU.RECIPE_MV)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
         }
 
         if (AppliedEnergistics2.isModLoaded()) {
@@ -95,7 +95,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16))
                 .duration(10 * SECONDS)
                 .eut(16)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -104,7 +104,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16))
                 .duration(10 * SECONDS)
                 .eut(16)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -113,7 +113,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17))
                 .duration(10 * SECONDS)
                 .eut(16)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -122,7 +122,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18))
                 .duration(10 * SECONDS)
                 .eut(16)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -131,7 +131,7 @@ public class FormingPressRecipes implements Runnable {
                 .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20))
                 .duration(10 * SECONDS)
                 .eut(16)
-                .addTo(sPressRecipes);
+                .addTo(formingPressRecipes);
         }
 
         GT_Values.RA.stdBuilder()
@@ -139,14 +139,14 @@ public class FormingPressRecipes implements Runnable {
             .itemOutputs(ItemList.Food_Raw_Cake.get(1L))
             .duration(19 * SECONDS + 4 * TICKS)
             .eut(4)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L))
             .itemOutputs(ItemList.Arrow_Head_Glass_Emtpy.get(1L))
             .duration(3 * SECONDS + 4 * TICKS)
             .eut(4)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -155,7 +155,7 @@ public class FormingPressRecipes implements Runnable {
             .itemOutputs(ItemList.Credit_Greg_Cupronickel.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -164,7 +164,7 @@ public class FormingPressRecipes implements Runnable {
             .itemOutputs(ItemList.Coin_Doge.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -173,7 +173,7 @@ public class FormingPressRecipes implements Runnable {
             .itemOutputs(ItemList.Credit_Iron.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -182,7 +182,7 @@ public class FormingPressRecipes implements Runnable {
             .itemOutputs(ItemList.Credit_Iron.get(4L))
             .duration(5 * SECONDS)
             .eut(16)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -191,6 +191,6 @@ public class FormingPressRecipes implements Runnable {
             .itemOutputs(new ItemStack(Items.brick, 1, 0))
             .duration(5 * SECONDS)
             .eut(16)
-            .addTo(sPressRecipes);
+            .addTo(formingPressRecipes);
     }
 }