diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-10-15 02:43:07 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-10-16 00:50:06 +0800 |
| commit | a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a (patch) | |
| tree | 8f35ef541a5bace21530db7e9ffeed9d1060facf /fabric/src/main/java | |
| parent | c65b2a347b38724ccb777114f5353e7f18b978b5 (diff) | |
| download | RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.tar.gz RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.tar.bz2 RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.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 | 3 |
1 files changed, 2 insertions, 1 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 651ff2821..01b5f2a47 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 @@ -30,6 +30,7 @@ import me.shedaniel.rei.api.common.fluid.FluidSupportProvider; import me.shedaniel.rei.api.common.plugins.REIServerPlugin; import me.shedaniel.rei.api.common.util.EntryStacks; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; @@ -50,7 +51,7 @@ public class FabricFluidAPISupportPlugin implements REIServerPlugin { 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(), view.getAmount(), view.getResource().getNbt()))) + .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), Fraction.of(view.getAmount(), FluidConstants.BUCKET), view.getResource().getNbt()))) .collect(Collectors.toList()); } if (!result.isEmpty()) { |