Rename project
This commit is contained in:
37 files changed
+105
-91
No files matched your search
+2
-2
@@ -5,9 +5,9 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.bedrock
|
||||
package cn.rtast.libmc.mcping.bedrock
|
||||
|
||||
import cn.rtast.mcping.platform._Buffer
|
||||
import cn.rtast.libmc.common._Buffer
|
||||
import kotlin.random.Random
|
||||
|
||||
private val rakNetMagic = byteArrayOf(
|
||||
+4
-3
@@ -5,10 +5,11 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.bedrock
|
||||
package cn.rtast.libmc.mcping.bedrock
|
||||
|
||||
import cn.rtast.libmc.common._Buffer
|
||||
import cn.rtast.libmc.common._UdpSocket
|
||||
|
||||
import cn.rtast.mcping.platform._Buffer
|
||||
import cn.rtast.mcping.platform._UdpSocket
|
||||
|
||||
internal fun _UdpSocket.sendPacket(packet: MinecraftBedrockPacket): ByteArray {
|
||||
val buf = _Buffer()
|
||||
+6
-6
@@ -5,15 +5,15 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.bedrock
|
||||
package cn.rtast.libmc.mcping.bedrock
|
||||
|
||||
import cn.rtast.mcping.PingResponse
|
||||
import cn.rtast.mcping.platform.MCPingContext
|
||||
import cn.rtast.mcping.platform._UdpSocket
|
||||
import cn.rtast.mcping.platform.wrap
|
||||
import cn.rtast.libmc.common.LibMCContext
|
||||
import cn.rtast.libmc.common._UdpSocket
|
||||
import cn.rtast.libmc.common.wrap
|
||||
import cn.rtast.libmc.mcping.PingResponse
|
||||
import kotlin.time.Clock
|
||||
|
||||
internal fun pingBedrockServer(host: String, port: Int, context: MCPingContext): PingResponse {
|
||||
internal fun pingBedrockServer(host: String, port: Int, context: LibMCContext): PingResponse {
|
||||
val socket = _UdpSocket(host, port, context)
|
||||
return try {
|
||||
val sendTime = Clock.System.now().toEpochMilliseconds()
|
||||
+2
-2
@@ -5,9 +5,9 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.bedrock
|
||||
package cn.rtast.libmc.mcping.bedrock
|
||||
|
||||
import cn.rtast.mcping.PingResponse
|
||||
import cn.rtast.libmc.mcping.PingResponse
|
||||
|
||||
public enum class BedrockGameMode(public val gameMode: String) {
|
||||
Survival("Survival"),
|
||||
+3
-3
@@ -4,10 +4,10 @@
|
||||
* Date: 2026/9/3
|
||||
*/
|
||||
|
||||
package cn.rtast.mcping.java
|
||||
package cn.rtast.libmc.mcping.java
|
||||
|
||||
import cn.rtast.mcping.platform._Buffer
|
||||
import cn.rtast.mcping.platform._ReadChannel
|
||||
import cn.rtast.libmc.common._Buffer
|
||||
import cn.rtast.libmc.common._ReadChannel
|
||||
|
||||
|
||||
internal fun _Buffer.writeVarInt(value: Int) {
|
||||
+2
-2
@@ -5,9 +5,9 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.java
|
||||
package cn.rtast.libmc.mcping.java
|
||||
|
||||
import cn.rtast.mcping.platform._Buffer
|
||||
import cn.rtast.libmc.common._Buffer
|
||||
|
||||
internal interface MinecraftPacket {
|
||||
val packetId: Int
|
||||
+3
-3
@@ -5,10 +5,10 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.java
|
||||
package cn.rtast.libmc.mcping.java
|
||||
|
||||
import cn.rtast.mcping.platform._Buffer
|
||||
import cn.rtast.mcping.platform._WriteChannel
|
||||
import cn.rtast.libmc.common._Buffer
|
||||
import cn.rtast.libmc.common._WriteChannel
|
||||
|
||||
internal fun _WriteChannel.sendPacket(packet: MinecraftPacket) {
|
||||
val bodyBuffer = _Buffer()
|
||||
+5
-5
@@ -5,14 +5,14 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping.java
|
||||
package cn.rtast.libmc.mcping.java
|
||||
|
||||
import cn.rtast.mcping.PingResponse
|
||||
import cn.rtast.mcping.platform.MCPingContext
|
||||
import cn.rtast.mcping.platform._Socket
|
||||
import cn.rtast.libmc.common.LibMCContext
|
||||
import cn.rtast.libmc.common._Socket
|
||||
import cn.rtast.libmc.mcping.PingResponse
|
||||
import kotlin.time.Clock
|
||||
|
||||
internal fun pingJavaServer(host: String, port: Int, context: MCPingContext): PingResponse {
|
||||
internal fun pingJavaServer(host: String, port: Int, context: LibMCContext): PingResponse {
|
||||
val socket = _Socket(host, port, context)
|
||||
val receiveChannel = socket.openReadChannel()
|
||||
val sendChannel = socket.openWriteChannel()
|
||||
+5
-5
@@ -7,11 +7,11 @@
|
||||
@file:JvmName("McPing")
|
||||
|
||||
|
||||
package cn.rtast.mcping
|
||||
package cn.rtast.libmc.mcping
|
||||
|
||||
import cn.rtast.mcping.bedrock.pingBedrockServer
|
||||
import cn.rtast.mcping.java.pingJavaServer
|
||||
import cn.rtast.mcping.platform.MCPingContext
|
||||
import cn.rtast.libmc.common.LibMCContext
|
||||
import cn.rtast.libmc.mcping.bedrock.pingBedrockServer
|
||||
import cn.rtast.libmc.mcping.java.pingJavaServer
|
||||
import kotlin.jvm.JvmName
|
||||
import kotlin.jvm.JvmOverloads
|
||||
|
||||
@@ -20,7 +20,7 @@ public fun mcping(
|
||||
host: String,
|
||||
port: Int,
|
||||
type: ServerType = ServerType.Java,
|
||||
context: MCPingContext = MCPingContext(),
|
||||
context: LibMCContext = LibMCContext(),
|
||||
): PingResponse = when (type) {
|
||||
ServerType.Java -> pingJavaServer(host, port, context)
|
||||
ServerType.Bedrock -> pingBedrockServer(host, port, context)
|
||||
+3
-3
@@ -5,10 +5,10 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping
|
||||
package cn.rtast.libmc.mcping
|
||||
|
||||
import cn.rtast.mcping.bedrock.BedrockPingResponse
|
||||
import cn.rtast.mcping.bedrock.parseBedrockPingResponse
|
||||
import cn.rtast.libmc.mcping.bedrock.BedrockPingResponse
|
||||
import cn.rtast.libmc.mcping.bedrock.parseBedrockPingResponse
|
||||
|
||||
public data class PingResponse(
|
||||
/**
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
|
||||
package cn.rtast.mcping
|
||||
package cn.rtast.libmc.mcping
|
||||
|
||||
public enum class ServerType {
|
||||
Java, Bedrock
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
package test
|
||||
|
||||
import cn.rtast.mcping.ServerType
|
||||
import cn.rtast.mcping.mcping
|
||||
import cn.rtast.libmc.mcping.ServerType
|
||||
import cn.rtast.libmc.mcping.mcping
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlin.test.Test
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
package test;
|
||||
|
||||
import cn.rtast.mcping.McPing;
|
||||
import cn.rtast.mcping.PingResponse;
|
||||
import cn.rtast.mcping.ServerType;
|
||||
import cn.rtast.libmc.mcping.McPing;
|
||||
import cn.rtast.libmc.mcping.PingResponse;
|
||||
import cn.rtast.libmc.mcping.ServerType;
|
||||
import org.junit.Test;
|
||||
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
package test
|
||||
|
||||
import cn.rtast.mcping.ServerType
|
||||
import cn.rtast.mcping.mcping
|
||||
import cn.rtast.mcping.platform.MCPingContext
|
||||
import cn.rtast.libmc.common.LibMCContext
|
||||
import cn.rtast.libmc.mcping.ServerType
|
||||
import cn.rtast.libmc.mcping.mcping
|
||||
import io.ktor.network.selector.*
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.IO
|
||||
@@ -22,7 +22,7 @@ class TestMingwPing {
|
||||
fun `test ping java on mingw with selectorManager`() = runTest {
|
||||
val sm = SelectorManager(Dispatchers.IO)
|
||||
val response =
|
||||
mcping(host = "org.mc-complex.com", port = 25565, type = ServerType.Java, context = MCPingContext(sm))
|
||||
mcping(host = "org.mc-complex.com", port = 25565, type = ServerType.Java, context = LibMCContext(sm))
|
||||
println(response)
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ class TestMingwPing {
|
||||
fun `test ping bedrock on mingw with selectorManager`() = runTest {
|
||||
val sm = SelectorManager(Dispatchers.IO)
|
||||
val response =
|
||||
mcping(host = "play.wildnetwork.net", port = 19132, type = ServerType.Bedrock, context = MCPingContext(sm))
|
||||
mcping(host = "play.wildnetwork.net", port = 19132, type = ServerType.Bedrock, context = LibMCContext(sm))
|
||||
println(response)
|
||||
println(response.toBedrockResponse())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user