From 998efb6aa58a203765f9696d5593bacd22865b4b Mon Sep 17 00:00:00 2001 From: Adubbz Date: Fri, 4 Oct 2019 19:45:54 +1000 Subject: [PATCH] Update to Forge RB, update MCP mappings --- gradle.properties | 4 ++-- .../biomesoplenty/common/entity/item/BoatEntityBOP.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6d775b619..8f90f6ff6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ mod_version=9.0.0 minecraft_version=1.14.4 minecraft_version_toml=14 -forge_version=28.0.55 +forge_version=28.1.0 forge_version_toml=28 forge_group=net.minecraftforge -mappings_version=20190722-1.14.3 +mappings_version=20191004-1.14.3 diff --git a/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java b/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java index 0db6104b9..df5f7a573 100644 --- a/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java +++ b/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java @@ -383,7 +383,7 @@ public class BoatEntityBOP extends BoatEntity { blockpos$pooledmutableblockpos.setPos(l1, k1, i2); IFluidState ifluidstate = this.world.getFluidState(blockpos$pooledmutableblockpos); if (ifluidstate.isTagged(FluidTags.WATER)) { - f = Math.max(f, ifluidstate.func_215679_a(this.world, blockpos$pooledmutableblockpos)); + f = Math.max(f, ifluidstate.getActualHeight(this.world, blockpos$pooledmutableblockpos)); } if (f >= 1.0F) { @@ -461,7 +461,7 @@ public class BoatEntityBOP extends BoatEntity { blockpos$pooledmutableblockpos.setPos(k1, l1, i2); IFluidState ifluidstate = this.world.getFluidState(blockpos$pooledmutableblockpos); if (ifluidstate.isTagged(FluidTags.WATER)) { - float f = (float) l1 + ifluidstate.func_215679_a(this.world, blockpos$pooledmutableblockpos); + float f = (float) l1 + ifluidstate.getActualHeight(this.world, blockpos$pooledmutableblockpos); this.waterLevel = Math.max((double) f, this.waterLevel); flag |= axisalignedbb.minY < (double) f; } @@ -494,7 +494,7 @@ public class BoatEntityBOP extends BoatEntity { for (int i2 = i1; i2 < j1; ++i2) { blockpos$pooledmutableblockpos.setPos(k1, l1, i2); IFluidState ifluidstate = this.world.getFluidState(blockpos$pooledmutableblockpos); - if (ifluidstate.isTagged(FluidTags.WATER) && d0 < (double) ((float) blockpos$pooledmutableblockpos.getY() + ifluidstate.func_215679_a(this.world, blockpos$pooledmutableblockpos))) { + if (ifluidstate.isTagged(FluidTags.WATER) && d0 < (double) ((float) blockpos$pooledmutableblockpos.getY() + ifluidstate.getActualHeight(this.world, blockpos$pooledmutableblockpos))) { if (!ifluidstate.isSource()) { return Status.UNDER_FLOWING_WATER; }