Compare commits
4 Commits
dev/boss-b
...
dev/update
| Author | SHA1 | Date | |
|---|---|---|---|
|
f0f29e2d56
|
|||
|
c6669af651
|
|||
|
3984ab3fca
|
|||
|
bc2d5a7e75
|
@@ -50,17 +50,18 @@ public enum State {
|
||||
0x0B, PingPacket.class,
|
||||
0x0D, PlayerPositionPacket.class,
|
||||
0x0E, CPlayerPositionAndLookPacket.class,
|
||||
0x0F, PlayerLookPacket.class
|
||||
0x0F, PlayerLookPacket.class,
|
||||
0x15, EntityActionPacket.class
|
||||
),
|
||||
// client bound
|
||||
Map.of(
|
||||
BossBarPacket.class, 0x0C,
|
||||
PingPacket.class, 0x1F,
|
||||
JoinGamePacket.class, 0x23,
|
||||
SpawnPositionPacket.class, 0x46,
|
||||
ChunkDataPacket.class, 0x20,
|
||||
JoinGamePacket.class, 0x23,
|
||||
PlayerAbilitiesPacket.class,0x2C,
|
||||
SPlayerPositionAndLookPacket.class, 0x2F
|
||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||
UpdateHealthPacket.class, 0x41,
|
||||
SpawnPositionPacket.class, 0x46
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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,35 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -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,18 +0,0 @@
|
||||
package mc.protocol.utils;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public enum BossBarColor {
|
||||
PINK(0),
|
||||
BLUE(1),
|
||||
RED(2),
|
||||
GREEN(3),
|
||||
YELLOW(4),
|
||||
PURPLE(5),
|
||||
WHITE(6);
|
||||
|
||||
@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;
|
||||
}
|
||||
@@ -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,14 +7,15 @@ 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.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.*;
|
||||
import mc.protocol.utils.Difficulty;
|
||||
import mc.protocol.utils.GameMode;
|
||||
import mc.protocol.utils.LevelType;
|
||||
import mc.server.config.Config;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
|
||||
@@ -25,6 +26,7 @@ import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
@@ -66,6 +68,7 @@ public class PacketHandler {
|
||||
context.sendNow(response);
|
||||
}
|
||||
|
||||
@SuppressWarnings("java:S2189")
|
||||
public void onLoginStart(ConnectionContext context, LoginStartPacket loginStartPacket) {
|
||||
var loginSuccessPacket = new LoginSuccessPacket();
|
||||
loginSuccessPacket.setUuid(UUID.randomUUID());
|
||||
@@ -76,14 +79,14 @@ public class PacketHandler {
|
||||
|
||||
var joinGamePacket = new JoinGamePacket();
|
||||
joinGamePacket.setEntityId(random.nextInt());
|
||||
joinGamePacket.setGameMode(GameMode.SPECTATOR);
|
||||
joinGamePacket.setGameMode(GameMode.SURVIVAL);
|
||||
joinGamePacket.setDimension(0/*Overworld*/);
|
||||
joinGamePacket.setDifficulty(Difficulty.PEACEFUL);
|
||||
joinGamePacket.setLevelType(LevelType.FLAT);
|
||||
|
||||
context.send(joinGamePacket);
|
||||
|
||||
Location spawnLocation = new Location(0d, 63d, 0d);
|
||||
Location spawnLocation = new Location(7d, 130d, 7d);
|
||||
|
||||
var spawnPositionPacket = new SpawnPositionPacket();
|
||||
spawnPositionPacket.setSpawn(spawnLocation);
|
||||
@@ -124,15 +127,29 @@ public class PacketHandler {
|
||||
|
||||
// -- Эксперименты -- //
|
||||
|
||||
BossBarPacket boss1 = new BossBarPacket();
|
||||
boss1.setUuid(UUID.randomUUID());
|
||||
boss1.setAction(BossBarAction.ADD);
|
||||
boss1.setTitle(Text.of("BOSS-1"));
|
||||
boss1.setHealth(1.0f);
|
||||
boss1.setColor(BossBarColor.RED);
|
||||
boss1.setDivision(BossBarDivision.NONE);
|
||||
var updateHealthPacket = new UpdateHealthPacket();
|
||||
updateHealthPacket.setHealth(0.1f);
|
||||
updateHealthPacket.setFood(0);
|
||||
updateHealthPacket.setFoodSaturation(5.0f);
|
||||
|
||||
context.sendNow(boss1);
|
||||
context.sendNow(updateHealthPacket);
|
||||
|
||||
while (true) {
|
||||
context.sendNow(updateHealthPacket);
|
||||
|
||||
updateHealthPacket.setHealth(updateHealthPacket.getHealth() + 1.0f);
|
||||
updateHealthPacket.setFood(updateHealthPacket.getFood() + 1);
|
||||
if (updateHealthPacket.getHealth() > 20.0f) {
|
||||
updateHealthPacket.setHealth(0.1f);
|
||||
updateHealthPacket.setFood(0);
|
||||
}
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(50);
|
||||
} catch (InterruptedException e) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String faviconToBase64(Path iconPath) {
|
||||
|
||||
Reference in New Issue
Block a user