Google
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add chat translators

This commit is contained in:
RednedEpic 2019-07-20 20:10:30 -05:00
parent 2b72082a6f
commit a777add304
3 changed files with 248 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
View File

@ -25,6 +25,7 @@
package org.geysermc.connector.network;
import com.github.steveice10.mc.protocol.packet.ingame.client.ClientChatPacket;
import com.nimbusds.jose.JWSObject;
import com.nukkitx.protocol.bedrock.handler.BatchHandler;
import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler;
@ -401,7 +402,11 @@ public class UpstreamPacketHandler implements BedrockPacketHandler {
@Override
public boolean handle(TextPacket packet) {
System.out.println("Handled packet: " + packet.getClass().getSimpleName());
return false;
ClientChatPacket chatPacket = new ClientChatPacket(packet.getMessage());
session.getDownstream().getSession().send(chatPacket);
return true;
}
@Override

35
connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
View File

@ -29,6 +29,8 @@ import com.flowpowered.math.vector.Vector2f;
import com.flowpowered.math.vector.Vector2i;
import com.flowpowered.math.vector.Vector3f;
import com.flowpowered.math.vector.Vector3i;
import com.github.steveice10.mc.protocol.data.message.TranslationMessage;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerChatPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
import com.nukkitx.nbt.CompoundTagBuilder;
import com.nukkitx.nbt.NbtUtils;
@ -42,6 +44,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufOutputStream;
import io.netty.buffer.Unpooled;
import org.geysermc.connector.utils.GeyserUtils;
import org.geysermc.connector.utils.MessageUtils;
import org.geysermc.connector.utils.Toolbox;
import java.io.ByteArrayOutputStream;
@ -68,6 +71,7 @@ public class TranslatorsInit {
public static void start() {
addLoginPackets();
addChatPackets();
}
private static void addLoginPackets() {
@ -158,6 +162,37 @@ public class TranslatorsInit {
});
}
private static void addChatPackets() {
Registry.add(ServerChatPacket.class, (packet, session) -> {
TextPacket textPacket = new TextPacket();
textPacket.setPlatformChatId("");
textPacket.setSourceName("");
textPacket.setXuid(session.getAuthenticationData().getXboxUUID());
switch (packet.getType()) {
case CHAT:
textPacket.setType(TextPacket.Type.CHAT);
case SYSTEM:
textPacket.setType(TextPacket.Type.SYSTEM);
case NOTIFICATION:
textPacket.setType(TextPacket.Type.TIP);
default:
textPacket.setType(TextPacket.Type.RAW);
}
if (packet.getMessage() instanceof TranslationMessage) {
textPacket.setType(TextPacket.Type.TRANSLATION);
textPacket.setNeedsTranslation(true);
textPacket.setParameters(MessageUtils.getTranslationParams(((TranslationMessage) packet.getMessage()).getTranslationParams()));
textPacket.setMessage(MessageUtils.getBedrockMessage(packet.getMessage()));
} else {
textPacket.setNeedsTranslation(false);
textPacket.setMessage(MessageUtils.getBedrockMessage(packet.getMessage()));
}
session.getUpstream().sendPacket(textPacket);
});
}
private static byte[] empty(byte[] b, Vector2i pos) {
ByteBuf by = Unpooled.buffer();

207
connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java Normal file
View File

@ -0,0 +1,207 @@
package org.geysermc.connector.utils;
import com.github.steveice10.mc.protocol.data.message.ChatColor;
import com.github.steveice10.mc.protocol.data.message.ChatFormat;
import com.github.steveice10.mc.protocol.data.message.Message;
import com.github.steveice10.mc.protocol.data.message.TranslationMessage;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import java.util.ArrayList;
import java.util.List;
public class MessageUtils {
public static List<String> getTranslationParams(Message[] messages) {
List<String> strings = new ArrayList<String>();
for (int i = 0; i < messages.length; i++) {
if (messages[i] instanceof TranslationMessage) {
TranslationMessage translation = (TranslationMessage) messages[i];
StringBuilder builder = new StringBuilder("");
builder.append("%");
builder.append(translation.getTranslationKey());
strings.add(builder.toString());
if (translation.getTranslationKey().equals("commands.gamemode.success.other")) {
strings.add("");
}
for (int j = 0; j < getTranslationParams(translation.getTranslationParams()).size(); j++) {
strings.add(getTranslationParams(translation.getTranslationParams()).get(j));
}
} else {
StringBuilder builder = new StringBuilder("");
builder.append(getFormat(messages[i].getStyle().getFormats()));
builder.append(getColor(messages[i].getStyle().getColor()));
builder.append(getBedrockMessage(messages[i]));
strings.add(builder.toString());
}
}
return strings;
}
public static String getTranslationText(TranslationMessage message) {
StringBuilder builder = new StringBuilder("");
builder.append(getFormat(message.getStyle().getFormats()));
builder.append(getColor(message.getStyle().getColor()));
builder.append("%");
builder.append(message.getTranslationKey());
return builder.toString();
}
public static String getBedrockMessage(Message message) {
JsonParser parser = new JsonParser();
if (isMessage(message.getText())) {
JsonObject object = parser.parse(message.getText()).getAsJsonObject();
message = Message.fromJson(formatJson(object));
}
StringBuilder builder = new StringBuilder(message.getText());
for (Message msg : message.getExtra()) {
builder.append(getFormat(msg.getStyle().getFormats()));
builder.append(getColor(msg.getStyle().getColor()));
if (!(msg.getText() == null)) {
builder.append(getBedrockMessage(msg));
}
}
return builder.toString();
}
private static String getColor(ChatColor color) {
String base = "\u00a7";
switch (color) {
case BLACK:
base += "0";
break;
case DARK_BLUE:
base += "1";
break;
case DARK_GREEN:
base += "2";
break;
case DARK_AQUA:
base += "3";
break;
case DARK_RED:
base += "4";
break;
case DARK_PURPLE:
base += "5";
break;
case GOLD:
base += "6";
break;
case GRAY:
base += "7";
break;
case DARK_GRAY:
base += "8";
break;
case BLUE:
base += "9";
break;
case GREEN:
base += "a";
break;
case AQUA:
base += "b";
break;
case RED:
base += "c";
break;
case LIGHT_PURPLE:
base += "d";
break;
case YELLOW:
base += "e";
break;
case WHITE:
base += "f";
break;
case RESET:
base += "r";
break;
default:
break;
}
return base;
}
private static String getFormat(List<ChatFormat> formats) {
String str = "";
for (ChatFormat cf : formats) {
String base = "\u00a7";
switch (cf) {
case OBFUSCATED:
base += "k";
break;
case BOLD:
base += "l";
break;
case STRIKETHROUGH:
base += "m";
break;
case UNDERLINED:
base += "n";
break;
case ITALIC:
base += "o";
break;
default:
break;
}
str += base;
}
return str;
}
public static boolean isMessage(String text) {
JsonParser parser = new JsonParser();
try {
JsonObject object = parser.parse(text).getAsJsonObject();
try {
Message.fromJson(formatJson(object));
} catch (Exception ex) {
return false;
}
} catch (Exception ex) {
return false;
}
return true;
}
public static JsonObject formatJson(JsonObject object) {
if (object.has("hoverEvent")) {
JsonObject sub = (JsonObject) object.get("hoverEvent");
JsonElement element = sub.get("value");
if (element instanceof JsonArray) {
JsonObject newobj = new JsonObject();
newobj.add("extra", element);
newobj.addProperty("text", "");
sub.remove("value");
sub.add("value", newobj);
}
}
if (object.has("extra")) {
JsonArray a = object.getAsJsonArray("extra");
for (int i = 0; i < a.size(); i++) {
if (!(a.get(i) instanceof JsonPrimitive))
formatJson((JsonObject) a.get(i));
}
}
return object;
}
}