Deprecate LorenzUtils.sendCommandToServer. #1025

3 files changed, 18 insertions, 17 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
index 6b352ca8c..8fcee01d0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.FriendAPI
 import at.hannibal2.skyhanni.data.PartyAPI
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
-import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.ChatUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 object PartyCommands {
@@ -15,45 +15,46 @@ object PartyCommands {
     fun kickOffline() {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        LorenzUtils.sendCommandToServer("party kickoffline")
+        ChatUtils.sendCommandToServer("party kickoffline")
     }
 
     fun disband() {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        LorenzUtils.sendCommandToServer("party disband")
+        ChatUtils.sendCommandToServer("party disband")
     }
 
     fun warp() {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        LorenzUtils.sendCommandToServer("party warp")
+        ChatUtils.sendCommandToServer("party warp")
     }
 
     fun kick(args: Array<String>) {
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
         if (args.isEmpty()) return
-        if (args.size > 1 && config.partyKickReason)
-            LorenzUtils.sendCommandToServer("pc Kicking ${args[0]}: ${args.drop(1).joinToString(" ").trim()}")
-        LorenzUtils.sendCommandToServer("party kick ${args[0]}")
+        if (args.size > 1 && config.partyKickReason) {
+            ChatUtils.sendCommandToServer("pc Kicking ${args[0]}: ${args.drop(1).joinToString(" ").trim()}")
+        }
+        ChatUtils.sendCommandToServer("party kick ${args[0]}")
     }
 
     fun transfer(args: Array<String>) {
         if (args.isEmpty()) {
-            LorenzUtils.sendCommandToServer("pt")
+            ChatUtils.sendCommandToServer("pt")
             return
         }
         if (!config.shortCommands) return
         if (PartyAPI.partyMembers.isEmpty()) return
-        LorenzUtils.sendCommandToServer("party transfer ${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
-        LorenzUtils.sendCommandToServer("party promote ${args[0]}")
+        ChatUtils.sendCommandToServer("party promote ${args[0]}")
     }
 
     @SubscribeEvent
@@ -72,8 +73,8 @@ object PartyCommands {
         val kickReason = args.drop(3).joinToString(" ").trim()
         if (kickReason.isEmpty()) return
         event.cancel()
-        LorenzUtils.sendCommandToServer("pc Kicking $kickedPlayer: $kickReason")
-        LorenzUtils.sendCommandToServer("p kick $kickedPlayer")
+        ChatUtils.sendCommandToServer("pc Kicking $kickedPlayer: $kickReason")
+        ChatUtils.sendCommandToServer("p kick $kickedPlayer")
     }
 
     fun customTabComplete(command: String): List<String>? {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/SendCoordinatedCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/SendCoordinatedCommand.kt
index 34797780b..5a81747fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/commands/SendCoordinatedCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/commands/SendCoordinatedCommand.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.features.commands
 
 import at.hannibal2.skyhanni.events.MessageSendToServerEvent
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LocationUtils
-import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class SendCoordinatedCommand {
@@ -12,11 +12,11 @@ class SendCoordinatedCommand {
         val message = event.message
         if (message == "/sendcoords") {
             event.isCanceled = true
-            LorenzUtils.sendCommandToServer(getCoordinates())
+            ChatUtils.sendCommandToServer(getCoordinates())
         } else if (message.startsWith("/sendcoords ")) {
             event.isCanceled = true
             val description = message.split(" ").drop(1).joinToString(" ")
-            LorenzUtils.sendCommandToServer("${getCoordinates()} $description")
+            ChatUtils.sendCommandToServer("${getCoordinates()} $description")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt
index 26873a2ad..963115b9b 100644
--- 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.LorenzUtils
+import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.NEUItems
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -17,7 +17,7 @@ object ViewRecipeCommand {
         if (message == message.uppercase()) return
         if (message.startsWith("/viewrecipe ", ignoreCase = true)) {
             event.isCanceled = true
-            LorenzUtils.sendCommandToServer(message.uppercase())
+            ChatUtils.sendCommandToServer(message.uppercase())
         }
     }