From a12056fbf4c469ff8b41f84a9ed3d1fa99776871 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jan 2020 18:18:31 -0600 Subject: [PATCH] Remove custom getLightValue from subtiles, should be implemented on a per-block basis now the usual vanilla way. May resolve lighting issues? (#3140) --- .../botania/api/subtile/TileEntitySpecialFlower.java | 7 ------- .../vazkii/botania/common/block/BlockAlfPortal.java | 2 +- .../java/vazkii/botania/common/block/BlockAltar.java | 10 ++++++---- .../common/block/BlockFloatingSpecialFlower.java | 6 ------ .../botania/common/block/BlockSpecialFlower.java | 8 -------- 5 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index c55e330b8..be46aa435 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -298,13 +298,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc) {} - /** - * Gets the light value for this SubTileEntity, this is a int (-1 to default to the flower) - */ - public int getLightValue() { - return 0; - } - /** * Gets the comparator input value for this SubTileEntity */ diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 52561340e..34c521d7b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -64,7 +64,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable { @Override public int getLightValue(@Nonnull BlockState state) { - return state.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; + return state.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : super.getLightValue(state); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 5447c4aa8..39c2bc4af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -101,10 +101,12 @@ public class BlockAltar extends BlockMod { @Override public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - TileAltar tile = (TileAltar) world.getTileEntity(pos); - return tile != null && tile.getFluid() == Fluids.LAVA ? 15 : 0; + TileEntity te = world.getTileEntity(pos); + if (te instanceof TileAltar && ((TileAltar) te).getFluid() == Fluids.LAVA) { + return 15; + } else { + return super.getLightValue(state, world, pos); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 59d63896b..afe1bbf35 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -46,12 +46,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I this.teProvider = teProvider; } - @Override - public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - return tile instanceof TileEntitySpecialFlower ? ((TileEntitySpecialFlower) tile).getLightValue() : lightValue; - } - @Override public boolean hasComparatorInputOverride(BlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index e13297766..332de9244 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -60,14 +60,6 @@ public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandH return SHAPE.withOffset(shift.x, shift.y, shift.z); } - @Override - public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) { - TileEntity te = world.getTileEntity(pos); - if (te instanceof TileEntitySpecialFlower) { - return ((TileEntitySpecialFlower) te).getLightValue(); - } else return 0; - } - @Override public boolean hasComparatorInputOverride(BlockState state) { return true;