loosen up the equals impl a bit by testing against stack

make test more specific to chem bath recipe map

Author: ghzdude

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

@@ -54,8 +54,8 @@ public boolean equals(Object o) {
                 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);
+            } else {
+                return this.gtRecipeInput.acceptsStack(other.stack);
             }
         }
         return false;

src/test/java/gregtech/api/recipes/RecipeMapTest.java

@@ -2,13 +2,16 @@
 
 import gregtech.Bootstrap;
 import gregtech.api.GTValues;
+import gregtech.api.items.metaitem.MetaItem;
 import gregtech.api.recipes.builders.SimpleRecipeBuilder;
 import gregtech.api.recipes.map.AbstractMapIngredient;
 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 gregtech.common.items.MetaItems;
+import gregtech.loaders.recipe.VanillaStandardRecipes;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
@@ -24,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
@@ -281,46 +285,38 @@ public void wildcardInput() {
     }
 
     @Test
-    public void testInputs() {
+    public void testInputs() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        for (MetaItem<?> item : MetaItems.ITEMS) {
+            item.registerSubItems();
+        }
+
+        Method dyingCleaningRecipes = VanillaStandardRecipes.class.getDeclaredMethod("dyingCleaningRecipes");
+        dyingCleaningRecipes.setAccessible(true);
+        dyingCleaningRecipes.invoke(null);
+
         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();
+        Method prepareRecipeFind = RecipeMap.class.getDeclaredMethod("prepareRecipeFind", Collection.class,
+                Collection.class);
+        prepareRecipeFind.setAccessible(true);
 
-        map.recipeBuilder()
-                .input(Blocks.WOOL, 1, true)
-                .fluidInputs(Chlorine.getFluid(50))
-                .output(Blocks.WOOL)
-                .duration(1).EUt(1)
-                .buildAndRegister();
+        // noinspection unchecked
+        List<List<AbstractMapIngredient>> list = (List<List<AbstractMapIngredient>>) prepareRecipeFind.invoke(map,
+                Collections.singletonList(new ItemStack(Blocks.WOOL)),
+                Collections.singletonList(GTUtility.copy(dye)));
 
-        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);
+        // 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)));
+
+        List<ItemStack> wool = Arrays.asList(new ItemStack(Blocks.WOOL));
+        List<FluidStack> fluidDye = Arrays.asList(GTUtility.copy(dye));
+        Recipe recipe = RecipeMaps.CHEMICAL_BATH_RECIPES.find(
+                wool, fluidDye, r -> r.matches(false, wool, fluidDye));
 
         MatcherAssert.assertThat("recipe could not be found!", recipe != null);
     }