user singleton lists in recipe cache/indexes where applicable

Author: thiakil

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

@@ -75,7 +75,18 @@ public Iterable<RECIPE> getRecipes(INPUT input) {
      * @param recipe Recipe to add.
      */
     protected void addInputCache(KEY input, RECIPE recipe) {
-        inputCache.computeIfAbsent(input, i -> new ArrayList<>()).add(recipe);
+        if (!inputCache.containsKey(input)) {
+            inputCache.put(input, Collections.singletonList(recipe));
+        } else {
+            List<RECIPE> existing = inputCache.get(input);
+            if (existing.size() == 1) {
+                List<RECIPE> newList = new ArrayList<>(existing);
+                newList.add(recipe);
+                inputCache.put(input, newList);
+            } else {
+                existing.add(recipe);
+            }
+        }
     }
 
     /**

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

@@ -3,11 +3,11 @@
 import com.google.common.collect.Iterables;
 import it.unimi.dsi.fastutil.Hash;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import mekanism.api.recipes.MekanismRecipe;
 import mekanism.api.recipes.ingredients.InputIngredient;
 
@@ -22,7 +22,7 @@ public abstract class ComponentSensitiveInputCache<KEY, INPUT, INGREDIENT extend
      * Map of NBT based keys representing inputs to a set of the recipes that contain said input. This allows for quick contains checking by checking if a key exists, as
      * well as quicker recipe lookup.
      */
-    private final Map<INPUT, Set<RECIPE>> componentInputCache;
+    private final Map<INPUT, List<RECIPE>> componentInputCache;
 
     protected ComponentSensitiveInputCache(Hash.Strategy<? super INPUT> componentHashStrategy) {
         this.componentInputCache = new Object2ObjectOpenCustomHashMap<>(componentHashStrategy);
@@ -51,7 +51,7 @@ public boolean contains(INPUT input) {
      */
     @Override
     public Iterable<RECIPE> getRecipes(INPUT input) {
-        Set<RECIPE> nbtRecipes = componentInputCache.getOrDefault(input, Collections.emptySet());
+        List<RECIPE> nbtRecipes = componentInputCache.getOrDefault(input, Collections.emptyList());
         if (nbtRecipes.isEmpty()) {
             return super.getRecipes(input);
         }
@@ -69,6 +69,17 @@ public Iterable<RECIPE> getRecipes(INPUT input) {
      * @param recipe Recipe to add.
      */
     protected void addNbtInputCache(INPUT input, RECIPE recipe) {
-        componentInputCache.computeIfAbsent(input, i -> new HashSet<>()).add(recipe);
+        if (!componentInputCache.containsKey(input)) {
+            componentInputCache.put(input, Collections.singletonList(recipe));
+        } else {
+            List<RECIPE> existing = componentInputCache.get(input);
+            if (existing.size() == 1) {
+                List<RECIPE> newList = new ArrayList<>(existing);
+                newList.add(recipe);
+                componentInputCache.put(input, newList);
+            } else {
+                existing.add(recipe);
+            }
+        }
     }
 }