Compare commits
5 Commits
dev/boss-b
...
dev/chat
| Author | SHA1 | Date | |
|---|---|---|---|
|
c632513e4c
|
|||
|
918db26698
|
|||
|
68a288c525
|
|||
|
47e6c3e76f
|
|||
|
bc2d5a7e75
|
@@ -54,7 +54,7 @@ public enum State {
|
|||||||
),
|
),
|
||||||
// client bound
|
// client bound
|
||||||
Map.of(
|
Map.of(
|
||||||
BossBarPacket.class, 0x0C,
|
SChatPacket.class, 0x0F,
|
||||||
PingPacket.class, 0x1F,
|
PingPacket.class, 0x1F,
|
||||||
JoinGamePacket.class, 0x23,
|
JoinGamePacket.class, 0x23,
|
||||||
SpawnPositionPacket.class, 0x46,
|
SpawnPositionPacket.class, 0x46,
|
||||||
|
|||||||
@@ -25,6 +25,12 @@ public enum TextColor {
|
|||||||
WHITE ("white", 'f');
|
WHITE ("white", 'f');
|
||||||
//@formatter:on
|
//@formatter:on
|
||||||
|
|
||||||
|
public static final char SPECIAL_CHAR = '\u00a7';
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
private final char code;
|
private final char code;
|
||||||
|
|
||||||
|
public String toLegacy() {
|
||||||
|
return "" + SPECIAL_CHAR + code;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
package mc.protocol.packets.server;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import mc.protocol.io.NetByteBuf;
|
|
||||||
import mc.protocol.model.text.Text;
|
|
||||||
import mc.protocol.packets.ServerSidePacket;
|
|
||||||
import mc.protocol.serializer.TextSerializer;
|
|
||||||
import mc.protocol.utils.BossBarAction;
|
|
||||||
import mc.protocol.utils.BossBarColor;
|
|
||||||
import mc.protocol.utils.BossBarDivision;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Boss bar packet.
|
|
||||||
*
|
|
||||||
* <p>Управление босс-баром.</p>
|
|
||||||
*
|
|
||||||
* <p>Структура пакета</p>
|
|
||||||
* <pre>
|
|
||||||
* | FIELD | TYPE | NOTES |
|
|
||||||
* |-------------|--------|----------------------------------|
|
|
||||||
* | UUID | String | Уникальный ID для бара |
|
|
||||||
* | Action | VarInt | Код действия |
|
|
||||||
* | Data fields | - | Зависит от значния поля "Action" |
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <p>Варианты "Action" и поля в "Data action"</p>
|
|
||||||
* <pre>
|
|
||||||
* | ACTION | DATA FIELD | TYPE | NOTES |
|
|
||||||
* | VALUE | DESCRIPTION | | | |
|
|
||||||
* |-------|------------- |------------|---------------|--------------------------------------------------------|
|
|
||||||
* | 0 | add | Title | Text | Название бара |
|
|
||||||
* | | | Health | Float | Число от 0 до 1. Определяет процент заполненности бара |
|
|
||||||
* | | | Color | VarInt | Цвет бара. См. ниже значения |
|
|
||||||
* | | | Division | VarInt | Тип делений. См. ниже значения |
|
|
||||||
* | | | Flags | Unsigned Byte | Битовая маска: |
|
|
||||||
* | | | | | 0x01 - затемняет небо |
|
|
||||||
* | | | | | 0x02 - является босс-баром Ender Dragon |
|
|
||||||
* | | | | | (используется для воспроизведения музыки) |
|
|
||||||
* | 1 | remove | - | - | Не имеет дополнительных полей. Удаляет текущий бар. |
|
|
||||||
* | 2 | update health | Health | Float | (см. выше) |
|
|
||||||
* | 3 | update title | Title | Text | (см. выше) |
|
|
||||||
* | 4 | update style | Color | VarInt | (см. выше) |
|
|
||||||
* | | | Division | VarInt | (см. выше) |
|
|
||||||
* | 5 | update flags | Flags | Unsigned Byte | (см. выше) |
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <p>Варианты цветов бара</p>
|
|
||||||
* <pre>
|
|
||||||
* | CODE | COLOR |
|
|
||||||
* |------|--------|
|
|
||||||
* | 0 | Pink |
|
|
||||||
* | 1 | Blue |
|
|
||||||
* | 2 | Red |
|
|
||||||
* | 3 | Green |
|
|
||||||
* | 4 | Yellow |
|
|
||||||
* | 5 | Purple |
|
|
||||||
* | 6 | White |
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <p>Типы делений бара</p>
|
|
||||||
* <pre>
|
|
||||||
* | CODE | DIVISION |
|
|
||||||
* |------|-------------|
|
|
||||||
* | 0 | Нет делений |
|
|
||||||
* | 1 | 6 делений |
|
|
||||||
* | 2 | 10 делений |
|
|
||||||
* | 3 | 12 делений |
|
|
||||||
* | 4 | 20 делений |
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Boss_Bar" target="_top">Boss bar</a>
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class BossBarPacket implements ServerSidePacket {
|
|
||||||
|
|
||||||
private UUID uuid;
|
|
||||||
private BossBarAction action;
|
|
||||||
|
|
||||||
private Text title;
|
|
||||||
private Float health;
|
|
||||||
private BossBarColor color;
|
|
||||||
private BossBarDivision division;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeSelf(NetByteBuf netByteBuf) {
|
|
||||||
netByteBuf.writeUUID(this.uuid);
|
|
||||||
netByteBuf.writeVarInt(this.action.getCode());
|
|
||||||
|
|
||||||
switch (this.action) {
|
|
||||||
case ADD:
|
|
||||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
|
|
||||||
netByteBuf.writeFloat(this.health);
|
|
||||||
netByteBuf.writeVarInt(this.color.getCode());
|
|
||||||
netByteBuf.writeVarInt(this.division.getCode());
|
|
||||||
netByteBuf.writeUnsignedByte(0x00); // Flags
|
|
||||||
break;
|
|
||||||
case UPDATE_HEALTH:
|
|
||||||
netByteBuf.writeFloat(this.health);
|
|
||||||
break;
|
|
||||||
case UPDATE_TITLE:
|
|
||||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
|
|
||||||
break;
|
|
||||||
case UPDATE_STYLE:
|
|
||||||
netByteBuf.writeVarInt(this.color.getCode());
|
|
||||||
netByteBuf.writeVarInt(this.division.getCode());
|
|
||||||
break;
|
|
||||||
case UPDATE_FLAGS:
|
|
||||||
netByteBuf.writeUnsignedByte(0x00); // Flags
|
|
||||||
break;
|
|
||||||
case REMOVE:
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package mc.protocol.utils;
|
|
||||||
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public enum BossBarAction {
|
|
||||||
ADD(0),
|
|
||||||
REMOVE(1),
|
|
||||||
UPDATE_HEALTH(2),
|
|
||||||
UPDATE_TITLE(3),
|
|
||||||
UPDATE_STYLE(4),
|
|
||||||
UPDATE_FLAGS(5);
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
private final int code;
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package mc.protocol.utils;
|
|
||||||
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@SuppressWarnings("java:S115")
|
|
||||||
public enum BossBarDivision {
|
|
||||||
NONE(0),
|
|
||||||
_6(1),
|
|
||||||
_10(2),
|
|
||||||
_12(3),
|
|
||||||
_20(4);
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
private final int code;
|
|
||||||
}
|
|
||||||
@@ -4,14 +4,11 @@ import lombok.Getter;
|
|||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public enum BossBarColor {
|
public enum ChatPosition {
|
||||||
PINK(0),
|
|
||||||
BLUE(1),
|
CHAT(0),
|
||||||
RED(2),
|
SYSTEM(1),
|
||||||
GREEN(3),
|
HOTBAR(2);
|
||||||
YELLOW(4),
|
|
||||||
PURPLE(5),
|
|
||||||
WHITE(6);
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final int code;
|
private final int code;
|
||||||
@@ -8,13 +8,18 @@ import mc.protocol.model.Location;
|
|||||||
import mc.protocol.model.Look;
|
import mc.protocol.model.Look;
|
||||||
import mc.protocol.model.ServerInfo;
|
import mc.protocol.model.ServerInfo;
|
||||||
import mc.protocol.model.text.Text;
|
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.PingPacket;
|
||||||
import mc.protocol.packets.client.HandshakePacket;
|
import mc.protocol.packets.client.HandshakePacket;
|
||||||
import mc.protocol.packets.client.LoginStartPacket;
|
import mc.protocol.packets.client.LoginStartPacket;
|
||||||
import mc.protocol.packets.client.StatusServerRequestPacket;
|
import mc.protocol.packets.client.StatusServerRequestPacket;
|
||||||
import mc.protocol.packets.server.*;
|
import mc.protocol.packets.server.*;
|
||||||
import mc.protocol.serializer.TextSerializer;
|
import mc.protocol.serializer.TextSerializer;
|
||||||
import mc.protocol.utils.*;
|
import mc.protocol.utils.ChatPosition;
|
||||||
|
import mc.protocol.utils.Difficulty;
|
||||||
|
import mc.protocol.utils.GameMode;
|
||||||
|
import mc.protocol.utils.LevelType;
|
||||||
import mc.server.config.Config;
|
import mc.server.config.Config;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
@@ -76,14 +81,14 @@ public class PacketHandler {
|
|||||||
|
|
||||||
var joinGamePacket = new JoinGamePacket();
|
var joinGamePacket = new JoinGamePacket();
|
||||||
joinGamePacket.setEntityId(random.nextInt());
|
joinGamePacket.setEntityId(random.nextInt());
|
||||||
joinGamePacket.setGameMode(GameMode.SPECTATOR);
|
joinGamePacket.setGameMode(GameMode.SURVIVAL);
|
||||||
joinGamePacket.setDimension(0/*Overworld*/);
|
joinGamePacket.setDimension(0/*Overworld*/);
|
||||||
joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
|
joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
|
||||||
joinGamePacket.setLevelType(LevelType.FLAT);
|
joinGamePacket.setLevelType(LevelType.FLAT);
|
||||||
|
|
||||||
context.send(joinGamePacket);
|
context.send(joinGamePacket);
|
||||||
|
|
||||||
Location spawnLocation = new Location(0d, 63d, 0d);
|
Location spawnLocation = new Location(7d, 130d, 7d);
|
||||||
|
|
||||||
var spawnPositionPacket = new SpawnPositionPacket();
|
var spawnPositionPacket = new SpawnPositionPacket();
|
||||||
spawnPositionPacket.setSpawn(spawnLocation);
|
spawnPositionPacket.setSpawn(spawnLocation);
|
||||||
@@ -124,15 +129,25 @@ public class PacketHandler {
|
|||||||
|
|
||||||
// -- Эксперименты -- //
|
// -- Эксперименты -- //
|
||||||
|
|
||||||
BossBarPacket boss1 = new BossBarPacket();
|
var chatPacket = new SChatPacket();
|
||||||
boss1.setUuid(UUID.randomUUID());
|
chatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "== Hello! =="));
|
||||||
boss1.setAction(BossBarAction.ADD);
|
chatPacket.setPosition(ChatPosition.CHAT);
|
||||||
boss1.setTitle(Text.of("BOSS-1"));
|
|
||||||
boss1.setHealth(1.0f);
|
|
||||||
boss1.setColor(BossBarColor.RED);
|
|
||||||
boss1.setDivision(BossBarDivision.NONE);
|
|
||||||
|
|
||||||
context.sendNow(boss1);
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String faviconToBase64(Path iconPath) {
|
private static String faviconToBase64(Path iconPath) {
|
||||||
|
|||||||
Reference in New Issue
Block a user