Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-29 07:55:07 +02:00
Code Issues Projects Releases Wiki Activity

Remove deprecated elements from packets

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-03-24 17:22:40 +00:00
parent eeedd97e8b
commit 0a1a0f2fa1
5 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/network/packet/server/play/CombatEventPacket.java
View File

@ -1,7 +1,6 @@
package net.minestom.server.network.packet.server.play;
import net.kyori.adventure.text.Component;
import net.minestom.server.chat.JsonMessage;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.Player;
import net.minestom.server.network.packet.server.ComponentHoldingServerPacket;
@ -43,14 +42,6 @@ public class CombatEventPacket implements ComponentHoldingServerPacket {
return packet;
}
/**
* @deprecated Use {@link #death(Player, Entity, Component)}
*/
@Deprecated
public static CombatEventPacket death(Player player, Entity killer, JsonMessage message) {
return death(player, killer, message.asComponent());
}
public static CombatEventPacket death(Player player, Entity killer, Component message) {
CombatEventPacket packet = new CombatEventPacket();
packet.type = EventType.DEATH;

9
src/main/java/net/minestom/server/network/packet/server/play/DisconnectPacket.java
View File

@ -1,7 +1,6 @@
package net.minestom.server.network.packet.server.play;
import net.kyori.adventure.text.Component;
import net.minestom.server.chat.JsonMessage;
import net.minestom.server.network.packet.server.ComponentHoldingServerPacket;
import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier;
@ -23,14 +22,6 @@ public class DisconnectPacket implements ComponentHoldingServerPacket {
this.message = message;
}
/**
* @deprecated Use {@link #DisconnectPacket(Component)}
*/
@Deprecated
public DisconnectPacket(@NotNull JsonMessage message){
this(message.asComponent());
}
@Override
public void write(@NotNull BinaryWriter writer) {
writer.writeComponent(message);

9
src/main/java/net/minestom/server/network/packet/server/play/EntitySoundEffectPacket.java
View File

@ -1,9 +1,9 @@
package net.minestom.server.network.packet.server.play;
import net.kyori.adventure.sound.Sound;
import net.minestom.server.adventure.AdventurePacketConvertor;
import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier;
import net.minestom.server.sound.SoundCategory;
import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull;
@ -15,15 +15,10 @@ public class EntitySoundEffectPacket implements ServerPacket {
public float volume;
public float pitch;
/**
* @deprecated Use {@link #soundSource}
*/
@Deprecated public SoundCategory soundCategory;
@Override
public void write(@NotNull BinaryWriter writer) {
writer.writeVarInt(soundId);
writer.writeVarInt(soundCategory != null ? soundCategory.ordinal() : soundSource.ordinal());
writer.writeVarInt(AdventurePacketConvertor.getSoundSourceValue(soundSource));
writer.writeVarInt(entityId);
writer.writeFloat(volume);
writer.writeFloat(pitch);

9
src/main/java/net/minestom/server/network/packet/server/play/PlayerInfoPacket.java
View File

@ -2,7 +2,6 @@ package net.minestom.server.network.packet.server.play;
import net.kyori.adventure.text.Component;
import net.minestom.server.adventure.ComponentHolder;
import net.minestom.server.chat.JsonMessage;
import net.minestom.server.entity.GameMode;
import net.minestom.server.network.packet.server.ComponentHoldingServerPacket;
import net.minestom.server.network.packet.server.ServerPacket;
@ -219,14 +218,6 @@ public class PlayerInfoPacket implements ComponentHoldingServerPacket {
public Component displayName;
/**
* @deprecated Use {@link #UpdateDisplayName(UUID, Component)}
*/
@Deprecated
public UpdateDisplayName(UUID uuid, JsonMessage displayName) {
this(uuid, displayName.asComponent());
}
public UpdateDisplayName(UUID uuid, Component displayName) {
super(uuid);
this.displayName = displayName;

9
src/main/java/net/minestom/server/network/packet/server/play/SoundEffectPacket.java
View File

@ -5,7 +5,6 @@ import net.minestom.server.adventure.AdventurePacketConvertor;
import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier;
import net.minestom.server.sound.SoundEvent;
import net.minestom.server.sound.SoundCategory;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.binary.BinaryWriter;
import org.jetbrains.annotations.NotNull;
@ -18,14 +17,6 @@ public class SoundEffectPacket implements ServerPacket {
public float volume;
public float pitch;
/**
* @deprecated Use variables
*/
@Deprecated
public static SoundEffectPacket create(SoundCategory category, SoundEvent sound, Position position, float volume, float pitch) {
return create(category.asSource(), sound, position, volume, pitch);
}
@NotNull
public static SoundEffectPacket create(Source category, SoundEvent sound, Position position, float volume, float pitch) {
SoundEffectPacket packet = new SoundEffectPacket();