Small changes and preparations for upcoming functions

Author: EnigmA-008

src/main/kotlin/org/lambda/NoteESP.kt

@@ -4,24 +4,33 @@ import com.lambda.client.event.events.PacketEvent
 import com.lambda.client.event.events.RenderOverlayEvent
 import com.lambda.client.event.events.RenderWorldEvent
 import com.lambda.client.module.Category
+import com.lambda.client.module.modules.render.Search
+import com.lambda.client.module.modules.render.Search.setting
 import com.lambda.client.plugin.api.PluginModule
 import com.lambda.client.util.graphics.ESPRenderer
 import com.lambda.client.util.graphics.GlStateUtils
 import com.lambda.client.util.graphics.ProjectionUtils
 import com.lambda.client.util.graphics.font.FontRenderAdapter
 import com.lambda.client.util.math.CoordinateConverter.asString
+import com.lambda.client.util.math.VectorUtils.distanceTo
 import com.lambda.client.util.math.VectorUtils.toVec3dCenter
 import com.lambda.client.util.text.MessageSendHelper
 import com.lambda.event.listener.listener
+import net.minecraft.block.state.IBlockState
+import net.minecraft.init.Blocks
 import net.minecraft.init.SoundEvents
 import net.minecraft.network.play.server.SPacketBlockAction
 import net.minecraft.network.play.server.SPacketSoundEffect
 import net.minecraft.util.SoundEvent
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Vec3d
+import net.minecraft.world.chunk.Chunk
 import net.minecraftforge.event.world.NoteBlockEvent
 import org.lambda.util.Note
 import org.lwjgl.opengl.GL11
+import java.awt.Color
 import java.util.concurrent.ConcurrentHashMap
+import javax.sound.midi.Instrument
 import kotlin.math.log2
 import kotlin.math.roundToInt
 
@@ -30,27 +39,42 @@ internal object NoteESP: PluginModule(
     category = Category.RENDER,
     description = "Shows note block pitch",
     pluginMain = MusicToolsPlugin
-) {
+)
+
+//TODO: no listener for non note blocks > i already did that? i dont see where
+//TODO: render only for own y to own y - 2 > vague ideas, but i have no idea how
+//TODO: range for rendering > found something in the search module but have no idea how to adapt this
+//TODO: 1.12.2 color mode of the rendering > no idea how to tell him to use the default colors
+//TODO: add instrument to rendering > no idea how. do i need another concurrenthashmap for that? i at least managed to render a second line on the block
+//TODO: remove rendering when block is broken > no idea how to check regularly if the block is still there
+
+{
     private val filled by setting("Filled", true, description = "Renders surfaces")
     private val outline by setting("Outline", true, description = "Renders outline")
     private val alphaFilled by setting("Alpha Filled", 26, 0..255, 1, { filled }, description = "Alpha for surfaces")
     private val alphaOutline by setting("Alpha Outline", 26, 0..255, 1, { outline }, description = "Alpha for outline")
     private val thickness by setting("Outline Thickness", 2f, .25f..4f, .25f, { outline })
     private val textScale by setting("Text Scale", 1f, .0f..4f, .25f)
+    private val colorScheme by setting("Color Scheme", ColorScheme.DEFAULT, description = "Changes Color Scheme")
+    private val range by setting("Search Range", 128, 0..256, 8, description = "Range for Rendering")
     private val reset = setting("Reset", false, description = "Resets cached notes")
     private val debug by setting("Debug", false, description = "Debug messages in chat")
 
     private val cachedNotes = ConcurrentHashMap<BlockPos, Note>()
     private val renderer = ESPRenderer()
 
+    enum class ColorScheme {
+        DEFAULT, RAINBOW
+    }
+    // reset button
     init {
         reset.consumers.add { _, it ->
             if (it) {
                 cachedNotes.clear()
             }
             false
         }
-
+        //listens to played note block
         listener<PacketEvent.Receive> { event ->
             if (event.packet is SPacketBlockAction) {
                 val packet = (event.packet as SPacketBlockAction)
@@ -66,18 +90,25 @@ internal object NoteESP: PluginModule(
             }
         }
 
+        //renders box
         listener<RenderWorldEvent> {
             renderer.aFilled = if (filled) alphaFilled else 0
             renderer.aOutline = if (outline) alphaOutline else 0
             renderer.thickness = thickness
 
             cachedNotes.forEach {
-                renderer.add(it.key, it.value.color)
+//                when(colorScheme){
+//                    ColorScheme.DEFAULT -> {
+//                        renderer.add(it.key, it.value.default)
+//                    }
+//                    ColorScheme.RAINBOW -> {
+                        renderer.add(it.key, it.value.rainbow)
+//                    }
+//                }
             }
-
             renderer.render(true)
         }
-
+        //renders text overlay
         listener<RenderOverlayEvent> {
             GlStateUtils.rescaleActual()
 
@@ -89,8 +120,10 @@ internal object NoteESP: PluginModule(
                 GL11.glTranslated(screenPos.x, screenPos.y, 0.0)
                 GL11.glScalef(textScale * 2f, textScale * 2f, 1f)
 
-                val center = FontRenderAdapter.getStringWidth(it.value.ordinal.toString()) / -2f
-                FontRenderAdapter.drawString(it.value.ordinal.toString(), center, 0f, color = it.value.color)
+                val centerValue = FontRenderAdapter.getStringWidth(it.value.ordinal.toString()) / -2f
+                val centerKey = FontRenderAdapter.getStringWidth(it.key.toString()) / -2f
+                FontRenderAdapter.drawString(it.value.ordinal.toString(), centerValue, 0f, color = it.value.rainbow)
+                FontRenderAdapter.drawString(it.key.toString(), centerKey, +10f, color = it.value.rainbow)
 
                 GL11.glPopMatrix()
             }

src/main/kotlin/org/lambda/util/Note.kt

@@ -2,7 +2,7 @@ package org.lambda.util
 
 import com.lambda.client.util.color.ColorHolder
 
-enum class Note(val color: ColorHolder) {
+enum class Note(val rainbow: ColorHolder) {
     F_SHARP_LOW(ColorHolder(119, 215, 0)),
     G_LOW(ColorHolder(149, 192, 0)),
     G_SHARP_LOW(ColorHolder(178, 165, 0)),
@@ -28,4 +28,32 @@ enum class Note(val color: ColorHolder) {
     E_HIGH(ColorHolder(31, 252, 0)),
     F_HIGH(ColorHolder(89, 232, 0)),
     F_SHARP_SUPER_HIGH(ColorHolder(148, 193, 0))
-}
+}
+
+//enum class Note(val default: ColorHolder) {
+//    F_SHARP_LOW(ColorHolder(85, 221, 192)),
+//    G_LOW(ColorHolder(126, 196, 177)),
+//    G_SHARP_LOW(ColorHolder(164, 164, 171)),
+//    A_LOW(ColorHolder(196, 126, 177)),
+//    A_SHARP_LOW(ColorHolder(221, 85, 192)),
+//    B_LOW(ColorHolder(237, 44, 218)),
+//    C_LOW(ColorHolder(243, 6, 6)),
+//    C_SHARP_LOW(ColorHolder(237, 218, 44)),
+//    D_LOW(ColorHolder(221, 192, 85)),
+//    D_SHARP_LOW(ColorHolder(196, 177, 126)),
+//    E_LOW(ColorHolder(164, 171, 164)),
+//    F_LOW(ColorHolder(126, 177, 196)),
+//    F_SHARP_HIGH(ColorHolder(85, 192, 221)),
+//    G_HIGH(ColorHolder(44, 218, 237)),
+//    G_SHARP_HIGH(ColorHolder(6, 6, 243)),
+//    A_HIGH(ColorHolder(218, 44, 237)),
+//    A_SHARP_HIGH(ColorHolder(192, 85, 221)),
+//    B_HIGH(ColorHolder(177, 126, 196)),
+//    C_HIGH(ColorHolder(171, 164, 164)),
+//    C_SHARP_HIGH(ColorHolder(177, 196, 126)),
+//    D_HIGH(ColorHolder(192, 221, 85)),
+//    D_SHARP_HIGH(ColorHolder(218, 237, 44)),
+//    E_HIGH(ColorHolder(6, 243, 6)),
+//    F_HIGH(ColorHolder(44, 237, 218)),
+//    F_SHARP_SUPER_HIGH(ColorHolder(85, 221, 192))
+//}