Skip to content

Commit 509f5b9

Browse files
committed
default to no entities enabled in NoRender and only check self if its mc.player
1 parent 51fade3 commit 509f5b9

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/main/kotlin/com/lambda/config/groups/EntitySelectionSettings.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ class EntitySelectionSettings(
4646
override val passiveEntities by c.setting("${prefix}Passive Entities", emptySet(), passiveEntityMap.values.toSet(), "Passive entities to omit from rendering").group(*baseGroup).index()
4747
override val vehicleEntities by c.setting("${prefix}Vehicle Entities", emptySet(), vehicleEntityMap.values.toSet(), "Vehicle entities to omit from rendering").group(*baseGroup).index()
4848
override val projectileEntities by c.setting("${prefix}Projectile Entities", emptySet(), projectileEntityMap.values.toSet(), "Projectile entities to omit from rendering").group(*baseGroup).index()
49-
override val bossEntities by c.setting("${prefix}Boss Entities", emptySet(), bossEntityMap.values.toSet(), "Boss entities to omit from rendering").group(*baseGroup).index()
49+
override val bossEntities by c.setting("${prefix}Boss Entities", bossEntityMap.values.toSet(), bossEntityMap.values.toSet(), "Boss entities to omit from rendering").group(*baseGroup).index()
5050
override val decorationEntities by c.setting("${prefix}Decoration Entities", emptySet(), decorationEntityMap.values.toSet(), "Decoration entities to omit from rendering").group(*baseGroup).index()
5151
override val blockEntities by c.setting("${prefix}Block Entities", emptySet(), blockEntityMap.values.toSet(), "Block entities to omit from rendering").group(*baseGroup).index()
5252
override val miscEntities by c.setting("${prefix}Misc Entities", emptySet(), miscEntityMap.values.toSet(), "Miscellaneous entities to omit from rendering").group(*baseGroup).index()
5353

5454
fun isSelected(entity: Entity): Boolean {
5555
val name = entity::class.simpleName
56-
return if (entity == mc.player && !self) false
56+
return if (entity == mc.player) self
5757
else when (entity.type.spawnGroup) {
5858
SpawnGroup.MISC ->
5959
miscEntityMap[name] in miscEntities ||

src/main/kotlin/com/lambda/module/modules/render/Nametags.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ object Nametags : Module(
6060
}
6161

6262
private enum class TextGroup(override val displayName: String): NamedEnum {
63-
Friend("Friend"),
64-
Other("Other")
63+
Other("Other"),
64+
Friend("Friend")
6565
}
6666

6767
private val itemScale by setting("Item Scale", 3f, 0.4f..5f, 0.01f).group(Group.General)

src/main/kotlin/com/lambda/module/modules/render/NoRender.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package com.lambda.module.modules.render
1919

20+
import com.lambda.config.applyEdits
2021
import com.lambda.config.groups.EntitySelectionSettings
2122
import com.lambda.module.Module
2223
import com.lambda.module.tag.ModuleTag
@@ -72,7 +73,13 @@ object NoRender : Module(
7273
// RenderLayer.getArmorEntityGlint(), RenderLayer.getGlint(), RenderLayer.getGlintTranslucent(), RenderLayer.getEntityGlint()
7374
// @JvmStatic val noEnchantmentGlint by setting("No Enchantment Glint", false).group(Group.Entity)
7475
// @JvmStatic val noDeadEntities by setting("No Dead Entities", false).group(Group.Entity)
75-
private val entitySettings = EntitySelectionSettings(c = this, baseGroup = arrayOf(Group.Entity))
76+
private val entitySettings = EntitySelectionSettings(c = this, baseGroup = arrayOf(Group.Entity)).apply {
77+
applyEdits {
78+
editTyped(::playerEntities, ::mobEntities, ::bossEntities) {
79+
defaultValue(mutableSetOf())
80+
}
81+
}
82+
}
7683

7784
@JvmStatic val noTerrainFog by setting("No Terrain Fog", false).group(Group.World)
7885
@JvmStatic val noSignText by setting("No Sign Text", false).group(Group.World)

src/main/kotlin/com/lambda/module/modules/render/Tracers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ object Tracers : Module(
5353
}
5454

5555
private enum class LineGroup(override val displayName: String) : NamedEnum {
56-
Friend("Friend"),
57-
Other("Other")
56+
Other("Other"),
57+
Friend("Friend")
5858
}
5959

6060
private val target by setting("Target", TracerMode.Feet).group(Group.General)

0 commit comments

Comments
 (0)