From afe32352abcef8d501acf7985d2e9b1f3fcb673e Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 7 Sep 2020 23:02:24 +0800 Subject: Made FluidSupportProvider capable in returning more than 1 fluid and fix hwyla double modid tooltip Signed-off-by: shedaniel --- .../src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java') diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java index e1dda377f..65019ba8b 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java @@ -138,7 +138,7 @@ public class FluidEntryStack extends AbstractEntryStack { @Override public boolean equalsIgnoreTagsAndAmount(EntryStack stack) { if (stack.getType() == Type.ITEM) - return equalsIgnoreTagsAndAmount(EntryStack.copyItemToFluid(stack)); + return EntryStack.copyItemToFluids(stack).anyMatch(this::equalsIgnoreTagsAndAmount); if (stack.getType() != Type.FLUID) return false; return fluid == stack.getFluid(); @@ -147,7 +147,7 @@ public class FluidEntryStack extends AbstractEntryStack { @Override public boolean equalsIgnoreTags(EntryStack stack) { if (stack.getType() == Type.ITEM) - return equalsIgnoreTags(EntryStack.copyItemToFluid(stack)); + return EntryStack.copyItemToFluids(stack).anyMatch(this::equalsIgnoreTags); if (stack.getType() != Type.FLUID) return false; return fluid == stack.getFluid() && (amount.equals(IGNORE_AMOUNT) || stack.getAccurateAmount().equals(IGNORE_AMOUNT) || amount.equals(stack.getAccurateAmount())); @@ -156,7 +156,7 @@ public class FluidEntryStack extends AbstractEntryStack { @Override public boolean equalsIgnoreAmount(EntryStack stack) { if (stack.getType() == Type.ITEM) - return equalsIgnoreAmount(EntryStack.copyItemToFluid(stack)); + return EntryStack.copyItemToFluids(stack).anyMatch(this::equalsIgnoreAmount); if (stack.getType() != Type.FLUID) return false; return fluid == stack.getFluid(); -- cgit