From 0cc101e5cb57e62674abe421983444f79ea630fc Mon Sep 17 00:00:00 2001
From: Danielshe <shekwancheung0528@gmail.com>
Date: Wed, 6 Nov 2019 21:40:11 +0800
Subject: 3.2.6

---
 src/main/java/me/shedaniel/rei/api/EntryStack.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/api/EntryStack.java')

diff --git a/src/main/java/me/shedaniel/rei/api/EntryStack.java b/src/main/java/me/shedaniel/rei/api/EntryStack.java
index 01fc901b4..905540d56 100644
--- a/src/main/java/me/shedaniel/rei/api/EntryStack.java
+++ b/src/main/java/me/shedaniel/rei/api/EntryStack.java
@@ -11,6 +11,7 @@ import me.shedaniel.rei.impl.EmptyEntryStack;
 import me.shedaniel.rei.impl.FluidEntryStack;
 import me.shedaniel.rei.impl.ItemEntryStack;
 import net.minecraft.block.Block;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemConvertible;
@@ -31,7 +32,7 @@ public interface EntryStack {
     }
     
     static EntryStack create(Fluid fluid) {
-        return create(fluid, 1000);
+        return new FluidEntryStack(fluid);
     }
     
     static EntryStack create(Fluid fluid, int amount) {
@@ -46,10 +47,6 @@ public interface EntryStack {
         return new ItemEntryStack(new ItemStack(item));
     }
     
-    static EntryStack create(Block block) {
-        return new ItemEntryStack(new ItemStack(block));
-    }
-    
     Optional<Identifier> getIdentifier();
     
     EntryStack.Type getType();
@@ -144,5 +141,13 @@ public interface EntryStack {
             private Item() {
             }
         }
+        
+        public static class Fluid {
+            // Return null to disable
+            public static final Settings<Function<EntryStack, String>> AMOUNT_TOOLTIP = new Settings<Function<EntryStack, String>>(stack -> I18n.translate("tooltip.rei.fluid_amount", stack.getAmount()));
+            
+            private Fluid() {
+            }
+        }
     }
 }
-- 
cgit