some improvements

Author: MeiNanziiii

src/main/java/ua/mei/minekord/mixin/PlayerManagerMixin.java

@@ -12,19 +12,14 @@
 import ua.mei.minekord.config.MinekordConfigKt;
 import ua.mei.minekord.event.IPCheckEvent;
 
-import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
 @Mixin(PlayerManager.class)
 public class PlayerManagerMixin {
     @Inject(method = "checkCanJoin", at = @At("RETURN"), cancellable = true)
     private void minekord$checkRoles(SocketAddress socketAddress, GameProfile gameProfile, CallbackInfoReturnable<Text> cir) {
-        if (cir.getReturnValue() == null && MinekordConfigKt.getConfig().get(ExperimentalSpec.DiscordSpec.INSTANCE.getEnabled())) {
-            boolean loginByIp = MinekordConfigKt.getConfig().get(ExperimentalSpec.DiscordSpec.INSTANCE.getLoginByIp());
-            String playerName = gameProfile.getName();
-            String cachedIp = IPCache.INSTANCE.getFromCache(playerName);
-
-            if (loginByIp && socketAddress instanceof InetSocketAddress inet && !cachedIp.equals(inet.getHostName())) {
+        if (cir.getReturnValue() == null && MinekordConfigKt.getConfig().get(ExperimentalSpec.DiscordSpec.INSTANCE.getEnabled()) && MinekordConfigKt.getConfig().get(ExperimentalSpec.DiscordSpec.INSTANCE.getLoginByIp())) {
+            if (!IPCache.INSTANCE.haveInCache(gameProfile.getName(), socketAddress)) {
                 IPCheckEvent.Companion.getEvent().invoker().request(socketAddress, gameProfile);
                 cir.setReturnValue(Text.translatable("multiplayer.disconnect.generic"));
             }

src/main/kotlin/ua/mei/minekord/bot/MinekordBot.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.launch
 import ua.mei.minekord.bot.extensions.IPCheckExtension
 import ua.mei.minekord.bot.extensions.SetupExtension
 import ua.mei.minekord.config.BotSpec
+import ua.mei.minekord.config.ExperimentalSpec
 import ua.mei.minekord.config.config
 import kotlin.coroutines.CoroutineContext
 
@@ -23,15 +24,13 @@ object MinekordBot : CoroutineScope {
             bot = ExtensibleBot(config[BotSpec.token]) {
                 extensions {
                     add(::SetupExtension)
-                    add(::IPCheckExtension)
+
+                    if (config[ExperimentalSpec.DiscordSpec.enabled])
+                        add(::IPCheckExtension)
                 }
             }
 
-            try {
-                bot.start()
-            } catch (_: Throwable) {
-                println("LOX")
-            }
+            bot.start()
         }
     }
 

src/main/kotlin/ua/mei/minekord/bot/extensions/IPCheckExtension.kt

@@ -25,7 +25,7 @@ class IPCheckExtension : Extension() {
     override val name: String = "IP Check Extension"
 
     override suspend fun setup() {
-        IPCheckEvent.event.register { address, profile ->
+        IPCheckEvent.event.register { socketAddress, profile ->
             MinekordBot.launch {
                 try {
                     if (!config[ExperimentalSpec.DiscordSpec.enabled]) return@launch
@@ -39,7 +39,7 @@ class IPCheckExtension : Extension() {
 
                             field {
                                 name = "> IP"
-                                value = "> ${address.address}"
+                                value = "> ${socketAddress.address}"
                                 inline = true
                             }
                             field {
@@ -54,7 +54,7 @@ class IPCheckExtension : Extension() {
                                 style = ButtonStyle.Success
 
                                 action {
-                                    IPCache.putIntoCache(profile.name, address.address)
+                                    IPCache.putIntoCache(profile.name, socketAddress.address)
 
                                     edit {
                                         components {

src/main/kotlin/ua/mei/minekord/cache/IPCache.kt

@@ -3,8 +3,10 @@ package ua.mei.minekord.cache
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.stream.JsonReader
+import io.ktor.util.network.address
 import net.fabricmc.loader.api.FabricLoader
 import java.io.FileReader
+import java.net.SocketAddress
 import java.nio.file.Files
 import java.nio.file.Path
 
@@ -37,7 +39,7 @@ object IPCache {
         save()
     }
 
-    fun getFromCache(nickname: String): String {
-        return cache[nickname] ?: ""
+    fun haveInCache(nickname: String, socketAddress: SocketAddress): Boolean {
+        return cache[nickname] == socketAddress.address
     }
 }

src/main/kotlin/ua/mei/minekord/event/IPCheckEvent.kt

@@ -6,13 +6,13 @@ import net.fabricmc.fabric.api.event.EventFactory
 import java.net.SocketAddress
 
 fun interface IPCheckEvent {
-    fun request(address: SocketAddress, profile: GameProfile)
+    fun request(socketAddress: SocketAddress, profile: GameProfile)
 
     companion object {
         val event: Event<IPCheckEvent> = EventFactory.createArrayBacked(IPCheckEvent::class.java) { listeners ->
-            IPCheckEvent { address, profile ->
+            IPCheckEvent { socketAddress, profile ->
                 listeners.forEach { listener ->
-                    listener.request(address, profile)
+                    listener.request(socketAddress, profile)
                 }
             }
         }