Use mojang's builtin item stack hash strategy instead of rolling our own one, and make our fluid stack one be based off of the logic more closely

Author: pupnewfster

src/main/java/mekanism/common/lib/collection/FluidHashStrategy.java

@@ -3,6 +3,7 @@
 import it.unimi.dsi.fastutil.Hash.Strategy;
 import net.neoforged.neoforge.fluids.FluidStack;
 
+//Based on ItemStackLinkedSet#TYPE_AND_TAG
 public class FluidHashStrategy implements Strategy<FluidStack> {
 
     public static final FluidHashStrategy INSTANCE = new FluidHashStrategy();
@@ -12,16 +13,14 @@ private FluidHashStrategy() {
 
     @Override
     public int hashCode(FluidStack stack) {
-        return stack == null ? 0 : FluidStack.hashFluidAndComponents(stack);
+        return FluidStack.hashFluidAndComponents(stack);
     }
 
     @Override
     public boolean equals(FluidStack a, FluidStack b) {
         if (a == b) {
             return true;
-        } else if (a == null || b == null) {
-            return false;
         }
-        return FluidStack.isSameFluidSameComponents(a, b);
+        return a != null && b != null && a.isEmpty() == b.isEmpty() && FluidStack.isSameFluidSameComponents(a, b);
     }
 }

src/main/java/mekanism/common/lib/collection/ItemHashStrategy.java

@@ -24,7 +24,7 @@ public abstract class ComponentSensitiveInputCache<KEY, INPUT, INGREDIENT extend
      */
     private final Map<INPUT, Set<RECIPE>> componentInputCache;
 
-    protected ComponentSensitiveInputCache(Hash.Strategy<INPUT> componentHashStrategy) {
+    protected ComponentSensitiveInputCache(Hash.Strategy<? super INPUT> componentHashStrategy) {
         this.componentInputCache = new Object2ObjectOpenCustomHashMap<>(componentHashStrategy);
     }
 

src/main/java/mekanism/common/recipe/lookup/cache/type/ComponentSensitiveInputCache.java

@@ -2,17 +2,17 @@
 
 import mekanism.api.recipes.MekanismRecipe;
 import mekanism.api.recipes.ingredients.ItemStackIngredient;
-import mekanism.common.lib.collection.ItemHashStrategy;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackLinkedSet;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.neoforged.neoforge.common.crafting.CompoundIngredient;
 import net.neoforged.neoforge.common.crafting.DataComponentIngredient;
 
 public class ItemInputCache<RECIPE extends MekanismRecipe> extends ComponentSensitiveInputCache<Item, ItemStack, ItemStackIngredient, RECIPE> {
 
     public ItemInputCache() {
-        super(ItemHashStrategy.INSTANCE);
+        super(ItemStackLinkedSet.TYPE_AND_TAG);
     }
 
     @Override