Lazily construct GTRecipeWrappers in JEI recipe category

GregTechCEu · Jan 11, 2025 · 144fd03 · 144fd03
1 parent 2472c9c
commit 144fd03
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeJEICategory.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/recipe/GTRecipeJEICategory.java
@@ -2,6 +2,7 @@
 
 import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.machine.MachineDefinition;
+import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
@@ -25,12 +26,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.function.Function;
 
-public class GTRecipeJEICategory extends ModularUIRecipeCategory<GTRecipeWrapper> {
+public class GTRecipeJEICategory extends ModularUIRecipeCategory<GTRecipe> {
 
-    public static final Function<GTRecipeCategory, RecipeType<GTRecipeWrapper>> TYPES = Util
-            .memoize(c -> new RecipeType<>(c.registryKey, GTRecipeWrapper.class));
+    public static final Function<GTRecipeCategory, RecipeType<GTRecipe>> TYPES = Util
+            .memoize(c -> new RecipeType<>(c.registryKey, GTRecipe.class));
 
     private final GTRecipeCategory category;
     @Getter
@@ -40,6 +42,7 @@ public class GTRecipeJEICategory extends ModularUIRecipeCategory<GTRecipeWrapper
 
     public GTRecipeJEICategory(IJeiHelpers helpers,
                                @NotNull GTRecipeCategory category) {
+        super(GTRecipeWrapper::new);
         this.category = category;
         var recipeType = category.getRecipeType();
         IGuiHelper guiHelper = helpers.getGuiHelper();
@@ -53,9 +56,7 @@ public static void registerRecipes(IRecipeRegistration registration) {
             if (!category.shouldRegisterDisplays()) continue;
             var type = category.getRecipeType();
             if (category == type.getCategory()) type.buildRepresentativeRecipes();
-            var wrapped = type.getRecipesInCategory(category).stream()
-                    .map(GTRecipeWrapper::new)
-                    .toList();
+            var wrapped = List.copyOf(type.getRecipesInCategory(category));
             registration.addRecipes(TYPES.apply(category), wrapped);
         }
     }
@@ -80,7 +81,7 @@ public static RecipeType<?> machineType(GTRecipeCategory category) {
 
     @Override
     @NotNull
-    public RecipeType<GTRecipeWrapper> getRecipeType() {
+    public RecipeType<GTRecipe> getRecipeType() {
         return TYPES.apply(category);
     }
 
@@ -91,7 +92,7 @@ public Component getTitle() {
     }
 
     @Override
-    public @Nullable ResourceLocation getRegistryName(@NotNull GTRecipeWrapper wrapper) {
-        return wrapper.recipe.id;
+    public @Nullable ResourceLocation getRegistryName(@NotNull GTRecipe recipe) {
+        return recipe.id;
     }
 }