Changed BlockFluidBase "fog" color use color from Fluid getColor() method (#4462)

This commit is contained in:
jabelar authored and LexManos committed 2017-10-31 10:46:40 -07:00
1 parent 7b4040b70b
commit 61dea7f4c0
10 files changed
+150 -37

No files matched your search

@@ -22,6 +22,11 @@ package net.minecraftforge.fluids;
import java.util.Map;
import java.util.Random;
import javax.annotation.Nonnull;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLiquid;
import net.minecraft.block.material.Material;
@@ -34,10 +39,10 @@ import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -48,11 +53,6 @@ import net.minecraftforge.common.property.PropertyFloat;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import javax.annotation.Nonnull;
/**
* This is a base implementation for Fluid blocks.
*
@@ -728,4 +728,22 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
{
return NULL_AABB;
}
@Override
@SideOnly (Side.CLIENT)
public Vec3d getFogColor(World world, BlockPos pos, IBlockState state, Entity entity, Vec3d originalColor, float partialTicks)
{
if (getFluid() != null)
{
int color = getFluid().getColor();
float red = (color >> 16 & 0xFF) / 255.0F;
float green = (color >> 8 & 0xFF) / 255.0F;
float blue = (color & 0xFF) / 255.0F;
return new Vec3d(red, green, blue);
}
else
{
return super.getFogColor(world, pos, state, entity, originalColor, partialTicks);
}
}
}