Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-11-14 19:34:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update hardcoded block values in BlockEventPacket

Browse source
This commit is contained in:
Camotoy 2022-12-13 14:01:15 -05:00
parent 5506b94bf6
commit ed9d799316
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java
View file

@ -17,27 +17,28 @@ import java.io.IOException;
@With @With
@AllArgsConstructor @AllArgsConstructor
public class ClientboundBlockEventPacket implements MinecraftPacket { public class ClientboundBlockEventPacket implements MinecraftPacket {
private static final int NOTE_BLOCK = 89; // Do we really want these hardcoded values?
private static final int STICKY_PISTON = 108; private static final int NOTE_BLOCK = 93;
private static final int PISTON = 115; private static final int STICKY_PISTON = 112;
private static final int MOB_SPAWNER = 160; // Value does not show in 1.16 private static final int PISTON = 119;
private static final int CHEST = 162; private static final int MOB_SPAWNER = 165; // Value does not show in 1.16
private static final int ENDER_CHEST = 299; private static final int CHEST = 167;
private static final int TRAPPED_CHEST = 360; private static final int ENDER_CHEST = 328;
private static final int END_GATEWAY = 537; private static final int TRAPPED_CHEST = 392;
private static final int SHULKER_BOX_LOWER = 547; private static final int END_GATEWAY = 576;
private static final int SHULKER_BOX_HIGHER = 563; private static final int SHULKER_BOX_LOWER = 586;
private static final int SHULKER_BOX_HIGHER = 602;
private final @NonNull Vector3i position; private final @NonNull Vector3i position;
private final @NonNull BlockValueType type; private final @NonNull BlockValueType type;
private final @NonNull BlockValue value; private final @NonNull BlockValue value;
private final int blockId; private final int blockId;
public ClientboundBlockEventPacket(ByteBuf in, MinecraftCodecHelper helper) throws IOException { public ClientboundBlockEventPacket(ByteBuf in, MinecraftCodecHelper helper) {
this.position = helper.readPosition(in); this.position = helper.readPosition(in);
int type = in.readUnsignedByte(); int type = in.readUnsignedByte();
int value = in.readUnsignedByte(); int value = in.readUnsignedByte();
this.blockId = helper.readVarInt(in) & 0xFFF; this.blockId = helper.readVarInt(in);
// TODO: Handle this in MinecraftCodecHelper // TODO: Handle this in MinecraftCodecHelper
if (this.blockId == NOTE_BLOCK) { if (this.blockId == NOTE_BLOCK) {
@ -63,7 +64,7 @@ public class ClientboundBlockEventPacket implements MinecraftPacket {
} }
@Override @Override
public void serialize(ByteBuf out, MinecraftCodecHelper helper) throws IOException { public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
int val = 0; int val = 0;
// TODO: Handle this in MinecraftCodecHelper // TODO: Handle this in MinecraftCodecHelper
if (this.type instanceof NoteBlockValueType) { if (this.type instanceof NoteBlockValueType) {
@ -79,6 +80,6 @@ public class ClientboundBlockEventPacket implements MinecraftPacket {
helper.writePosition(out, this.position); helper.writePosition(out, this.position);
out.writeByte(MagicValues.value(Integer.class, this.type)); out.writeByte(MagicValues.value(Integer.class, this.type));
out.writeByte(val); out.writeByte(val);
helper.writeVarInt(out, this.blockId & 4095); helper.writeVarInt(out, this.blockId);
} }
} }