b687180e12
Once the old folder is done, then patches are done. Want to know whats still to do? Look in that folder. Now stop asking.
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockLiquid.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockLiquid.java
|
|
@@ -284,14 +284,14 @@
|
|
|
|
if (integer.intValue() == 0)
|
|
{
|
|
- p_176365_1_.func_175656_a(p_176365_2_, Blocks.field_150343_Z.func_176223_P());
|
|
+ p_176365_1_.func_175656_a(p_176365_2_, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_176365_1_, p_176365_2_, p_176365_2_, Blocks.field_150343_Z.func_176223_P()));
|
|
this.func_180688_d(p_176365_1_, p_176365_2_);
|
|
return true;
|
|
}
|
|
|
|
if (integer.intValue() <= 4)
|
|
{
|
|
- p_176365_1_.func_175656_a(p_176365_2_, Blocks.field_150347_e.func_176223_P());
|
|
+ p_176365_1_.func_175656_a(p_176365_2_, net.minecraftforge.event.ForgeEventFactory.fireFluidPlaceBlockEvent(p_176365_1_, p_176365_2_, p_176365_2_, Blocks.field_150347_e.func_176223_P()));
|
|
this.func_180688_d(p_176365_1_, p_176365_2_);
|
|
return true;
|
|
}
|
|
@@ -452,4 +452,29 @@
|
|
{
|
|
return BlockFaceShape.UNDEFINED;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ @SideOnly (Side.CLIENT)
|
|
+ public Vec3d getFogColor(World world, BlockPos pos, IBlockState state, Entity entity, Vec3d originalColor, float partialTicks)
|
|
+ {
|
|
+ Vec3d viewport = net.minecraft.client.renderer.ActiveRenderInfo.func_178806_a(entity, partialTicks);
|
|
+
|
|
+ if (state.func_185904_a().func_76224_d())
|
|
+ {
|
|
+ float height = 0.0F;
|
|
+ if (state.func_177230_c() instanceof BlockLiquid)
|
|
+ {
|
|
+ height = func_149801_b(state.func_177229_b(field_176367_b)) - 0.11111111F;
|
|
+ }
|
|
+ float f1 = (float) (pos.func_177956_o() + 1) - height;
|
|
+ if (viewport.field_72448_b > (double)f1)
|
|
+ {
|
|
+ BlockPos upPos = pos.func_177984_a();
|
|
+ IBlockState upState = world.func_180495_p(upPos);
|
|
+ return upState.func_177230_c().getFogColor(world, upPos, upState, entity, originalColor, partialTicks);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return super.getFogColor(world, pos, state, entity, originalColor, partialTicks);
|
|
+ }
|
|
}
|