Skip to content

Commit d218aeb

Browse files
committed
Update mcpe41.npd
1 parent 37380ad commit d218aeb

File tree

3 files changed

+73
-11
lines changed

3 files changed

+73
-11
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
<artifactId>BlockServer</artifactId>
5555
<version>1.0.0-BETA-SNAPSHOT</version>
5656
</dependency>
57+
<dependency>
58+
<groupId>io.github.jython234.jpacketlib</groupId>
59+
<artifactId>JPacketLib</artifactId>
60+
<version>1.0-SNAPSHOT</version>
61+
</dependency>
5762
</dependencies>
5863

5964
<build>

src/main/java/org/blockserver/pe/network/PENetworkConverter.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,13 @@
1717
package org.blockserver.pe.network;
1818

1919
import org.blockserver.core.modules.message.Message;
20-
import org.blockserver.core.modules.message.MessageInPlayerLogin;
20+
import org.blockserver.core.modules.message.PlayerLoginMessage;
2121
import org.blockserver.core.modules.network.BinaryBuffer;
2222
import org.blockserver.core.modules.network.NetworkConverter;
2323
import org.blockserver.core.modules.network.RawPacket;
24-
import org.blockserver.core.modules.player.Player;
2524

2625
import static org.blockserver.pe.network.NetworkInfo.*;
2726

28-
import java.net.InetSocketAddress;
29-
import java.util.ArrayList;
30-
import java.util.Arrays;
31-
import java.util.Collection;
32-
import java.util.stream.Collectors;
33-
3427
/**
3528
* Converter for Minecraft: PE
3629
*/
@@ -42,14 +35,13 @@ public RawPacket toPacket(Message message) {
4235
}
4336

4437
@Override
45-
public Message toMessage(RawPacket rawPacket, Player player) {
38+
public Message toMessage(RawPacket rawPacket) {
4639
BinaryBuffer bb = rawPacket.getBuffer();
4740
bb.setPosition(0);
4841
byte pid = bb.getByte();
4942
switch (pid) {
5043
case LOGIN_PACKET:
51-
return new MessageInPlayerLogin(player); //TODO: add info + decode
52-
44+
//return new PlayerLoginMessage(player); //TODO: GET PLAYER
5345
default:
5446
return null;
5547
}

src/main/resources/mcpe41.npd

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<protocol
3+
xmlns="http://jython234.github.io/JPacketLib"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://jython234.github.io/JPacketLib https://raw.githubusercontent.com/jython234/JPacketLib/master/npd.xsd"
6+
7+
name="MinecraftPEProtocol"
8+
version="41">
9+
10+
<packet name="LOGIN_PACKET">
11+
<pid>8F</pid>
12+
<field name="username" type="str"/>
13+
<field name="protocol1" type="int32"/>
14+
<field name="protocol2" type="int32"/>
15+
<field name="clientId" type="int64"/>
16+
<field name="clientUUID" type="bytes" length="16"/>
17+
<field name="serverAddress" type="str"/>
18+
<field name="clientSecret" type="str"/>
19+
<field name="skinName" type="str"/>
20+
<field name="skin" type="str"/>
21+
</packet>
22+
23+
<packet name="PLAY_STATUS_PACKET">
24+
<pid>90</pid>
25+
<field name="status" type="int32"/>
26+
</packet>
27+
28+
<packet name="DISCONNECT_PACKET">
29+
<pid>91</pid>
30+
<field name="message" type="str"/>
31+
</packet>
32+
33+
<packet name="BATCH_PACKET">
34+
<pid>92</pid>
35+
<!--<field name="payloadLength" type="int32"/> TODO: Implement this
36+
<field name="payload" type="bytes" getLength="payloadLength"/> -->
37+
</packet>
38+
39+
<packet name="TEXT_PACKET">
40+
<pid>93</pid>
41+
<!-- TODO: Conditional fields -->
42+
</packet>
43+
44+
<packet name="SET_TIME_PACKET">
45+
<pid>94</pid>
46+
<field name="time" type="int32"/>
47+
<field name="started" type="bool"/>
48+
</packet>
49+
50+
<packet name="StartGamePacket">
51+
<pid>95</pid>
52+
<field name="seed" type="int32"/>
53+
<field name="dimension" type="byte"/>
54+
<field name="generator" type="int32"/>
55+
<field name="gamemode" type="int32"/>
56+
<field name="entityId" type="int64"/>
57+
<field name="spawnX" type="int32"/>
58+
<field name="spawnY" type="int32"/>
59+
<field name="spawnZ" type="int32"/>
60+
<field name="x" type="float"/>
61+
<field name="y" type="float"/>
62+
<field name="z" type="float"/>
63+
<field name="unknown1" type="byte"/> <!-- 0 -->
64+
</packet>
65+
</protocol>

0 commit comments

Comments
 (0)