add convenient null checking wrapper for FluidTankProperties

CD4017BE · Oct 2, 2019 · f5efc45 · f5efc45
1 parent 01a2bd6
commit f5efc45
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/java/cd4017be/lib/util/ItemFluidUtil.java b/src/java/cd4017be/lib/util/ItemFluidUtil.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.function.ToIntFunction;
-
+import javax.annotation.Nonnull;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -239,6 +239,14 @@ public static ItemStack drain(IItemHandler inv, ToIntFunction<ItemStack> filter)
 		return ItemStack.EMPTY;
 	}
 
+	public static final IFluidTankProperties[] NO_TANKS = new IFluidTankProperties[0];
+
+	/** @return acc.{@link IFluidHandler#getTankProperties() getTankProperties()} or {@link #NO_TANKS} */
+	public static @Nonnull IFluidTankProperties[] listTanks(IFluidHandler acc) {
+		IFluidTankProperties[] p = acc.getTankProperties();
+		return p == null ? NO_TANKS : p;
+	}
+
 	public static class StackedFluidAccess implements IFluidHandler {
 
 		public final IFluidHandlerItem acc;