Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Give fluids actual densities now that the API is out #5963

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Give fluids actual densities now that the API is out #5963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/blusunrize/immersiveengineering/common/fluids/PotionFluid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,8 @@ public PotionFluidType()
{
super(Properties.create()
.sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL)
.sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY));
.sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY)
.density(1300));
}

@Override
Expand Down
21 changes: 14 additions & 7 deletions src/main/java/blusunrize/immersiveengineering/common/register/IEFluids.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,37 @@ public class IEFluids
public static final Set<BlockEntry<? extends LiquidBlock>> ALL_FLUID_BLOCKS = new HashSet<>();

public static final FluidEntry CREOSOTE = FluidEntry.make(
"creosote", 800, rl("block/fluid/creosote_still"), rl("block/fluid/creosote_flow")
"creosote", 800, rl("block/fluid/creosote_still"), rl("block/fluid/creosote_flow"),
createBuilder(1230, 2000)
);
public static final FluidEntry PLANTOIL = FluidEntry.make(
"plantoil", rl("block/fluid/plantoil_still"), rl("block/fluid/plantoil_flow")
"plantoil", rl("block/fluid/plantoil_still"), rl("block/fluid/plantoil_flow"),
createBuilder(920, 1000)
);
public static final FluidEntry ETHANOL = FluidEntry.make(
"ethanol", rl("block/fluid/ethanol_still"), rl("block/fluid/ethanol_flow")
"ethanol", rl("block/fluid/ethanol_still"), rl("block/fluid/ethanol_flow"),
createBuilder(790, 1000)
);
public static final FluidEntry BIODIESEL = FluidEntry.make(
"biodiesel", rl("block/fluid/biodiesel_still"), rl("block/fluid/biodiesel_flow")
"biodiesel", rl("block/fluid/biodiesel_still"), rl("block/fluid/biodiesel_flow"),
createBuilder(880, 1000)
);
public static final FluidEntry HIGH_POWER_BIODIESEL = FluidEntry.make(
"high_power_biodiesel", rl("block/fluid/biodiesel_still"), rl("block/fluid/biodiesel_flow")
"high_power_biodiesel", rl("block/fluid/biodiesel_still"), rl("block/fluid/biodiesel_flow"),
createBuilder(910, 1000)
);
public static final FluidEntry CONCRETE = FluidEntry.make(
"concrete", rl("block/fluid/concrete_still"), rl("block/fluid/concrete_flow"),
ConcreteFluid::new, ConcreteFluid.Flowing::new, createBuilder(2400, 4000),
ImmutableList.of(IEProperties.INT_32)
);
public static final FluidEntry HERBICIDE = FluidEntry.make(
"herbicide", rl("block/fluid/herbicide_still"), rl("block/fluid/herbicide_flow")
"herbicide", rl("block/fluid/herbicide_still"), rl("block/fluid/herbicide_flow"),
createBuilder(1100, 1000)
);
public static final FluidEntry REDSTONE_ACID = FluidEntry.make(
"redstone_acid", rl("block/fluid/redstone_acid_still"), rl("block/fluid/redstone_acid_flow")
"redstone_acid", rl("block/fluid/redstone_acid_still"), rl("block/fluid/redstone_acid_flow"),
createBuilder(1200, 1000)
);
public static final Holder<FluidType> POTION_TYPE = TYPE_REGISTER.register("potion", PotionFluid.PotionFluidType::new);
public static final DeferredHolder<Fluid, PotionFluid> POTION = REGISTER.register("potion", PotionFluid::new);
Expand Down
Loading