Skip to content

Commit 4d0d39a

Browse files
beanbag44beanbag44
committed
setting groups
1 parent 40f287b commit 4d0d39a

File tree

2 files changed

+55
-44
lines changed

2 files changed

+55
-44
lines changed

‎src/main/java/com/lambda/mixin/render/InGameOverlayRendererMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class InGameOverlayRendererMixin {
3434
@Inject(method = "renderFireOverlay", at = @At("HEAD"), cancellable = true)
3535
private static void onRenderFireOverlay(MatrixStack matrices, VertexConsumerProvider vertexConsumers, CallbackInfo ci) {
36-
if (NoRender.INSTANCE.isEnabled() && NoRender.getNoBurning()) ci.cancel();
36+
if (NoRender.INSTANCE.isEnabled() && NoRender.getNoFireOverlay()) ci.cancel();
3737
}
3838

3939
@ModifyArg(method = "renderFireOverlay", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V"), index = 1)

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

Lines changed: 54 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package com.lambda.module.modules.render
2020
import com.lambda.module.Module
2121
import com.lambda.module.tag.ModuleTag
2222
import com.lambda.util.DynamicReflectionSerializer.remappedName
23+
import com.lambda.util.NamedEnum
2324
import com.lambda.util.reflections.scanResult
2425
import io.github.classgraph.ClassInfo
2526
import net.minecraft.block.entity.BlockEntity
@@ -51,51 +52,61 @@ object NoRender : Module(
5152
private val vehicleEntityMap = createEntityNameMap("net.minecraft.entity.vehicle.")
5253
private val miscEntityMap = createEntityNameMap("net.minecraft.entity.", strictDir = true)
5354

54-
@JvmStatic val noBlindness by setting("No Blindness", true)
55-
@JvmStatic val noDarkness by setting("No Darkness", true)
56-
@JvmStatic val noNausea by setting("No Nausea", true)
57-
@JvmStatic val noBurning by setting("No Burning Overlay", true)
58-
@JvmStatic val fireOverlayYOffset by setting("Fire Overlay Y Offset", -0.3, -0.8..0.0, 0.1) { !noBurning }
59-
@JvmStatic val noPortalOverlay by setting("No Portal Overlay", true)
60-
@JvmStatic val noFluidOverlay by setting("No Fluid Overlay", true)
61-
@JvmStatic val noPowderedSnowOverlay by setting("No Powdered Snow Overlay", true)
62-
@JvmStatic val noInWall by setting("No In Wall Overlay", true)
63-
@JvmStatic val noPumpkinOverlay by setting("No Pumpkin Overlay", true)
64-
@JvmStatic val noVignette by setting("No Vignette", true)
65-
@JvmStatic val noSpyglassOverlay by setting("No Spyglass Overlay", false)
66-
@JvmStatic val noGuiShadow by setting("No Gui Shadow", false)
67-
@JvmStatic val noFloatingItemAnimation by setting("No Floating Item Animation", false, "Disables floating item animations, typically used when a totem pops")
68-
@JvmStatic val noSignText by setting("No Sign Text", false)
55+
private enum class Group(override val displayName: String) : NamedEnum {
56+
Hud("Hud"),
57+
Entity("Entity"),
58+
World("World"),
59+
Effect("Effect")
60+
}
61+
62+
@JvmStatic val noBlindness by setting("No Blindness", true).group(Group.Effect)
63+
@JvmStatic val noDarkness by setting("No Darkness", true).group(Group.Effect)
64+
@JvmStatic val noNausea by setting("No Nausea", true).group(Group.Effect)
65+
66+
@JvmStatic val noFireOverlay by setting("No Fire Overlay", true).group(Group.Hud)
67+
@JvmStatic val fireOverlayYOffset by setting("Fire Overlay Y Offset", -0.3, -0.8..0.0, 0.1) { !noFireOverlay }.group(Group.Hud)
68+
@JvmStatic val noPortalOverlay by setting("No Portal Overlay", true).group(Group.Hud)
69+
@JvmStatic val noFluidOverlay by setting("No Fluid Overlay", true).group(Group.Hud)
70+
@JvmStatic val noPowderedSnowOverlay by setting("No Powdered Snow Overlay", true).group(Group.Hud)
71+
@JvmStatic val noInWall by setting("No In Wall Overlay", true).group(Group.Hud)
72+
@JvmStatic val noPumpkinOverlay by setting("No Pumpkin Overlay", true).group(Group.Hud)
73+
@JvmStatic val noVignette by setting("No Vignette", true).group(Group.Hud)
74+
@JvmStatic val noChatVerificationToast by setting("No Chat Verification Toast", true).group(Group.Hud)
75+
@JvmStatic val noSpyglassOverlay by setting("No Spyglass Overlay", false).group(Group.Hud)
76+
@JvmStatic val noGuiShadow by setting("No Gui Shadow", false).group(Group.Hud)
77+
@JvmStatic val noFloatingItemAnimation by setting("No Floating Item Animation", false, "Disables floating item animations, typically used when a totem pops").group(Group.Hud)
78+
@JvmStatic val noCrosshair by setting("No Crosshair", false).group(Group.Hud)
79+
@JvmStatic val noBossBar by setting("No Boss Bar", false).group(Group.Hud)
80+
@JvmStatic val noScoreBoard by setting("No Score Board", false).group(Group.Hud)
81+
@JvmStatic val noStatusIcons by setting("No Status Icons", false).group(Group.Hud)
82+
83+
@JvmStatic val noArmor by setting("No Armor", false).group(Group.Entity)
84+
@JvmStatic val includeNoElytra by setting("Include No Elytra", false) { noArmor }.group(Group.Entity)
85+
@JvmStatic val includeNoOtherHeadItems by setting("Include No Other Head Items", false) { noArmor }.group(Group.Entity)
86+
@JvmStatic val noInvisibility by setting("No Invisibility", true).group(Group.Entity)
87+
@JvmStatic val noGlow by setting("No Glow", false).group(Group.Entity)
88+
@JvmStatic val noNametags by setting("No Nametags", false).group(Group.Entity)
6989
// Blehhh cba
70-
// @JvmStatic val noEnchantmentGlint by setting("No Enchantment Glint", false)
71-
@JvmStatic val noArmor by setting("No Armor", false)
72-
@JvmStatic val includeNoElytra by setting("Include No Elytra", false) { noArmor }
73-
@JvmStatic val includeNoOtherHeadItems by setting("Include No Other Head Items", false) { noArmor }
74-
@JvmStatic val noInvisibility by setting("No Invisibility", true)
75-
@JvmStatic val noGlow by setting("No Glow", false)
76-
@JvmStatic val noCrosshair by setting("No Crosshair", false)
77-
@JvmStatic val noBossBar by setting("No Boss Bar", false)
78-
@JvmStatic val noScoreBoard by setting("No Score Board", false)
79-
@JvmStatic val noStatusIcons by setting("No Status Icons", false)
80-
@JvmStatic val noWorldBorder by setting("No World Border", false)
81-
@JvmStatic val noEnchantingTableBook by setting("No Enchanting Table Book", false)
82-
@JvmStatic val noChatVerificationToast by setting("No Chat Verification Toast", true)
90+
// @JvmStatic val noEnchantmentGlint by setting("No Enchantment Glint", false).group(Group.Entity)
91+
// @JvmStatic val noDeadEntities by setting("No Dead Entities", false).group(Group.Entity)
92+
private val playerEntities by setting("Player Entities", playerEntityMap.values.toSet(), emptySet(), "Player entities to omit from rendering").group(Group.Entity)
93+
private val bossEntities by setting("Boss Entities", bossEntityMap.values.toSet(), emptySet(), "Boss entities to omit from rendering").group(Group.Entity)
94+
private val decorationEntities by setting("Decoration Entities", decorationEntityMap.values.toSet(), emptySet(), "Decoration entities to omit from rendering").group(Group.Entity)
95+
private val mobEntities by setting("Mob Entities", mobEntityMap.values.toSet(), emptySet(), "Mob entities to omit from rendering").group(Group.Entity)
96+
private val passiveEntities by setting("Passive Entities", passiveEntityMap.values.toSet(), emptySet(), "Passive entities to omit from rendering").group(Group.Entity)
97+
private val projectileEntities by setting("Projectile Entities", projectileEntityMap.values.toSet(), emptySet(), "Projectile entities to omit from rendering").group(Group.Entity)
98+
private val vehicleEntities by setting("Vehicle Entities", vehicleEntityMap.values.toSet(), emptySet(), "Vehicle entities to omit from rendering").group(Group.Entity)
99+
private val miscEntities by setting("Misc Entities", miscEntityMap.values.toSet(), emptySet(), "Miscellaneous entities to omit from rendering").group(Group.Entity)
100+
private val blockEntities by setting("Block Entities", blockEntityMap.values.toSet(), emptySet(), "Block entities to omit from rendering").group(Group.Entity)
101+
102+
@JvmStatic val noSignText by setting("No Sign Text", false).group(Group.World)
103+
@JvmStatic val noWorldBorder by setting("No World Border", false).group(Group.World)
104+
@JvmStatic val noEnchantingTableBook by setting("No Enchanting Table Book", false).group(Group.World)
83105
// Couldn't get to work with block entities without crashing with sodium on boot
84-
// @JvmStatic val noBlockBreakingOverlay by setting("No Block Breaking Overlay", false)
85-
@JvmStatic val noBeaconBeams by setting("No Beacon Beams", false)
86-
@JvmStatic val noSpawnerMob by setting("No Spawner Mob", false)
87-
// @JvmStatic val noDeadEntities by setting("No Dead Entities", false)
88-
@JvmStatic val noNametags by setting("No Nametags", false)
89-
private val particles by setting("Particles", particleMap.values.toSet(), emptySet(), "Particles to omit from rendering")
90-
private val playerEntities by setting("Player Entities", playerEntityMap.values.toSet(), emptySet(), "Player entities to omit from rendering")
91-
private val bossEntities by setting("Boss Entities", bossEntityMap.values.toSet(), emptySet(), "Boss entities to omit from rendering")
92-
private val decorationEntities by setting("Decoration Entities", decorationEntityMap.values.toSet(), emptySet(), "Decoration entities to omit from rendering")
93-
private val mobEntities by setting("Mob Entities", mobEntityMap.values.toSet(), emptySet(), "Mob entities to omit from rendering")
94-
private val passiveEntities by setting("Passive Entities", passiveEntityMap.values.toSet(), emptySet(), "Passive entities to omit from rendering")
95-
private val projectileEntities by setting("Projectile Entities", projectileEntityMap.values.toSet(), emptySet(), "Projectile entities to omit from rendering")
96-
private val vehicleEntities by setting("Vehicle Entities", vehicleEntityMap.values.toSet(), emptySet(), "Vehicle entities to omit from rendering")
97-
private val miscEntities by setting("Misc Entities", miscEntityMap.values.toSet(), emptySet(), "Miscellaneous entities to omit from rendering")
98-
private val blockEntities by setting("Block Entities", blockEntityMap.values.toSet(), emptySet(), "Block entities to omit from rendering")
106+
// @JvmStatic val noBlockBreakingOverlay by setting("No Block Breaking Overlay", false).group(Group.World)
107+
@JvmStatic val noBeaconBeams by setting("No Beacon Beams", false).group(Group.World)
108+
@JvmStatic val noSpawnerMob by setting("No Spawner Mob", false).group(Group.World)
109+
private val particles by setting("Particles", particleMap.values.toSet(), emptySet(), "Particles to omit from rendering").group(Group.World)
99110

100111
private fun createParticleNameMap(): Map<String, String> {
101112
val subClasses = scanResult

0 commit comments

Comments
 (0)