Compare commits
4 Commits
dev/experi
...
dev/chat
| Author | SHA1 | Date | |
|---|---|---|---|
|
c632513e4c
|
|||
|
918db26698
|
|||
|
68a288c525
|
|||
|
47e6c3e76f
|
@@ -50,18 +50,17 @@ public enum State {
|
||||
0x0B, PingPacket.class,
|
||||
0x0D, PlayerPositionPacket.class,
|
||||
0x0E, CPlayerPositionAndLookPacket.class,
|
||||
0x0F, PlayerLookPacket.class,
|
||||
0x15, EntityActionPacket.class
|
||||
0x0F, PlayerLookPacket.class
|
||||
),
|
||||
// client bound
|
||||
Map.of(
|
||||
SChatPacket.class, 0x0F,
|
||||
PingPacket.class, 0x1F,
|
||||
ChunkDataPacket.class, 0x20,
|
||||
JoinGamePacket.class, 0x23,
|
||||
SpawnPositionPacket.class, 0x46,
|
||||
ChunkDataPacket.class, 0x20,
|
||||
PlayerAbilitiesPacket.class,0x2C,
|
||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||
SetExperiencePacket.class, 0x40,
|
||||
SpawnPositionPacket.class, 0x46
|
||||
SPlayerPositionAndLookPacket.class, 0x2F
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -25,6 +25,12 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,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;
|
||||
}
|
||||
}
|
||||
@@ -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,35 +0,0 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
15
protocol/src/main/java/mc/protocol/utils/ChatPosition.java
Normal file
15
protocol/src/main/java/mc/protocol/utils/ChatPosition.java
Normal file
@@ -0,0 +1,15 @@
|
||||
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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -2,18 +2,21 @@ package mc.server;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import mc.protocol.ProtocolConstant;
|
||||
import mc.protocol.State;
|
||||
import mc.protocol.*;
|
||||
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;
|
||||
@@ -27,7 +30,6 @@ import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@@ -69,7 +71,6 @@ public class PacketHandler {
|
||||
context.sendNow(response);
|
||||
}
|
||||
|
||||
@SuppressWarnings("java:S2189")
|
||||
public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
|
||||
var loginSuccessPacket = new LoginSuccessPacket();
|
||||
loginSuccessPacket.setUuid(UUID.randomUUID());
|
||||
@@ -128,27 +129,25 @@ public class PacketHandler {
|
||||
|
||||
// -- Эксперименты -- //
|
||||
|
||||
var setExperiencePacket = new SetExperiencePacket();
|
||||
setExperiencePacket.setExperienceBar(0f);
|
||||
setExperiencePacket.setLevel(0);
|
||||
setExperiencePacket.setTotalExperience(100);
|
||||
var chatPacket = new SChatPacket();
|
||||
chatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "== Hello! =="));
|
||||
chatPacket.setPosition(ChatPosition.CHAT);
|
||||
|
||||
while (true) {
|
||||
context.sendNow(setExperiencePacket);
|
||||
context.send(chatPacket);
|
||||
|
||||
setExperiencePacket.setExperienceBar(setExperiencePacket.getExperienceBar() + 0.01f);
|
||||
setExperiencePacket.setLevel(setExperiencePacket.getLevel() + 1);
|
||||
if (setExperiencePacket.getExperienceBar() > 1.0f) {
|
||||
setExperiencePacket.setExperienceBar(0f);
|
||||
setExperiencePacket.setLevel(0);
|
||||
}
|
||||
var systemChatPacket = new SChatPacket();
|
||||
systemChatPacket.setMessage(Text.of(TextColor.RED.toLegacy() + "[SYSTEM]"));
|
||||
systemChatPacket.setPosition(ChatPosition.SYSTEM);
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(10);
|
||||
} catch (InterruptedException e) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user