Skip to content

Commit

Permalink
Add missing fields, change protocol version, fix small typo
Browse files Browse the repository at this point in the history
  • Loading branch information
MrPowerGamerBR committed Aug 18, 2017
1 parent 8e50536 commit 590141b
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ public RecyclableCollection<ClientBoundPacketData> toData() {
MiscSerializer.writeLFloat(serializer, yaw);
VarNumberSerializer.writeSVarInt(serializer, 0); //held itemstack (it is actually a slot, but we only send null itemstack here, so we only write 0 id)
VarNumberSerializer.writeSVarInt(serializer, 0); //TODO: metadata

//adventure settings
VarNumberSerializer.writeVarInt(serializer, 0);
VarNumberSerializer.writeVarInt(serializer, 0);
VarNumberSerializer.writeVarInt(serializer, 0);
VarNumberSerializer.writeVarInt(serializer, 0);
VarNumberSerializer.writeVarInt(serializer, 0);

VarNumberSerializer.writeVarLong(serializer, 0); //?

//entity links
//TODO: Implement entity links
VarNumberSerializer.writeSVarInt(serializer, 0);
return RecyclableSingletonList.create(serializer);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package protocolsupport.protocol.packet.middleimpl.serverbound.play.v_pe;

import java.text.MessageFormat;

import org.apache.commons.lang3.Validate;

import io.netty.buffer.ByteBuf;
import org.apache.commons.lang3.Validate;
import protocolsupport.api.ProtocolVersion;
import protocolsupport.protocol.packet.middle.serverbound.play.MiddleChat;
import protocolsupport.protocol.serializer.StringSerializer;

import java.text.MessageFormat;

public class Chat extends MiddleChat {

private static final int validChatType = 1;
Expand All @@ -17,7 +16,7 @@ public class Chat extends MiddleChat {
public void readFromClientData(ByteBuf clientdata) {
ProtocolVersion version = connection.getVersion();
int type = clientdata.readUnsignedByte();
Validate.isTrue(type == validChatType, MessageFormat.format("Unxepected serverbound chat type, expected {0}, but received {1}", validChatType, type));
Validate.isTrue(type == validChatType, MessageFormat.format("Unexcepted serverbound chat type, expected {0}, but received {1}", validChatType, type));
clientdata.readUnsignedByte(); //skip unknown byte (seems to be always 0)
StringSerializer.readString(clientdata, version); //skip sender
message = StringSerializer.readString(clientdata, version);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package protocolsupport.protocol.typeremapper.pe;

import java.util.Arrays;

import protocolsupport.api.ProtocolVersion;
import protocolsupport.protocol.packet.middleimpl.ClientBoundPacketData;
import protocolsupport.protocol.serializer.VarNumberSerializer;
import protocolsupport.protocol.storage.NetworkDataCache;

import java.util.Arrays;

public class PEAdventureSettings {

public static final int ADVENTURE_MODE_ENABLED = 0x1;
Expand Down Expand Up @@ -54,6 +54,7 @@ public static ClientBoundPacketData createPacket(int entityId, int... flags) {
//TODO: Actually work with permissions?
VarNumberSerializer.writeVarInt(serializer, PERMISSIONS_ALLOW_ALL);
VarNumberSerializer.writeVarInt(serializer, GROUP_NORMAL);
VarNumberSerializer.writeVarInt(serializer, 0); //? (custom flags)
VarNumberSerializer.writeSVarLong(serializer, 0);
return serializer;
}
Expand Down
6 changes: 3 additions & 3 deletions src/protocolsupport/zplatform/impl/PENetServerConstants.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package protocolsupport.zplatform.impl;

import java.net.InetSocketAddress;

import io.netty.channel.Channel;
import protocolsupport.api.events.ServerPingResponseEvent;
import protocolsupport.protocol.packet.handler.AbstractStatusListener;
import raknetserver.pipeline.raknet.RakNetPacketConnectionEstablishHandler.PingHandler;

import java.net.InetSocketAddress;

public class PENetServerConstants {

public static final PingHandler PING_HANDLER = new PingHandler() {
Expand All @@ -16,7 +16,7 @@ public String getServerInfo(Channel channel) {
return String.join(";",
"MCPE",
revent.getMotd().replace(";", ":"),
"130", "1.2.0",
"133", "1.2.0",
String.valueOf(revent.getPlayers().size()), String.valueOf(revent.getMaxPlayers())
);
}
Expand Down

0 comments on commit 590141b

Please sign in to comment.