Only take into account changed components when creating a data component ingredient

Author: pupnewfster

src/api/java/mekanism/api/recipes/ingredients/creator/IItemStackIngredientCreator.java

@@ -1,9 +1,13 @@
 package mekanism.api.recipes.ingredients.creator;
 
+import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.recipes.ingredients.ItemStackIngredient;
 import net.minecraft.core.Holder;
+import net.minecraft.core.component.DataComponentPredicate;
+import net.minecraft.core.component.DataComponentType;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -37,8 +41,17 @@ default ItemStackIngredient from(ItemStack stack, int amount) {
         stack = stack.copy();
         //Support Components that are on the stack in case it matters
         // Note: Only bother making it a data component ingredient if the stack has data, otherwise there is no point in doing the extra checks
-        if (!stack.getComponentsPatch().isEmpty()) {
-            return from(DataComponentIngredient.of(false, stack), amount);
+        if (!stack.isComponentsPatchEmpty()) {
+            DataComponentPredicate.Builder builder = DataComponentPredicate.builder();
+            for (Map.Entry<DataComponentType<?>, Optional<?>> entry : stack.getComponentsPatch().entrySet()) {
+                Optional<?> value = entry.getValue();
+                //Note: We only add if the value is added, we don't check ones that have been removed from default, as that isn't easily feasible
+                if (value.isPresent()) {
+                    //noinspection rawtypes,unchecked
+                    builder.expect((DataComponentType) entry.getKey(), value);
+                }
+            }
+            return from(DataComponentIngredient.of(false, builder.build(), stack.getItemHolder()), amount);
         }
         return from(Ingredient.of(stack), amount);
     }

src/main/java/mekanism/client/recipe_viewer/jei/MekanismJEI.java

@@ -153,7 +153,7 @@ public static RecipeType<?>[] recipeType(IRecipeViewerRecipeType<?>... recipeTyp
 
     private static final IIngredientSubtypeInterpreter<ItemStack> MEKANISM_NBT_INTERPRETER = (stack, context) -> {
         //TODO - 1.20.5: Re-evaluate if we want the components check or if it should check it slightly differently?
-        if (context == UidContext.Ingredient && !stack.getComponentsPatch().isEmpty()) {
+        if (context == UidContext.Ingredient && !stack.isComponentsPatchEmpty()) {
             String representation = getChemicalComponent(stack, ContainerType.GAS, Capabilities.GAS.item());
             representation = addInterpretation(representation, getChemicalComponent(stack, ContainerType.INFUSION, Capabilities.INFUSION.item()));
             representation = addInterpretation(representation, getChemicalComponent(stack, ContainerType.PIGMENT, Capabilities.PIGMENT.item()));

src/main/java/mekanism/common/recipe/ClearConfigurationRecipe.java

@@ -111,7 +111,7 @@ private ItemStack getTargetStack(CraftingContainer container) {
         for (int i = 0, slots = container.getContainerSize(); i < slots; ++i) {
             ItemStack stackInSlot = container.getItem(i);
             if (!stackInSlot.isEmpty()) {
-                if (stackInSlot.getComponentsPatch().isEmpty()) {
+                if (stackInSlot.isComponentsPatchEmpty()) {
                     //We currently only want to target block items that have at least one component
                     return ItemStack.EMPTY;
                 }

src/main/java/mekanism/common/recipe/upgrade/MekanismShapedRecipe.java

@@ -37,7 +37,7 @@ public ItemStack assemble(CraftingContainer inv, HolderLookup.Provider provider)
         List<ItemStack> componentInputs = new ArrayList<>();
         for (int i = 0; i < inv.getContainerSize(); i++) {
             ItemStack stack = inv.getItem(i);
-            if (!stack.isEmpty() && !stack.getComponentsPatch().isEmpty()) {
+            if (!stack.isEmpty() && !stack.isComponentsPatchEmpty()) {
                 componentInputs.add(stack);
             }
         }