Skip to content

Commit d549564

Browse files
AvanatikerAvanatiker
committed
Some smol improvements
1 parent 3191bdf commit d549564

File tree

5 files changed

+35
-49
lines changed

5 files changed

+35
-49
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ private static Identifier getTexture(Identifier original, BipedEntityRenderState
4848

4949
@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V", at = @At("HEAD"), cancellable = true)
5050
private void injectRender(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, BipedEntityRenderState bipedEntityRenderState, float f, float g, CallbackInfo ci) {
51-
if (NoRender.INSTANCE.isEnabled() && NoRender.getNoArmor() && NoRender.getIncludeNoElytra()) ci.cancel();
51+
if (NoRender.INSTANCE.isEnabled()&& NoRender.getNoElytra()) ci.cancel();
5252
}
5353
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void injectRenderVignetteOverlay(DrawContext context, Entity entity, Cal
6060

6161
@Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true)
6262
private void injectRenderStatusEffectOverlay(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
63-
if (NoRender.INSTANCE.isEnabled() && NoRender.getNoStatusIcons()) ci.cancel();
63+
if (NoRender.INSTANCE.isEnabled() && NoRender.getNoStatusEffects()) ci.cancel();
6464
}
6565

6666
@Inject(method = "renderSpyglassOverlay", at = @At("HEAD"), cancellable = true)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private static void onRenderFireOverlay(MatrixStack matrices, VertexConsumerProv
3939
@ModifyArg(method = "renderFireOverlay", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V"), index = 1)
4040
private static float onRenderFireOverlayTranslate(float x) {
4141
if (NoRender.INSTANCE.isEnabled()) {
42-
return (float) NoRender.getFireOverlayYOffset();
42+
return (float) NoRender.getFireOverlayYOffset() - 0.3f;
4343
} else {
4444
return -0.3f;
4545
}

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

Lines changed: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ object NoRender : Module(
3838
) {
3939
private val entities = scanResult
4040
.getSubclasses(Entity::class.java)
41-
.asSequence()
4241
.filter { !it.isAbstract && it.name.startsWith("net.minecraft") }
4342

4443
private val particleMap = createParticleNameMap()
@@ -63,8 +62,8 @@ object NoRender : Module(
6362
@JvmStatic val noDarkness by setting("No Darkness", true).group(Group.Effect)
6463
@JvmStatic val noNausea by setting("No Nausea", true).group(Group.Effect)
6564

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)
65+
@JvmStatic val noFireOverlay by setting("No Fire Overlay", false).group(Group.Hud)
66+
@JvmStatic val fireOverlayYOffset by setting("Fire Overlay Y Offset", 0.3, -0.4..0.4, 0.02) { !noFireOverlay }.group(Group.Hud)
6867
@JvmStatic val noPortalOverlay by setting("No Portal Overlay", true).group(Group.Hud)
6968
@JvmStatic val noFluidOverlay by setting("No Fluid Overlay", true).group(Group.Hud)
7069
@JvmStatic val noPowderedSnowOverlay by setting("No Powdered Snow Overlay", true).group(Group.Hud)
@@ -78,15 +77,15 @@ object NoRender : Module(
7877
@JvmStatic val noCrosshair by setting("No Crosshair", false).group(Group.Hud)
7978
@JvmStatic val noBossBar by setting("No Boss Bar", false).group(Group.Hud)
8079
@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)
80+
@JvmStatic val noStatusEffects by setting("No Status Effects", false).group(Group.Hud)
8281

8382
@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)
83+
@JvmStatic val noElytra by setting("No Elytra", false).group(Group.Entity)
8584
@JvmStatic val includeNoOtherHeadItems by setting("Include No Other Head Items", false) { noArmor }.group(Group.Entity)
8685
@JvmStatic val noInvisibility by setting("No Invisibility", true).group(Group.Entity)
8786
@JvmStatic val noGlow by setting("No Glow", false).group(Group.Entity)
8887
@JvmStatic val noNametags by setting("No Nametags", false).group(Group.Entity)
89-
// Blehhh cba
88+
// RenderLayer.getArmorEntityGlint(), RenderLayer.getGlint(), RenderLayer.getGlintTranslucent(), RenderLayer.getEntityGlint()
9089
// @JvmStatic val noEnchantmentGlint by setting("No Enchantment Glint", false).group(Group.Entity)
9190
// @JvmStatic val noDeadEntities by setting("No Dead Entities", false).group(Group.Entity)
9291
private val playerEntities by setting("Player Entities", playerEntityMap.values.toSet(), emptySet(), "Player entities to omit from rendering").group(Group.Entity)
@@ -108,56 +107,41 @@ object NoRender : Module(
108107
@JvmStatic val noSpawnerMob by setting("No Spawner Mob", false).group(Group.World)
109108
private val particles by setting("Particles", particleMap.values.toSet(), emptySet(), "Particles to omit from rendering").group(Group.World)
110109

111-
private fun createParticleNameMap(): Map<String, String> {
112-
val subClasses = scanResult
110+
private fun createParticleNameMap() =
111+
scanResult
113112
.getSubclasses(Particle::class.java)
114-
.filter { !it.isAbstract }
115-
return createNameMap(subClasses.asSequence(), "net.minecraft.client.particle.", "Particle")
116-
}
113+
.filter { !it.isAbstract }.createNameMap("net.minecraft.client.particle.", "Particle")
117114

118-
private fun createEntityNameMap(directory: String, strictDir: Boolean = false): Map<String, String> {
119-
return createNameMap(entities, directory, "Entity", strictDir)
120-
}
115+
private fun createEntityNameMap(directory: String, strictDir: Boolean = false) =
116+
entities.createNameMap(directory, "Entity", strictDir)
121117

122-
private fun createBlockEntityNameMap(): Map<String, String> {
123-
val subClasses = scanResult
118+
private fun createBlockEntityNameMap() =
119+
scanResult
124120
.getSubclasses(BlockEntity::class.java)
125-
.filter { !it.isAbstract }
126-
return createNameMap(subClasses.asSequence(), "net.minecraft.block.entity", "BlockEntity")
127-
}
121+
.filter { !it.isAbstract }.createNameMap("net.minecraft.block.entity", "BlockEntity")
128122

129-
private fun createNameMap(
130-
items: Sequence<ClassInfo>,
123+
private fun Collection<ClassInfo>.createNameMap(
131124
directory: String,
132125
removePattern: String = "",
133126
strictDirectory: Boolean = false
134-
): Map<String, String> {
135-
val map = mutableMapOf<String, String>()
136-
items
137-
.map {
138-
val remappedName = it.name.remappedName
139-
val displayName = remappedName
140-
.substring(remappedName.indexOfLast { it == '.' } + 1)
141-
.replace(removePattern, "")
142-
.fancyFormat()
143-
MappingInfo(it.simpleName, remappedName, displayName)
144-
}
145-
.sortedBy { it.displayName.lowercase() }
146-
.filter { info ->
147-
if (strictDirectory)
148-
info.remapped.startsWith(directory) && !info.remapped.substring(directory.length).contains(".")
149-
else info.remapped.startsWith(directory)
150-
}
151-
.forEach { info ->
152-
map[info.raw] = info.displayName
153-
}
154-
return map
155-
}
127+
) = map {
128+
val remappedName = it.name.remappedName
129+
val displayName = remappedName
130+
.substring(remappedName.indexOfLast { it == '.' } + 1)
131+
.replace(removePattern, "")
132+
.fancyFormat()
133+
MappingInfo(it.simpleName, remappedName, displayName)
134+
}
135+
.sortedBy { it.displayName.lowercase() }
136+
.filter { info ->
137+
if (strictDirectory)
138+
info.remapped.startsWith(directory) && !info.remapped.substring(directory.length).contains(".")
139+
else info.remapped.startsWith(directory)
140+
}
141+
.associate { it.raw to it.displayName }
156142

157143
private fun String.fancyFormat() =
158-
this
159-
.replace("$", " - ")
160-
.replace("(?<!\\s)[A-Z]".toRegex(), " $0")
144+
replace("$", " - ").replace("(?<!\\s)[A-Z]".toRegex(), " $0")
161145

162146
@JvmStatic
163147
fun shouldOmitParticle(particle: Particle) =

‎src/main/kotlin/com/lambda/util/DynamicReflectionSerializer.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import net.minecraft.nbt.NbtCompound
3333
import net.minecraft.registry.RegistryKey
3434
import net.minecraft.registry.entry.RegistryEntry
3535
import net.minecraft.screen.ScreenHandlerType
36+
import net.minecraft.text.MutableText
3637
import net.minecraft.text.Text
3738
import net.minecraft.util.Identifier
3839
import net.minecraft.util.math.BlockPos
@@ -67,6 +68,7 @@ object DynamicReflectionSerializer : Loadable {
6768
TranslationStorage::class,
6869
ChunkPos::class,
6970
Text::class,
71+
MutableText::class,
7072
org.slf4j.Logger::class,
7173
String::class,
7274
)

0 commit comments

Comments
 (0)