Add a struct for research data to replace the generic pair (#3209)

Author: screret

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java

@@ -49,7 +49,6 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 
-import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.objects.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -410,14 +409,14 @@ private Object2IntMap<ItemStack> getIngredientStacks(IRecipeCapabilityHolder hol
         if (io == IO.OUT && recipe.recipeType.isScanner()) {
             scannerPossibilities = new ArrayList<>();
             // Scanner Output replacing, used for cycling research outputs
-            Pair<GTRecipeType, String> researchData = null;
+            ResearchManager.ResearchItem researchData = null;
             for (Content stack : recipe.getOutputContents(ItemRecipeCapability.CAP)) {
                 researchData = ResearchManager.readResearchId(ItemRecipeCapability.CAP.of(stack.content).getItems()[0]);
                 if (researchData != null) break;
             }
             if (researchData != null) {
-                Collection<GTRecipe> possibleRecipes = researchData.getFirst()
-                        .getDataStickEntry(researchData.getSecond());
+                Collection<GTRecipe> possibleRecipes = researchData.recipeType()
+                        .getDataStickEntry(researchData.researchId());
                 Set<ItemStack> cache = new ObjectOpenCustomHashSet<>(ItemStackHashStrategy.comparingItem());
                 if (possibleRecipes != null) {
                     for (GTRecipe r : possibleRecipes) {

src/main/java/com/gregtechceu/gtceu/common/item/DataItemBehavior.java

@@ -7,7 +7,6 @@
 import com.gregtechceu.gtceu.api.item.component.IInteractionItem;
 import com.gregtechceu.gtceu.api.machine.feature.IDataStickInteractable;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
-import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.common.machine.owner.MachineOwner;
 import com.gregtechceu.gtceu.utils.ResearchManager;
 
@@ -20,7 +19,6 @@
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 
-import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.jetbrains.annotations.Nullable;
 
@@ -47,7 +45,7 @@ public boolean requireDataBank() {
     @Override
     public void appendHoverText(ItemStack stack, @Nullable Level level, List<Component> tooltipComponents,
                                 TooltipFlag isAdvanced) {
-        Pair<GTRecipeType, String> researchData = ResearchManager.readResearchId(stack);
+        ResearchManager.ResearchItem researchData = ResearchManager.readResearchId(stack);
         if (researchData == null) {
             if (stack.getOrCreateTag().contains("pos", Tag.TAG_INT_ARRAY) && stack.hasTag()) {
                 int[] posArray = stack.getOrCreateTag().getIntArray("pos");
@@ -58,7 +56,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List<Compone
                         Component.literal("" + posArray[2]).withStyle(ChatFormatting.LIGHT_PURPLE)));
             }
         } else {
-            Collection<GTRecipe> recipes = researchData.getFirst().getDataStickEntry(researchData.getSecond());
+            Collection<GTRecipe> recipes = researchData.recipeType().getDataStickEntry(researchData.researchId());
             if (recipes != null && !recipes.isEmpty()) {
                 tooltipComponents.add(Component.translatable("behavior.data_item.assemblyline.title"));
                 Collection<ItemStack> added = new ObjectOpenHashSet<>();

src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java

@@ -14,7 +14,6 @@
 import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
-import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.common.item.PortableScannerBehavior;
 import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.DataBankMachine;
 import com.gregtechceu.gtceu.common.recipe.condition.ResearchCondition;
@@ -33,7 +32,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.BlockHitResult;
 
-import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import lombok.Getter;
@@ -123,10 +121,11 @@ private void rebuildData(boolean isDataBank) {
         recipes.clear();
         for (int i = 0; i < this.importItems.getSlots(); i++) {
             ItemStack stack = this.importItems.getStackInSlot(i);
-            Pair<GTRecipeType, String> researchData = ResearchManager.readResearchId(stack);
+            ResearchManager.ResearchItem researchData = ResearchManager.readResearchId(stack);
             boolean isValid = ResearchManager.isStackDataItem(stack, isDataBank);
             if (researchData != null && isValid) {
-                Collection<GTRecipe> collection = researchData.getFirst().getDataStickEntry(researchData.getSecond());
+                Collection<GTRecipe> collection = researchData.recipeType()
+                        .getDataStickEntry(researchData.researchId());
                 if (collection != null) {
                     recipes.addAll(collection);
                 }

src/main/java/com/gregtechceu/gtceu/core/mixins/GuiGraphicsMixin.java

@@ -2,7 +2,6 @@
 
 import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
-import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.utils.ResearchManager;
 
 import net.minecraft.client.gui.GuiGraphics;
@@ -11,7 +10,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 
-import com.mojang.datafixers.util.Pair;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -40,13 +38,13 @@ private void renderItem(@Nullable LivingEntity entity, @Nullable Level level, It
             cancellable = true)
     protected void gtceu$renderItem(@Nullable LivingEntity livingEntity, @Nullable Level level, ItemStack stack,
                                     int x, int y, int seed, int z, CallbackInfo ci) {
-        if (GTCEU$OVERRIDING_FOR.get() != null) {
+        if (GTCEU$OVERRIDING_FOR.get() != null || !Screen.hasShiftDown()) {
             return;
         }
 
-        Pair<GTRecipeType, String> researchData = ResearchManager.readResearchId(stack);
-        if (Screen.hasShiftDown() && researchData != null) {
-            Collection<GTRecipe> recipes = researchData.getFirst().getDataStickEntry(researchData.getSecond());
+        ResearchManager.ResearchItem researchData = ResearchManager.readResearchId(stack);
+        if (researchData != null) {
+            Collection<GTRecipe> recipes = researchData.recipeType().getDataStickEntry(researchData.researchId());
             if (recipes != null && !recipes.isEmpty()) {
                 for (var recipe : recipes) {
                     ItemStack output = ItemRecipeCapability.CAP

src/main/java/com/gregtechceu/gtceu/utils/ResearchManager.java

@@ -16,14 +16,15 @@
 
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 
-import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -67,16 +68,12 @@ public static void writeResearchToNBT(@NotNull CompoundTag stackCompound, @NotNu
      * @return the research id
      */
     @Nullable
-    public static Pair<GTRecipeType, String> readResearchId(@NotNull ItemStack stack) {
+    public static ResearchItem readResearchId(@NotNull ItemStack stack) {
         CompoundTag compound = stack.getTag();
         if (!hasResearchTag(compound)) return null;
 
         CompoundTag researchCompound = compound.getCompound(RESEARCH_NBT_TAG);
-        String researchId = researchCompound.getString(RESEARCH_ID_NBT_TAG);
-        ResourceLocation researchRecipeType = ResourceLocation
-                .tryParse(researchCompound.getString(RESEARCH_TYPE_NBT_TAG));
-        return researchId.isEmpty() || researchRecipeType == null ? null :
-                Pair.of(GTRegistries.RECIPE_TYPES.get(researchRecipeType), researchId);
+        return ResearchItem.CODEC.parse(NbtOps.INSTANCE, researchCompound).result().orElse(null);
     }
 
     /**
@@ -156,6 +153,16 @@ public static void createDefaultResearchRecipe(@NotNull GTRecipeType recipeType,
         }
     }
 
+    public record ResearchItem(@NotNull String researchId, @NotNull GTRecipeType recipeType) {
+
+        // spotless:off
+        public static final Codec<ResearchItem> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+                Codec.STRING.fieldOf("research_id").forGetter(ResearchItem::researchId),
+                GTRegistries.RECIPE_TYPES.codec().fieldOf("research_type").forGetter(ResearchItem::recipeType)
+        ).apply(instance, ResearchItem::new));
+        // spotless:on
+    }
+
     public static class DataStickCopyScannerLogic implements GTRecipeType.ICustomRecipeLogic {
 
         private static final int EUT = 2;