feat(legacy/ChineseHat): Hat texture option. (CCBlueX#5188)

mems01 · Jan 5, 2025 · 6724af2 · 6724af2
1 parent a4b7558
commit 6724af2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/render/ChineseHat.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/render/ChineseHat.kt
@@ -22,9 +22,9 @@ import net.ccbluex.liquidbounce.utils.extensions.*
 import net.ccbluex.liquidbounce.utils.render.ColorSettingsInteger
 import net.ccbluex.liquidbounce.utils.render.ColorUtils
 import net.ccbluex.liquidbounce.utils.render.ColorUtils.withAlpha
-import net.ccbluex.liquidbounce.utils.render.RenderUtils
 import net.ccbluex.liquidbounce.utils.render.RenderUtils.drawCone
 import net.ccbluex.liquidbounce.utils.render.RenderUtils.drawConesForEntities
+import net.ccbluex.liquidbounce.utils.render.RenderUtils.glStateManagerColor
 import net.ccbluex.liquidbounce.utils.rotation.RotationUtils.isEntityHeightVisible
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.entity.Entity
@@ -34,11 +34,10 @@ import java.awt.Color
 
 object ChineseHat : Module("ChineseHat", Category.RENDER) {
 
+    private val useChineseHatTexture by boolean("UseChineseHatTexture", false)
+
     private val colorMode by choices("Color", arrayOf("Custom", "DistanceColor", "Rainbow"), "Custom")
-    private val colors =
-        ColorSettingsInteger(this, zeroAlphaCheck = true, alphaApply = { true }) { colorMode == "Custom" }.with(
-            0, 160, 255, 150
-        )
+    private val colors = ColorSettingsInteger(this, zeroAlphaCheck = true, alphaApply = { true }) { colorMode == "Custom" }.with(0, 160, 255, 150)
 
     private val playerHeight by float("PlayerHeight", 0.5f, 0.25f..2f)
 
@@ -64,8 +63,6 @@ object ChineseHat : Module("ChineseHat", Category.RENDER) {
 
     val render = handler<Render3DEvent> {
         drawConesForEntities {
-            var lastColor: Color? = null
-
             for (entity in entityLookup) {
                 val isRenderingSelf =
                     entity == mc.thePlayer && (mc.gameSettings.thirdPersonView != 0 || FreeCam.handleEvents())
@@ -87,14 +84,9 @@ object ChineseHat : Module("ChineseHat", Category.RENDER) {
                 GlStateManager.pushMatrix()
                 GlStateManager.translate(x, y, z)
 
-                figureOutColor(entity).let {
-                    if (it != lastColor) {
-                        RenderUtils.glColor(it)
-                        lastColor = it
-                    }
-                }
+                glStateManagerColor(figureOutColor(entity))
 
-                drawCone(coneWidth, coneHeight)
+                drawCone(coneWidth, coneHeight, useChineseHatTexture)
 
                 GlStateManager.popMatrix()
 

diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.kt b/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.kt
@@ -373,32 +373,52 @@ object RenderUtils : MinecraftInstance {
 
         GlStateManager.disableTexture2D()
         GlStateManager.disableCull()
+
         GlStateManager.enableBlend()
         GlStateManager.enableDepth()
-        GL11.glDepthMask(false)
+        GlStateManager.depthMask(false)
         GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
 
         f()
 
-        RenderUtils.glColor(Color.WHITE)
+        GlStateManager.resetColor()
 
         GlStateManager.enableTexture2D()
-        GL11.glDepthMask(true)
+        GlStateManager.depthMask(true)
+        GlStateManager.enableCull()
+
         GlStateManager.disableBlend()
         GlStateManager.disableDepth()
-        GlStateManager.enableCull()
 
         GlStateManager.popMatrix()
         GlStateManager.popAttrib()
     }
 
-    fun drawCone(width: Float, height: Float) {
+    fun drawCone(width: Float, height: Float, useTexture: Boolean = false) {
+        if (useTexture) {
+            // TODO: Maybe image option support to allow many different type of hats.
+            mc.textureManager.bindTexture(ResourceLocation("liquidbounce/textures/hat.png"))
+            GlStateManager.enableTexture2D()
+            GlStateManager.depthMask(true)
+        }
+
         GL11.glBegin(GL11.GL_TRIANGLE_FAN)
 
+        if (useTexture) {
+            // Place texture in the middle, on the tip
+            GL11.glTexCoord2d(0.5, 0.5)
+        }
+
         // The tip of the cone
         GL11.glVertex3d(0.0, height.toDouble(), 0.0)
 
         for (point in circlePoints) {
+            if (useTexture) {
+                val u = 0.5 + 0.5 * point.xCoord
+                val v = 0.5 + 0.5 * point.zCoord
+                GL11.glTexCoord2d(u, v)
+            }
+
             GL11.glVertex3d(point.xCoord * width, 0.0, point.zCoord * width)
         }
 
@@ -976,6 +996,9 @@ object RenderUtils : MinecraftInstance {
 
     fun glColor(color: Color) = glColor(color.red, color.green, color.blue, color.alpha)
 
+    fun glStateManagerColor(color: Color) =
+        GlStateManager.color(color.red / 255f, color.green / 255f, color.blue / 255f, color.alpha / 255f)
+
     private fun glColor(hex: Int) = glColor(hex shr 16 and 0xFF, hex shr 8 and 0xFF, hex and 0xFF, hex shr 24 and 0xFF)
 
     fun draw2D(entity: EntityLivingBase, posX: Double, posY: Double, posZ: Double, color: Int, backgroundColor: Int) {

diff --git a/src/main/resources/assets/minecraft/liquidbounce/textures/hat.png b/src/main/resources/assets/minecraft/liquidbounce/textures/hat.png