Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 21:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ServerStopSoundPacket

Browse source
This commit is contained in:
Jonas Herzig 2018-07-19 13:11:58 +02:00
parent 0264c12567
commit 258efd8be2
2 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java
View file

@ -55,6 +55,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.ServerResourcePack
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerRespawnPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerSetCooldownPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerStatisticsPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerStopSoundPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerSwitchCameraPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerTabCompletePacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerTitlePacket;
@ -419,7 +420,7 @@ public class MinecraftProtocol extends PacketProtocol {
this.registerIncoming(0x49, ServerSpawnPositionPacket.class);
this.registerIncoming(0x4A, ServerUpdateTimePacket.class);
this.registerIncoming(0x4B, ServerTitlePacket.class);
// FIXME: 4C
this.registerIncoming(0x4C, ServerStopSoundPacket.class);
this.registerIncoming(0x4D, ServerPlayBuiltinSoundPacket.class);
this.registerIncoming(0x4E, ServerPlayerListDataPacket.class);
this.registerIncoming(0x4F, ServerEntityCollectItemPacket.class);

71
src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/ServerStopSoundPacket.java Normal file
View file

@ -0,0 +1,71 @@
package com.github.steveice10.mc.protocol.packet.ingame.server;
import com.github.steveice10.mc.protocol.data.MagicValues;
import com.github.steveice10.mc.protocol.data.game.world.sound.BuiltinSound;
import com.github.steveice10.mc.protocol.data.game.world.sound.CustomSound;
import com.github.steveice10.mc.protocol.data.game.world.sound.Sound;
import com.github.steveice10.mc.protocol.data.game.world.sound.SoundCategory;
import com.github.steveice10.mc.protocol.packet.MinecraftPacket;
import com.github.steveice10.packetlib.io.NetInput;
import com.github.steveice10.packetlib.io.NetOutput;
import java.io.IOException;
public class ServerStopSoundPacket extends MinecraftPacket {
private SoundCategory category;
private Sound sound;
@SuppressWarnings("unused")
private ServerStopSoundPacket() {
}
public ServerStopSoundPacket(SoundCategory category, Sound sound) {
this.category = category;
this.sound = sound;
}
public SoundCategory getCategory() {
return this.category;
}
public Sound getSound() {
return sound;
}
@Override
public void read(NetInput in) throws IOException {
int flags = in.readByte();
if((flags & 0x1) != 0) {
this.category = MagicValues.key(SoundCategory.class, in.readVarInt());
} else {
this.category = null;
}
if((flags & 0x2) != 0) {
String value = in.readString();
try {
this.sound = MagicValues.key(BuiltinSound.class, value);
} catch(IllegalArgumentException e) {
this.sound = new CustomSound(value);
}
} else {
this.sound = null;
}
}
@Override
public void write(NetOutput out) throws IOException {
out.writeByte((this.category != null ? 0x1 : 0) | (this.sound != null ? 0x2 : 0));
if (this.category != null) {
out.writeByte(MagicValues.value(Integer.class, this.category));
}
if (this.sound != null) {
String value = "";
if (this.sound instanceof CustomSound) {
value = ((CustomSound) this.sound).getName();
} else if (this.sound instanceof BuiltinSound) {
value = MagicValues.value(String.class, this.sound);
}
out.writeString(value);
}
}
}