Skip to content

Commit

Permalink
Update Targets.kt
Browse files Browse the repository at this point in the history
  • Loading branch information
C00LC0D35 authored Apr 20, 2023
1 parent f2e5edc commit 36ff3d4
Showing 1 changed file with 65 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import kotlin.math.roundToInt
@ElementInfo(name = "Targets")
open class Targets : Element(-46.0, -40.0, 1F, Side(Side.Horizontal.MIDDLE, Side.Vertical.MIDDLE)) {

val modeValue = ListValue("Mode", arrayOf("FDP", "Bar", "Chill", "ChillLite", "Stitch", "Rice", "Slowly", "Remix", "Novoline", "Novoline2" , "Astolfo", "Liquid", "Flux", "Rise", "Exhibition", "ExhibitionOld", "Zamorozka", "Arris", "Tenacity", "Tenacity5", "WaterMelon", "SparklingWater"), "Chill")
val modeValue = ListValue("Mode", arrayOf("FDP", "FDP2", "Bar", "Chill", "ChillLite", "Stitch", "Rice", "Slowly", "Remix", "Novoline", "Novoline2" , "Astolfo", "Liquid", "Flux", "Rise", "Exhibition", "ExhibitionOld", "Zamorozka", "Arris", "Tenacity", "Tenacity5", "WaterMelon", "SparklingWater"), "FDP2")
private val modeRise = ListValue("RiseMode", arrayOf("Original", "New1", "New2", "Rise6"), "Rise6").displayable { modeValue.equals("Rise") }

private val chillFontSpeed = FloatValue("Chill-FontSpeed", 0.5F, 0.01F, 1F).displayable { modeValue.get().equals("chill", true) }
Expand Down Expand Up @@ -307,6 +307,7 @@ open class Targets : Element(-46.0, -40.0, 1F, Side(Side.Horizontal.MIDDLE, Side

when (modeValue.get().lowercase()) {
"fdp" -> drawFDP(prevTarget!!)
"fdp2" -> drawFDP2(prevTarget!!)
"novoline" -> drawNovo(prevTarget!!)
"novoline2" -> drawNovo2(prevTarget!!)
"astolfo" -> drawAstolfo(prevTarget!!)
Expand Down Expand Up @@ -775,7 +776,7 @@ open class Targets : Element(-46.0, -40.0, 1F, Side(Side.Horizontal.MIDDLE, Side
GL11.glTranslatef(calcTranslateX, calcTranslateY, 0F)
GL11.glScalef(1F - calcScaleX, 1F - calcScaleY, 1F - calcScaleX)
}
RenderUtils.drawRect(2f, 2f, 48f + additionalWidth, 48f, Color(0, 0, 0, 130).rgb)
RenderUtils.drawRoundedCornerRect(0f, 0f, 50f + additionalWidth, 50f, 7f, Color(0, 0, 0, 130).rgb)
GL11.glPopMatrix()
}, {
GL11.glPushMatrix()
Expand All @@ -784,7 +785,7 @@ open class Targets : Element(-46.0, -40.0, 1F, Side(Side.Horizontal.MIDDLE, Side
GL11.glTranslatef(calcTranslateX, calcTranslateY, 0F)
GL11.glScalef(1F - calcScaleX, 1F - calcScaleY, 1F - calcScaleX)
}
RenderUtils.drawRect(2f, 2f, 48f + additionalWidth, 48f, Color(0, 0, 0, 130).rgb)
RenderUtils.drawRoundedCornerRect(0f, 0f, 50f + additionalWidth, 50f, 7f, Color(0, 0, 0, 130).rgb)
GL11.glPopMatrix()
})
GL11.glPopMatrix()
Expand Down Expand Up @@ -959,6 +960,67 @@ open class Targets : Element(-46.0, -40.0, 1F, Side(Side.Horizontal.MIDDLE, Side
font.drawString("Health ${getHealth(target).roundToInt()}", 56, 12 + (font.FONT_HEIGHT * 1.5).toInt(), Color.WHITE.rgb)

}

private fun drawFDP2(target: EntityLivingBase) {
val additionalWidth = ((font.getStringWidth(target.name) * 1.2).toInt().coerceAtLeast(70) + font.getStringWidth("Name: ") * 1.1 + 7.0).roundToInt()
val healthBarWidth = additionalWidth - (font.getStringWidth("20") * 1.15).roundToInt() - 16


RenderUtils.drawRoundedCornerRect(0f, 0f, 50f + additionalWidth, 50f, 7f, Color(0, 0, 0, 170).rgb)

if (shadowValue.get()) {
GL11.glTranslated(-renderX, -renderY, 0.0)
GL11.glPushMatrix()
ShadowUtils.shadow(shadowStrength.get(), {
GL11.glPushMatrix()
GL11.glTranslated(renderX, renderY, 0.0)
if (fadeValue.get()) {
GL11.glTranslatef(calcTranslateX, calcTranslateY, 0F)
GL11.glScalef(1F - calcScaleX, 1F - calcScaleY, 1F - calcScaleX)
}
RenderUtils.drawRoundedCornerRect(0f, 0f, 50f + additionalWidth, 50f, 7f, Color(0, 0, 0, 170).rgb)
GL11.glPopMatrix()
}, {
GL11.glPushMatrix()
GL11.glTranslated(renderX, renderY, 0.0)
if (fadeValue.get()) {
GL11.glTranslatef(calcTranslateX, calcTranslateY, 0F)
GL11.glScalef(1F - calcScaleX, 1F - calcScaleY, 1F - calcScaleX)
}
RenderUtils.drawRoundedCornerRect(0f, 0f, 50f + additionalWidth, 50f, 7f, Color(0, 0, 0, 170).rgb)
GL11.glPopMatrix()
})
GL11.glPopMatrix()
GL11.glTranslated(renderX, renderY, 0.0)
}

//draw head
GL11.glPushMatrix()

Stencil.write(false)
GL11.glDisable(GL11.GL_TEXTURE_2D)
GL11.glEnable(GL11.GL_BLEND)
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
RenderUtils.fastRoundedRect(5F, 4F, 47F, 46F, 5F)
GL11.glDisable(GL11.GL_BLEND)
GL11.glEnable(GL11.GL_TEXTURE_2D)
Stencil.erase(true)
drawHead(target.skin, 5, 4, 47, 46, 1F)
Stencil.dispose()
GL11.glPopMatrix()

// draw name
GL11.glPushMatrix()
GL11.glScalef(1.2f, 1.2f, 1.2f)
font.drawString("Name: ${target.name}", 43, 10, Color.WHITE.rgb)
GL11.glPopMatrix()
font.drawString("Hp: ${getHealth(target).roundToInt()}", 45, 20, Color.WHITE.rgb)

// draw health
RenderUtils.drawRoundedCornerRect(50f, 31f, 50f + healthBarWidth , 39f, 3f, Color(20, 20, 20, 255).rgb)
RenderUtils.drawRoundedCornerRect(50f, 31f, 50f + (healthBarWidth * (easingHP / target.maxHealth)) , 39f, 4f, Color(122, 214, 255, 255).rgb)

}

private fun drawExhibition(entity: EntityPlayer) {
val font = Fonts.fontTahoma
Expand Down

0 comments on commit 36ff3d4

Please sign in to comment.