3.3

Fix #58
Close #134
Close #158
Fix #227

1 files changed, 20 insertions, 24 deletions

diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
index 7baca2a3e..7b92a314b 100644
--- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
@@ -27,10 +27,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.registry.Registry;
 
 import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 @Deprecated
 public class FluidEntryStack extends AbstractEntryStack {
@@ -38,21 +35,21 @@ public class FluidEntryStack extends AbstractEntryStack {
     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;
     }
-
+    
     protected static Pair<Sprite, Integer> getOrLoadSprite(Fluid fluid) {
         Pair<Sprite, Integer> possibleCached = FLUID_SPRITE_CACHE.get(fluid);
         if (possibleCached != null)
             return possibleCached;
-
+        
         FluidRenderHandler fluidRenderHandler = FluidRenderHandlerRegistry.INSTANCE.get(fluid);
         if (fluidRenderHandler == null)
             return null;
@@ -64,22 +61,22 @@ public class FluidEntryStack extends AbstractEntryStack {
         FLUID_SPRITE_CACHE.put(fluid, pair);
         return pair;
     }
-
+    
     @Override
     public Optional<Identifier> getIdentifier() {
         return Optional.ofNullable(Registry.FLUID.getId(getFluid()));
     }
-
+    
     @Override
     public Type getType() {
         return Type.FLUID;
     }
-
+    
     @Override
     public int getAmount() {
         return amount;
     }
-
+    
     @Override
     public void setAmount(int amount) {
         this.amount = amount == EMPTY_AMOUNT ? EMPTY_AMOUNT : Math.max(amount, 0);
@@ -87,12 +84,12 @@ public class FluidEntryStack extends AbstractEntryStack {
             fluid = Fluids.EMPTY;
         }
     }
-
+    
     @Override
     public boolean isEmpty() {
         return (amount != EMPTY_AMOUNT && amount <= 0) || fluid == Fluids.EMPTY;
     }
-
+    
     @Override
     public EntryStack copy() {
         EntryStack stack = EntryStack.create(fluid, amount);
@@ -101,40 +98,40 @@ public class FluidEntryStack extends AbstractEntryStack {
         }
         return stack;
     }
-
+    
     @Override
     public Object getObject() {
         return fluid;
     }
-
+    
     @Override
     public boolean equalsIgnoreTagsAndAmount(EntryStack stack) {
         if (stack.getType() != Type.FLUID)
             return false;
         return fluid == stack.getFluid();
     }
-
+    
     @Override
     public boolean equalsIgnoreTags(EntryStack stack) {
         if (stack.getType() != Type.FLUID)
             return false;
         return fluid == stack.getFluid() && amount == stack.getAmount();
     }
-
+    
     @Override
     public boolean equalsIgnoreAmount(EntryStack stack) {
         if (stack.getType() != Type.FLUID)
             return false;
         return fluid == stack.getFluid();
     }
-
+    
     @Override
     public boolean equalsAll(EntryStack stack) {
         if (stack.getType() != Type.FLUID)
             return false;
         return fluid == stack.getFluid() && amount == stack.getAmount();
     }
-
+    
     @Override
     public int hashCode() {
         int result = 1;
@@ -144,7 +141,7 @@ public class FluidEntryStack extends AbstractEntryStack {
         result = 31 * result;
         return result;
     }
-
+    
     @Nullable
     @Override
     public QueuedTooltip getTooltip(int mouseX, int mouseY) {
@@ -154,8 +151,7 @@ public class FluidEntryStack extends AbstractEntryStack {
         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(Arrays.asList(amountTooltip.split("\n")));
         }
         toolTip.addAll(getSetting(Settings.TOOLTIP_APPEND_EXTRA).value().apply(this));
         if (getSetting(Settings.TOOLTIP_APPEND_MOD).value().get() && ConfigObject.getInstance().shouldAppendModNames()) {
@@ -171,7 +167,7 @@ public class FluidEntryStack extends AbstractEntryStack {
         }
         return QueuedTooltip.create(toolTip);
     }
-
+    
     @Override
     public void render(Rectangle bounds, int mouseX, int mouseY, float delta) {
         if (getSetting(Settings.RENDER).value().get()) {