Added ColorScheme, instrument overlay, range and fixed block selection

EnigmA-008 · EnigmA-008 · commit 0befec9a4da1 · 2022-02-15T02:51:41.000+01:00
diff --git a/src/main/kotlin/org/lambda/ExampleCommand.kt b/src/main/kotlin/org/lambda/ExampleCommand.kt
@@ -4,7 +4,7 @@ import com.lambda.client.command.ClientCommand
 import com.lambda.client.manager.managers.FriendManager
 import com.lambda.client.util.text.MessageSendHelper
 
-object ExampleCommand: ClientCommand(
+object ExampleCommand : ClientCommand(
     name = "example",
     description = "Example friend command"
 ) {
diff --git a/src/main/kotlin/org/lambda/ExampleLabelHud.kt b/src/main/kotlin/org/lambda/ExampleLabelHud.kt
@@ -3,7 +3,7 @@ package org.lambda
 import com.lambda.client.event.SafeClientEvent
 import com.lambda.client.plugin.api.PluginLabelHud
 
-internal object ExampleLabelHud: PluginLabelHud(
+internal object ExampleLabelHud : PluginLabelHud(
     name = "ExampleLabelHud",
     category = Category.MISC,
     description = "Simple hud example",
diff --git a/src/main/kotlin/org/lambda/ExampleModule.kt b/src/main/kotlin/org/lambda/ExampleModule.kt
@@ -10,7 +10,7 @@ import net.minecraft.entity.Entity
 import net.minecraft.network.play.client.CPacketUseEntity
 import net.minecraft.util.EnumHand
 
-internal object ExampleModule: PluginModule(
+internal object ExampleModule : PluginModule(
     name = "ExampleModule",
     category = Category.MISC,
     description = "Example module which mounts entities using packets",
@@ -58,15 +58,15 @@ internal object ExampleModule: PluginModule(
                 it != player.ridingEntity
             }.minByOrNull {
                 player.getDistanceSq(it)
-            } ?.let {
+            }?.let {
                 if (maxReach == 0.0f || player.getDistance(it) <= maxReach) {
                     sendChatMessage("$chatName Mounting: ${it.name}@${it.positionVector}")
                     connection.sendPacket(CPacketUseEntity(it, EnumHand.MAIN_HAND))
                 } else {
                     sendChatMessage("$chatName Closest entity too far away: ${it.name}@${it.positionVector.distanceTo(player.positionVector)}")
                 }
             } ?: run {
-                sendChatMessage("$chatName Can't find any Entity in world.")
-            }
+            sendChatMessage("$chatName Can't find any Entity in world.")
+        }
     }
 }
diff --git a/src/main/kotlin/org/lambda/MusicToolsPlugin.kt b/src/main/kotlin/org/lambda/MusicToolsPlugin.kt
@@ -2,7 +2,7 @@ package org.lambda
 
 import com.lambda.client.plugin.api.Plugin
 
-internal object MusicToolsPlugin: Plugin() {
+internal object MusicToolsPlugin : Plugin() {
 
     override fun onLoad() {
         // Load any modules, commands, or HUD elements here
diff --git a/src/main/kotlin/org/lambda/NoteESP.kt b/src/main/kotlin/org/lambda/NoteESP.kt
@@ -4,48 +4,35 @@ 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.toVec3d
 import com.lambda.client.util.math.VectorUtils.toVec3dCenter
 import com.lambda.client.util.text.MessageSendHelper
+import com.lambda.client.util.threads.safeListener
 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.block.BlockNote
 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.ExampleLabelHud.updateText
 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
 
-internal object NoteESP: PluginModule(
+internal object NoteESP : PluginModule(
     name = "NoteESP",
     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
 
 {
@@ -60,73 +47,78 @@ internal object NoteESP: PluginModule(
     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 cachedMusicData = ConcurrentHashMap<BlockPos, MusicData>()
     private val renderer = ESPRenderer()
 
     enum class ColorScheme {
         DEFAULT, RAINBOW
     }
+
     // reset button
     init {
         reset.consumers.add { _, it ->
             if (it) {
-                cachedNotes.clear()
+                cachedMusicData.clear()
             }
             false
         }
+
         //listens to played note block
-        listener<PacketEvent.Receive> { event ->
+        safeListener<PacketEvent.Receive> { event ->
             if (event.packet is SPacketBlockAction) {
                 val packet = (event.packet as SPacketBlockAction)
 
-                val instrument = NoteBlockEvent.Instrument.values()[packet.data1]
-                val note = Note.values()[packet.data2]
+                if (world.getBlockState(packet.blockPosition).block is BlockNote) {
+                    val instrument = NoteBlockEvent.Instrument.values()[packet.data1]
+                    val note = Note.values()[packet.data2]
 
-                cachedNotes[packet.blockPosition] = note
+                    cachedMusicData[packet.blockPosition] = MusicData(note, instrument)
 
-                if (debug) {
-                    MessageSendHelper.sendChatMessage("Instrument: ${instrument.name} Pos: (${packet.blockPosition.asString()}) Pitch: ${note.name}")
+                    if (debug) {
+                        MessageSendHelper.sendChatMessage("Instrument: ${instrument.name} Pos: (${packet.blockPosition.asString()}) Pitch: ${note.name}")
+                    }
                 }
             }
         }
 
         //renders box
-        listener<RenderWorldEvent> {
+        safeListener<RenderWorldEvent> {
             renderer.aFilled = if (filled) alphaFilled else 0
             renderer.aOutline = if (outline) alphaOutline else 0
             renderer.thickness = thickness
 
-            cachedNotes.forEach {
-//                when(colorScheme){
-//                    ColorScheme.DEFAULT -> {
-//                        renderer.add(it.key, it.value.default)
-//                    }
-//                    ColorScheme.RAINBOW -> {
-                        renderer.add(it.key, it.value.rainbow)
-//                    }
-//                }
+            cachedMusicData.forEach {
+                if (player.getPositionEyes(1f).distanceTo(it.key.toVec3dCenter()) < range) {
+                    renderer.add(it.key, it.value.color)
+                }
             }
             renderer.render(true)
         }
+
         //renders text overlay
         listener<RenderOverlayEvent> {
             GlStateUtils.rescaleActual()
 
-            cachedNotes.forEach {
+            cachedMusicData.forEach {
                 GL11.glPushMatrix()
 
                 val screenPos = ProjectionUtils.toScreenPos(it.key.toVec3dCenter())
 
                 GL11.glTranslated(screenPos.x, screenPos.y, 0.0)
                 GL11.glScalef(textScale * 2f, textScale * 2f, 1f)
 
-                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)
+                val centerValue = FontRenderAdapter.getStringWidth(it.value.note.ordinal.toString()) / -2f
+                val centerKey = FontRenderAdapter.getStringWidth(it.value.instrument.name) / -2f
+
+                FontRenderAdapter.drawString(it.value.note.ordinal.toString(), centerValue, 0f, color = it.value.color)
+                FontRenderAdapter.drawString(it.value.instrument.name, centerKey, FontRenderAdapter.getFontHeight(), color = it.value.color)
 
                 GL11.glPopMatrix()
             }
         }
     }
+
+    private class MusicData(val note: Note, val instrument: NoteBlockEvent.Instrument) {
+        val color = if (colorScheme == ColorScheme.DEFAULT) note.default else note.rainbow
+    }
 }
diff --git a/src/main/kotlin/org/lambda/util/Instrument.kt b/src/main/kotlin/org/lambda/util/Instrument.kt
@@ -0,0 +1,3 @@
+package org.lambda.util
+
+enum class Instrument
diff --git a/src/main/kotlin/org/lambda/util/Note.kt b/src/main/kotlin/org/lambda/util/Note.kt
@@ -2,58 +2,30 @@ package org.lambda.util
 
 import com.lambda.client.util.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)),
-    A_LOW(ColorHolder(204, 134, 0)),
-    A_SHARP_LOW(ColorHolder(226, 101, 0)),
-    B_LOW(ColorHolder(243, 65, 0)),
-    C_LOW(ColorHolder(252, 30, 0)),
-    C_SHARP_LOW(ColorHolder(254, 0, 15)),
-    D_LOW(ColorHolder(247, 0, 51)),
-    D_SHARP_LOW(ColorHolder(232, 0, 90)),
-    E_LOW(ColorHolder(207, 0, 131)),
-    F_LOW(ColorHolder(174, 0, 169)),
-    F_SHARP_HIGH(ColorHolder(134, 0, 204)),
-    G_HIGH(ColorHolder(91, 0, 231)),
-    G_SHARP_HIGH(ColorHolder(45, 0, 249)),
-    A_HIGH(ColorHolder(2, 10, 254)),
-    A_SHARP_HIGH(ColorHolder(0, 55, 246)),
-    B_HIGH(ColorHolder(0, 104, 224)),
-    C_HIGH(ColorHolder(0, 154, 188)),
-    C_SHARP_HIGH(ColorHolder(0, 198, 141)),
-    D_HIGH(ColorHolder(0, 233, 88)),
-    D_SHARP_HIGH(ColorHolder(0, 252, 33)),
-    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))
-//}
+enum class Note(val default: ColorHolder, val rainbow: ColorHolder) {
+    F_SHARP_LOW(ColorHolder(85, 221, 192), ColorHolder(119, 215, 0)),
+    G_LOW(ColorHolder(126, 196, 177), ColorHolder(149, 192, 0)),
+    G_SHARP_LOW(ColorHolder(164, 164, 171), ColorHolder(178, 165, 0)),
+    A_LOW(ColorHolder(196, 126, 177), ColorHolder(204, 134, 0)),
+    A_SHARP_LOW(ColorHolder(221, 85, 192), ColorHolder(226, 101, 0)),
+    B_LOW(ColorHolder(237, 44, 218), ColorHolder(243, 65, 0)),
+    C_LOW(ColorHolder(243, 6, 6), ColorHolder(252, 30, 0)),
+    C_SHARP_LOW(ColorHolder(237, 218, 44), ColorHolder(254, 0, 15)),
+    D_LOW(ColorHolder(221, 192, 85), ColorHolder(247, 0, 51)),
+    D_SHARP_LOW(ColorHolder(196, 177, 126), ColorHolder(232, 0, 90)),
+    E_LOW(ColorHolder(164, 171, 164), ColorHolder(207, 0, 131)),
+    F_LOW(ColorHolder(126, 177, 196), ColorHolder(174, 0, 169)),
+    F_SHARP_HIGH(ColorHolder(85, 192, 221), ColorHolder(134, 0, 204)),
+    G_HIGH(ColorHolder(44, 218, 237), ColorHolder(91, 0, 231)),
+    G_SHARP_HIGH(ColorHolder(6, 6, 243), ColorHolder(45, 0, 249)),
+    A_HIGH(ColorHolder(218, 44, 237), ColorHolder(2, 10, 254)),
+    A_SHARP_HIGH(ColorHolder(192, 85, 221), ColorHolder(0, 55, 246)),
+    B_HIGH(ColorHolder(177, 126, 196), ColorHolder(0, 104, 224)),
+    C_HIGH(ColorHolder(171, 164, 164), ColorHolder(0, 154, 188)),
+    C_SHARP_HIGH(ColorHolder(177, 196, 126), ColorHolder(0, 198, 141)),
+    D_HIGH(ColorHolder(192, 221, 85), ColorHolder(0, 233, 88)),
+    D_SHARP_HIGH(ColorHolder(218, 237, 44), ColorHolder(0, 252, 33)),
+    E_HIGH(ColorHolder(6, 243, 6), ColorHolder(31, 252, 0)),
+    F_HIGH(ColorHolder(44, 237, 218), ColorHolder(89, 232, 0)),
+    F_SHARP_SUPER_HIGH(ColorHolder(85, 221, 192), ColorHolder(148, 193, 0))
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package org.lambda.util`
	`2`	`+`
	`3`	`+enum class Instrument`