Compare commits
4 Commits
dev/chat
...
dev/open-s
| Author | SHA1 | Date | |
|---|---|---|---|
|
2b3d45a389
|
|||
|
abac6e8491
|
|||
|
c6669af651
|
|||
|
3984ab3fca
|
@@ -50,17 +50,19 @@ public enum State {
|
||||
0x0B, PingPacket.class,
|
||||
0x0D, PlayerPositionPacket.class,
|
||||
0x0E, CPlayerPositionAndLookPacket.class,
|
||||
0x0F, PlayerLookPacket.class
|
||||
0x0F, PlayerLookPacket.class,
|
||||
0x15, EntityActionPacket.class,
|
||||
0x1C, UpdateSignPacket.class
|
||||
),
|
||||
// client bound
|
||||
Map.of(
|
||||
SChatPacket.class, 0x0F,
|
||||
PingPacket.class, 0x1F,
|
||||
JoinGamePacket.class, 0x23,
|
||||
SpawnPositionPacket.class, 0x46,
|
||||
ChunkDataPacket.class, 0x20,
|
||||
JoinGamePacket.class, 0x23,
|
||||
OpenSignEditorPacket.class, 0x2A,
|
||||
PlayerAbilitiesPacket.class,0x2C,
|
||||
SPlayerPositionAndLookPacket.class, 0x2F
|
||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||
SpawnPositionPacket.class, 0x46
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -25,12 +25,6 @@ public enum TextColor {
|
||||
WHITE ("white", 'f');
|
||||
//@formatter:on
|
||||
|
||||
public static final char SPECIAL_CHAR = '\u00a7';
|
||||
|
||||
private final String name;
|
||||
private final char code;
|
||||
|
||||
public String toLegacy() {
|
||||
return "" + SPECIAL_CHAR + code;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package mc.protocol.model.text;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public enum TextStyleLegacy {
|
||||
|
||||
OBFUSCATED('k'),
|
||||
BOLD('l'),
|
||||
STRIKETHOUGH('m'),
|
||||
UNDERLINE('n'),
|
||||
ITALIC('o'),
|
||||
RESET('r');
|
||||
|
||||
private final char code;
|
||||
|
||||
public String toLegacy() {
|
||||
return "" + TextColor.SPECIAL_CHAR + code;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
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.ChatPosition;
|
||||
|
||||
/**
|
||||
* Chat packet.
|
||||
*
|
||||
* <p>Структура пакета</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |-----------|------|-----------------------------------------------|
|
||||
* | JSON Data | Text | Текст* |
|
||||
* | Position | Byte | 0 - сообщение чата |
|
||||
* | | | 1 - системное сообщение (отображается в чате) |
|
||||
* | | | 2 - над панелью быстрого доступа (hotbar) |
|
||||
* </pre>
|
||||
*
|
||||
* <p>
|
||||
* * - стоит обратить внимание, что {@link TextColor} и {@link TextStyle} не работают: клиент не применяет
|
||||
* стилистику в таком виде. Однако метод через символ "§" (\<span>u00a7</span>) работает.
|
||||
* </p>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Chat_Message_.28clientbound.29">Chat Message (clientbound)</a>
|
||||
*/
|
||||
@Data
|
||||
public class SChatPacket implements ServerSidePacket {
|
||||
|
||||
private Text message;
|
||||
private ChatPosition position;
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.message).toString());
|
||||
netByteBuf.writeByte(this.position.getCode());
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import lombok.Data;
|
||||
import mc.protocol.io.NetByteBuf;
|
||||
import mc.protocol.model.Location;
|
||||
import mc.protocol.packets.ServerSidePacket;
|
||||
import mc.protocol.serializer.LocationSerializer;
|
||||
|
||||
/**
|
||||
* Спавн позиция игрока.
|
||||
@@ -14,7 +15,7 @@ import mc.protocol.packets.ServerSidePacket;
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |----------|----------|-----------------------|
|
||||
* | Location | Position | Локация спавна игрока |
|
||||
* | Location | Location | Локация спавна игрока |
|
||||
* </pre>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Spawn_Position">Spawn Position</a>
|
||||
@@ -26,16 +27,7 @@ public class SpawnPositionPacket implements ServerSidePacket {
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
long spawnSerialized =
|
||||
((long) (floorDouble(spawn.getX()) & 0x3FFFFFF) << 38)
|
||||
| ((long) (floorDouble(spawn.getY()) & 0xFFF) << 26)
|
||||
| (floorDouble(spawn.getZ()) & 0x3FFFFFF);
|
||||
long spawnSerialized = LocationSerializer.toLongValue(this.spawn);
|
||||
netByteBuf.writeLong(spawnSerialized);
|
||||
}
|
||||
|
||||
private static int floorDouble(double value) {
|
||||
int i = (int) value;
|
||||
return value < (double) i ? i - 1 : i;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package mc.protocol.utils;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public enum ChatPosition {
|
||||
|
||||
CHAT(0),
|
||||
SYSTEM(1),
|
||||
HOTBAR(2);
|
||||
|
||||
@Getter
|
||||
private final int code;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
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;
|
||||
}
|
||||
@@ -7,16 +7,12 @@ 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.model.text.TextColor;
|
||||
import mc.protocol.model.text.TextStyleLegacy;
|
||||
import mc.protocol.packets.PingPacket;
|
||||
import mc.protocol.packets.client.HandshakePacket;
|
||||
import mc.protocol.packets.client.LoginStartPacket;
|
||||
import mc.protocol.packets.client.StatusServerRequestPacket;
|
||||
import mc.protocol.packets.server.*;
|
||||
import mc.protocol.serializer.TextSerializer;
|
||||
import mc.protocol.utils.ChatPosition;
|
||||
import mc.protocol.utils.Difficulty;
|
||||
import mc.protocol.utils.GameMode;
|
||||
import mc.protocol.utils.LevelType;
|
||||
@@ -129,25 +125,10 @@ public class PacketHandler {
|
||||
|
||||
// -- Эксперименты -- //
|
||||
|
||||
var chatPacket = new SChatPacket();
|
||||
chatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "== Hello! =="));
|
||||
chatPacket.setPosition(ChatPosition.CHAT);
|
||||
var openSignEditorPacket = new OpenSignEditorPacket();
|
||||
openSignEditorPacket.setLocation(spawnLocation);
|
||||
|
||||
context.send(chatPacket);
|
||||
|
||||
var systemChatPacket = new SChatPacket();
|
||||
systemChatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "[SYSTEM]"));
|
||||
systemChatPacket.setPosition(ChatPosition.SYSTEM);
|
||||
|
||||
context.send(systemChatPacket);
|
||||
|
||||
var hotbarChatPacket = new SChatPacket();
|
||||
hotbarChatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + TextStyleLegacy.BOLD.toLegacy() + "In game info"));
|
||||
hotbarChatPacket.setPosition(ChatPosition.HOTBAR);
|
||||
|
||||
context.send(hotbarChatPacket);
|
||||
|
||||
context.flushSending();
|
||||
context.sendNow(openSignEditorPacket);
|
||||
}
|
||||
|
||||
private static String faviconToBase64(Path iconPath) {
|
||||
|
||||
Reference in New Issue
Block a user