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 7339c11..803d925 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 @@ -10,7 +10,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.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; import java.util.UUID; @@ -98,7 +98,7 @@ public class BossBarPacket implements SCPacket { } if (action == Action.ADD || action == Action.UPDATE_TITLE) { - netStream.writeString(TextMapper.getInstance().mapping(barData.title)); + netStream.writeString(TextToStringConverter.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 903e61c..305ec8a 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.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @AllArgsConstructor @@ -24,7 +24,7 @@ public class ChatMessageServerPacket implements SCPacket { @Override public void writeSelf(NetOutputStream netStream) { - netStream.writeString(TextMapper.getInstance().mapping(text)); + netStream.writeString(TextToStringConverter.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 96f83f7..2f811ac 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.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @AllArgsConstructor @@ -20,6 +20,6 @@ public class DisconnectPacket implements SCPacket { @Override public void writeSelf(NetOutputStream netStream) { - netStream.writeString(TextMapper.getInstance().mapping(reason)); + netStream.writeString(TextToStringConverter.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 20872c5..21f1a2e 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.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @Setter @@ -23,13 +23,13 @@ public class PlayerListHeaderAndFooterPacket implements SCPacket { if (header == null) { netStream.writeString("{\"translate\":\"\"}"); } else { - netStream.writeString(TextMapper.getInstance().mapping(header)); + netStream.writeString(TextToStringConverter.getInstance().mapping(header)); } if (footer == null) { netStream.writeString("{\"translate\":\"\"}"); } else { - netStream.writeString(TextMapper.getInstance().mapping(footer)); + netStream.writeString(TextToStringConverter.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 9eb85d3..b2766fc 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 @@ -8,7 +8,7 @@ import lombok.*; import lombok.extern.slf4j.Slf4j; import mc.core.network.NetOutputStream; import mc.core.network.SCPacket; -import mc.core.network.proto_1_12_2.serializers.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.player.PlayerMode; import mc.core.text.Text; @@ -76,7 +76,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(TextMapper.getInstance().mapping(playerData.displayName)); + netStream.writeString(TextToStringConverter.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 9b357a8..a85045a 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 @@ -10,7 +10,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.TextMapper; +import mc.core.network.proto_1_12_2.serializers.TextToStringConverter; import mc.core.text.Text; @RequiredArgsConstructor @@ -106,7 +106,7 @@ public class TitlePacket implements SCPacket { case SET_TITLE: case SET_SUBTITLE: case SET_ACTION_BAR: - netStream.writeString(TextMapper.getInstance().mapping(this.text)); + netStream.writeString(TextToStringConverter.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/Mapper.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Converter.java similarity index 70% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Mapper.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Converter.java index 167dc43..95a73a6 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Mapper.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/Converter.java @@ -1,5 +1,5 @@ package mc.core.network.proto_1_12_2.serializers; -public interface Mapper { +public interface Converter { T mapping(F fromObject); } diff --git a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java similarity index 92% rename from proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java rename to proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java index 2590d2f..2629f2e 100644 --- a/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextMapper.java +++ b/proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/serializers/TextToStringConverter.java @@ -9,9 +9,9 @@ import com.google.gson.JsonObject; import lombok.Getter; import mc.core.text.Text; -public class TextMapper implements Mapper { +public class TextToStringConverter implements Converter { @Getter - private static TextMapper instance = new TextMapper(); + private static TextToStringConverter instance = new TextToStringConverter(); private JsonObject serialize(Text text) { JsonObject jsonObject = new JsonObject();