diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java index 127f124..681a1b2 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/BossBarPacket.java @@ -9,7 +9,7 @@ import lombok.Setter; import lombok.ToString; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextSerializer; +import mc.core.network.proto_1_12_2.serializers.TextMapper; import mc.core.text.Text; import java.util.UUID; @@ -72,7 +72,7 @@ public class BossBarPacket implements SCPacket { } if (action == ACTION_ADD || action == ACTION_UPDATE_TITLE) { - netStream.writeString(TextSerializer.serialize(barData.title).toString()); + netStream.writeString(TextMapper.getInstance().mapping(barData.title)); } if (action == ACTION_ADD || action == ACTION_UPDATE_HEALTH) { diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java index 0f20c2e..903e61c 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChatMessageServerPacket.java @@ -11,7 +11,7 @@ import lombok.ToString; import mc.core.chat.MessageType; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextSerializer; +import mc.core.network.proto_1_12_2.serializers.TextMapper; import mc.core.text.Text; @AllArgsConstructor @@ -24,7 +24,7 @@ public class ChatMessageServerPacket implements SCPacket { @Override public void writeSelf(NetOutputStream netStream) { - netStream.writeString(TextSerializer.serialize(text).toString()); + netStream.writeString(TextMapper.getInstance().mapping(text)); netStream.writeByte(type.getId()); } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java index 00568ad..96f83f7 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/DisconnectPacket.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextSerializer; +import mc.core.network.proto_1_12_2.serializers.TextMapper; import mc.core.text.Text; @AllArgsConstructor @@ -20,6 +20,6 @@ public class DisconnectPacket implements SCPacket { @Override public void writeSelf(NetOutputStream netStream) { - netStream.writeString(TextSerializer.serialize(reason).toString()); + netStream.writeString(TextMapper.getInstance().mapping(reason)); } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java index 8579a1b..20872c5 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListHeaderAndFooterPacket.java @@ -8,7 +8,7 @@ import lombok.Setter; import lombok.ToString; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextSerializer; +import mc.core.network.proto_1_12_2.serializers.TextMapper; import mc.core.text.Text; @Setter @@ -23,13 +23,13 @@ public class PlayerListHeaderAndFooterPacket implements SCPacket { if (header == null) { netStream.writeString("{\"translate\":\"\"}"); } else { - netStream.writeString(TextSerializer.serialize(header).toString()); + netStream.writeString(TextMapper.getInstance().mapping(header)); } if (footer == null) { netStream.writeString("{\"translate\":\"\"}"); } else { - netStream.writeString(TextSerializer.serialize(footer).toString()); + netStream.writeString(TextMapper.getInstance().mapping(footer)); } } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java index b8a651d..8c6f3e9 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerListItemPacket.java @@ -11,7 +11,7 @@ import lombok.ToString; import lombok.extern.slf4j.Slf4j; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextSerializer; +import mc.core.network.proto_1_12_2.serializers.TextMapper; import mc.core.player.PlayerMode; import mc.core.text.Text; @@ -73,7 +73,7 @@ public class PlayerListItemPacket implements SCPacket { if (action == ACTION_ADD_PLAYER || action == ACTION_UPDATE_DISPLAY_NAME) { netStream.writeBoolean(playerData.hasDisplayName); if (playerData.hasDisplayName) { - netStream.writeString(TextSerializer.serialize(playerData.displayName).toString()); + netStream.writeString(TextMapper.getInstance().mapping(playerData.displayName)); } } } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java index 3b426f1..26f51d9 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/TitlePacket.java @@ -9,7 +9,7 @@ import lombok.Setter; import lombok.ToString; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextSerializer; +import mc.core.network.proto_1_12_2.serializers.TextMapper; import mc.core.text.Text; @RequiredArgsConstructor @@ -98,7 +98,7 @@ public class TitlePacket implements SCPacket { case SET_TITLE: case SET_SUBTITLE: case SET_ACTION_BAR: - netStream.writeString(TextSerializer.serialize(this.text).toString()); + netStream.writeString(TextMapper.getInstance().mapping(this.text)); break; case SET_DISPLAY_TIME: netStream.writeInt(this.fadeInTime); diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextSerializer.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java similarity index 83% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextSerializer.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java index da8d29e..2590d2f 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextSerializer.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java @@ -6,10 +6,14 @@ package mc.core.network.proto_1_12_2.serializers; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import lombok.Getter; import mc.core.text.Text; -public class TextSerializer { - public static JsonObject serialize(Text text) { +public class TextMapper implements Mapper { + @Getter + private static TextMapper instance = new TextMapper(); + + private JsonObject serialize(Text text) { JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("text", text.getContent()); @@ -43,4 +47,9 @@ public class TextSerializer { return jsonObject; } + + @Override + public String mapping(Text fromObject) { + return serialize(fromObject).toString(); + } }