Archived
0

1 Commits

Author SHA1 Message Date
74a9066a04 TitlePacket 2021-05-08 19:48:21 +03:00
10 changed files with 120 additions and 213 deletions

View File

@@ -50,19 +50,17 @@ public enum State {
0x0B, PingPacket.class,
0x0D, PlayerPositionPacket.class,
0x0E, CPlayerPositionAndLookPacket.class,
0x0F, PlayerLookPacket.class,
0x15, EntityActionPacket.class,
0x1C, UpdateSignPacket.class
0x0F, PlayerLookPacket.class
),
// client bound
Map.of(
PingPacket.class, 0x1F,
ChunkDataPacket.class, 0x20,
JoinGamePacket.class, 0x23,
OpenSignEditorPacket.class, 0x2A,
SpawnPositionPacket.class, 0x46,
ChunkDataPacket.class, 0x20,
PlayerAbilitiesPacket.class,0x2C,
SPlayerPositionAndLookPacket.class, 0x2F,
SpawnPositionPacket.class, 0x46
TitlePacket.class, 0x48
)
);

View File

@@ -1,52 +0,0 @@
package mc.protocol.packets.client;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import mc.protocol.io.NetByteBuf;
import mc.protocol.packets.ClientSidePacket;
import mc.protocol.utils.EntityActionAction;
/**
* Entity Action packet.
*
* <p>Структура пакета</p>
* <pre>
* | FIELD | TYPE | NOTES |
* |------------|--------|-------------------------------------------|
* | Entity ID | VarInt | ID игрока |
* | Action ID | VarInt | ID действия |
* | Jump Boost | VarInt | Используется только при "Action ID" = 5. |
* | | | В этом случае значение будет от 0 до 100. |
* | | | В остальных случаях значение 0. |
* </pre>
*
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Entity_Action" target="_top">Entity Action</a>
*/
@NoArgsConstructor
@Getter
@EqualsAndHashCode
@ToString
public class EntityActionPacket implements ClientSidePacket {
private Integer entityId;
private EntityActionAction action;
private Integer jumpBoost;
@Override
public void readSelf(NetByteBuf netByteBuf) {
this.entityId = netByteBuf.readVarInt();
int actionId = netByteBuf.readVarInt();
this.jumpBoost = netByteBuf.readVarInt();
this.action = EntityActionAction.valueOfCode(actionId);
}
@Override
public void passivate() {
this.entityId = null;
this.action = null;
this.jumpBoost = null;
}
}

View File

@@ -1,57 +0,0 @@
package mc.protocol.packets.client;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import mc.protocol.io.NetByteBuf;
import mc.protocol.model.Location;
import mc.protocol.packets.ClientSidePacket;
import mc.protocol.packets.server.OpenSignEditorPacket;
import mc.protocol.serializer.LocationSerializer;
/**
* Update Sign packet.
*
* <p>Отправляется клиентом, когда нажата кнопка "Done" в окне редактирования таблички.</p>
*
* <p>Структура пакета</p>
* <pre>
* | FIELD | TYPE | NOTES |
* |----------|--------------|--------------------------------|
* | Location | Location | Позиция редактируемой табилчки |
* | Line 1 | String (384) | Строка таблички |
* | Line 2 | String (384) | Строка таблички |
* | Line 3 | String (384) | Строка таблички |
* | Line 4 | String (384) | Строка таблички |
* </pre>
*
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Update_Sign" target="_top">Update Sign</a>
* @see OpenSignEditorPacket
*/
@NoArgsConstructor
@Getter
@EqualsAndHashCode
@ToString
public class UpdateSignPacket implements ClientSidePacket {
private Location location;
@SuppressWarnings("MismatchedReadAndWriteOfArray")
private String[] lines;
@Override
public void readSelf(NetByteBuf netByteBuf) {
this.location = LocationSerializer.fromLongValue(netByteBuf.readLong());
this.lines = new String[4];
this.lines[0] = netByteBuf.readString(384);
this.lines[1] = netByteBuf.readString(384);
this.lines[2] = netByteBuf.readString(384);
this.lines[3] = netByteBuf.readString(384);
}
@Override
public void passivate() {
this.location = null;
this.lines = null;
}
}

View File

@@ -1,33 +0,0 @@
package mc.protocol.packets.server;
import lombok.Data;
import mc.protocol.io.NetByteBuf;
import mc.protocol.model.Location;
import mc.protocol.packets.ServerSidePacket;
import mc.protocol.packets.client.UpdateSignPacket;
import mc.protocol.serializer.LocationSerializer;
/**
* Открыть окно редактирования таблички.
*
* <p>Структура пакета</p>
* <pre>
* | FIELD | TYPE | NOTES |
* |----------|----------|-------|
* | Location | Location | |
* </pre>
*
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Open_Sign_Editor">Open Sign Editor</a>
* @see UpdateSignPacket
*/
@Data
public class OpenSignEditorPacket implements ServerSidePacket {
private Location location;
@Override
public void writeSelf(NetByteBuf netByteBuf) {
long value = LocationSerializer.toLongValue(this.location);
netByteBuf.writeLong(value);
}
}

View File

@@ -4,7 +4,6 @@ import lombok.Data;
import mc.protocol.io.NetByteBuf;
import mc.protocol.model.Location;
import mc.protocol.packets.ServerSidePacket;
import mc.protocol.serializer.LocationSerializer;
/**
* Спавн позиция игрока.
@@ -15,7 +14,7 @@ import mc.protocol.serializer.LocationSerializer;
* <pre>
* | FIELD | TYPE | NOTES |
* |----------|----------|-----------------------|
* | Location | Location | Локация спавна игрока |
* | Location | Position | Локация спавна игрока |
* </pre>
*
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Spawn_Position">Spawn Position</a>
@@ -27,7 +26,16 @@ public class SpawnPositionPacket implements ServerSidePacket {
@Override
public void writeSelf(NetByteBuf netByteBuf) {
long spawnSerialized = LocationSerializer.toLongValue(this.spawn);
long spawnSerialized =
((long) (floorDouble(spawn.getX()) & 0x3FFFFFF) << 38)
| ((long) (floorDouble(spawn.getY()) & 0xFFF) << 26)
| (floorDouble(spawn.getZ()) & 0x3FFFFFF);
netByteBuf.writeLong(spawnSerialized);
}
private static int floorDouble(double value) {
int i = (int) value;
return value < (double) i ? i - 1 : i;
}
}

View File

@@ -0,0 +1,82 @@
package mc.protocol.packets.server;
import lombok.Data;
import mc.protocol.io.NetByteBuf;
import mc.protocol.model.text.Text;
import mc.protocol.model.text.TextColor;
import mc.protocol.model.text.TextStyle;
import mc.protocol.packets.ServerSidePacket;
import mc.protocol.serializer.TextSerializer;
import mc.protocol.utils.TitleAction;
/**
* Title packet.
*
* <p>Структура пакета</p>
* <pre>
* | FIELD | TYPE | NOTES |
* |-------------|-------------|----------------------------------|
* | Action | VarInt | Определяет остальные поля пакета |
* | Data fields | - | зависят от "Action" |
* </pre>
*
* <p>Варианты "Action"</p>
* <pre>
* | ACTION | FIELD | TYPE | NOTES |
* | VALUE | DESCRIPTION | | | |
* |-------|-----------------------|-----------------|---------|-------------------------------------------------|
* | 0 | set title | Title Text | Text | |
* | 1 | set subtitle | Subtitle Text | Text | |
* | 2 | set action bar | Action bar text | Text | [*] |
* | 3 | set times and display | Fade In | Integer | Время (в тиках (tick)) на эфект появления |
* | | | Stay | Integer | Время (в тиках (tick)) на отображение на экране |
* | | | Fade Out | Integer | Время (в тиках (tick)) на эфект исчезания |
* | 4 | hide | - | - | |
* | 5 | reset | - | - | |
* </pre>
*
* <p>
* * - стоит обратить внимание, что {@link TextColor} и {@link TextStyle} не работают: клиент не применяет
* стилистику в таком виде. Однако метод через символ "§" (\<span>u00a7</span>) работает.
* </p>
*
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Title">Title</a>
*/
@Data
public class TitlePacket implements ServerSidePacket {
private TitleAction action;
private Text title;
private Text subtitle;
private Text actionbar;
private Integer fadeIn;
private Integer stay;
private Integer fadeOut;
@Override
public void writeSelf(NetByteBuf netByteBuf) {
netByteBuf.writeVarInt(this.action.getCode());
switch (this.action) {
case SET_TITLE:
netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
break;
case SET_SUBTITLE:
netByteBuf.writeString(TextSerializer.toJsonObject(this.subtitle).toString());
break;
case SET_ACTIONBAR:
netByteBuf.writeString(TextSerializer.toJsonObject(this.actionbar).toString());
break;
case SET_TIMES_AND_DISPLAY:
netByteBuf.writeInt(fadeIn);
netByteBuf.writeInt(stay);
netByteBuf.writeInt(fadeOut);
break;
case HIDE:
case RESET:
default:
break;
}
}
}

View File

@@ -1,26 +0,0 @@
package mc.protocol.serializer;
import lombok.experimental.UtilityClass;
import mc.protocol.model.Location;
@UtilityClass
public class LocationSerializer {
public long toLongValue(Location location) {
return ((long) (floorDouble(location.getX()) & 0x3FFFFFF) << 38)
| ((long) (floorDouble(location.getY()) & 0xFFF) << 26)
| (floorDouble(location.getZ()) & 0x3FFFFFF);
}
public Location fromLongValue(long value) {
return new Location(
value >> 38,
(value >> 26) & 0xFFF,
value << 38 >> 38);
}
private static int floorDouble(double value) {
int i = (int) value;
return value < (double) i ? i - 1 : i;
}
}

View File

@@ -1,33 +0,0 @@
package mc.protocol.utils;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import javax.annotation.Nullable;
@RequiredArgsConstructor
public enum EntityActionAction {
START_SNEAKING(0),
STOP_SNEAKING(1),
LEAVE_BED(2),
START_SPRINTING(3),
STOP_SPRINTING(4),
START_JUMP_WITH_HORSE(5),
STOP_JUMP_WITH_HORSE(6),
OPEN_HORSE_INVENTORY(7),
START_FLYING_WITH_ELYTRA(8);
@Nullable
public static EntityActionAction valueOfCode(int code) {
for (EntityActionAction action : EntityActionAction.values()) {
if (action.code == code) {
return action;
}
}
return null;
}
@Getter
private final int code;
}

View File

@@ -0,0 +1,17 @@
package mc.protocol.utils;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum TitleAction {
SET_TITLE(0),
SET_SUBTITLE(1),
SET_ACTIONBAR(2),
SET_TIMES_AND_DISPLAY(3),
HIDE(4),
RESET(5);
@Getter
private final int code;
}

View File

@@ -7,6 +7,7 @@ import mc.protocol.api.ConnectionContext;
import mc.protocol.model.Location;
import mc.protocol.model.Look;
import mc.protocol.model.ServerInfo;
import mc.protocol.model.text.Text;
import mc.protocol.packets.PingPacket;
import mc.protocol.packets.client.HandshakePacket;
import mc.protocol.packets.client.LoginStartPacket;
@@ -16,6 +17,7 @@ import mc.protocol.serializer.TextSerializer;
import mc.protocol.utils.Difficulty;
import mc.protocol.utils.GameMode;
import mc.protocol.utils.LevelType;
import mc.protocol.utils.TitleAction;
import mc.server.config.Config;
import org.apache.commons.io.IOUtils;
@@ -125,10 +127,11 @@ public class PacketHandler {
// -- Эксперименты -- //
var openSignEditorPacket = new OpenSignEditorPacket();
openSignEditorPacket.setLocation(spawnLocation);
var titlePacket = new TitlePacket();
titlePacket.setAction(TitleAction.SET_TITLE);
titlePacket.setTitle(Text.of("HELLO"));
context.sendNow(openSignEditorPacket);
context.sendNow(titlePacket);
}
private static String faviconToBase64(Path iconPath) {