Rework representative recipes and category interactions (GregTechCEu#2525)

krossgg · web-flow · commit c96ae44a520a · 2024-12-10T14:01:20.000-05:00
diff --git a/gradle/scripts/moddevgradle.gradle b/gradle/scripts/moddevgradle.gradle
@@ -79,7 +79,7 @@ neoForge {
 
         data {
             data()
-            sourceSet = sourceSets.main
+            sourceSet = sourceSets.extra
             ideName = "Data Generation"
 
             gameDirectory.set(file('run/data'))
diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -2299,6 +2299,9 @@
   "gtceu.fluid_solidifier": "ɹǝıɟıpıןoS pınןℲ",
   "gtceu.forge_hammer": "ɹǝɯɯɐH ǝbɹoℲ",
   "gtceu.forming_press": "ssǝɹԀ buıɯɹoℲ",
+  "gtceu.forming_press.naming.named": "ɯǝʇI pǝɯɐNo§",
+  "gtceu.forming_press.naming.press": "ssǝɹԀ pǝɯɐNo§",
+  "gtceu.forming_press.naming.to_name": "ǝɯɐN oʇ ɯǝʇIo§",
   "gtceu.fusion_reactor": "ɹoʇɔɐǝᴚ uoısnℲ",
   "gtceu.gas_collector": "ɹoʇɔǝןןoƆ sɐ⅁",
   "gtceu.gas_turbine": "ǝuıqɹn⟘ sɐ⅁",
@@ -5063,6 +5066,7 @@
   "material.gtceu.nether_air": "ɹıⱯ ɹǝɥʇǝN",
   "material.gtceu.nether_quartz": "zʇɹɐnὉ ɹǝɥʇǝN",
   "material.gtceu.nether_star": "ɹɐʇS ɹǝɥʇǝN",
+  "material.gtceu.netherite": "ǝʇıɹǝɥʇǝN",
   "material.gtceu.netherrack": "ʞɔɐɹɹǝɥʇǝN",
   "material.gtceu.neutronium": "ɯnıuoɹʇnǝN",
   "material.gtceu.nichrome": "ǝɯoɹɥɔıN",
diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -2299,6 +2299,9 @@
   "gtceu.fluid_solidifier": "Fluid Solidifier",
   "gtceu.forge_hammer": "Forge Hammer",
   "gtceu.forming_press": "Forming Press",
+  "gtceu.forming_press.naming.named": "§oNamed Item",
+  "gtceu.forming_press.naming.press": "§oNamed Press",
+  "gtceu.forming_press.naming.to_name": "§oItem to Name",
   "gtceu.fusion_reactor": "Fusion Reactor",
   "gtceu.gas_collector": "Gas Collector",
   "gtceu.gas_turbine": "Gas Turbine",
@@ -5063,6 +5066,7 @@
   "material.gtceu.nether_air": "Nether Air",
   "material.gtceu.nether_quartz": "Nether Quartz",
   "material.gtceu.nether_star": "Nether Star",
+  "material.gtceu.netherite": "Netherite",
   "material.gtceu.netherrack": "Netherrack",
   "material.gtceu.neutronium": "Neutronium",
   "material.gtceu.nichrome": "Nichrome",
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java
@@ -122,7 +122,6 @@ public GTRecipe(GTRecipeType recipeType,
         this.duration = duration;
         this.isFuel = isFuel;
         this.recipeCategory = (recipeCategory != GTRecipeCategory.DEFAULT) ? recipeCategory : recipeType.getCategory();
-        if (id != null) this.recipeType.addToCategoryMap(this.recipeCategory, this);
     }
 
     public Map<RecipeCapability<?>, List<Content>> copyContents(Map<RecipeCapability<?>, List<Content>> contents,
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializer.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeSerializer.java
@@ -149,6 +149,8 @@ public GTRecipe fromNetwork(@NotNull ResourceLocation id, @NotNull FriendlyByteB
                 inputChanceLogics, outputChanceLogics, tickInputChanceLogics, tickOutputChanceLogics,
                 conditions, ingredientActions, data, duration, isFuel, category);
 
+        recipe.recipeCategory.addRecipe(recipe);
+
         // a little special piece of code for loading all the research entries into the recipe type's list on the
         // client.
         ResearchCondition researchCondition = conditions.stream().filter(ResearchCondition.class::isInstance).findAny()
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java
@@ -331,15 +331,14 @@ public GTRecipe toGTrecipe(ResourceLocation id, Recipe<?> recipe) {
         return GTRecipeSerializer.SERIALIZER.fromJson(id, builder.build().serializeRecipe());
     }
 
-    public @NotNull List<GTRecipe> getRepresentativeRecipes() {
-        List<GTRecipe> recipes = new ArrayList<>();
+    public void buildRepresentativeRecipes() {
         for (ICustomRecipeLogic logic : customRecipeLogicRunners) {
-            List<GTRecipe> logicRecipes = logic.getRepresentativeRecipes();
-            if (logicRecipes != null && !logicRecipes.isEmpty()) {
-                recipes.addAll(logicRecipes);
-            }
+            logic.buildRepresentativeRecipes();
         }
-        return recipes;
+    }
+
+    public void addToMainCategory(GTRecipe recipe) {
+        addToCategoryMap(category, recipe);
     }
 
     public void addToCategoryMap(GTRecipeCategory category, GTRecipe recipe) {
@@ -357,19 +356,17 @@ public Set<GTRecipe> getRecipesInCategory(GTRecipeCategory category) {
     public interface ICustomRecipeLogic {
 
         /**
-         * @return A custom recipe to run given the current Scanner's inputs. Will be called only if a registered
+         * @return A custom recipe to run given the current holder's inputs. Will be called only if a registered
          *         recipe is not found to run. Return null if no recipe should be run by your logic.
          */
         @Nullable
         GTRecipe createCustomRecipe(IRecipeCapabilityHolder holder);
 
         /**
-         * @return A list of Recipes that are never registered, but are added to JEI to demonstrate the custom logic.
-         *         Not required, can return empty or null to not add any.
+         * Build all representative recipes in this method, then add them to the appropriate recipe category.
+         * These are added to XEI to demonstrate the custom logic.
+         * Not required, can NOOP if unneeded.
          */
-        @Nullable
-        default List<GTRecipe> getRepresentativeRecipes() {
-            return null;
-        }
+        default void buildRepresentativeRecipes() {}
     }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/category/GTRecipeCategory.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/category/GTRecipeCategory.java
@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.api.recipe.category;
 
 import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
 import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
@@ -64,6 +65,10 @@ public IGuiTexture getIcon() {
         return icon;
     }
 
+    public void addRecipe(GTRecipe recipe) {
+        recipeType.addToCategoryMap(this, recipe);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookup.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookup.java
@@ -469,11 +469,11 @@ public boolean addRecipe(GTRecipe recipe) {
         if (recipe.getType() == GTRecipeTypes.COMBUSTION_GENERATOR_FUELS) {
             Content content = recipe.getInputContents(FluidRecipeCapability.CAP).get(0);
             FluidIngredient fluid = FluidRecipeCapability.CAP.of(content.content);
-            PowerlessJetpack.FUELS.put(fluid, recipe.duration);
+            PowerlessJetpack.FUELS.putIfAbsent(fluid, recipe.duration);
         }
         List<List<AbstractMapIngredient>> items = fromRecipe(recipe);
         if (recurseIngredientTreeAdd(recipe, items, lookup, 0, 0)) {
-            recipeType.addToCategoryMap(recipe.recipeCategory, recipe);
+            recipe.recipeCategory.addRecipe(recipe);
             return true;
         }
         return false;
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java
@@ -14,6 +14,7 @@
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.recipe.RecipeCondition;
+import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory;
 import com.gregtechceu.gtceu.integration.emi.recipe.GTRecipeEMICategory;
 import com.gregtechceu.gtceu.integration.jei.recipe.GTRecipeJEICategory;
 import com.gregtechceu.gtceu.integration.rei.recipe.GTRecipeREICategory;
@@ -246,12 +247,14 @@ public IEditableUI<WidgetGroup, RecipeHolder> createEditableUITemplate(final boo
                                     if (LDLib.isReiLoaded()) {
                                         ViewSearchBuilder.builder().addCategories(
                                                 recipeType.getCategories().stream()
+                                                        .filter(GTRecipeCategory::isXEIVisible)
                                                         .map(GTRecipeREICategory::machineCategory)
                                                         .collect(Collectors.toList()))
                                                 .open();
                                     } else if (LDLib.isJeiLoaded()) {
                                         JEIPlugin.jeiRuntime.getRecipesGui().showTypes(
                                                 recipeType.getCategories().stream()
+                                                        .filter(GTRecipeCategory::isXEIVisible)
                                                         .map(GTRecipeJEICategory::machineType)
                                                         .collect(Collectors.toList()));
                                     } else if (LDLib.isEmiLoaded()) {
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/FormingPressLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/FormingPressLogic.java
@@ -12,7 +12,9 @@
 import com.gregtechceu.gtceu.utils.GTStringUtils;
 
 import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -79,4 +81,22 @@ public class FormingPressLogic implements GTRecipeType.ICustomRecipeLogic {
         }
         return null;
     }
+
+    @Override
+    public void buildRepresentativeRecipes() {
+        ItemStack press = GTItems.SHAPE_MOLD_NAME.asStack();
+        press.setHoverName(Component.translatable("gtceu.forming_press.naming.press"));
+        ItemStack toName = new ItemStack(Items.NAME_TAG);
+        toName.setHoverName(Component.translatable("gtceu.forming_press.naming.to_name"));
+        ItemStack named = new ItemStack(Items.NAME_TAG);
+        named.setHoverName(Component.translatable("gtceu.forming_press.naming.named"));
+        var recipe = GTRecipeTypes.FORMING_PRESS_RECIPES.recipeBuilder("copy")
+                .notConsumable(press)
+                .inputItems(toName)
+                .outputItems(named)
+                .duration(40)
+                .EUt(4)
+                .buildRawRecipe();
+        GTRecipeTypes.FORMING_PRESS_RECIPES.addToMainCategory(recipe);
+    }
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/MachineLang.java
@@ -405,6 +405,11 @@ protected static void init(RegistrateLangProvider provider) {
         provider.add("gtceu.machine.world_accelerator.mode_tile", "Block Entity Mode");
         provider.add("gtceu.machine.world_accelerator.mode_entity", "Random Tick Mode");
 
+        // Forming Press
+        provider.add("gtceu.forming_press.naming.press", "§oNamed Press");
+        provider.add("gtceu.forming_press.naming.to_name", "§oItem to Name");
+        provider.add("gtceu.forming_press.naming.named", "§oNamed Item");
+
         // Scanner
         provider.add("gtceu.scanner.copy_stick_from", "§oStick to Copy");
         provider.add("gtceu.scanner.copy_stick_empty", "§oEmpty Stick");
diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java
@@ -20,7 +20,6 @@
 import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderIngredient;
 import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredient;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
-import com.gregtechceu.gtceu.common.data.GTRecipeCategories;
 import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
 import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour;
 import com.gregtechceu.gtceu.common.recipe.condition.*;
@@ -1267,12 +1266,11 @@ public void save(Consumer<FinishedRecipe> consumer) {
         consumer.accept(build());
     }
 
-    // Hide raw recipes
     public GTRecipe buildRawRecipe() {
         var recipe = new GTRecipe(recipeType, id.withPrefix(recipeType.registryName.getPath() + "/"),
                 input, output, tickInput, tickOutput,
                 inputChanceLogic, outputChanceLogic, tickInputChanceLogic, tickOutputChanceLogic,
-                conditions, List.of(), data, duration, isFuel, GTRecipeCategories.DUMMY);
+                conditions, List.of(), data, duration, isFuel, recipeCategory);
         return recipe;
     }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTRecipeEMICategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/recipe/GTRecipeEMICategory.java
@@ -18,7 +18,6 @@
 import dev.emi.emi.api.stack.EmiStack;
 
 import java.util.function.Function;
-import java.util.stream.Stream;
 
 public class GTRecipeEMICategory extends EmiRecipeCategory {
 
@@ -35,9 +34,9 @@ public static void registerDisplays(EmiRegistry registry) {
         for (GTRecipeCategory category : GTRegistries.RECIPE_CATEGORIES) {
             if (!category.isXEIVisible() && !Platform.isDevEnv()) continue;
             var type = category.getRecipeType();
+            if (category == type.getCategory()) type.buildRepresentativeRecipes();
             EmiRecipeCategory emiCategory = CATEGORIES.apply(category);
-            var recipes = type.getRecipesInCategory(category).stream();
-            Stream.concat(recipes, type.getRepresentativeRecipes().stream())
+            type.getRecipesInCategory(category).stream()
                     .map(recipe -> new GTEmiRecipe(recipe, emiCategory))
                     .forEach(registry::addRecipe);
         }
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
@@ -26,7 +26,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
-import java.util.stream.Stream;
 
 public class GTRecipeJEICategory extends ModularUIRecipeCategory<GTRecipeWrapper> {
 
@@ -53,8 +52,8 @@ public static void registerRecipes(IRecipeRegistration registration) {
         for (GTRecipeCategory category : GTRegistries.RECIPE_CATEGORIES) {
             if (!category.isXEIVisible() && !Platform.isDevEnv()) continue;
             var type = category.getRecipeType();
-            var recipes = type.getRecipesInCategory(category).stream();
-            var wrapped = Stream.concat(recipes, type.getRepresentativeRecipes().stream())
+            if (category == type.getCategory()) type.buildRepresentativeRecipes();
+            var wrapped = type.getRecipesInCategory(category).stream()
                     .map(GTRecipeWrapper::new)
                     .toList();
             registration.addRecipes(TYPES.apply(category), wrapped);
diff --git a/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeREICategory.java b/src/main/java/com/gregtechceu/gtceu/integration/rei/recipe/GTRecipeREICategory.java
@@ -24,7 +24,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Function;
-import java.util.stream.Stream;
 
 public class GTRecipeREICategory extends ModularUIDisplayCategory<GTRecipeDisplay> {
 
@@ -49,9 +48,9 @@ public static void registerDisplays(DisplayRegistry registry) {
         for (GTRecipeCategory category : GTRegistries.RECIPE_CATEGORIES) {
             if (!category.isXEIVisible() && !Platform.isDevEnv()) continue;
             var type = category.getRecipeType();
-            var recipes = type.getRecipesInCategory(category).stream();
+            if (category == type.getCategory()) type.buildRepresentativeRecipes();
             var identifier = CATEGORIES.apply(category);
-            Stream.concat(recipes, type.getRepresentativeRecipes().stream())
+            type.getRecipesInCategory(category).stream()
                     .map(r -> new GTRecipeDisplay(r, identifier))
                     .forEach(registry::add);
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java b/src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java
@@ -27,8 +27,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.function.Consumer;
 
 public final class ResearchManager {
@@ -194,25 +192,26 @@ private GTRecipe createDataRecipe(@NotNull ItemStack first, @NotNull ItemStack s
                     .inputItems(first)
                     .notConsumable(second)
                     .outputItems(output)
-                    .duration(DURATION).EUt(EUT).buildRawRecipe();
+                    .duration(DURATION).EUt(EUT)
+                    .buildRawRecipe();
         }
 
-        @Nullable
         @Override
-        public List<GTRecipe> getRepresentativeRecipes() {
+        public void buildRepresentativeRecipes() {
             ItemStack copiedStick = GTItems.TOOL_DATA_STICK.asStack();
             copiedStick.setHoverName(Component.translatable("gtceu.scanner.copy_stick_from"));
             ItemStack emptyStick = GTItems.TOOL_DATA_STICK.asStack();
             emptyStick.setHoverName(Component.translatable("gtceu.scanner.copy_stick_empty"));
             ItemStack resultStick = GTItems.TOOL_DATA_STICK.asStack();
             resultStick.setHoverName(Component.translatable("gtceu.scanner.copy_stick_to"));
-            return Collections.singletonList(
-                    GTRecipeTypes.SCANNER_RECIPES.recipeBuilder("copy_" + GTStringUtils.itemStackToString(copiedStick))
-                            .inputItems(emptyStick)
-                            .notConsumable(copiedStick)
-                            .outputItems(resultStick)
-                            .duration(DURATION).EUt(EUT)
-                            .buildRawRecipe());
+            var recipe = GTRecipeTypes.SCANNER_RECIPES
+                    .recipeBuilder("copy_" + GTStringUtils.itemStackToString(copiedStick))
+                    .inputItems(emptyStick)
+                    .notConsumable(copiedStick)
+                    .outputItems(resultStick)
+                    .duration(DURATION).EUt(EUT)
+                    .buildRawRecipe();
+            GTRecipeTypes.SCANNER_RECIPES.addToMainCategory(recipe);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,6 @@ public GTRecipe(GTRecipeType recipeType,`
`122`	`122`	`this.duration = duration;`
`123`	`123`	`this.isFuel = isFuel;`
`124`	`124`	`this.recipeCategory = (recipeCategory != GTRecipeCategory.DEFAULT) ? recipeCategory : recipeType.getCategory();`
`125`		`- if (id != null) this.recipeType.addToCategoryMap(this.recipeCategory, this);`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`public Map<RecipeCapability<?>, List<Content>> copyContents(Map<RecipeCapability<?>, List<Content>> contents,`
Original file line number	Diff line number	Diff line change
`@@ -469,11 +469,11 @@ public boolean addRecipe(GTRecipe recipe) {`
`469`	`469`	`if (recipe.getType() == GTRecipeTypes.COMBUSTION_GENERATOR_FUELS) {`
`470`	`470`	`Content content = recipe.getInputContents(FluidRecipeCapability.CAP).get(0);`
`471`	`471`	`FluidIngredient fluid = FluidRecipeCapability.CAP.of(content.content);`
`472`		`- PowerlessJetpack.FUELS.put(fluid, recipe.duration);`
	`472`	`+ PowerlessJetpack.FUELS.putIfAbsent(fluid, recipe.duration);`
`473`	`473`	`}`
`474`	`474`	`List<List<AbstractMapIngredient>> items = fromRecipe(recipe);`
`475`	`475`	`if (recurseIngredientTreeAdd(recipe, items, lookup, 0, 0)) {`
`476`		`- recipeType.addToCategoryMap(recipe.recipeCategory, recipe);`
	`476`	`+ recipe.recipeCategory.addRecipe(recipe);`
`477`	`477`	`return true;`
`478`	`478`	`}`
`479`	`479`	`return false;`