Compare commits
2 Commits
dev/update
...
dev/tablis
| Author | SHA1 | Date | |
|---|---|---|---|
47ccc3252a
|
|||
|
0d72a8a29c
|
@@ -59,9 +59,10 @@ public enum State {
|
||||
ChunkDataPacket.class, 0x20,
|
||||
JoinGamePacket.class, 0x23,
|
||||
PlayerAbilitiesPacket.class,0x2C,
|
||||
PlayerListItemPacket.class,0x2E,
|
||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||
UpdateHealthPacket.class, 0x41,
|
||||
SpawnPositionPacket.class, 0x46
|
||||
SpawnPositionPacket.class, 0x46,
|
||||
PlayerListHeaderAndFooterPacket.class,0x4A
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* Установка текста для "шапки" и "подвала" Tab-листа.
|
||||
*
|
||||
* <p>Структура пакета</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |--------|------|-------|
|
||||
* | Header | Text | |
|
||||
* | Footer | Text | |
|
||||
* </pre>
|
||||
*
|
||||
* <p>Для удаления "шапки" и/или "подвала", нужно отправить следующий {@link Text} компонент:</p>
|
||||
* <pre>
|
||||
* {"translate":""}
|
||||
* </pre>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Player_List_Header_And_Footer">Player List Header And Footer</a>
|
||||
* @see PlayerListItemPacket
|
||||
*/
|
||||
@Data
|
||||
public class PlayerListHeaderAndFooterPacket implements ServerSidePacket {
|
||||
|
||||
private static final String REMOVE_COMPONENT = "{\"translate\":\"\"}";
|
||||
|
||||
private Text header;
|
||||
private Text foother;
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
if (this.header == null) {
|
||||
netByteBuf.writeString(REMOVE_COMPONENT);
|
||||
} else {
|
||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.header).toString());
|
||||
}
|
||||
|
||||
if (this.foother == null) {
|
||||
netByteBuf.writeString(REMOVE_COMPONENT);
|
||||
} else {
|
||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.foother).toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
package mc.protocol.packets.server;
|
||||
|
||||
import lombok.*;
|
||||
import mc.protocol.io.NetByteBuf;
|
||||
import mc.protocol.packets.ServerSidePacket;
|
||||
import mc.protocol.utils.GameMode;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
/**
|
||||
* Player List Item packet.
|
||||
*
|
||||
* <p>Обновление списка игроков, по кнопке TAB.</p>
|
||||
*
|
||||
* <p>Структура пакета</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |-------------------|-------------|-------------------------------------------------|
|
||||
* | Action | VarInt | Определяет поля для секции "Player" |
|
||||
* | Number of players | VarInt | Количество элементов в секции "Players" |
|
||||
* | Players | Array | Перечисление полей для каждого игрока (player). |
|
||||
* | | | Поля определяются по "Action" |
|
||||
* </pre>
|
||||
*
|
||||
* <p>Варианты "Action"</p>
|
||||
* <pre>
|
||||
* | ACTION | PLAYER FIELD | TYPE | NOTES |
|
||||
* | VALUE | DESCRIPTION | | | |
|
||||
* |-------|---------------------|----------------------|-------------|----------------------------------------------------|
|
||||
* | 0 | add player | UUID | UUID | |
|
||||
* | | | Name | String (16) | |
|
||||
* | | | Number Of Properties | VarInt | Количество элементов "Properties" |
|
||||
* | | | Properties | - | см. поля ниже |
|
||||
* | | | Gamemode | VarInt | |
|
||||
* | | | Ping | VarInt | в милисекундах |
|
||||
* | | | Has Display Name | Boolean | |
|
||||
* | | | Display Name | Text | Опционально. Только если "Has Display Name" = true |
|
||||
* | 1 | update gamemode | UUID | UUID | |
|
||||
* | | | Gamemode | VarInt | |
|
||||
* | 2 | update latency | UUID | UUID | |
|
||||
* | | | Ping | VarInt | (см. выше) |
|
||||
* | 3 | update display name | UUID | UUID | |
|
||||
* | | | Has Display Name | Boolean | |
|
||||
* | | | Display Name | Text | (см. выше) |
|
||||
* | 4 | remove player | UUID | UUID | |
|
||||
* </pre>
|
||||
*
|
||||
* <p>Поля секции "Properties"</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |-----------|------------- |---------------------------------------------|
|
||||
* | Name | String (32767) | |
|
||||
* | Value | String (32767) | |
|
||||
* | Is Signed | Boolean | |
|
||||
* | Signature | String (32767) | Опционально. Только если "Is Signed" = true |
|
||||
* </pre>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Player_List_Item">Player List Item</a>
|
||||
* @see PlayerListHeaderAndFooterPacket
|
||||
*/
|
||||
@Data
|
||||
public class PlayerListItemPacket implements ServerSidePacket {
|
||||
|
||||
private final List<PlayerItem> playerItems = new ArrayList<>();
|
||||
|
||||
private Action action;
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
netByteBuf.writeVarInt(this.action.getCode());
|
||||
netByteBuf.writeVarInt(playerItems.size());
|
||||
|
||||
BiConsumer<NetByteBuf, PlayerItem> consumer = null;
|
||||
switch (this.action) {
|
||||
//@formatter:off
|
||||
case ADD_PLAYER: consumer = this::addPlayer; break;
|
||||
case UPDATE_GAMEMODE: consumer = this::updateGamemode; break;
|
||||
case UPDATE_LATENCY: consumer = this::updateLatency; break;
|
||||
case UPDATE_DISPLAY_NAME: consumer = this::updateDisplayName; break;
|
||||
case REMOVE_PLAYER: consumer = this::removePlayer; break;
|
||||
//@formatter:on
|
||||
}
|
||||
|
||||
Objects.requireNonNull(consumer);
|
||||
|
||||
for (PlayerItem playerItem : playerItems) {
|
||||
consumer.accept(netByteBuf, playerItem);
|
||||
}
|
||||
}
|
||||
|
||||
private void addPlayer(NetByteBuf netByteBuf, PlayerItem playerItem) {
|
||||
netByteBuf.writeUUID(playerItem.getUuid());
|
||||
netByteBuf.writeString(playerItem.getName());
|
||||
netByteBuf.writeVarInt(playerItem.getProperties().size());
|
||||
|
||||
for (PlayerProperties property : playerItem.getProperties()) {
|
||||
netByteBuf.writeString(property.getName());
|
||||
netByteBuf.writeString(property.getValue());
|
||||
netByteBuf.writeBoolean(property.getIsSigned());
|
||||
if (property.getIsSigned()) {
|
||||
netByteBuf.writeString(property.getSignature());
|
||||
}
|
||||
}
|
||||
|
||||
netByteBuf.writeVarInt(playerItem.getGamemode().getId());
|
||||
netByteBuf.writeVarInt(playerItem.getPing());
|
||||
netByteBuf.writeBoolean(playerItem.getHasDisplayName());
|
||||
if (playerItem.getHasDisplayName()) {
|
||||
netByteBuf.writeString(playerItem.getDisplayName());
|
||||
}
|
||||
}
|
||||
|
||||
private void updateGamemode(NetByteBuf netByteBuf, PlayerItem playerItem) {
|
||||
netByteBuf.writeUUID(playerItem.getUuid());
|
||||
netByteBuf.writeVarInt(playerItem.getGamemode().getId());
|
||||
}
|
||||
|
||||
private void updateLatency(NetByteBuf netByteBuf, PlayerItem playerItem) {
|
||||
netByteBuf.writeUUID(playerItem.getUuid());
|
||||
netByteBuf.writeVarInt(playerItem.getPing());
|
||||
}
|
||||
|
||||
private void updateDisplayName(NetByteBuf netByteBuf, PlayerItem playerItem) {
|
||||
netByteBuf.writeUUID(playerItem.getUuid());
|
||||
netByteBuf.writeBoolean(playerItem.getHasDisplayName());
|
||||
if (playerItem.getHasDisplayName()) {
|
||||
netByteBuf.writeString(playerItem.getDisplayName());
|
||||
}
|
||||
}
|
||||
|
||||
private void removePlayer(NetByteBuf netByteBuf, PlayerItem playerItem) {
|
||||
netByteBuf.writeUUID(playerItem.getUuid());
|
||||
}
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public enum Action {
|
||||
ADD_PLAYER(0),
|
||||
UPDATE_GAMEMODE(1),
|
||||
UPDATE_LATENCY(2),
|
||||
UPDATE_DISPLAY_NAME(3),
|
||||
REMOVE_PLAYER(4);
|
||||
|
||||
@Getter
|
||||
private final int code;
|
||||
}
|
||||
|
||||
@Builder(builderClassName = "Builder")
|
||||
@Value
|
||||
public static class PlayerItem {
|
||||
List<PlayerProperties> properties = new ArrayList<>();
|
||||
|
||||
UUID uuid;
|
||||
String name;
|
||||
GameMode gamemode;
|
||||
Integer ping;
|
||||
Boolean hasDisplayName;
|
||||
String displayName;
|
||||
}
|
||||
|
||||
@Builder(builderClassName = "Builder")
|
||||
@Value
|
||||
public static class PlayerProperties {
|
||||
String name;
|
||||
String value;
|
||||
Boolean isSigned;
|
||||
String signature;
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package mc.protocol.packets.server;
|
||||
|
||||
import lombok.Data;
|
||||
import mc.protocol.io.NetByteBuf;
|
||||
import mc.protocol.packets.ServerSidePacket;
|
||||
|
||||
/**
|
||||
* Update Health Packet.
|
||||
*
|
||||
* <p>Структура пакета</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |-----------------|--------|----------------------------------|
|
||||
* | Health | Float | 0 = смерть; 20 = полное здоровье |
|
||||
* | Food | VarInt | 0-20 |
|
||||
* | Food Saturation | Float | 0-5 |
|
||||
* </pre>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Update_Health">Update Health</a>
|
||||
* @see <a href="https://minecraft.fandom.com/wiki/Food#Hunger_and_saturation">Food: Hunger and saturation</a>
|
||||
*/
|
||||
@Data
|
||||
public class UpdateHealthPacket implements ServerSidePacket {
|
||||
|
||||
private float health;
|
||||
private int food;
|
||||
private float foodSaturation;
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
netByteBuf.writeFloat(this.health);
|
||||
netByteBuf.writeVarInt(this.food);
|
||||
netByteBuf.writeFloat(this.foodSaturation);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,8 @@ 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.packets.PingPacket;
|
||||
import mc.protocol.packets.client.HandshakePacket;
|
||||
import mc.protocol.packets.client.LoginStartPacket;
|
||||
@@ -26,7 +28,6 @@ import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@@ -68,18 +69,21 @@ public class PacketHandler {
|
||||
context.sendNow(response);
|
||||
}
|
||||
|
||||
@SuppressWarnings("java:S2189")
|
||||
public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
|
||||
var playerUuid = UUID.randomUUID();
|
||||
var playerName = loginStartPacket.getName();
|
||||
var playerGamemode = GameMode.SURVIVAL;
|
||||
|
||||
var loginSuccessPacket = new LoginSuccessPacket();
|
||||
loginSuccessPacket.setUuid(UUID.randomUUID());
|
||||
loginSuccessPacket.setName(loginStartPacket.getName());
|
||||
loginSuccessPacket.setUuid(playerUuid);
|
||||
loginSuccessPacket.setName(playerName);
|
||||
|
||||
context.sendNow(loginSuccessPacket);
|
||||
context.setState(State.PLAY);
|
||||
|
||||
var joinGamePacket = new JoinGamePacket();
|
||||
joinGamePacket.setEntityId(random.nextInt());
|
||||
joinGamePacket.setGameMode(GameMode.SURVIVAL);
|
||||
joinGamePacket.setGameMode(playerGamemode);
|
||||
joinGamePacket.setDimension(0/*Overworld*/);
|
||||
joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
|
||||
joinGamePacket.setLevelType(LevelType.FLAT);
|
||||
@@ -127,29 +131,30 @@ public class PacketHandler {
|
||||
|
||||
// -- Эксперименты -- //
|
||||
|
||||
var updateHealthPacket = new UpdateHealthPacket();
|
||||
updateHealthPacket.setHealth(0.1f);
|
||||
updateHealthPacket.setFood(0);
|
||||
updateHealthPacket.setFoodSaturation(5.0f);
|
||||
var playerListItemPacket = new PlayerListItemPacket();
|
||||
playerListItemPacket.setAction(PlayerListItemPacket.Action.ADD_PLAYER);
|
||||
playerListItemPacket.getPlayerItems().add(PlayerListItemPacket.PlayerItem.builder()
|
||||
.uuid(playerUuid)
|
||||
.name(playerName)
|
||||
.gamemode(playerGamemode)
|
||||
.ping(100)
|
||||
.hasDisplayName(false)
|
||||
.build());
|
||||
|
||||
context.sendNow(updateHealthPacket);
|
||||
context.send(playerListItemPacket);
|
||||
|
||||
while (true) {
|
||||
context.sendNow(updateHealthPacket);
|
||||
var playerListHeaderAndFooterPacket = new PlayerListHeaderAndFooterPacket();
|
||||
playerListHeaderAndFooterPacket.setHeader(Text.builder()
|
||||
.append("") //TODO bug component
|
||||
.append(Text.of(TextColor.GREEN, "==="))
|
||||
.append(Text.of(TextColor.RED, " MC-PROJECT "))
|
||||
.append(Text.of(TextColor.GREEN, "==="))
|
||||
.build());
|
||||
playerListHeaderAndFooterPacket.setFoother(Text.of(TextColor.GRAY, "develop by DmitriyMX"));
|
||||
|
||||
updateHealthPacket.setHealth(updateHealthPacket.getHealth() + 1.0f);
|
||||
updateHealthPacket.setFood(updateHealthPacket.getFood() + 1);
|
||||
if (updateHealthPacket.getHealth() > 20.0f) {
|
||||
updateHealthPacket.setHealth(0.1f);
|
||||
updateHealthPacket.setFood(0);
|
||||
}
|
||||
context.send(playerListHeaderAndFooterPacket);
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(50);
|
||||
} catch (InterruptedException e) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
context.flushSending();
|
||||
}
|
||||
|
||||
private static String faviconToBase64(Path iconPath) {
|
||||
|
||||
Reference in New Issue
Block a user