diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java index c278cfd42..92c9aa7fb 100644 --- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java @@ -407,7 +407,18 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { public boolean handle(TextPacket packet) { System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + if(packet.getMessage().charAt(0) == '.') { + + ClientChatPacket chatPacket = new ClientChatPacket(packet.getMessage().replace(".", "/")); + + session.getDownstream().getSession().send(chatPacket); + + return true; + + } + ClientChatPacket chatPacket = new ClientChatPacket(packet.getMessage()); + session.getDownstream().getSession().send(chatPacket); return true; diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java b/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java index f9a205ac6..1c1d25f90 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java @@ -167,7 +167,7 @@ public class TranslatorsInit { TextPacket textPacket = new TextPacket(); textPacket.setPlatformChatId(""); textPacket.setSourceName(""); - textPacket.setXuid(session.getAuthenticationData().getXboxUUID()); + textPacket.setXuid(""); switch (packet.getType()) { case CHAT: textPacket.setType(TextPacket.Type.CHAT); @@ -192,23 +192,4 @@ public class TranslatorsInit { session.getUpstream().sendPacket(textPacket); }); } - - private static byte[] empty(byte[] b, Vector2i pos) { - ByteBuf by = Unpooled.buffer(); - - GeyserUtils.writePEChunkCoord(by, pos); - - return by.array(); - } - - private static class CanWriteToBB extends ByteArrayOutputStream { - - CanWriteToBB() { - super(8192); - } - - void writeTo(ByteBuf buf) { - buf.writeBytes(super.buf, 0, super.count); - } - } } diff --git a/connector/src/main/java/org/geysermc/connector/utils/Chunks.java b/connector/src/main/java/org/geysermc/connector/utils/Chunks.java new file mode 100644 index 000000000..9edd0393b --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/utils/Chunks.java @@ -0,0 +1,33 @@ +package org.geysermc.connector.utils; + +import com.github.steveice10.mc.protocol.data.game.chunk.Chunk; +import com.github.steveice10.mc.protocol.data.game.chunk.Column; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; + +import java.util.Objects; + +public class Chunks { + + public ChunkData getData(Column c) { + Objects.requireNonNull(c); + + int count = 0; + + for(Chunk chunk : c.getChunks()) { + if(chunk != null) { + count++; + } + } + + return null; + } + + @AllArgsConstructor(access = AccessLevel.PACKAGE) + public static final class ChunkData { + public final int count; + + public final byte[] bytes; + + } +} diff --git a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java index 6cdac23a5..af499ff7e 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java @@ -30,6 +30,10 @@ public class MessageUtils { strings.add(""); } + if (translation.getTranslationKey().equals("command.context.here")) { + strings.add(" - no permission or invalid command!"); + } + for (int j = 0; j < getTranslationParams(translation.getTranslationParams()).size(); j++) { strings.add(getTranslationParams(translation.getTranslationParams()).get(j)); }