diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-10-16 00:59:29 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-10-16 00:59:29 +0800 |
| commit | 1dcf535cdf25c808ee4c0827a27c5b0e50094fda (patch) | |
| tree | 5d5d297d245dc8cf339c64c655b075216f6e73ba /fabric/src/main/java | |
| parent | 6e7a641926d8b0ea2d0a1caddbf348fe24b669ce (diff) | |
| download | RoughlyEnoughItems-1dcf535cdf25c808ee4c0827a27c5b0e50094fda.tar.gz RoughlyEnoughItems-1dcf535cdf25c808ee4c0827a27c5b0e50094fda.tar.bz2 RoughlyEnoughItems-1dcf535cdf25c808ee4c0827a27c5b0e50094fda.zip | |
Fix merge conflicts
Diffstat (limited to 'fabric/src/main/java')
| -rw-r--r-- | fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<EntryStack<FluidStack>> 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()) { |