feat(Hats): image mode (#7582)

Author: MukjepScarlet

src/main/kotlin/net/ccbluex/liquidbounce/config/types/ValueUtils.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.ccbluex.liquidbounce.api.core.ioScope
-import net.ccbluex.liquidbounce.config.types.nesting.ToggleableConfigurable
+import net.ccbluex.liquidbounce.event.EventListener
 import net.ccbluex.liquidbounce.utils.client.asPlainText
 import net.ccbluex.liquidbounce.utils.client.chat
 import net.ccbluex.liquidbounce.utils.client.inGame
@@ -47,10 +47,10 @@ import kotlin.time.Duration.Companion.seconds
 /**
  * Convert the [FileValue] to a [ReadOnlyProperty] of [DynamicTexture].
  */
-fun FileValue.toTextureProperty(
-    owner: ToggleableConfigurable,
+fun <V> FileValue.toTextureProperty(
+    owner: V,
     printErrorToChat: Boolean = true,
-): ReadOnlyProperty<Any?, DynamicTexture?> {
+): ReadOnlyProperty<Any?, DynamicTexture?> where V : EventListener, V : Value<*> {
     var texture: DynamicTexture? = null
     ioScope.launch {
         asStateFlow().filter { it.isFile }.collectLatest { file ->

src/main/kotlin/net/ccbluex/liquidbounce/config/types/nesting/Configurable.kt

@@ -22,6 +22,9 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonNull
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
+import com.mojang.blaze3d.platform.InputConstants
+import net.ccbluex.fastutil.enumSetOf
+import net.ccbluex.fastutil.toEnumSet
 import net.ccbluex.liquidbounce.config.types.BindValue
 import net.ccbluex.liquidbounce.config.types.ChooseListValue
 import net.ccbluex.liquidbounce.config.types.CurveValue
@@ -40,25 +43,24 @@ import net.ccbluex.liquidbounce.config.types.Value
 import net.ccbluex.liquidbounce.config.types.ValueType
 import net.ccbluex.liquidbounce.event.EventListener
 import net.ccbluex.liquidbounce.render.engine.type.Color4b
+import net.ccbluex.liquidbounce.utils.client.logger
 import net.ccbluex.liquidbounce.utils.client.toLowerCamelCase
 import net.ccbluex.liquidbounce.utils.input.InputBind
 import net.ccbluex.liquidbounce.utils.math.Easing
-import net.minecraft.world.level.block.Block
-import com.mojang.blaze3d.platform.InputConstants
-import net.ccbluex.fastutil.enumSetOf
-import net.ccbluex.fastutil.toEnumSet
-import net.ccbluex.liquidbounce.utils.client.logger
-import net.minecraft.world.entity.EntityType
+import net.minecraft.core.Vec3i
+import net.minecraft.resources.Identifier
+import net.minecraft.sounds.SoundEvent
 import net.minecraft.world.effect.MobEffect
+import net.minecraft.world.entity.EntityType
 import net.minecraft.world.item.Item
-import net.minecraft.sounds.SoundEvent
-import net.minecraft.resources.Identifier
+import net.minecraft.world.level.block.Block
 import net.minecraft.world.phys.Vec3
-import net.minecraft.core.Vec3i
 import org.joml.Vector2f
+import org.joml.Vector2fc
 import org.lwjgl.glfw.GLFW
 import java.io.File
-import java.util.*
+import java.util.EnumSet
+import java.util.SequencedSet
 import java.util.function.ToIntFunction
 
 @Suppress("TooManyFunctions")
@@ -352,6 +354,8 @@ open class Configurable(
 
     fun block(name: String, default: Block) = value(name, default, ValueType.BLOCK)
 
+    fun vec2f(name: String, default: Vector2fc) = value(name, default, ValueType.VECTOR2_F)
+
     fun vec3i(name: String, default: Vec3i) = value(name, default, ValueType.VECTOR3_I)
 
     fun vec3d(name: String, default: Vec3) = value(name, default, ValueType.VECTOR3_D)

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/hats/HatsMode.kt

@@ -30,14 +30,19 @@ import net.ccbluex.liquidbounce.features.module.modules.render.hats.ModuleHats.m
 import net.ccbluex.liquidbounce.render.WorldRenderEnvironment
 import net.ccbluex.liquidbounce.render.renderEnvironmentForWorld
 import net.ccbluex.liquidbounce.render.withPositionRelativeToCamera
+import net.ccbluex.liquidbounce.render.withPush
 import net.ccbluex.liquidbounce.utils.entity.interpolateCurrentPosition
+import net.ccbluex.liquidbounce.utils.entity.interpolateCurrentRotation
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.EquipmentSlot
+import org.joml.Quaternionf
 import org.joml.Vector2f
 import org.joml.Vector3f
 import kotlin.math.cos
 import kotlin.math.sin
 
+private val ROTATION = Quaternionf()
+
 /**
  * @author minecrrrr
  */
@@ -46,7 +51,9 @@ abstract class HatsMode(name: String) : Choice(name) {
         get() = modes
 
     // --- Settings ---
-    protected val height by float("HeightOffset", 0.1f, 0f..2f)
+    private val followRotation by boolean("FollowRotation", false)
+
+    protected val height by float("HeightOffset", 0.2f, 0f..2f)
 
     protected object EquipOffset : Configurable("EquipmentOffset") {
         val equipmentOffset by float("ArmorOffset", 0.1f, 0f..1f)
@@ -70,7 +77,6 @@ abstract class HatsMode(name: String) : Choice(name) {
 
     @Suppress("unused")
     private val renderHandler = handler<WorldRenderEvent> {
-        val world = net.ccbluex.liquidbounce.utils.client.world
         val player = mc.player ?: return@handler
 
         for (entity in world.players()) {
@@ -85,19 +91,23 @@ abstract class HatsMode(name: String) : Choice(name) {
             }
 
             if (shouldRender) {
-
                 val hurtMarked = entity.hurtTime > 0 && hurtMarked
                 val pos = entity.interpolateCurrentPosition(it.partialTicks)
+                val rotation = entity.interpolateCurrentRotation(it.partialTicks)
 
                 val equipOffset = if (!entity.getItemBySlot(EquipmentSlot.HEAD).isEmpty) {
-                    EquipOffset.equipmentOffset.toDouble()
+                    EquipOffset.equipmentOffset
                 } else {
-                    0.0
+                    0.0F
                 }
 
                 renderEnvironmentForWorld(it.matrixStack) {
-                    withPositionRelativeToCamera(pos.add(0.0, entity.bbHeight + height.toDouble() + equipOffset, 0.0)) {
-                        drawHat(hurtMarked)
+                    withPositionRelativeToCamera(pos.add(0.0, entity.eyeHeight.toDouble(), 0.0)) {
+                        matrixStack.withPush {
+                            if (followRotation) mulPose(rotation.toQuaternion(ROTATION))
+                            translate(0F, entity.bbHeight - entity.eyeHeight + height + equipOffset, 0F)
+                            drawHat(hurtMarked)
+                        }
                     }
                 }
             }

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/hats/ModuleHats.kt

@@ -24,6 +24,7 @@ import net.ccbluex.liquidbounce.features.module.ClientModule
 import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsCone
 import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsFlower
 import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsHalo
+import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsImage
 import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsOrbs
 import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsStar
 
@@ -32,14 +33,15 @@ import net.ccbluex.liquidbounce.features.module.modules.render.hats.modes.HatsSt
  */
 object ModuleHats : ClientModule("Hats", Category.RENDER) {
 
-    val modes = choices(
-        "Mode", HatsCone, arrayOf(
+    val modes = choices("Mode", 0) {
+        arrayOf(
             HatsCone,
             HatsHalo,
             HatsOrbs,
             HatsFlower,
             HatsStar,
+            HatsImage,
         )
-    ).apply { tagBy(this) }
+    }.apply { tagBy(this) }
 
 }

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/hats/modes/HatsFlower.kt

@@ -43,7 +43,7 @@ internal object HatsFlower : HatsMode("Flower") {
         val innerRadius by float("Thickness", 0.05f, 0.01f..1f)
         val sharpness by float("Sharpness", 0.6f, 0.1f..0.9f)
         val petalCount by int("PetalCount", 5, 5..15)
-        val spinSpeed by float("SpinSpeed", 1f, 0f..10f)
+        val spinSpeed by float("SpinSpeed", 1f, -10f..10f)
     }
 
     init {

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/hats/modes/HatsImage.kt

@@ -0,0 +1,61 @@
+/*
+ * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce)
+ *
+ * Copyright (c) 2015 - 2026 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LiquidBounce is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package net.ccbluex.liquidbounce.features.module.modules.render.hats.modes
+
+import net.ccbluex.liquidbounce.config.types.toTextureProperty
+import net.ccbluex.liquidbounce.features.module.modules.render.hats.HatsMode
+import net.ccbluex.liquidbounce.render.WorldRenderEnvironment
+import net.ccbluex.liquidbounce.render.drawCustomMeshTextured
+import net.ccbluex.liquidbounce.render.engine.type.Color4b
+import net.ccbluex.liquidbounce.render.withPush
+import net.minecraft.util.Mth
+import org.joml.Quaternionf
+import org.joml.Vector2f
+
+internal object HatsImage : HatsMode("Image") {
+
+    private val image by file("Image").toTextureProperty(this, printErrorToChat = true)
+    private val colorModulator by color("ColorModulator", Color4b.WHITE)
+    private val scale by vec2f("Scale", Vector2f(1f, 1f))
+    private val spinSpeed by float("SpinSpeed", 1f, -10f..10f)
+
+    private val ROTATION = Quaternionf()
+
+    override fun WorldRenderEnvironment.drawHat(isHurt: Boolean) {
+        val texture = image ?: return
+
+        matrixStack.withPush {
+            mulPose(
+                ROTATION.scaling(1f)
+                    .rotateX(Mth.HALF_PI)
+                    .rotateZ(getRotationAngle(spinSpeed))
+            )
+            scale(scale.x(), scale.y(), 1f)
+
+            drawCustomMeshTextured(texture) { pose ->
+                val color = colorModulator.argb
+                addVertex(pose, -0.5f, -0.5f, 0f).setUv(0f, 0f).setColor(color)
+                addVertex(pose, -0.5f, 0.5f, 0f).setUv(0f, 1f).setColor(color)
+                addVertex(pose, 0.5f, 0.5f, 0f).setUv(1f, 1f).setColor(color)
+                addVertex(pose, 0.5f, -0.5f, 0f).setUv(1f, 0f).setColor(color)
+            }
+        }
+    }
+}

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/hats/modes/HatsOrbs.kt

@@ -50,7 +50,7 @@ internal object HatsOrbs : HatsMode("Orbs") {
             val waveSpeed by float("WaveSpeed", 2.0f, 0.1f..10f)
         }
 
-        val spinSpeed by float("SpinSpeed", 2f, 0f..10f)
+        val spinSpeed by float("SpinSpeed", 2f, -10f..10f)
     }
 
     init {

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/hats/modes/HatsStar.kt

@@ -44,7 +44,7 @@ internal object HatsStar : HatsMode("Star") {
         val innerRadius by float("Thickness", 0.05f, 0.01f..1f)
         val sharpness by float("Sharpness", 0.6f, 0.1f..0.7f)
         val pointsCount by int("PointsCount", 5, 5..15)
-        val spinSpeed by float("SpinSpeed", 1f, 0f..10f)
+        val spinSpeed by float("SpinSpeed", 1f, -10f..10f)
     }
 
     init {

src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/data/Rotation.kt

@@ -23,9 +23,11 @@ import net.ccbluex.liquidbounce.utils.aiming.utils.RotationUtil
 import net.ccbluex.liquidbounce.utils.aiming.utils.RotationUtil.angleDifference
 import net.ccbluex.liquidbounce.utils.client.player
 import net.ccbluex.liquidbounce.utils.client.toDegrees
+import net.ccbluex.liquidbounce.utils.client.toRadians
 import net.ccbluex.liquidbounce.utils.entity.rotation
 import net.minecraft.util.Mth
 import net.minecraft.world.phys.Vec3
+import org.joml.Quaternionf
 import kotlin.math.abs
 import kotlin.math.atan2
 import kotlin.math.hypot
@@ -66,6 +68,10 @@ data class Rotation @JvmOverloads constructor(
     val xRot: Float get() = pitch
     val yRot: Float get() = yaw
 
+    @JvmOverloads
+    fun toQuaternion(dest: Quaternionf = Quaternionf()): Quaternionf =
+        dest.rotationYXZ(Mth.PI - yRot.toRadians(), -xRot.toRadians(), 0f)
+
     /**
      * Fixes GCD and Modulo 360° at yaw
      *