diff --git a/build.gradle.kts b/build.gradle.kts index 6219700..478624f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,6 @@ dependencies { implementation(libs.aws.s3.sdk) implementation(libs.rconlib) implementation(libs.mcprotocollib) - implementation(libs.dnsjava) } tasks.build { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 57d1450..b668d14 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,6 @@ rconLibVersion = "1.1.0" mysqlConnectorVersion = "9.1.0" postgresqlVersion = "42.7.4" mcprotolobVersion = "1.21-SNAPSHOT" -dnsJavaVersion = "3.6.2" [libraries] ronebot = { group = "cn.rtast", name = "ROneBot", version.ref = "ronebotVersion" } @@ -41,7 +40,6 @@ slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4jVersi aws-s3-sdk = { group = "software.amazon.awssdk", name = "s3", version.ref = "awsS3SDKVersion" } rconlib = { group = "cn.rtast", name = "RCONLib", version.ref = "rconLibVersion" } mcprotocollib = { group = "org.geysermc.mcprotocollib", name = "protocol", version.ref = "mcprotolobVersion" } -dnsjava = { group = "dnsjava", name = "dnsjava", version.ref = "dnsJavaVersion" } [bundles] diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt index 1c835e5..a4db570 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt @@ -32,7 +32,6 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.Logger import cn.rtast.fancybot.util.mcbot.MCClient import cn.rtast.fancybot.util.misc.isFullyTransparent -import cn.rtast.fancybot.util.misc.resolveMinecraftSrv import cn.rtast.fancybot.util.misc.scaleImage import cn.rtast.fancybot.util.misc.toByteArray import cn.rtast.fancybot.util.misc.toURL @@ -611,10 +610,10 @@ class MCBotCommand : BaseCommand() { val executor = Executors.newFixedThreadPool(100) val address = args[1] val host = address.split(":").first() - val (newAddress, newPort) = host.resolveMinecraftSrv() + val port = address.split(":").last().toInt() val count = args[2].toInt() (1..count).forEach { - val client = MCClient(newAddress, newPort, generateRandomString()) + val client = MCClient(host, port, generateRandomString()) .also { it.createClient() } executor.execute { clients.add(client.runBot()) } } diff --git a/src/main/kotlin/cn/rtast/fancybot/util/misc/DNS.kt b/src/main/kotlin/cn/rtast/fancybot/util/misc/DNS.kt deleted file mode 100644 index ab20c84..0000000 --- a/src/main/kotlin/cn/rtast/fancybot/util/misc/DNS.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright © 2024 RTAkland - * Author: RTAkland - * Date: 2024/10/18 - */ - - -package cn.rtast.fancybot.util.misc - -import org.xbill.DNS.Lookup -import org.xbill.DNS.SRVRecord -import org.xbill.DNS.Type - -fun String.resolveMinecraftSrv(): Pair { - val srvDomain = "_minecraft._tcp.$this" - val lookup = Lookup(srvDomain, Type.SRV) - val result = lookup.run() - if (result != null && result.isNotEmpty()) { - val srvRecord = result[0] as SRVRecord - val target = srvRecord.target.toString().trimEnd('.') - val port = srvRecord.port - return Pair(target, port) - } - return Pair(this, 25565) -}