make hypixel commands not stupid

catgirlseraid · May 14, 2024 · 3d4e457 · 3d4e457
1 parent 15d9442
commit 3d4e457
Show file tree

Hide file tree

Showing 40 changed files with 95 additions and 244 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt
@@ -13,7 +13,6 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ChatUtils.isCommand
 import at.hannibal2.skyhanni.utils.ChatUtils.senderIsSkyhanni
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.NEUCalculator
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -58,7 +57,7 @@ object GetFromSackAPI {
         text: String = "§lCLICK HERE§r§e to grab §ax${item.amount} §9${item.itemName}§e from sacks!",
     ) =
         ChatUtils.clickableChat(text, onClick = {
-            HypixelCommands.getFromSacks(item.internalName.asString(), item.amount)
+            ChatUtils.sendCommandToServer("gfs ${item.internalName.asString()} ${item.amount}")
         })
 
     fun getFromSlotClickedSackItems(items: List<PrimitiveItemStack>, slotIndex: Int) = addToInventory(items, slotIndex)
@@ -86,7 +85,7 @@ object GetFromSackAPI {
         if (!LorenzUtils.inSkyBlock) return
         if (queue.isNotEmpty() && lastTimeOfCommand.passedSince() >= minimumDelay) {
             val item = queue.poll()
-            HypixelCommands.getFromSacks(item.internalName.asString().replace('-', ':'), item.amount)
+            ChatUtils.sendCommandToServer("gfs ${item.internalName.asString().replace('-', ':')} ${item.amount}")
             lastTimeOfCommand = ChatUtils.getTimeWhenNewlyQueuedMessageGetsExecuted()
         }
     }
@@ -158,7 +157,7 @@ object GetFromSackAPI {
 
     private fun bazaarMessage(item: String, amount: Int, isRemaining: Boolean = false) = ChatUtils.clickableChat(
         "§lCLICK §r§eto get the ${if (isRemaining) "remaining " else ""}§ax${amount} §9$item §efrom bazaar",
-        onClick = { HypixelCommands.bazaar(item.removeColor()) }
+        onClick = { ChatUtils.sendCommandToServer("bazaar ${item.removeColor()}") }
     )
 
     private fun commandValidator(args: List<String>): Pair<CommandResult, PrimitiveItemStack?> {

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotIconConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotIconConfig.java
@@ -2,7 +2,7 @@
 
 import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.features.garden.inventory.plots.GardenPlotIcon;
-import at.hannibal2.skyhanni.utils.HypixelCommands;
+import at.hannibal2.skyhanni.utils.ChatUtils;
 import com.google.gson.annotations.Expose;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton;
@@ -19,6 +19,6 @@ public class PlotIconConfig {
     @ConfigEditorButton(buttonText = "Reset")
     public Runnable hardReset = () -> {
         GardenPlotIcon.INSTANCE.setHardReset(true);
-        HypixelCommands.gardenDesk();
+        ChatUtils.sendCommandToServer("desk");
     };
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matchFirst
@@ -73,7 +72,7 @@ object ProfileStorageData {
                     "§cCan not read profile name from tab list! Open /widget and enable Profile Widget. " +
                         "This is needed for the mod to function! And therefore this warning cannot be disabled",
                     onClick = {
-                        HypixelCommands.widget()
+                        ChatUtils.sendCommandToServer("widget")
                     }
                 )
             } else {

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt
@@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal
 import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -84,7 +83,7 @@ object BingoCardDisplay {
             newList.add(Renderable.clickAndHover("§cOpen the §e/bingo §ccard.",
                 listOf("Click to run §e/bingo"),
                 onClick = {
-                    HypixelCommands.bingo()
+                    ChatUtils.sendCommandToServer("bingo")
                 }
             ))
         } else {

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
@@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.data.hypixel.chat.event.PartyChatEvent
 import at.hannibal2.skyhanni.events.TabCompletionEvent
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.mc.McPlayer
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -34,7 +33,7 @@ object PartyChatCommands {
             { config.transferCommand },
             requiresPartyLead = true,
             executable = {
-                HypixelCommands.partyTransfer(it.cleanedAuthor)
+                ChatUtils.sendCommandToServer("party transfer ${it.cleanedAuthor}")
             }
         ),
         PartyChatCommand(
@@ -43,7 +42,7 @@ object PartyChatCommands {
             requiresPartyLead = true,
             executable = {
                 lastWarp = SimpleTimeMark.now()
-                HypixelCommands.partyWarp()
+                ChatUtils.sendCommandToServer("party warp")
             }
         ),
         PartyChatCommand(
@@ -52,7 +51,7 @@ object PartyChatCommands {
             requiresPartyLead = true,
             executable = {
                 lastAllInvite = SimpleTimeMark.now()
-                HypixelCommands.partyAllInvite()
+                ChatUtils.sendCommandToServer("party settings allinvite")
             }
         ),
     )

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.FriendAPI
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
 import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker
-import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.mc.McWorld
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -18,19 +18,19 @@ object PartyCommands {
     fun kickOffline() {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        HypixelCommands.partyKickOffline()
+        ChatUtils.sendCommandToServer("party kickoffline")
     }
 
     fun disband() {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        HypixelCommands.partyDisband()
+        ChatUtils.sendCommandToServer("party disband")
     }
 
     fun warp() {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        HypixelCommands.partyWarp()
+        ChatUtils.sendCommandToServer("party warp")
     }
 
     fun kick(args: Array<String>) {
@@ -40,9 +40,9 @@ object PartyCommands {
         val kickedPlayer = args[0]
         val kickedReason = args.drop(1).joinToString(" ").trim()
         if (kickedReason.isNotEmpty() && config.partyKickReason) {
-            HypixelCommands.partyChat("Kicking $kickedPlayer: $kickedReason")
+            ChatUtils.sendCommandToServer("pc Kicking $kickedPlayer: $kickedReason")
         }
-        HypixelCommands.partyKick(kickedPlayer)
+        ChatUtils.sendCommandToServer("party kick $kickedPlayer")
     }
 
     fun transfer(args: Array<String>) {
@@ -51,19 +51,19 @@ object PartyCommands {
                 LimboTimeTracker.printStats(true)
                 return
             }
-            HypixelCommands.playtime()
+            ChatUtils.sendCommandToServer("playtime")
             return
         }
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        HypixelCommands.partyTransfer(args[0])
+        ChatUtils.sendCommandToServer("party transfer ${args[0]}")
     }
 
     fun promote(args: Array<String>) {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
         if (args.isEmpty()) return
-        HypixelCommands.partyPromote(args[0])
+        ChatUtils.sendCommandToServer("party promote ${args[0]}")
     }
 
     @SubscribeEvent
@@ -82,8 +82,8 @@ object PartyCommands {
         val kickReason = args.drop(1).joinToString(" ").trim()
         if (kickReason.isEmpty()) return
         event.cancel()
-        HypixelCommands.partyChat("Kicking $kickedPlayer: $kickReason")
-        HypixelCommands.partyKick(kickedPlayer)
+        ChatUtils.sendCommandToServer("pc Kicking $kickedPlayer: $kickReason")
+        ChatUtils.sendCommandToServer("pc $kickedPlayer")
     }
 
     fun customTabComplete(command: String): List<String>? {

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.commands
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
-import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.NEUItems
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -20,7 +20,7 @@ object ViewRecipeCommand {
         val item = message.uppercase().substringAfter("viewrecipe").trim()
         if (item.isEmpty()) return
         event.isCanceled = true
-        HypixelCommands.viewRecipe(item)
+        ChatUtils.sendCommandToServer("viewrecipe $item")
     }
 
     val list by lazy {

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WarpIsCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WarpIsCommand.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.commands
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
-import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -15,7 +15,7 @@ object WarpIsCommand {
 
         if (event.message.lowercase() == "/warp is") {
             event.isCanceled = true
-            HypixelCommands.island()
+            ChatUtils.sendCommandToServer("island")
         }
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonArchitectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonArchitectFeatures.kt
@@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.data.SackAPI.getAmountInSacks
 import at.hannibal2.skyhanni.data.item.SkyhanniItems
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -45,7 +44,7 @@ object DungeonArchitectFeatures {
         ChatUtils.clickableChat(
             "§c§lPUZZLE FAILED! §r§b$name §r§efailed a puzzle. \n" +
                 "§eClick here to get §5Architect's First Draft §7(§e${architectItemAmount}x left§7)",
-            { HypixelCommands.getFromSacks("ARCHITECT_FIRST_DRAFT", 1) },
+            { ChatUtils.sendCommandToServer("gfs ARCHITECT_FIRST_DRAFT 1") },
             prefix = false
         )
         LorenzUtils.sendTitle("§c§lPUZZLE FAILED!", 3.seconds)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.events.LorenzKeyPressEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.sorted
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
@@ -34,7 +33,7 @@ object BurrowWarpHelper {
         currentWarp?.let {
             if (lastWarpTime.passedSince() > 5.seconds) {
                 lastWarpTime = SimpleTimeMark.now()
-                HypixelCommands.warp(it.name)
+                ChatUtils.sendCommandToServer("warp ${it.name}")
                 lastWarp = currentWarp
                 GriffinBurrowHelper.lastTitleSentTime = SimpleTimeMark.now() + 2.seconds
                 TitleManager.optionalResetTitle {

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.KeyboardManager
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -218,7 +217,7 @@ object InquisitorWaypointShare {
             return
         }
         inquisitor = -1
-        HypixelCommands.partyChat("pc Inquisitor dead!")
+        ChatUtils.sendCommandToServer("pc Inquisitor dead!")
     }
 
     private fun sendInquisitor() {
@@ -244,7 +243,7 @@ object InquisitorWaypointShare {
         val x = location.x.toInt()
         val y = location.y.toInt()
         val z = location.z.toInt()
-        HypixelCommands.partyChat("x: $x, y: $y, z: $z ")
+        ChatUtils.sendCommandToServer("pc x: $x, y: $y, z: $z")
     }
 
     @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.event.hoppity
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType
 import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
-import at.hannibal2.skyhanni.utils.HypixelCommands
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.LorenzVec
@@ -54,7 +54,7 @@ object HoppityEggsShared {
         val y = closestEgg.y.toInt()
         val z = closestEgg.z.toInt()
 
-        HypixelCommands.allChat("[SkyHanni] ${meal.mealName} Chocolate Egg located at x: $x, y: $y, z: $z ($note)")
+        ChatUtils.sendCommandToServer("ac [SkyHanni] ${meal.mealName} Chocolate Egg located at x: $x, y: $y, z: $z ($note)")
     }
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.waypoints && config.sharedWaypoints

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/winter/NewYearCakeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/winter/NewYearCakeReminder.kt
@@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.fame.ReminderUtils
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.StringUtils.matches
@@ -65,7 +64,7 @@ object NewYearCakeReminder {
         ChatUtils.clickableChat(
             "Reminding you to grab the free New Year Cake. Click here to open the baker menu!",
             onClick = {
-                HypixelCommands.openBaker()
+                ChatUtils.sendCommandToServer("openbaker")
             }
         )
     }

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt
@@ -12,7 +12,6 @@ import at.hannibal2.skyhanni.features.garden.CropType.Companion.getTurboCrop
 import at.hannibal2.skyhanni.features.garden.pests.PestAPI
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.NEUInternalName
@@ -190,7 +189,7 @@ object FarmingFortuneDisplay {
                     "§cshowing latest Crop Fortune."
                 ),
                 onClick = {
-                    HypixelCommands.widget()
+                    ChatUtils.sendCommandToServer("widget")
                 }
             ))
         } else {
@@ -201,7 +200,7 @@ object FarmingFortuneDisplay {
                     "§cshowing the Farming Fortune stat."
                 ),
                 onClick = {
-                    HypixelCommands.widget()
+                    ChatUtils.sendCommandToServer("widget")
                 }
             ))
         }
@@ -217,7 +216,7 @@ object FarmingFortuneDisplay {
                 "§cCan not read Farming Fortune from tab list! Open /widget and enable the Stats Widget " +
                     "and showing the Farming Fortune stat.",
                 onClick = {
-                    HypixelCommands.widget()
+                    ChatUtils.sendCommandToServer("widget")
                 }
             )
             lastUniversalFortuneMissingError = SimpleTimeMark.now()
@@ -228,7 +227,7 @@ object FarmingFortuneDisplay {
                 "§cCan not read Crop Fortune from tab list! Open /widget and enable the Stats Widget " +
                     "and showing latest Crop Fortune.",
                 onClick = {
-                    HypixelCommands.widget()
+                    ChatUtils.sendCommandToServer("widget")
                 }
             )
             lastCropFortuneMissingError = SimpleTimeMark.now()

diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt
@@ -9,7 +9,6 @@ import at.hannibal2.skyhanni.events.LorenzToolTipEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.ConditionalUtils
-import at.hannibal2.skyhanni.utils.HypixelCommands
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
@@ -96,7 +95,7 @@ object GardenLevelDisplay {
                 " \n§b§lGARDEN LEVEL UP §8$oldLevel ➜ §b$newLevel\n" +
                     " §8+§aRespect from Elite Farmers and SkyHanni members :)\n ",
                 onClick = {
-                    HypixelCommands.gardenLevels()
+                    ChatUtils.sendCommandToServer("gardenlevels")
                 },
                 prefix = false
             )