Skip to content

Commit 3704033

Browse files
authored
Fix #1102: Incompatibility with electrodynamics, by removing fluid variant normalization to source (#1119)
1 parent 0150629 commit 3704033

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/FluidVariantImpl.java

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,18 @@
2828
import java.util.Objects;
2929
import java.util.concurrent.ConcurrentHashMap;
3030
import net.minecraft.core.component.DataComponentPatch;
31-
import net.minecraft.core.registries.BuiltInRegistries;
32-
import net.minecraft.resources.ResourceLocation;
33-
import net.minecraft.world.level.material.FlowingFluid;
3431
import net.minecraft.world.level.material.Fluid;
35-
import net.minecraft.world.level.material.Fluids;
3632
import net.neoforged.neoforge.fluids.FluidStack;
3733
import org.slf4j.Logger;
3834
import org.slf4j.LoggerFactory;
3935

4036
public class FluidVariantImpl implements FluidVariant {
4137
private static final Map<Fluid, FluidVariant> noTagCache = new ConcurrentHashMap<>();
4238

43-
private static Fluid normalizeFluid(Fluid fluid) {
44-
if (!fluid.isSource(fluid.defaultFluidState()) && fluid != Fluids.EMPTY) {
45-
// Note: the empty fluid is not still, that's why we check for it specifically.
46-
47-
if (fluid instanceof FlowingFluid flowable) {
48-
// Normalize FlowableFluids to their still variants.
49-
return flowable.getSource();
50-
} else {
51-
// If not a FlowableFluid, we don't know how to convert -> crash.
52-
ResourceLocation id = BuiltInRegistries.FLUID.getKey(fluid);
53-
throw new IllegalArgumentException("Cannot convert flowing fluid %s (%s) into a still fluid.".formatted(id, fluid));
54-
}
55-
}
56-
return fluid;
57-
}
58-
5939
public static FluidVariant of(Fluid fluid) {
6040
Objects.requireNonNull(fluid, "Fluid may not be null.");
6141

62-
return noTagCache.computeIfAbsent(normalizeFluid(fluid), f -> new FluidVariantImpl(new FluidStack(f, 1)));
42+
return noTagCache.computeIfAbsent(fluid, f -> new FluidVariantImpl(new FluidStack(f, 1)));
6343
}
6444

6545
public static FluidVariant of(FluidStack stack) {

0 commit comments

Comments
 (0)