From 1dcf535cdf25c808ee4c0827a27c5b0e50094fda Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 16 Oct 2021 00:59:29 +0800 Subject: Fix merge conflicts --- .../shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fabric/src/main/java') diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java b/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java index 01b5f2a47..8847874c1 100644 --- a/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java +++ b/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java @@ -50,8 +50,8 @@ public class FabricFluidAPISupportPlugin implements REIServerPlugin { List> result; try (Transaction transaction = Transaction.openOuter()) { result = StreamSupport.stream(storage.iterable(transaction).spliterator(), false) - .filter(view -> !view.isResourceBlank() && !view.getResource().isBlank()) - .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), Fraction.of(view.getAmount(), FluidConstants.BUCKET), view.getResource().getNbt()))) + .filter(view -> !view.isResourceBlank()) + .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), view.getAmount(), view.getResource().getNbt()))) .collect(Collectors.toList()); } if (!result.isEmpty()) { -- cgit