Compare commits
1 Commits
dev/tablis
...
dev/experi
| Author | SHA1 | Date | |
|---|---|---|---|
|
346d64aea5
|
@@ -59,10 +59,9 @@ public enum State {
|
|||||||
ChunkDataPacket.class, 0x20,
|
ChunkDataPacket.class, 0x20,
|
||||||
JoinGamePacket.class, 0x23,
|
JoinGamePacket.class, 0x23,
|
||||||
PlayerAbilitiesPacket.class,0x2C,
|
PlayerAbilitiesPacket.class,0x2C,
|
||||||
PlayerListItemPacket.class,0x2E,
|
|
||||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||||
SpawnPositionPacket.class, 0x46,
|
SetExperiencePacket.class, 0x40,
|
||||||
PlayerListHeaderAndFooterPacket.class,0x4A
|
SpawnPositionPacket.class, 0x46
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -1,50 +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;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Установка текста для "шапки" и "подвала" 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());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package mc.protocol.packets.server;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import mc.protocol.io.NetByteBuf;
|
||||||
|
import mc.protocol.packets.ServerSidePacket;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set Experience packet.
|
||||||
|
*
|
||||||
|
* <p>Структура пакета</p>
|
||||||
|
* <pre>
|
||||||
|
* | FIELD | TYPE | NOTES |
|
||||||
|
* |------------------|----------|------------------------|
|
||||||
|
* | Experience bar | Float | Значение от 0.0 до 1.0 |
|
||||||
|
* | Level | VarInt | |
|
||||||
|
* | Total Experience | VarInt | |
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Set_Experience">Set Experience</a>
|
||||||
|
* @see <a href="https://minecraft.fandom.com/wiki/Experience#Leveling_up">Experience: Leveling up</a>
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class SetExperiencePacket implements ServerSidePacket {
|
||||||
|
|
||||||
|
private float experienceBar;
|
||||||
|
private int level;
|
||||||
|
private int totalExperience;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void writeSelf(NetByteBuf netByteBuf) {
|
||||||
|
netByteBuf.writeFloat(this.experienceBar);
|
||||||
|
netByteBuf.writeVarInt(this.level);
|
||||||
|
netByteBuf.writeVarInt(this.totalExperience);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,13 +2,12 @@ package mc.server;
|
|||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import mc.protocol.*;
|
import mc.protocol.ProtocolConstant;
|
||||||
|
import mc.protocol.State;
|
||||||
import mc.protocol.api.ConnectionContext;
|
import mc.protocol.api.ConnectionContext;
|
||||||
import mc.protocol.model.Location;
|
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.TextColor;
|
|
||||||
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;
|
||||||
@@ -28,6 +27,7 @@ import java.util.Base64;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -69,21 +69,18 @@ public class PacketHandler {
|
|||||||
context.sendNow(response);
|
context.sendNow(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("java:S2189")
|
||||||
public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
|
public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
|
||||||
var playerUuid = UUID.randomUUID();
|
|
||||||
var playerName = loginStartPacket.getName();
|
|
||||||
var playerGamemode = GameMode.SURVIVAL;
|
|
||||||
|
|
||||||
var loginSuccessPacket = new LoginSuccessPacket();
|
var loginSuccessPacket = new LoginSuccessPacket();
|
||||||
loginSuccessPacket.setUuid(playerUuid);
|
loginSuccessPacket.setUuid(UUID.randomUUID());
|
||||||
loginSuccessPacket.setName(playerName);
|
loginSuccessPacket.setName(loginStartPacket.getName());
|
||||||
|
|
||||||
context.sendNow(loginSuccessPacket);
|
context.sendNow(loginSuccessPacket);
|
||||||
context.setState(State.PLAY);
|
context.setState(State.PLAY);
|
||||||
|
|
||||||
var joinGamePacket = new JoinGamePacket();
|
var joinGamePacket = new JoinGamePacket();
|
||||||
joinGamePacket.setEntityId(random.nextInt());
|
joinGamePacket.setEntityId(random.nextInt());
|
||||||
joinGamePacket.setGameMode(playerGamemode);
|
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);
|
||||||
@@ -131,30 +128,27 @@ public class PacketHandler {
|
|||||||
|
|
||||||
// -- Эксперименты -- //
|
// -- Эксперименты -- //
|
||||||
|
|
||||||
var playerListItemPacket = new PlayerListItemPacket();
|
var setExperiencePacket = new SetExperiencePacket();
|
||||||
playerListItemPacket.setAction(PlayerListItemPacket.Action.ADD_PLAYER);
|
setExperiencePacket.setExperienceBar(0f);
|
||||||
playerListItemPacket.getPlayerItems().add(PlayerListItemPacket.PlayerItem.builder()
|
setExperiencePacket.setLevel(0);
|
||||||
.uuid(playerUuid)
|
setExperiencePacket.setTotalExperience(100);
|
||||||
.name(playerName)
|
|
||||||
.gamemode(playerGamemode)
|
|
||||||
.ping(100)
|
|
||||||
.hasDisplayName(false)
|
|
||||||
.build());
|
|
||||||
|
|
||||||
context.send(playerListItemPacket);
|
while (true) {
|
||||||
|
context.sendNow(setExperiencePacket);
|
||||||
|
|
||||||
var playerListHeaderAndFooterPacket = new PlayerListHeaderAndFooterPacket();
|
setExperiencePacket.setExperienceBar(setExperiencePacket.getExperienceBar() + 0.01f);
|
||||||
playerListHeaderAndFooterPacket.setHeader(Text.builder()
|
setExperiencePacket.setLevel(setExperiencePacket.getLevel() + 1);
|
||||||
.append("") //TODO bug component
|
if (setExperiencePacket.getExperienceBar() > 1.0f) {
|
||||||
.append(Text.of(TextColor.GREEN, "==="))
|
setExperiencePacket.setExperienceBar(0f);
|
||||||
.append(Text.of(TextColor.RED, " MC-PROJECT "))
|
setExperiencePacket.setLevel(0);
|
||||||
.append(Text.of(TextColor.GREEN, "==="))
|
}
|
||||||
.build());
|
|
||||||
playerListHeaderAndFooterPacket.setFoother(Text.of(TextColor.GRAY, "develop by DmitriyMX"));
|
|
||||||
|
|
||||||
context.send(playerListHeaderAndFooterPacket);
|
try {
|
||||||
|
TimeUnit.MILLISECONDS.sleep(10);
|
||||||
context.flushSending();
|
} catch (InterruptedException e) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String faviconToBase64(Path iconPath) {
|
private static String faviconToBase64(Path iconPath) {
|
||||||
|
|||||||
Reference in New Issue
Block a user