diff options
| author | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-09-19 19:32:24 -0400 |
|---|---|---|
| committer | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-09-19 19:32:24 -0400 |
| commit | ee274160da525f72caf64236e3b52edfaabb1234 (patch) | |
| tree | 1865a665cb166a470ee2e2f8ccc3606dff644499 /src/main | |
| parent | f2853531873b2a88949535289350a9ed56863eea (diff) | |
| download | SkytilsMod-ee274160da525f72caf64236e3b52edfaabb1234.tar.gz SkytilsMod-ee274160da525f72caf64236e3b52edfaabb1234.tar.bz2 SkytilsMod-ee274160da525f72caf64236e3b52edfaabb1234.zip | |
Hit
Diffstat (limited to 'src/main')
4 files changed, 9 insertions, 5 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/asm/transformers/DSMColoredNamesTransformer.kt b/src/main/kotlin/skytils/skytilsmod/asm/transformers/DSMColoredNamesTransformer.kt index c0e53949..b3f9ae86 100644 --- a/src/main/kotlin/skytils/skytilsmod/asm/transformers/DSMColoredNamesTransformer.kt +++ b/src/main/kotlin/skytils/skytilsmod/asm/transformers/DSMColoredNamesTransformer.kt @@ -49,7 +49,7 @@ object DSMColoredNamesTransformer { @JvmStatic fun modifyColoredNamesCheck(entity: Entity): Boolean { val customName = entity.customNameTag - return customName.isNotEmpty() && !customName.endsWith("§c❤") && !customName - .endsWith(" Hits") + return customName.isNotEmpty() && !customName.endsWith("§c❤") && !customName.dropLastWhile { it == 's' } + .endsWith(" Hit") } }
\ No newline at end of file diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt index 58e7047a..2afb4bfc 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt @@ -626,7 +626,8 @@ class SlayerFeatures { val alignment = if (leftAlign) SmartFontRenderer.TextAlignment.LEFT_RIGHT else SmartFontRenderer.TextAlignment.RIGHT_LEFT if (slayerNameEntity != null) { - if (slayerNameEntity!!.displayName.formattedText.contains("Hits")) { + if (slayerNameEntity!!.displayName.formattedText.dropLastWhile { it == 's' } + .endsWith(" Hit")) { ScreenRenderer.fontRenderer.drawString( "§dShield Phase", if (leftAlign) 0f else width.toFloat(), diff --git a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderHook.kt b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderHook.kt index 7a309591..ee05675b 100644 --- a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderHook.kt +++ b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderHook.kt @@ -47,7 +47,8 @@ fun renderLivingLabel( maxDistance: Int, ci: CallbackInfo ) { - if (Skytils.config.lowerEndermanNametags && (str.contains("❤") || str.contains("Hits")) && (str.contains("Enderman") || str.contains( + if (Skytils.config.lowerEndermanNametags && (str.contains("❤") || str.dropLastWhile { it == 's' } + .endsWith(" Hit")) && (str.contains("Enderman") || str.contains( "Zealot" ) || str.contains("Voidling") || str.contains("Voidgloom")) ) { diff --git a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RendererLivingEntityHook.kt b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RendererLivingEntityHook.kt index 56de558e..7816fed5 100644 --- a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RendererLivingEntityHook.kt +++ b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RendererLivingEntityHook.kt @@ -38,7 +38,9 @@ fun setColorMultiplier( entity.hurtTime = 0 if (yangGlyphEntity != null || yangGlyph != null) { cir.setReturnValue(Skytils.config.seraphBeaconPhaseColor.withAlpha(169)) - } else if (slayerNameEntity != null && slayerNameEntity!!.customNameTag.endsWith("Hits")) { + } else if (slayerNameEntity != null && (slayerNameEntity!!.customNameTag.dropLastWhile { it == 's' } + .endsWith(" Hit")) + ) { cir.setReturnValue(Skytils.config.seraphHitsPhaseColor.withAlpha(169)) } else cir.setReturnValue(Skytils.config.seraphNormalPhaseColor.withAlpha(169)) } |