Compare commits
1 Commits
dev/timeup
...
dev/title
| Author | SHA1 | Date | |
|---|---|---|---|
|
74a9066a04
|
@@ -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(
|
||||
PingPacket.class, 0x1F,
|
||||
ChunkDataPacket.class, 0x20,
|
||||
JoinGamePacket.class, 0x23,
|
||||
SpawnPositionPacket.class, 0x46,
|
||||
ChunkDataPacket.class, 0x20,
|
||||
PlayerAbilitiesPacket.class,0x2C,
|
||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||
SpawnPositionPacket.class, 0x46,
|
||||
TimeUpdatePacket.class, 0x47
|
||||
TitlePacket.class, 0x48
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
package mc.protocol.packets.server;
|
||||
|
||||
import lombok.Data;
|
||||
import mc.protocol.io.NetByteBuf;
|
||||
import mc.protocol.packets.ServerSidePacket;
|
||||
|
||||
/**
|
||||
* Обновление времени суток.
|
||||
*
|
||||
* <p>Структура пакета</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |-------------|------|----------------------------------------|
|
||||
* | World Age | Long | Время жизни мира. В тиках (tick) |
|
||||
* | Time of day | Long | Суточное время в тиках (tick), 0-24000 |
|
||||
* </pre>
|
||||
*
|
||||
* <p>
|
||||
* Каждую секунду происходит 20 тиков.
|
||||
* В игровых сутках 24000 тиков, т.е. игровые сутки в Minecraft длятся 20 минут.
|
||||
* В Vanilla сервере значение "Time of day" увеличивается на 20 единиц каждую секунду.
|
||||
* </p>
|
||||
*
|
||||
* <p>Временные промежутки:</p>
|
||||
* <ul>
|
||||
* <li>0 - восход солнца</li>
|
||||
* <li>6000 - полдень</li>
|
||||
* <li>12000 - закат</li>
|
||||
* <li>18000 - полночь</li>
|
||||
* </ul>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Time_Update">Time Update</a>
|
||||
*/
|
||||
@Data
|
||||
public class TimeUpdatePacket implements ServerSidePacket {
|
||||
|
||||
private long worldAge;
|
||||
private long timeOfDay;
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
netByteBuf.writeLong(this.worldAge);
|
||||
netByteBuf.writeLong(this.timeOfDay);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
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.TitleAction;
|
||||
|
||||
/**
|
||||
* Title packet.
|
||||
*
|
||||
* <p>Структура пакета</p>
|
||||
* <pre>
|
||||
* | FIELD | TYPE | NOTES |
|
||||
* |-------------|-------------|----------------------------------|
|
||||
* | Action | VarInt | Определяет остальные поля пакета |
|
||||
* | Data fields | - | зависят от "Action" |
|
||||
* </pre>
|
||||
*
|
||||
* <p>Варианты "Action"</p>
|
||||
* <pre>
|
||||
* | ACTION | FIELD | TYPE | NOTES |
|
||||
* | VALUE | DESCRIPTION | | | |
|
||||
* |-------|-----------------------|-----------------|---------|-------------------------------------------------|
|
||||
* | 0 | set title | Title Text | Text | |
|
||||
* | 1 | set subtitle | Subtitle Text | Text | |
|
||||
* | 2 | set action bar | Action bar text | Text | [*] |
|
||||
* | 3 | set times and display | Fade In | Integer | Время (в тиках (tick)) на эфект появления |
|
||||
* | | | Stay | Integer | Время (в тиках (tick)) на отображение на экране |
|
||||
* | | | Fade Out | Integer | Время (в тиках (tick)) на эфект исчезания |
|
||||
* | 4 | hide | - | - | |
|
||||
* | 5 | reset | - | - | |
|
||||
* </pre>
|
||||
*
|
||||
* <p>
|
||||
* * - стоит обратить внимание, что {@link TextColor} и {@link TextStyle} не работают: клиент не применяет
|
||||
* стилистику в таком виде. Однако метод через символ "§" (\<span>u00a7</span>) работает.
|
||||
* </p>
|
||||
*
|
||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Title">Title</a>
|
||||
*/
|
||||
@Data
|
||||
public class TitlePacket implements ServerSidePacket {
|
||||
|
||||
private TitleAction action;
|
||||
|
||||
private Text title;
|
||||
private Text subtitle;
|
||||
private Text actionbar;
|
||||
private Integer fadeIn;
|
||||
private Integer stay;
|
||||
private Integer fadeOut;
|
||||
|
||||
@Override
|
||||
public void writeSelf(NetByteBuf netByteBuf) {
|
||||
netByteBuf.writeVarInt(this.action.getCode());
|
||||
|
||||
switch (this.action) {
|
||||
case SET_TITLE:
|
||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.title).toString());
|
||||
break;
|
||||
case SET_SUBTITLE:
|
||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.subtitle).toString());
|
||||
break;
|
||||
case SET_ACTIONBAR:
|
||||
netByteBuf.writeString(TextSerializer.toJsonObject(this.actionbar).toString());
|
||||
break;
|
||||
case SET_TIMES_AND_DISPLAY:
|
||||
netByteBuf.writeInt(fadeIn);
|
||||
netByteBuf.writeInt(stay);
|
||||
netByteBuf.writeInt(fadeOut);
|
||||
break;
|
||||
case HIDE:
|
||||
case RESET:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
17
protocol/src/main/java/mc/protocol/utils/TitleAction.java
Normal file
17
protocol/src/main/java/mc/protocol/utils/TitleAction.java
Normal file
@@ -0,0 +1,17 @@
|
||||
package mc.protocol.utils;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public enum TitleAction {
|
||||
SET_TITLE(0),
|
||||
SET_SUBTITLE(1),
|
||||
SET_ACTIONBAR(2),
|
||||
SET_TIMES_AND_DISPLAY(3),
|
||||
HIDE(4),
|
||||
RESET(5);
|
||||
|
||||
@Getter
|
||||
private final int code;
|
||||
}
|
||||
@@ -7,6 +7,7 @@ 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;
|
||||
@@ -16,6 +17,7 @@ import mc.protocol.serializer.TextSerializer;
|
||||
import mc.protocol.utils.Difficulty;
|
||||
import mc.protocol.utils.GameMode;
|
||||
import mc.protocol.utils.LevelType;
|
||||
import mc.protocol.utils.TitleAction;
|
||||
import mc.server.config.Config;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
|
||||
@@ -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,7 +69,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());
|
||||
@@ -127,25 +127,11 @@ public class PacketHandler {
|
||||
|
||||
// -- Эксперименты -- //
|
||||
|
||||
var timeUpdatePacket = new TimeUpdatePacket();
|
||||
timeUpdatePacket.setWorldAge(0);
|
||||
timeUpdatePacket.setTimeOfDay(0);
|
||||
var titlePacket = new TitlePacket();
|
||||
titlePacket.setAction(TitleAction.SET_TITLE);
|
||||
titlePacket.setTitle(Text.of("HELLO"));
|
||||
|
||||
while (true) {
|
||||
context.sendNow(timeUpdatePacket);
|
||||
|
||||
timeUpdatePacket.setTimeOfDay(timeUpdatePacket.getTimeOfDay() + 20);
|
||||
if (timeUpdatePacket.getTimeOfDay() >= 24_000) {
|
||||
timeUpdatePacket.setWorldAge(timeUpdatePacket.getWorldAge() + 1);
|
||||
timeUpdatePacket.setTimeOfDay(0);
|
||||
}
|
||||
|
||||
try {
|
||||
TimeUnit.MILLISECONDS.sleep(5);
|
||||
} catch (InterruptedException e) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
context.sendNow(titlePacket);
|
||||
}
|
||||
|
||||
private static String faviconToBase64(Path iconPath) {
|
||||
|
||||
Reference in New Issue
Block a user