diff --git a/common/build.gradle.kts b/libmc-common/build.gradle.kts similarity index 100% rename from common/build.gradle.kts rename to libmc-common/build.gradle.kts diff --git a/common/src/commonMain/kotlin/cn/rtast/libmc/common/buffer.kt b/libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/buffer.kt similarity index 100% rename from common/src/commonMain/kotlin/cn/rtast/libmc/common/buffer.kt rename to libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/buffer.kt diff --git a/common/src/commonMain/kotlin/cn/rtast/libmc/common/byte_order.kt b/libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/byte_order.kt similarity index 100% rename from common/src/commonMain/kotlin/cn/rtast/libmc/common/byte_order.kt rename to libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/byte_order.kt diff --git a/common/src/commonMain/kotlin/cn/rtast/libmc/common/channels.kt b/libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/channels.kt similarity index 100% rename from common/src/commonMain/kotlin/cn/rtast/libmc/common/channels.kt rename to libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/channels.kt diff --git a/common/src/commonMain/kotlin/cn/rtast/libmc/common/context.kt b/libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/context.kt similarity index 100% rename from common/src/commonMain/kotlin/cn/rtast/libmc/common/context.kt rename to libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/context.kt diff --git a/common/src/commonMain/kotlin/cn/rtast/libmc/common/socket.kt b/libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/socket.kt similarity index 100% rename from common/src/commonMain/kotlin/cn/rtast/libmc/common/socket.kt rename to libmc-common/src/commonMain/kotlin/cn/rtast/libmc/common/socket.kt diff --git a/common/src/jvmMain/kotlin/cn/rtast/libmc/common/buffer.jvm.kt b/libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/buffer.jvm.kt similarity index 100% rename from common/src/jvmMain/kotlin/cn/rtast/libmc/common/buffer.jvm.kt rename to libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/buffer.jvm.kt diff --git a/common/src/jvmMain/kotlin/cn/rtast/libmc/common/channels.jvm.kt b/libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/channels.jvm.kt similarity index 100% rename from common/src/jvmMain/kotlin/cn/rtast/libmc/common/channels.jvm.kt rename to libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/channels.jvm.kt diff --git a/common/src/jvmMain/kotlin/cn/rtast/libmc/common/context.jvm.kt b/libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/context.jvm.kt similarity index 100% rename from common/src/jvmMain/kotlin/cn/rtast/libmc/common/context.jvm.kt rename to libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/context.jvm.kt diff --git a/common/src/jvmMain/kotlin/cn/rtast/libmc/common/order_convert.kt b/libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/order_convert.kt similarity index 100% rename from common/src/jvmMain/kotlin/cn/rtast/libmc/common/order_convert.kt rename to libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/order_convert.kt diff --git a/common/src/jvmMain/kotlin/cn/rtast/libmc/common/socket.jvm.kt b/libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/socket.jvm.kt similarity index 100% rename from common/src/jvmMain/kotlin/cn/rtast/libmc/common/socket.jvm.kt rename to libmc-common/src/jvmMain/kotlin/cn/rtast/libmc/common/socket.jvm.kt diff --git a/common/src/nativeMain/kotlin/cn/rtast/libmc/common/buffer.native.kt b/libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/buffer.native.kt similarity index 100% rename from common/src/nativeMain/kotlin/cn/rtast/libmc/common/buffer.native.kt rename to libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/buffer.native.kt diff --git a/common/src/nativeMain/kotlin/cn/rtast/libmc/common/channels.native.kt b/libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/channels.native.kt similarity index 100% rename from common/src/nativeMain/kotlin/cn/rtast/libmc/common/channels.native.kt rename to libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/channels.native.kt diff --git a/common/src/nativeMain/kotlin/cn/rtast/libmc/common/context.native.kt b/libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/context.native.kt similarity index 100% rename from common/src/nativeMain/kotlin/cn/rtast/libmc/common/context.native.kt rename to libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/context.native.kt diff --git a/common/src/nativeMain/kotlin/cn/rtast/libmc/common/socket.native.kt b/libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/socket.native.kt similarity index 100% rename from common/src/nativeMain/kotlin/cn/rtast/libmc/common/socket.native.kt rename to libmc-common/src/nativeMain/kotlin/cn/rtast/libmc/common/socket.native.kt diff --git a/mcping/build.gradle.kts b/libmc-mcping/build.gradle.kts similarity index 100% rename from mcping/build.gradle.kts rename to libmc-mcping/build.gradle.kts diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet_writer.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet_writer.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet_writer.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/packet_writer.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_bedrock.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_bedrock.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_bedrock.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_bedrock.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_response_parser.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_response_parser.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_response_parser.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/bedrock/ping_response_parser.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/mc_primitives.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/mc_primitives.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/mc_primitives.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/mc_primitives.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet_writer.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet_writer.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet_writer.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/packet_writer.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/ping_java.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/ping_java.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/ping_java.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/java/ping_java.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/mcping.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/mcping.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/mcping.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/mcping.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/ping_response.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/ping_response.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/ping_response.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/ping_response.kt diff --git a/mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/server_type.kt b/libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/server_type.kt similarity index 100% rename from mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/server_type.kt rename to libmc-mcping/src/commonMain/kotlin/cn/rtast/libmc/mcping/server_type.kt diff --git a/mcping/src/commonTest/kotlin/test/TestPing.kt b/libmc-mcping/src/commonTest/kotlin/test/TestPing.kt similarity index 100% rename from mcping/src/commonTest/kotlin/test/TestPing.kt rename to libmc-mcping/src/commonTest/kotlin/test/TestPing.kt diff --git a/mcping/src/jvmTest/java/test/TestPingInJava.java b/libmc-mcping/src/jvmTest/java/test/TestPingInJava.java similarity index 100% rename from mcping/src/jvmTest/java/test/TestPingInJava.java rename to libmc-mcping/src/jvmTest/java/test/TestPingInJava.java diff --git a/mcping/src/mingwTest/kotlin/test/TestMingwPing.kt b/libmc-mcping/src/mingwTest/kotlin/test/TestMingwPing.kt similarity index 100% rename from mcping/src/mingwTest/kotlin/test/TestMingwPing.kt rename to libmc-mcping/src/mingwTest/kotlin/test/TestMingwPing.kt diff --git a/rconlib/build.gradle.kts b/libmc-rconlib/build.gradle.kts similarity index 100% rename from rconlib/build.gradle.kts rename to libmc-rconlib/build.gradle.kts diff --git a/rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/buffer_ext.kt b/libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/buffer_ext.kt similarity index 100% rename from rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/buffer_ext.kt rename to libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/buffer_ext.kt diff --git a/rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet.kt b/libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet.kt similarity index 100% rename from rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet.kt rename to libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet.kt diff --git a/rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet_type.kt b/libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet_type.kt similarity index 100% rename from rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet_type.kt rename to libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/packet_type.kt diff --git a/rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/rconlib.kt b/libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/rconlib.kt similarity index 100% rename from rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/rconlib.kt rename to libmc-rconlib/src/commonMain/kotlin/cn/rtast/libmc/mcping/rconlib/rconlib.kt diff --git a/rconlib/src/commonTest/kotlin/test/TestRCON.kt b/libmc-rconlib/src/commonTest/kotlin/test/TestRCON.kt similarity index 100% rename from rconlib/src/commonTest/kotlin/test/TestRCON.kt rename to libmc-rconlib/src/commonTest/kotlin/test/TestRCON.kt diff --git a/rconlib/src/jvmTest/java/test/TestRconClientOnJava.java b/libmc-rconlib/src/jvmTest/java/test/TestRconClientOnJava.java similarity index 100% rename from rconlib/src/jvmTest/java/test/TestRconClientOnJava.java rename to libmc-rconlib/src/jvmTest/java/test/TestRconClientOnJava.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 02f974a..8062980 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,10 @@ plugins { } rootProject.name = "libmc" -include(":common") -include(":mcping") -include(":rconlib") +includeSubModule(":common") +includeSubModule(":mcping") +includeSubModule(":rconlib") + +fun includeSubModule(name: String) = include(name).also { + project(name).projectDir = file("libmc-${name.removePrefix(":")}") +}