From b6caaf255da083516286321155ef339b60a07393 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Mon, 4 Dec 2023 06:26:09 +0900
Subject: Migrate to new RecipeMap (#788)

* Remove reference to GTPP_Recipe itself

* Remove GTPP_Recipe_Map_Internal

* Move recipemaps to separated class

* Remove unused recipemaps

* Migrate GT++ recipemaps
Remove sElementalDuplicatorRecipes in favor of GT replicatorRecipes supporting findRecipe

* Migrate the rest

* Adjust catalyst priorities

* Add ABS non-alloy recipe category

* Remove s prefixes from recipemaps

* Adapt to GT_StreamUtil rename

* Adjust recipe catalysts

* Fix build

* update gradle+bs+deps

(cherry picked from commit 8b185c7a4d881d38580cc98456265ebb751b6d93)

* update deps

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java    | 4 ++--
 .../gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/forestry/bees/items')

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
index ca48825dd2..e98eddbc4f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import java.util.List;
@@ -118,7 +118,7 @@ public class GTPP_Drop extends Item {
             return false;
         }
         GT_Values.RA.stdBuilder().itemInputs(tDrop).fluidOutputs(aOutput).duration(aDuration * TICKS).eut(aEUt)
-                .addTo(sFluidExtractionRecipes);
+                .addTo(fluidExtractionRecipes);
         return true;
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
index a8dd9a88d9..e8bb3aac7e 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes;
+import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
 import java.util.List;
@@ -97,7 +97,7 @@ public class GTPP_Propolis extends Item {
             return false;
         }
         GT_Values.RA.stdBuilder().itemInputs(tDrop).itemOutputs(aOutput).outputChances(aChance)
-                .duration(aDuration * TICKS).eut(aEUt).addTo(sExtractorRecipes);
+                .duration(aDuration * TICKS).eut(aEUt).addTo(extractorRecipes);
         return true;
     }
 }
-- 
cgit