Fix recipe lookups for filled fluid containers

mezz · Sep 25, 2016 · 85d763d · 85d763d
1 parent f189dd9
commit 85d763d
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/main/java/mezz/jei/SubtypeRegistry.java b/src/main/java/mezz/jei/SubtypeRegistry.java
@@ -68,12 +68,11 @@ public String getSubtypeInfo(@Nullable ItemStack itemStack) {
 			IFluidTankProperties[] tankPropertiesList = capability.getTankProperties();
 			StringBuilder info = new StringBuilder();
 			for (IFluidTankProperties tankProperties : tankPropertiesList) {
-				FluidStack contents = tankProperties.getContents();
-				if (contents != null) {
-					Fluid fluid = contents.getFluid();
-					if (fluid != null) {
-						info.append(fluid.getName()).append(";");
-					}
+				String contentsName = getContentsName(tankProperties);
+				if (contentsName != null) {
+					info.append(contentsName).append(";");
+				} else {
+					info.append("empty").append(";");
 				}
 			}
 			if (info.length() > 0) {
@@ -82,7 +81,18 @@ public String getSubtypeInfo(@Nullable ItemStack itemStack) {
 		}
 
 		return null;
+	}
 
+	@Nullable
+	private static String getContentsName(IFluidTankProperties fluidTankProperties) {
+		FluidStack contents = fluidTankProperties.getContents();
+		if (contents != null) {
+			Fluid fluid = contents.getFluid();
+			if (fluid != null) {
+				return fluid.getName();
+			}
+		}
+		return null;
 	}
 
 	private static class AllNbt implements ISubtypeInterpreter {