From 1bebabed8f1971024cc6d201df968e8dbfbc2ff3 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 28 Dec 2021 20:55:42 +0100 Subject: [PATCH] changed SendMessageToJava to EncodeJavaMessage --- modules/kraProtocol/kraProtocol.go | 2 +- serverCommunication/minecraft.go | 10 +++++----- serverCommunication/web.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/kraProtocol/kraProtocol.go b/modules/kraProtocol/kraProtocol.go index cfb560b..bf1e6d4 100644 --- a/modules/kraProtocol/kraProtocol.go +++ b/modules/kraProtocol/kraProtocol.go @@ -95,7 +95,7 @@ func SimulateMessageFromWebClient(status int, cmdID int, dest int, cmdNumber int return raw } -func SendMessageToJava(status int, cmdID int, dest int, playerUuid string, cmdNumber int, args interface{}) []byte { +func EncodeJavaMessage(status int, cmdID int, dest int, playerUuid string, cmdNumber int, args interface{}) []byte { argType := reflect.TypeOf(args).String() var argLen int var kraProtocolMessageToClientData structs.KraProtocolMessageToClient diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index 55449cf..3861107 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -37,7 +37,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, status int, cmdID int, dest in resArgs := minecraftCommandHandler(cmdNumber, playerUuid) if status == kraProtocol.StatusGet { - raw = kraProtocol.SendMessageToJava(kraProtocol.StatusReply, cmdID, 0, playerUuid, cmdNumber, resArgs) + raw = kraProtocol.EncodeJavaMessage(kraProtocol.StatusReply, cmdID, 0, playerUuid, cmdNumber, resArgs) err = conn.WriteMessage(websocket.BinaryMessage, raw) @@ -57,7 +57,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, status int, cmdID int, dest in logger.Minecraft.Warnln("write:", err) } } else { // conn is not connected - raw = kraProtocol.SendMessageToJava(kraProtocol.StatusErrTryAgain, cmdID, dest, playerUuid, cmdNumber, args) + raw = kraProtocol.EncodeJavaMessage(kraProtocol.StatusErrTryAgain, cmdID, dest, playerUuid, cmdNumber, args) err = conn.WriteMessage(websocket.BinaryMessage, raw) @@ -68,7 +68,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, status int, cmdID int, dest in } else if dest == kraProtocol.DestProxy { client := GetMinecraftClientByName("proxy-1") - raw := kraProtocol.SendMessageToJava(status, cmdID, dest, playerUuid, cmdNumber, args) + raw := kraProtocol.EncodeJavaMessage(status, cmdID, dest, playerUuid, cmdNumber, args) err = client.Connection.WriteMessage(websocket.BinaryMessage, raw) @@ -91,7 +91,7 @@ func minecraftCommandHandler(cmdNumber int, playerUuid string) (args string) { func SendMessageToServer(dest int, playerUuid string, args string) { mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(dest)) - raw := kraProtocol.SendMessageToJava(10, 1, 2, playerUuid, 15, args) + raw := kraProtocol.EncodeJavaMessage(10, 1, 2, playerUuid, 15, args) if mcClient != nil { mcClient.Connection.WriteMessage(websocket.BinaryMessage, raw) @@ -100,7 +100,7 @@ func SendMessageToServer(dest int, playerUuid string, args string) { func SendMessageToMinecraftServer(status int, dest int, playerUuid string, cmdNumber int, args string) { cmdID := 0 - raw := kraProtocol.SendMessageToJava(status, cmdID, dest, playerUuid, cmdNumber, args) + raw := kraProtocol.EncodeJavaMessage(status, cmdID, dest, playerUuid, cmdNumber, args) serverName := getMinecraftServerNameByDest(dest) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 57d54fb..d98c7ca 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -75,7 +75,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft connForDest := getConnForDest(dest, uuid) - raw = kraProtocol.SendMessageToJava(status, cmdID, dest, uuid, cmdNumber, args) + raw = kraProtocol.EncodeJavaMessage(status, cmdID, dest, uuid, cmdNumber, args) logger.Minecraft.Debugln("forwarding", client.Uuid, connForDest)