Skip to content

Add Option for sawn Lamps to be always a Light Level 15 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glowredman merged 4 commits into from
Jan 27, 2026
Merged

Add Option for sawn Lamps to be always a Light Level 15 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b17bc22
Update lightmicroblocks.scala to remove glitch where lamps made no light
june-dev-username Jan 12, 2026
dcea32c
idk
june-dev-username Jan 12, 2026
8bad565
Merge branch 'master' into patch-1
june-dev-username Jan 26, 2026
95f957a
Add config option
glowredman Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/scala/mrtjp/projectred/core/Configurator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ object Configurator extends ModConfig("ProjRed|Core") {
var routerUpdateThreadCount = 4
var maxPipesWandered = 0

var dimmLampParts = true

var enchantment_fuel_efficiencty_id = 80

/** Machines * */
Expand Down Expand Up @@ -133,6 +135,11 @@ object Configurator extends ModConfig("ProjRed|Core") {
maxPipesWandered,
"Maximum distance an item may aimlessly wander in a pipe before being erased. 0 for unlimited."
)
dimmLampParts = general.put(
"Dimm Lamp Microblocks",
dimmLampParts,
"If Lamps should emit less light when being cut down in Microblocks."
)

enchantment_fuel_efficiencty_id = general.put(
"Enchantment: Fuel Efficiency",
Expand Down
14 changes: 9 additions & 5 deletions src/main/scala/mrtjp/projectred/illumination/lightmicroblocks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import codechicken.microblock.MicroblockGenerator.IGeneratedMaterial
import codechicken.microblock._
import cpw.mods.fml.relauncher.{Side, SideOnly}
import mrtjp.projectred.ProjectRedIllumination
import mrtjp.projectred.core.Configurator
import mrtjp.projectred.core.RenderHalo

class LightMicroMaterial(meta: Int)
Expand Down Expand Up @@ -81,10 +82,13 @@ trait LightMicroblock extends Microblock {
}

override def getLightValue = {
val totalSize = tile.partList
.collect { case p: LightMicroblock => p }
.map(_.getSize / 8.0)
.sum
math.min(15, (15 * totalSize).toInt)
if (Configurator.dimmLampParts) {
val totalSize = tile.partList
.collect { case p: LightMicroblock => p }
.map(_.getSize / 8.0)
.sum
math.min(15, (15 * totalSize).toInt)
} else if (tile.partList.exists(_.isInstanceOf[LightMicroblock])) 15
else 0
}
}