diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 96278a388..0d2ce40c1 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -1152,6 +1152,10 @@ opencomputers { # the *worst case* is ~30KB/s/client. Again, for normal use-cases this # is actually barely noticeable. setRawDelay: 0.2 + + # Whether the hologram block should provide light. It'll also emit light + # when off, because having state-based light in MC is... painful. + emitLight: true } # Other settings that you might find useful to tweak. diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index ae7f7432f..aaeaac4ba 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -307,6 +307,7 @@ class Settings(val config: Config) { Array(0.25, 0.5) } val hologramSetRawDelay = config.getDouble("hologram.setRawDelay") max 0 + val hologramLight = config.getBoolean("hologram.emitLight") // ----------------------------------------------------------------------- // // misc diff --git a/src/main/scala/li/cil/oc/common/block/Hologram.scala b/src/main/scala/li/cil/oc/common/block/Hologram.scala index 069e4b200..1dab43a83 100644 --- a/src/main/scala/li/cil/oc/common/block/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/block/Hologram.scala @@ -4,6 +4,7 @@ import java.util import cpw.mods.fml.relauncher.Side import cpw.mods.fml.relauncher.SideOnly +import li.cil.oc.Settings import li.cil.oc.common.tileentity import li.cil.oc.integration.coloredlights.ModColoredLights import li.cil.oc.util.Rarity @@ -15,7 +16,9 @@ import net.minecraft.world.World import net.minecraftforge.common.util.ForgeDirection class Hologram(val tier: Int) extends SimpleBlock with traits.SpecialBlock { - ModColoredLights.setLightLevel(this, 15, 15, 15) + if (Settings.get.hologramLight) { + ModColoredLights.setLightLevel(this, 15, 15, 15) + } setBlockBounds(0, 0, 0, 1, 0.5f, 1) // ----------------------------------------------------------------------- //