Compare commits
1 Commits
dev/open-s
...
dev/update
| Author | SHA1 | Date | |
|---|---|---|---|
|
f0f29e2d56
|
@@ -51,17 +51,16 @@ public enum State {
|
|||||||
0x0D, PlayerPositionPacket.class,
|
0x0D, PlayerPositionPacket.class,
|
||||||
0x0E, CPlayerPositionAndLookPacket.class,
|
0x0E, CPlayerPositionAndLookPacket.class,
|
||||||
0x0F, PlayerLookPacket.class,
|
0x0F, PlayerLookPacket.class,
|
||||||
0x15, EntityActionPacket.class,
|
0x15, EntityActionPacket.class
|
||||||
0x1C, UpdateSignPacket.class
|
|
||||||
),
|
),
|
||||||
// client bound
|
// client bound
|
||||||
Map.of(
|
Map.of(
|
||||||
PingPacket.class, 0x1F,
|
PingPacket.class, 0x1F,
|
||||||
ChunkDataPacket.class, 0x20,
|
ChunkDataPacket.class, 0x20,
|
||||||
JoinGamePacket.class, 0x23,
|
JoinGamePacket.class, 0x23,
|
||||||
OpenSignEditorPacket.class, 0x2A,
|
|
||||||
PlayerAbilitiesPacket.class,0x2C,
|
PlayerAbilitiesPacket.class,0x2C,
|
||||||
SPlayerPositionAndLookPacket.class, 0x2F,
|
SPlayerPositionAndLookPacket.class, 0x2F,
|
||||||
|
UpdateHealthPacket.class, 0x41,
|
||||||
SpawnPositionPacket.class, 0x46
|
SpawnPositionPacket.class, 0x46
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,57 +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.model.Location;
|
|
||||||
import mc.protocol.packets.ClientSidePacket;
|
|
||||||
import mc.protocol.packets.server.OpenSignEditorPacket;
|
|
||||||
import mc.protocol.serializer.LocationSerializer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update Sign packet.
|
|
||||||
*
|
|
||||||
* <p>Отправляется клиентом, когда нажата кнопка "Done" в окне редактирования таблички.</p>
|
|
||||||
*
|
|
||||||
* <p>Структура пакета</p>
|
|
||||||
* <pre>
|
|
||||||
* | FIELD | TYPE | NOTES |
|
|
||||||
* |----------|--------------|--------------------------------|
|
|
||||||
* | Location | Location | Позиция редактируемой табилчки |
|
|
||||||
* | Line 1 | String (384) | Строка таблички |
|
|
||||||
* | Line 2 | String (384) | Строка таблички |
|
|
||||||
* | Line 3 | String (384) | Строка таблички |
|
|
||||||
* | Line 4 | String (384) | Строка таблички |
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Update_Sign" target="_top">Update Sign</a>
|
|
||||||
* @see OpenSignEditorPacket
|
|
||||||
*/
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Getter
|
|
||||||
@EqualsAndHashCode
|
|
||||||
@ToString
|
|
||||||
public class UpdateSignPacket implements ClientSidePacket {
|
|
||||||
|
|
||||||
private Location location;
|
|
||||||
@SuppressWarnings("MismatchedReadAndWriteOfArray")
|
|
||||||
private String[] lines;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void readSelf(NetByteBuf netByteBuf) {
|
|
||||||
this.location = LocationSerializer.fromLongValue(netByteBuf.readLong());
|
|
||||||
this.lines = new String[4];
|
|
||||||
this.lines[0] = netByteBuf.readString(384);
|
|
||||||
this.lines[1] = netByteBuf.readString(384);
|
|
||||||
this.lines[2] = netByteBuf.readString(384);
|
|
||||||
this.lines[3] = netByteBuf.readString(384);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void passivate() {
|
|
||||||
this.location = null;
|
|
||||||
this.lines = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package mc.protocol.packets.server;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import mc.protocol.io.NetByteBuf;
|
|
||||||
import mc.protocol.model.Location;
|
|
||||||
import mc.protocol.packets.ServerSidePacket;
|
|
||||||
import mc.protocol.packets.client.UpdateSignPacket;
|
|
||||||
import mc.protocol.serializer.LocationSerializer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Открыть окно редактирования таблички.
|
|
||||||
*
|
|
||||||
* <p>Структура пакета</p>
|
|
||||||
* <pre>
|
|
||||||
* | FIELD | TYPE | NOTES |
|
|
||||||
* |----------|----------|-------|
|
|
||||||
* | Location | Location | |
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Open_Sign_Editor">Open Sign Editor</a>
|
|
||||||
* @see UpdateSignPacket
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class OpenSignEditorPacket implements ServerSidePacket {
|
|
||||||
|
|
||||||
private Location location;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeSelf(NetByteBuf netByteBuf) {
|
|
||||||
long value = LocationSerializer.toLongValue(this.location);
|
|
||||||
netByteBuf.writeLong(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import lombok.Data;
|
|||||||
import mc.protocol.io.NetByteBuf;
|
import mc.protocol.io.NetByteBuf;
|
||||||
import mc.protocol.model.Location;
|
import mc.protocol.model.Location;
|
||||||
import mc.protocol.packets.ServerSidePacket;
|
import mc.protocol.packets.ServerSidePacket;
|
||||||
import mc.protocol.serializer.LocationSerializer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Спавн позиция игрока.
|
* Спавн позиция игрока.
|
||||||
@@ -15,7 +14,7 @@ import mc.protocol.serializer.LocationSerializer;
|
|||||||
* <pre>
|
* <pre>
|
||||||
* | FIELD | TYPE | NOTES |
|
* | FIELD | TYPE | NOTES |
|
||||||
* |----------|----------|-----------------------|
|
* |----------|----------|-----------------------|
|
||||||
* | Location | Location | Локация спавна игрока |
|
* | Location | Position | Локация спавна игрока |
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Spawn_Position">Spawn Position</a>
|
* @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=14204#Spawn_Position">Spawn Position</a>
|
||||||
@@ -27,7 +26,16 @@ public class SpawnPositionPacket implements ServerSidePacket {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeSelf(NetByteBuf netByteBuf) {
|
public void writeSelf(NetByteBuf netByteBuf) {
|
||||||
long spawnSerialized = LocationSerializer.toLongValue(this.spawn);
|
long spawnSerialized =
|
||||||
|
((long) (floorDouble(spawn.getX()) & 0x3FFFFFF) << 38)
|
||||||
|
| ((long) (floorDouble(spawn.getY()) & 0xFFF) << 26)
|
||||||
|
| (floorDouble(spawn.getZ()) & 0x3FFFFFF);
|
||||||
netByteBuf.writeLong(spawnSerialized);
|
netByteBuf.writeLong(spawnSerialized);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static int floorDouble(double value) {
|
||||||
|
int i = (int) value;
|
||||||
|
return value < (double) i ? i - 1 : i;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,26 +0,0 @@
|
|||||||
package mc.protocol.serializer;
|
|
||||||
|
|
||||||
import lombok.experimental.UtilityClass;
|
|
||||||
import mc.protocol.model.Location;
|
|
||||||
|
|
||||||
@UtilityClass
|
|
||||||
public class LocationSerializer {
|
|
||||||
|
|
||||||
public long toLongValue(Location location) {
|
|
||||||
return ((long) (floorDouble(location.getX()) & 0x3FFFFFF) << 38)
|
|
||||||
| ((long) (floorDouble(location.getY()) & 0xFFF) << 26)
|
|
||||||
| (floorDouble(location.getZ()) & 0x3FFFFFF);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Location fromLongValue(long value) {
|
|
||||||
return new Location(
|
|
||||||
value >> 38,
|
|
||||||
(value >> 26) & 0xFFF,
|
|
||||||
value << 38 >> 38);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int floorDouble(double value) {
|
|
||||||
int i = (int) value;
|
|
||||||
return value < (double) i ? i - 1 : i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -26,6 +26,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
|
||||||
@@ -67,6 +68,7 @@ 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 loginSuccessPacket = new LoginSuccessPacket();
|
var loginSuccessPacket = new LoginSuccessPacket();
|
||||||
loginSuccessPacket.setUuid(UUID.randomUUID());
|
loginSuccessPacket.setUuid(UUID.randomUUID());
|
||||||
@@ -125,10 +127,29 @@ public class PacketHandler {
|
|||||||
|
|
||||||
// -- Эксперименты -- //
|
// -- Эксперименты -- //
|
||||||
|
|
||||||
var openSignEditorPacket = new OpenSignEditorPacket();
|
var updateHealthPacket = new UpdateHealthPacket();
|
||||||
openSignEditorPacket.setLocation(spawnLocation);
|
updateHealthPacket.setHealth(0.1f);
|
||||||
|
updateHealthPacket.setFood(0);
|
||||||
|
updateHealthPacket.setFoodSaturation(5.0f);
|
||||||
|
|
||||||
context.sendNow(openSignEditorPacket);
|
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) {
|
private static String faviconToBase64(Path iconPath) {
|
||||||
|
|||||||
Reference in New Issue
Block a user