AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 08:58:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

PacketMapData (1.13+)

Browse Source
This commit is contained in:
Bixilon 2020-07-18 16:05:10 +02:00
parent f5c94d4267
commit 53ffdb7865
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.protocol.packets.clientbound.play; package de.bixilon.minosoft.protocol.packets.clientbound.play;
import de.bixilon.minosoft.game.datatypes.TextComponent;
import de.bixilon.minosoft.logging.Log; import de.bixilon.minosoft.logging.Log;
import de.bixilon.minosoft.protocol.packets.ClientboundPacket; import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
import de.bixilon.minosoft.protocol.protocol.InPacketBuffer; import de.bixilon.minosoft.protocol.protocol.InPacketBuffer;
@ -59,12 +60,10 @@ public class PacketMapData implements ClientboundPacket {
pins = new ArrayList<>(); pins = new ArrayList<>();
length--; // minus the dataData length--; // minus the dataData
for (int i = 0; i < length / 3; i++) { // loop over all sets ( 1 set: 3 bytes) for (int i = 0; i < length / 3; i++) { // loop over all sets ( 1 set: 3 bytes)
byte data = buffer.readByte(); byte directionAndType = buffer.readByte();
byte type = (byte) (data & 0xF);
MapPlayerDirection direction = MapPlayerDirection.byId(data >>> 4);
byte x = buffer.readByte(); byte x = buffer.readByte();
byte z = buffer.readByte(); byte z = buffer.readByte();
pins.add(new MapPinSet(MapPinType.byId(type), direction, x, z)); pins.add(new MapPinSet(MapPinType.byId(directionAndType & 0xF), directionAndType >>> 4, x, z));
} }
break; break;
case SCALE: case SCALE:
@ -89,9 +88,9 @@ public class PacketMapData implements ClientboundPacket {
byte x = buffer.readByte(); byte x = buffer.readByte();
byte z = buffer.readByte(); byte z = buffer.readByte();
if (buffer.getVersion().getVersionNumber() >= ProtocolVersion.VERSION_1_12_2.getVersionNumber()) { if (buffer.getVersion().getVersionNumber() >= ProtocolVersion.VERSION_1_12_2.getVersionNumber()) {
pins.add(new MapPinSet(MapPinType.byId(directionAndType >>> 4), MapPlayerDirection.byId(directionAndType & 0xF), x, z)); pins.add(new MapPinSet(MapPinType.byId(directionAndType >>> 4), directionAndType & 0xF, x, z));
} else { } else {
pins.add(new MapPinSet(MapPinType.byId(directionAndType & 0xF), MapPlayerDirection.byId(directionAndType >>> 4), x, z)); pins.add(new MapPinSet(MapPinType.byId(directionAndType & 0xF), directionAndType >>> 4, x, z));
} }
} }
short columns = BitByte.byteToUShort(buffer.readByte()); short columns = BitByte.byteToUShort(buffer.readByte());
@ -105,6 +104,34 @@ public class PacketMapData implements ClientboundPacket {
} }
return true; return true;
} }
case VERSION_1_13_2: {
mapId = buffer.readVarInt();
scale = buffer.readByte();
boolean trackPosition = buffer.readBoolean();
int pinCount = buffer.readVarInt();
pins = new ArrayList<>();
for (int i = 0; i < pinCount; i++) {
MapPinType type = MapPinType.byId(buffer.readVarInt());
byte x = buffer.readByte();
byte z = buffer.readByte();
byte direction = buffer.readByte();
TextComponent displayName = null;
if (buffer.readBoolean()) {
displayName = buffer.readTextComponent();
}
pins.add(new MapPinSet(type, direction, x, z, displayName));
}
short columns = BitByte.byteToUShort(buffer.readByte());
if (columns > 0) {
byte rows = buffer.readByte();
byte xOffset = buffer.readByte();
byte zOffset = buffer.readByte();
int dataLength = buffer.readVarInt();
data = buffer.readBytes(dataLength);
}
return true;
}
} }
return false; return false;
@ -172,30 +199,6 @@ public class PacketMapData implements ClientboundPacket {
} }
public enum MapPlayerDirection {
// ToDo
TO_DO(0);
final int id;
MapPlayerDirection(int id) {
this.id = id;
}
public static MapPlayerDirection byId(int id) {
for (MapPlayerDirection d : values()) {
if (d.getId() == id) {
return d;
}
}
return null;
}
public int getId() {
return id;
}
}
public enum MapPinType { public enum MapPinType {
WHITE_ARROW(0), WHITE_ARROW(0),
GREEN_ARROW(1), GREEN_ARROW(1),
@ -248,22 +251,32 @@ public class PacketMapData implements ClientboundPacket {
public static class MapPinSet { public static class MapPinSet {
final MapPinType type; final MapPinType type;
final MapPlayerDirection direction; final byte direction;
byte x; final byte x;
byte z; final byte z;
final TextComponent displayName;
public MapPinSet(MapPinType type, MapPlayerDirection direction, byte x, byte z) { public MapPinSet(MapPinType type, int direction, byte x, byte z) {
this.type = type; this.type = type;
this.direction = direction; this.direction = (byte) direction;
this.x = x; this.x = x;
this.z = z; this.z = z;
displayName = null;
}
public MapPinSet(MapPinType type, int direction, byte x, byte z, TextComponent displayName) {
this.type = type;
this.direction = (byte) direction;
this.x = x;
this.z = z;
this.displayName = displayName;
} }
public MapPinType getType() { public MapPinType getType() {
return type; return type;
} }
public MapPlayerDirection getDirection() { public byte getDirection() {
return direction; return direction;
} }