Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Update serverbound packet, update clientside ids

Browse Source
This commit is contained in:
TheMode 2021-05-31 18:00:57 +02:00
parent 191e97b186
commit fd977e05be
4 changed files with 117 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/network/packet/client/handler/ClientPlayPacketsHandler.java
View File

@ -11,7 +11,7 @@ public class ClientPlayPacketsHandler extends ClientPacketsHandler {
register(0x04, ClientStatusPacket::new);
register(0x05, ClientSettingsPacket::new);
register(0x06, ClientTabCompletePacket::new);
register(0x07, ClientWindowConfirmationPacket::new);
//register(0x07, ClientWindowConfirmationPacket::new);
register(0x08, ClientClickWindowButtonPacket::new);
register(0x09, ClientClickWindowPacket::new);
register(0x0A, ClientCloseWindowPacket::new);

5
src/main/java/net/minestom/server/network/packet/client/play/ClientSettingsPacket.java
View File

@ -15,6 +15,7 @@ public class ClientSettingsPacket extends ClientPlayPacket {
public boolean chatColors;
public byte displayedSkinParts;
public Player.MainHand mainHand = Player.MainHand.RIGHT;
public boolean disableTextFiltering;
@Override
public void read(@NotNull BinaryReader reader) {
@ -24,11 +25,12 @@ public class ClientSettingsPacket extends ClientPlayPacket {
this.chatColors = reader.readBoolean();
this.displayedSkinParts = reader.readByte();
this.mainHand = Player.MainHand.values()[reader.readVarInt()];
this.disableTextFiltering = reader.readBoolean();
}
@Override
public void write(@NotNull BinaryWriter writer) {
if(locale.length() > 128)
if (locale.length() > 128)
throw new IllegalArgumentException("Locale cannot be longer than 128 characters.");
writer.writeSizedString(locale);
writer.writeByte(viewDistance);
@ -36,5 +38,6 @@ public class ClientSettingsPacket extends ClientPlayPacket {
writer.writeBoolean(chatColors);
writer.writeByte(displayedSkinParts);
writer.writeVarInt(mainHand.ordinal());
writer.writeBoolean(disableTextFiltering);
}
}

182
src/main/java/net/minestom/server/network/packet/server/ServerPacketIdentifier.java
View File

@ -13,92 +13,100 @@ public class ServerPacketIdentifier {
public static final int SPAWN_LIVING_ENTITY = 0x02;
public static final int SPAWN_PAINTING = 0x03;
public static final int SPAWN_PLAYER = 0x04;
public static final int ENTITY_ANIMATION = 0x05;
public static final int STATISTICS = 0x06;
public static final int ACKNOWLEDGE_PLAYER_DIGGING = 0x07;
public static final int BLOCK_BREAK_ANIMATION = 0x08;
public static final int BLOCK_ENTITY_DATA = 0x09;
public static final int BLOCK_ACTION = 0x0A;
public static final int BLOCK_CHANGE = 0x0B;
public static final int BOSS_BAR = 0x0C;
public static final int SERVER_DIFFICULTY = 0x0D;
public static final int CHAT_MESSAGE = 0x0E;
public static final int TAB_COMPLETE = 0x0F;
public static final int DECLARE_COMMANDS = 0x10;
public static final int WINDOW_CONFIRMATION = 0x11;
public static final int CLOSE_WINDOW = 0x12;
public static final int WINDOW_ITEMS = 0x13;
public static final int WINDOW_PROPERTY = 0x14;
public static final int SET_SLOT = 0x15;
public static final int SET_COOLDOWN = 0x16;
public static final int PLUGIN_MESSAGE = 0x17;
public static final int NAMED_SOUND_EFFECT = 0x18;
public static final int DISCONNECT = 0x19;
public static final int ENTITY_STATUS = 0x1A;
public static final int EXPLOSION = 0x1B;
public static final int UNLOAD_CHUNK = 0x1C;
public static final int CHANGE_GAME_STATE = 0x1D;
public static final int OPEN_HORSE_WINDOW = 0x1E;
public static final int KEEP_ALIVE = 0x1F;
public static final int CHUNK_DATA = 0x20;
public static final int EFFECT = 0x21;
public static final int PARTICLE = 0x22;
public static final int UPDATE_LIGHT = 0x23;
public static final int JOIN_GAME = 0x24;
public static final int MAP_DATA = 0x25;
public static final int TRADE_LIST = 0x26;
public static final int ENTITY_POSITION = 0x27;
public static final int ENTITY_POSITION_AND_ROTATION = 0x28;
public static final int ENTITY_ROTATION = 0x29;
public static final int ENTITY_MOVEMENT = 0x2A;
public static final int VEHICLE_MOVE = 0x2B;
public static final int OPEN_BOOK = 0x2C;
public static final int OPEN_WINDOW = 0x2D;
public static final int OPEN_SIGN_EDITOR = 0x2E;
public static final int CRAFT_RECIPE_RESPONSE = 0x2F;
public static final int PLAYER_ABILITIES = 0x30;
public static final int COMBAT_EVENT = 0x31;
public static final int PLAYER_INFO = 0x32;
public static final int FACE_PLAYER = 0x33;
public static final int PLAYER_POSITION_AND_LOOK = 0x34;
public static final int UNLOCK_RECIPES = 0x35;
public static final int DESTROY_ENTITIES = 0x36;
public static final int REMOVE_ENTITY_EFFECT = 0x37;
public static final int RESOURCE_PACK_SEND = 0x38;
public static final int RESPAWN = 0x39;
public static final int ENTITY_HEAD_LOOK = 0x3A;
public static final int MULTI_BLOCK_CHANGE = 0x3B;
public static final int SELECT_ADVANCEMENT_TAB = 0x3C;
public static final int WORLD_BORDER = 0x3D;
public static final int CAMERA = 0x3E;
public static final int HELD_ITEM_CHANGE = 0x3F;
public static final int UPDATE_VIEW_POSITION = 0x40;
public static final int UPDATE_VIEW_DISTANCE = 0x41; // Not used by the dedicated server
public static final int SPAWN_POSITION = 0x42;
public static final int DISPLAY_SCOREBOARD = 0x43;
public static final int ENTITY_METADATA = 0x44;
public static final int ATTACH_ENTITY = 0x45;
public static final int ENTITY_VELOCITY = 0x46;
public static final int ENTITY_EQUIPMENT = 0x47;
public static final int SET_EXPERIENCE = 0x48;
public static final int UPDATE_HEALTH = 0x49;
public static final int SCOREBOARD_OBJECTIVE = 0x4A;
public static final int SET_PASSENGERS = 0x4B;
public static final int TEAMS = 0x4C;
public static final int UPDATE_SCORE = 0x4D;
public static final int TIME_UPDATE = 0x4E;
public static final int TITLE = 0x4F;
public static final int ENTITY_SOUND_EFFECT = 0x50;
public static final int SOUND_EFFECT = 0x51;
public static final int STOP_SOUND = 0x52;
public static final int PLAYER_LIST_HEADER_AND_FOOTER = 0x53;
public static final int NBT_QUERY_RESPONSE = 0x54;
public static final int COLLECT_ITEM = 0x55;
public static final int ENTITY_TELEPORT = 0x56;
public static final int ADVANCEMENTS = 0x57;
public static final int ENTITY_PROPERTIES = 0x58;
public static final int ENTITY_EFFECT = 0x59;
public static final int DECLARE_RECIPES = 0x5A;
public static final int TAGS = 0x5B;
public static final int SCULK_VIBRATION_SIGNAL = 0x05;
public static final int ENTITY_ANIMATION = 0x06;
public static final int STATISTICS = 0x07;
public static final int ACKNOWLEDGE_PLAYER_DIGGING = 0x08;
public static final int BLOCK_BREAK_ANIMATION = 0x09;
public static final int BLOCK_ENTITY_DATA = 0x0A;
public static final int BLOCK_ACTION = 0x0B;
public static final int BLOCK_CHANGE = 0x0C;
public static final int BOSS_BAR = 0x0D;
public static final int SERVER_DIFFICULTY = 0x0E;
public static final int CHAT_MESSAGE = 0x0F;
// TODO clear titles
public static final int TAB_COMPLETE = 0x11;
public static final int DECLARE_COMMANDS = 0x12;
//public static final int WINDOW_CONFIRMATION = 0x11;
public static final int CLOSE_WINDOW = 0x13;
public static final int WINDOW_ITEMS = 0x14;
public static final int WINDOW_PROPERTY = 0x15;
public static final int SET_SLOT = 0x16;
public static final int SET_COOLDOWN = 0x17;
public static final int PLUGIN_MESSAGE = 0x18;
public static final int NAMED_SOUND_EFFECT = 0x19;
public static final int DISCONNECT = 0x1A;
public static final int ENTITY_STATUS = 0x1B;
public static final int EXPLOSION = 0x1C;
public static final int UNLOAD_CHUNK = 0x1D;
public static final int CHANGE_GAME_STATE = 0x1E;
public static final int OPEN_HORSE_WINDOW = 0x1F;
// TODO initialize world border
public static final int KEEP_ALIVE = 0x21;
public static final int CHUNK_DATA = 0x22;
public static final int EFFECT = 0x23;
public static final int PARTICLE = 0x24;
public static final int UPDATE_LIGHT = 0x25;
public static final int JOIN_GAME = 0x26;
public static final int MAP_DATA = 0x27;
public static final int TRADE_LIST = 0x28;
public static final int ENTITY_POSITION = 0x29;
public static final int ENTITY_POSITION_AND_ROTATION = 0x2A;
public static final int ENTITY_ROTATION = 0x2B;
//public static final int ENTITY_MOVEMENT = 0x2A;
public static final int VEHICLE_MOVE = 0x2C;
public static final int OPEN_BOOK = 0x2D;
public static final int OPEN_WINDOW = 0x2E;
public static final int OPEN_SIGN_EDITOR = 0x2F;
public static final int CRAFT_RECIPE_RESPONSE = 0x30;
public static final int PLAYER_ABILITIES = 0x31;
//public static final int COMBAT_EVENT = 0x31;
// TODO END/ENTER/DEATH combat event
public static final int PLAYER_INFO = 0x35;
public static final int FACE_PLAYER = 0x36;
public static final int PLAYER_POSITION_AND_LOOK = 0x37;
public static final int UNLOCK_RECIPES = 0x38;
// TODO destroy entity
//public static final int DESTROY_ENTITIES = 0x36;
public static final int REMOVE_ENTITY_EFFECT = 0x3A;
public static final int RESOURCE_PACK_SEND = 0x3B;
public static final int RESPAWN = 0x3C;
public static final int ENTITY_HEAD_LOOK = 0x3D;
public static final int MULTI_BLOCK_CHANGE = 0x3E;
public static final int SELECT_ADVANCEMENT_TAB = 0x3F;
// TODO action bar, wordborder packets
//public static final int WORLD_BORDER = 0x3D;
public static final int CAMERA = 0x46;
public static final int HELD_ITEM_CHANGE = 0x47;
public static final int UPDATE_VIEW_POSITION = 0x48;
public static final int UPDATE_VIEW_DISTANCE = 0x49; // Not used by the dedicated server
public static final int SPAWN_POSITION = 0x4A;
public static final int DISPLAY_SCOREBOARD = 0x4B;
public static final int ENTITY_METADATA = 0x4C;
public static final int ATTACH_ENTITY = 0x4D;
public static final int ENTITY_VELOCITY = 0x4E;
public static final int ENTITY_EQUIPMENT = 0x4F;
public static final int SET_EXPERIENCE = 0x50;
public static final int UPDATE_HEALTH = 0x51;
public static final int SCOREBOARD_OBJECTIVE = 0x52;
public static final int SET_PASSENGERS = 0x53;
public static final int TEAMS = 0x54;
public static final int UPDATE_SCORE = 0x55;
// TODO set title subtitle
public static final int TIME_UPDATE = 0x57;
// TODO set title text/time
//public static final int TITLE = 0x4F;
public static final int ENTITY_SOUND_EFFECT = 0x5A;
public static final int SOUND_EFFECT = 0x5B;
public static final int STOP_SOUND = 0x5C;
public static final int PLAYER_LIST_HEADER_AND_FOOTER = 0x5D;
public static final int NBT_QUERY_RESPONSE = 0x5E;
public static final int COLLECT_ITEM = 0x5F;
public static final int ENTITY_TELEPORT = 0x60;
public static final int ADVANCEMENTS = 0x61;
public static final int ENTITY_PROPERTIES = 0x62;
public static final int ENTITY_EFFECT = 0x63;
public static final int DECLARE_RECIPES = 0x64;
public static final int TAGS = 0x65;
}

17
src/main/java/net/minestom/server/network/packet/server/play/SculkVibrationSignal.java Normal file
View File

@ -0,0 +1,17 @@
package net.minestom.server.network.packet.server.play;
import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull;
public class SculkVibrationSignal implements ServerPacket {
@Override
public int getId() {
return 0;
}
@Override
public void write(@NotNull BinaryWriter writer) {
}
}