add new test for checking ingredient equals

check gt recipe input and tag in equals impl
remove MapItemStackNBTIngredient.java as it seemed to be redundant

Author: ghzdude

src/main/java/gregtech/api/recipes/RecipeMap.java

@@ -16,7 +16,6 @@
 import gregtech.api.recipes.map.Either;
 import gregtech.api.recipes.map.MapFluidIngredient;
 import gregtech.api.recipes.map.MapItemStackIngredient;
-import gregtech.api.recipes.map.MapItemStackNBTIngredient;
 import gregtech.api.recipes.map.MapOreDictIngredient;
 import gregtech.api.recipes.map.MapOreDictNBTIngredient;
 import gregtech.api.recipes.ui.RecipeMapUI;
@@ -1155,11 +1154,9 @@ protected void buildFromRecipeItems(List<List<AbstractMapIngredient>> list, @Not
             } else {
                 // input must be represented as a list of possible stacks
                 List<AbstractMapIngredient> ingredients;
+                ingredients = MapItemStackIngredient.from(r);
                 if (r.hasNBTMatchingCondition()) {
-                    ingredients = MapItemStackNBTIngredient.from(r);
                     hasNBTMatcherInputs = true;
-                } else {
-                    ingredients = MapItemStackIngredient.from(r);
                 }
 
                 for (int i = 0; i < ingredients.size(); i++) {
@@ -1211,7 +1208,7 @@ protected void buildFromItemStacks(@NotNull List<List<AbstractMapIngredient>> li
             }
             if (hasNBTMatcherInputs) {
                 // add the nbt input for the regular input
-                ls.add(new MapItemStackNBTIngredient(stack, meta, nbt));
+                ls.add(new MapItemStackIngredient(stack, meta, nbt));
             }
             if (!ls.isEmpty()) list.add(ls);
         }

src/main/java/gregtech/api/recipes/map/MapItemStackIngredient.java

@@ -9,6 +9,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Objects;
 
 public class MapItemStackIngredient extends AbstractMapIngredient {
 
@@ -49,12 +50,12 @@ public boolean equals(Object o) {
             if (this.meta != other.meta) {
                 return false;
             }
-            if (this.gtRecipeInput != null) {
-                if (other.gtRecipeInput != null) {
-                    return gtRecipeInput.equalIgnoreAmount(other.gtRecipeInput);
-                }
-            } else if (other.gtRecipeInput != null) {
+            if (this.gtRecipeInput == other.gtRecipeInput) {
+                return Objects.equals(this.tag, other.tag);
+            } else if (this.gtRecipeInput == null) {
                 return other.gtRecipeInput.acceptsStack(this.stack);
+            } else if (other.gtRecipeInput != null) {
+                return gtRecipeInput.equalIgnoreAmount(other.gtRecipeInput);
             }
         }
         return false;

src/main/java/gregtech/api/recipes/map/MapItemStackNBTIngredient.java

@@ -7,6 +7,8 @@
 import gregtech.api.recipes.map.MapFluidIngredient;
 import gregtech.api.recipes.map.MapItemStackIngredient;
 import gregtech.api.recipes.map.MapOreDictIngredient;
+import gregtech.api.unification.material.Materials;
+import gregtech.api.util.GTUtility;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
@@ -22,8 +24,11 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 import static gregtech.api.unification.material.Materials.*;
 import static org.hamcrest.CoreMatchers.*;
@@ -274,4 +279,49 @@ public void wildcardInput() {
             MatcherAssert.assertThat(recipe, notNullValue());
         }
     }
+
+    @Test
+    public void testInputs() {
+        FluidStack dye = Materials.CHEMICAL_DYES[1].getFluid(GTValues.L);
+
+        map.recipeBuilder()
+                .inputs(new ItemStack(Blocks.WOOL))
+                .fluidInputs(GTUtility.copy(dye))
+                .outputs(new ItemStack(Blocks.WOOL, 1, 1))
+                .duration(1).EUt(1)
+                .buildAndRegister();
+
+        map.recipeBuilder()
+                .input(Blocks.WOOL, 1, true)
+                .fluidInputs(Chlorine.getFluid(50))
+                .output(Blocks.WOOL)
+                .duration(1).EUt(1)
+                .buildAndRegister();
+
+        try {
+            Method prepareRecipeFind = RecipeMap.class.getDeclaredMethod("prepareRecipeFind", Collection.class,
+                    Collection.class);
+            prepareRecipeFind.setAccessible(true);
+
+            // noinspection unchecked
+            List<List<AbstractMapIngredient>> list = (List<List<AbstractMapIngredient>>) prepareRecipeFind.invoke(map,
+                    Collections.singletonList(new ItemStack(Blocks.WOOL)),
+                    Collections.singletonList(GTUtility.copy(dye)));
+
+            // noinspection unchecked
+            List<List<AbstractMapIngredient>> list2 = (List<List<AbstractMapIngredient>>) prepareRecipeFind.invoke(map,
+                    Collections.singletonList(new ItemStack(Blocks.WOOL)),
+                    Collections.singletonList(Chlorine.getFluid(50)));
+
+            MatcherAssert.assertThat("the first two ingredients are not equal!",
+                    list.get(0).get(0).equals(list2.get(0).get(0)));
+        } catch (ReflectiveOperationException ignored) {}
+
+        Recipe recipe = map.find(
+                Collections.singleton(new ItemStack(Blocks.WOOL)),
+                Collections.singleton(GTUtility.copy(dye)),
+                r -> true);
+
+        MatcherAssert.assertThat("recipe could not be found!", recipe != null);
+    }
 }