From 97c8436558d8b13b70587703be50d0bd434b3e8d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 14 Feb 2020 00:22:40 +0800 Subject: 3.4.1 Signed-off-by: shedaniel --- .../java/me/shedaniel/rei/impl/FluidEntryStack.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java') diff --git a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java index e4e3b5013..93515e8e9 100644 --- a/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java +++ b/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java @@ -134,15 +134,30 @@ public class FluidEntryStack extends AbstractEntryStack { } @Override - public int hashCode() { + public int hashOfAll() { + int result = hashIgnoreAmountAndTags(); + result = 31 * result + amount; + return result; + } + + @Override + public int hashIgnoreAmountAndTags() { int result = 1; result = 31 * result + getType().ordinal(); result = 31 * result + fluid.hashCode(); - result = 31 * result + amount; - result = 31 * result; return result; } + @Override + public int hashIgnoreTags() { + return hashOfAll(); + } + + @Override + public int hashIgnoreAmount() { + return hashIgnoreAmountAndTags(); + } + @Nullable @Override public QueuedTooltip getTooltip(int mouseX, int mouseY) { -- cgit