mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fluid#isSame is asymmetric

Browse source 
- Fixes #2490
This commit is contained in:
Jozufozu 2021-12-20 21:51:21 -08:00
parent bcfd0aed88
commit 848eb904f5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/simibubi/create/events/ClientEvents.java
View file

@ -257,13 +257,13 @@ public class ClientEvents {
Fluid fluid = fluidstate.getType(); Fluid fluid = fluidstate.getType();
if (fluid.isSame(AllFluids.CHOCOLATE.get())) { if (AllFluids.CHOCOLATE.get().isSame(fluid)) {
event.setDensity(5f); event.setDensity(5f);
event.setCanceled(true); event.setCanceled(true);
return; return;
} }
if (fluid.isSame(AllFluids.HONEY.get())) { if (AllFluids.HONEY.get().isSame(fluid)) {
event.setDensity(1.5f); event.setDensity(1.5f);
event.setCanceled(true); event.setCanceled(true);
return; return;
@ -283,18 +283,18 @@ public class ClientEvents {
Level level = Minecraft.getInstance().level; Level level = Minecraft.getInstance().level;
BlockPos blockPos = info.getBlockPosition(); BlockPos blockPos = info.getBlockPosition();
FluidState fluidstate = level.getFluidState(blockPos); FluidState fluidstate = level.getFluidState(blockPos);
if (info.getPosition().y > blockPos.getY() + fluidstate.getHeight(level, blockPos)) if (info.getPosition().y > blockPos.getY() + fluidstate.getHeight(level, blockPos))
return; return;
Fluid fluid = fluidstate.getType(); Fluid fluid = fluidstate.getType();
if (fluid.isSame(AllFluids.CHOCOLATE.get())) { if (AllFluids.CHOCOLATE.get().isSame(fluid)) {
event.setRed(98 / 256f); event.setRed(98 / 256f);
event.setGreen(32 / 256f); event.setGreen(32 / 256f);
event.setBlue(32 / 256f); event.setBlue(32 / 256f);
} }
if (fluid.isSame(AllFluids.HONEY.get())) { if (AllFluids.HONEY.get().isSame(fluid)) {
event.setRed(234 / 256f); event.setRed(234 / 256f);
event.setGreen(174 / 256f); event.setGreen(174 / 256f);
event.setBlue(47 / 256f); event.setBlue(47 / 256f);