Added melody sendCoords

Fixed some issue with LeapMenu
odtheking · Jan 6, 2025 · f39b2aa · f39b2aa
1 parent a46a1b0
commit f39b2aa
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 42 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,10 +4,10 @@ plugins {
     idea
     java
     id("com.github.johnrengelman.shadow") version "8.1.1"
-    kotlin("jvm") version "2.0.0-Beta1"
-    id("net.kyori.blossom") version "1.3.1"
-    id("gg.essential.loom") version "0.10.0.+"
     id("dev.architectury.architectury-pack200") version "0.1.3"
+    id("gg.essential.loom") version "0.10.0.+"
+    id("net.kyori.blossom") version "1.3.1"
+    kotlin("jvm") version "2.0.0-Beta1"
 }
 
 version = project.findProperty("version") as String
@@ -23,12 +23,12 @@ allprojects {
         maven("https://repo.essential.gg/repository/maven-public/")
     }
 
-    apply(plugin = "java")
-    apply(plugin = "org.jetbrains.kotlin.jvm")
+    apply(plugin = "dev.architectury.architectury-pack200")
     apply(plugin = "com.github.johnrengelman.shadow")
-    apply(plugin = "net.kyori.blossom")
+    apply(plugin = "org.jetbrains.kotlin.jvm")
     apply(plugin = "gg.essential.loom")
-    apply(plugin = "dev.architectury.architectury-pack200")
+    apply(plugin = "net.kyori.blossom")
+    apply(plugin = "java")
 
     dependencies {
         minecraft("com.mojang:minecraft:1.8.9")

diff --git a/odin/log4j2.xml b/odin/log4j2.xml
diff --git a/odin/src/main/kotlin/me/odin/features/impl/floor7/p3/SimonSays.kt b/odin/src/main/kotlin/me/odin/features/impl/floor7/p3/SimonSays.kt
@@ -77,7 +77,6 @@ object SimonSays : Module(
                     currentPhase++
                     phaseClock.update()
                 }
-                clickInOrder.clear()
             } else if (state.block == Blocks.stone_button) {
                 if (old.block == Blocks.air && clickInOrder.size > currentPhase + 1) devMessage("was skipped!?!?!")
                 if (old.block == Blocks.stone_button && state.getValue(BlockButtonStone.POWERED)) {

diff --git a/odinclient/log4j2.xml b/odinclient/log4j2.xml
diff --git a/src/main/kotlin/me/odinmain/features/impl/dungeon/LeapMenu.kt b/src/main/kotlin/me/odinmain/features/impl/dungeon/LeapMenu.kt
@@ -15,11 +15,14 @@ import me.odinmain.utils.equalsOneOf
 import me.odinmain.utils.name
 import me.odinmain.utils.render.*
 import me.odinmain.utils.render.RenderUtils.drawTexturedModalRect
-import me.odinmain.utils.skyblock.*
+import me.odinmain.utils.skyblock.ClickType
 import me.odinmain.utils.skyblock.PlayerUtils.windowClick
 import me.odinmain.utils.skyblock.dungeon.DungeonClass
 import me.odinmain.utils.skyblock.dungeon.DungeonPlayer
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils.leapTeammates
+import me.odinmain.utils.skyblock.getItemIndexInContainerChest
+import me.odinmain.utils.skyblock.modMessage
+import me.odinmain.utils.skyblock.partyMessage
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.inventory.ContainerChest
@@ -28,7 +31,6 @@ import net.minecraftforge.client.event.GuiOpenEvent
 import net.minecraftforge.fml.common.Loader
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.lwjgl.input.Keyboard
-import org.lwjgl.input.Mouse
 import org.lwjgl.opengl.Display
 
 object LeapMenu : Module(
@@ -145,7 +147,7 @@ object LeapMenu : Module(
         if (playerToLeap == EMPTY) return
         if (playerToLeap.isDead) return modMessage("This player is dead, can't leap.")
 
-        leapTo(playerToLeap.name, gui.inventorySlots as ContainerChest)
+        leapTo(playerToLeap.name, gui)
 
         event.isCanceled = true
     }

diff --git a/src/main/kotlin/me/odinmain/features/impl/floor7/p3/MelodyMessage.kt b/src/main/kotlin/me/odinmain/features/impl/floor7/p3/MelodyMessage.kt
@@ -11,6 +11,7 @@ import me.odinmain.utils.name
 import me.odinmain.utils.skyblock.dungeon.DungeonUtils
 import me.odinmain.utils.skyblock.dungeon.M7Phases
 import me.odinmain.utils.skyblock.partyMessage
+import me.odinmain.utils.skyblock.sendCommand
 import net.minecraft.inventory.ContainerChest
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -22,13 +23,15 @@ object MelodyMessage : Module(
     private val sendMelodyMessage by BooleanSetting("Send Melody Message", true, description = "Sends a message when the melody terminal opens.")
     private val melodyMessage by StringSetting("Melody Message", "Melody Terminal start!", 128, description = "Message sent when the melody terminal opens.").withDependency { sendMelodyMessage }
     private val melodyProgress by BooleanSetting("Melody Progress", false, description = "Tells the party about melody terminal progress.")
+    private val melodySendCoords by BooleanSetting("Melody Send Coords", false, description = "Sends the coordinates of the melody terminal.").withDependency { melodyProgress }
 
     private var claySlots = hashMapOf(25 to "Melody terminal is at 25%", 34 to "Melody terminal is at 50%", 43 to "Melody terminal is at 75%")
 
     @SubscribeEvent
     fun onGuiLoad(event: TerminalEvent.Opened) {
         if (DungeonUtils.getF7Phase() != M7Phases.P3 || event.terminal.type != TerminalTypes.MELODY || mc.currentScreen is TermSimGui) return
         if (sendMelodyMessage) partyMessage(melodyMessage)
+        if (melodySendCoords) sendCommand("od sendcoords")
 
         claySlots = hashMapOf(25 to "Melody terminal is at 25%", 34 to "Melody terminal is at 50%", 43 to "Melody terminal is at 75%")
     }

diff --git a/src/main/kotlin/me/odinmain/features/impl/skyblock/ChatCommands.kt b/src/main/kotlin/me/odinmain/features/impl/skyblock/ChatCommands.kt
@@ -126,7 +126,7 @@ object ChatCommands : Module(
                 }
             }
             "allinvite", "allinv" -> if (allinvite && channel == ChatChannel.PARTY) sendCommand("p settings allinvite")
-            "pt", "ptme" -> if (pt && channel == ChatChannel.PARTY) sendCommand("p transfer $name")
+            "pt", "ptme", "transfer" -> if (pt && channel == ChatChannel.PARTY) sendCommand("p transfer $name")
             "downtime", "dt" -> {
                 if (!dt || channel != ChatChannel.PARTY) return
                 val reason = message.substringAfter("dt ").takeIf { it != message && !it.contains("!dt") } ?: "No reason given"

diff --git a/src/main/kotlin/me/odinmain/utils/skyblock/PlayerUtils.kt b/src/main/kotlin/me/odinmain/utils/skyblock/PlayerUtils.kt
@@ -89,13 +89,16 @@ object PlayerUtils {
     private fun sendWindowClick(slotId: Int, button: Int, mode: Int) {
         mc.thePlayer?.openContainer?.let {
             if (it !is ContainerChest) return
+            if (slotId !in 0 until it.inventorySlots.size) return
+
             mc.playerController?.windowClick(it.windowId, slotId, button, mode, mc.thePlayer)
         }
     }
 
     private fun sendWindowClickPacket(slotId: Int, button: Int, mode: Int) {
         mc.thePlayer?.openContainer?.let {
             if (it !is ContainerChest) return
+            if (slotId !in 0 until it.inventorySlots.size) return
             mc.netHandler?.networkManager?.sendPacket(C0EPacketClickWindow(it.windowId, slotId, button, mode, it.inventory[slotId], it.getNextTransactionID(mc.thePlayer?.inventory)))
         }
     }