From 4e2c0be9a75e435956ca80d56df2ca609245671d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 16 Apr 2021 17:29:21 +0800 Subject: Normalize fluid type Signed-off-by: shedaniel --- .../me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java index 9344eb9e8..75871dbca 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java @@ -63,6 +63,7 @@ import net.minecraft.tags.TagContainer; import net.minecraft.util.Mth; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.material.FlowingFluid; import net.minecraft.world.level.material.Fluid; import org.jetbrains.annotations.Nullable; @@ -116,7 +117,9 @@ public class FluidEntryDefinition implements EntryDefinition, EntryS @Override public FluidStack normalize(EntryStack entry, FluidStack value) { - FluidStack copy = value.copy(); + Fluid fluid = value.getFluid(); + if (fluid instanceof FlowingFluid) fluid = ((FlowingFluid) fluid).getSource(); + FluidStack copy = FluidStack.create(fluid, value.getAmount(), value.getTag()); copy.setAmount(FluidStack.bucketAmount()); return copy; } -- cgit