Add API to get full list of stacks for an item/fluid type. (#2804)

refinedmods · Jan 2, 2021 · a11a5e3 · a11a5e3
1 parent 74ab430
commit a11a5e3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java b/src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java
@@ -118,6 +118,12 @@ default int getCount(@Nonnull T stack) {
     @Nonnull
     Collection<StackListEntry<T>> getStacks();
 
+    /**
+     * @return a collection of stacks matching the given type (ignoring NBT)
+     */
+    @Nonnull
+    Collection<StackListEntry<T>> getStacks(@Nonnull T stack);
+
     /**
      * @return a new copy of this list, with the stacks in it copied as well
      */

diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidStackList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidStackList.java
@@ -6,14 +6,12 @@
 import com.refinedmods.refinedstorage.api.util.StackListResult;
 import com.refinedmods.refinedstorage.apiimpl.API;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 public class FluidStackList implements IStackList<FluidStack> {
     private final ArrayListMultimap<Fluid, StackListEntry<FluidStack>> stacks = ArrayListMultimap.create();
@@ -143,6 +141,12 @@ public Collection<StackListEntry<FluidStack>> getStacks() {
         return stacks.values();
     }
 
+    @Override
+    @Nonnull
+    public Collection<StackListEntry<FluidStack>> getStacks(@Nonnull FluidStack stack) {
+        return stacks.get(stack.getFluid());
+    }
+
     @Override
     @Nonnull
     public IStackList<FluidStack> copy() {

diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemStackList.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemStackList.java
@@ -11,10 +11,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 public class ItemStackList implements IStackList<ItemStack> {
     private final ArrayListMultimap<Item, StackListEntry<ItemStack>> stacks = ArrayListMultimap.create();
@@ -141,6 +138,12 @@ public Collection<StackListEntry<ItemStack>> getStacks() {
         return stacks.values();
     }
 
+    @Override
+    @Nonnull
+    public Collection<StackListEntry<ItemStack>> getStacks(@Nonnull ItemStack stack) {
+        return stacks.get(stack.getItem());
+    }
+
     @Override
     @Nonnull
     public IStackList<ItemStack> copy() {