1 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
index 816ec4d47..c9583dae7 100644
--- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
@@ -37,9 +37,14 @@ import java.util.Optional;
 @Deprecated
 public class FluidEntryStack extends AbstractEntryStack {
     private static final Map<Fluid, Pair<Sprite, Integer>> FLUID_SPRITE_CACHE = new HashMap<>();
+    private static final int EMPTY_AMOUNT = -1319182373;
     private Fluid fluid;
     private int amount;
     
+    public FluidEntryStack(Fluid fluid) {
+        this(fluid, EMPTY_AMOUNT);
+    }
+    
     public FluidEntryStack(Fluid fluid, int amount) {
         this.fluid = fluid;
         this.amount = amount;
@@ -79,7 +84,7 @@ public class FluidEntryStack extends AbstractEntryStack {
     
     @Override
     public void setAmount(int amount) {
-        this.amount = Math.max(amount, 0);
+        this.amount = amount == EMPTY_AMOUNT ? EMPTY_AMOUNT : Math.max(amount, 0);
         if (isEmpty()) {
             fluid = Fluids.EMPTY;
         }
@@ -87,7 +92,7 @@ public class FluidEntryStack extends AbstractEntryStack {
     
     @Override
     public boolean isEmpty() {
-        return amount <= 0 || fluid == Fluids.EMPTY;
+        return (amount != EMPTY_AMOUNT && amount <= 0) || fluid == Fluids.EMPTY;
     }
     
     @Override
@@ -138,6 +143,10 @@ public class FluidEntryStack extends AbstractEntryStack {
         if (!getSetting(Settings.TOOLTIP_ENABLED).value().get() || isEmpty())
             return null;
         List<String> toolTip = Lists.newArrayList(EntryListWidget.tryGetEntryStackName(this));
+        if (amount >= 0) {
+            String amountTooltip = getSetting(Settings.Fluid.AMOUNT_TOOLTIP).value().apply(this);
+            if (amountTooltip != null) for (String s : amountTooltip.split("\n")) toolTip.add(s);
+        }
         toolTip.addAll(getSetting(Settings.TOOLTIP_APPEND_EXTRA).value().apply(this));
         if (getSetting(Settings.TOOLTIP_APPEND_MOD).value().get() && RoughlyEnoughItemsCore.getConfigManager().getConfig().shouldAppendModNames()) {
             final String modString = ClientHelper.getInstance().getFormattedModFromIdentifier(Registry.FLUID.getId(fluid));