diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 18bc0e654..3c6607c23 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -83,6 +83,8 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a960db66c..9b966adac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -131,6 +131,8 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Override public int getLightValue(IBlockState state, IBlockAccess world, 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.hasLava) ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 12d889143..5709ef7a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -85,6 +85,9 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + TileEntity tile = world.getTileEntity(pos); int currentLight = tile instanceof TileSpecialFlower ? ((TileSpecialFlower) tile).getLightValue() : -1; if(currentLight == -1) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 445b39579..53777abf1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -87,6 +87,8 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 53ba12318..ba27cc36c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -171,6 +171,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + int currentLight = world.getTileEntity(pos) == null ? -1 : ((TileSpecialFlower) world.getTileEntity(pos)).getLightValue(); if(currentLight == -1) currentLight = 0; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 8aa5b2d83..8b0a19901 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -45,6 +45,8 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 795fed648..b155cc2bc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -161,6 +161,8 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index dd4e2ab4c..b1e351e31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -61,6 +61,8 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index c73ae2d33..5318d0c78 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -119,6 +119,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index c24e6e739..022e4a7ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -40,6 +40,9 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 1b058664c..9520a9050 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -38,6 +38,9 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili @Override @Optional.Method(modid = "easycoloredlights") public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { + if(world.getBlockState(pos).getBlock() != this) + return world.getBlockState(pos).getLightValue(world, pos); + return ColoredLightHelper.getPackedColor(world.getBlockState(pos).getValue(BotaniaStateProps.COLOR), originalLight); }