dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gavin Lambert
2021-01-02 23:36:23 +13:00
committed by GitHub
parent 74ab430728
commit a11a5e306e
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/refinedmods/refinedstorage/api/util/IStackList.java
View File

@@ -118,6 +118,12 @@ public interface IStackList<T> {
@Nonnull @Nonnull
Collection<StackListEntry<T>> getStacks(); 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 * @return a new copy of this list, with the stacks in it copied as well
*/ */

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidStackList.java
View File

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

11
src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemStackList.java
View File

@@ -11,10 +11,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collection; import java.util.*;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class ItemStackList implements IStackList<ItemStack> { public class ItemStackList implements IStackList<ItemStack> {
private final ArrayListMultimap<Item, StackListEntry<ItemStack>> stacks = ArrayListMultimap.create(); private final ArrayListMultimap<Item, StackListEntry<ItemStack>> stacks = ArrayListMultimap.create();
@@ -141,6 +138,12 @@ public class ItemStackList implements IStackList<ItemStack> {
return stacks.values(); return stacks.values();
} }
@Override
@Nonnull
public Collection<StackListEntry<ItemStack>> getStacks(@Nonnull ItemStack stack) {
return stacks.get(stack.getItem());
}
@Override @Override
@Nonnull @Nonnull
public IStackList<ItemStack> copy() { public IStackList<ItemStack> copy() {