Krakatoa-Earth
/
Backend
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed SendMessageToJava to EncodeJavaMessage

master
Alex 2021-12-28 20:55:42 +01:00
parent 450e71534a
commit 1bebabed8f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/kraProtocol/kraProtocol.go
View File

@ -95,7 +95,7 @@ func SimulateMessageFromWebClient(status int, cmdID int, dest int, cmdNumber int
return raw 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() argType := reflect.TypeOf(args).String()
var argLen int var argLen int
var kraProtocolMessageToClientData structs.KraProtocolMessageToClient var kraProtocolMessageToClientData structs.KraProtocolMessageToClient

10
serverCommunication/minecraft.go
View File

@ -37,7 +37,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, status int, cmdID int, dest in
resArgs := minecraftCommandHandler(cmdNumber, playerUuid) resArgs := minecraftCommandHandler(cmdNumber, playerUuid)
if status == kraProtocol.StatusGet { 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) 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) logger.Minecraft.Warnln("write:", err)
} }
} else { // conn is not connected } 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) 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 { } else if dest == kraProtocol.DestProxy {
client := GetMinecraftClientByName("proxy-1") 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) 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) { func SendMessageToServer(dest int, playerUuid string, args string) {
mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(dest)) 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 { if mcClient != nil {
mcClient.Connection.WriteMessage(websocket.BinaryMessage, raw) 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) { func SendMessageToMinecraftServer(status int, dest int, playerUuid string, cmdNumber int, args string) {
cmdID := 0 cmdID := 0
raw := kraProtocol.SendMessageToJava(status, cmdID, dest, playerUuid, cmdNumber, args) raw := kraProtocol.EncodeJavaMessage(status, cmdID, dest, playerUuid, cmdNumber, args)
serverName := getMinecraftServerNameByDest(dest) serverName := getMinecraftServerNameByDest(dest)

2
serverCommunication/web.go
View File

@ -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 if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft
connForDest := getConnForDest(dest, uuid) 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) logger.Minecraft.Debugln("forwarding", client.Uuid, connForDest)