Newer chat message wrappers extend chat message_v_16 to simplify usag…

…e for users aiming 1.16+
retrooper · Jun 23, 2023 · cd3449a · cd3449a
1 parent 75af221
commit cd3449a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 39 deletions.
diff --git a/.../main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19.java b/.../main/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19.java
@@ -24,10 +24,9 @@
 
 import java.time.Instant;
 import java.util.UUID;
-
-public class ChatMessage_v1_19 extends ChatMessage {
+//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
+public class ChatMessage_v1_19 extends ChatMessage_v1_16 {
     private @Nullable Component unsignedChatContent;
-    private UUID senderUUID;
     private Component senderDisplayName;
     private @Nullable Component teamName;
     private Instant timestamp;
@@ -37,9 +36,8 @@ public class ChatMessage_v1_19 extends ChatMessage {
     public ChatMessage_v1_19(Component chatContent, @Nullable Component unsignedChatContent, ChatType type,
                              UUID senderUUID, Component senderDisplayName, @Nullable Component teamName, Instant timestamp,
                              long salt, byte[] signature) {
-        super(chatContent, type);
+        super(chatContent, type, senderUUID);
         this.unsignedChatContent = unsignedChatContent;
-        this.senderUUID = senderUUID;
         this.senderDisplayName = senderDisplayName;
         this.teamName = teamName;
         this.timestamp = timestamp;
@@ -51,10 +49,6 @@ public ChatMessage_v1_19(Component chatContent, @Nullable Component unsignedChat
         return unsignedChatContent;
     }
 
-    public UUID getSenderUUID() {
-        return senderUUID;
-    }
-
     public Component getSenderDisplayName() {
         return senderDisplayName;
     }
@@ -79,10 +73,6 @@ public void setUnsignedChatContent(@Nullable Component unsignedChatContent) {
         this.unsignedChatContent = unsignedChatContent;
     }
 
-    public void setSenderUUID(UUID senderUUID) {
-        this.senderUUID = senderUUID;
-    }
-
     public void setSenderDisplayName(Component senderDisplayName) {
         this.senderDisplayName = senderDisplayName;
     }

diff --git a/...ain/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_1.java b/...ain/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_1.java
@@ -26,11 +26,10 @@
 
 import java.time.Instant;
 import java.util.UUID;
-
-public class ChatMessage_v1_19_1 extends ChatMessage {
+//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
+public class ChatMessage_v1_19_1 extends ChatMessage_v1_16 {
     private String plainContent;
     private @Nullable Component unsignedChatContent;
-    private UUID senderUUID;
     private ChatTypeBoundNetwork chatType;
     private byte @Nullable [] previousSignature;
     private byte[] signature;
@@ -46,10 +45,9 @@ public ChatMessage_v1_19_1(String plainContent, Component decoratedChatContent,
                                Instant timestamp, long salt,
                                LastSeenMessages lastSeenMessages,
                                FilterMask filterMask) {
-        super(decoratedChatContent, chatType.getType());
+        super(decoratedChatContent, chatType.getType(), senderUUID);
         this.plainContent = plainContent;
         this.unsignedChatContent = unsignedChatContent;
-        this.senderUUID = senderUUID;
         this.chatType = chatType;
         this.previousSignature = previousSignature;
         this.signature = signature;
@@ -79,14 +77,6 @@ public void setUnsignedChatContent(@Nullable Component unsignedChatContent) {
         this.unsignedChatContent = unsignedChatContent;
     }
 
-    public UUID getSenderUUID() {
-        return senderUUID;
-    }
-
-    public void setSenderUUID(UUID senderUUID) {
-        this.senderUUID = senderUUID;
-    }
-
     @Override
     public ChatType getType() {
         return chatType.getType();

diff --git a/...ain/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_3.java b/...ain/java/com/github/retrooper/packetevents/protocol/chat/message/ChatMessage_v1_19_3.java
@@ -9,9 +9,8 @@
 import java.time.Instant;
 import java.util.Optional;
 import java.util.UUID;
-
-public class ChatMessage_v1_19_3 extends ChatMessage {
-    UUID senderUUID;
+//We'll extend ChatMessage_v1_16 for now, hopefully no breaking changes in the future
+public class ChatMessage_v1_19_3 extends ChatMessage_v1_16 {
     int index;
     byte[] signature;
     String plainContent;
@@ -23,8 +22,7 @@ public class ChatMessage_v1_19_3 extends ChatMessage {
     ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType;
 
     public ChatMessage_v1_19_3(UUID senderUUID, int index, byte[] signature, String plainContent, Instant timestamp, long salt, LastSeenMessages.Packed lastSeenMessagesPacked, @Nullable Component unsignedChatContent, FilterMask filterMask, ChatMessage_v1_19_1.ChatTypeBoundNetwork chatType) {
-        super(Component.text(plainContent), chatType.getType());
-        this.senderUUID = senderUUID;
+        super(Component.text(plainContent), chatType.getType(), senderUUID);
         this.index = index;
         this.signature = signature;
         this.plainContent = plainContent;
@@ -36,14 +34,6 @@ public ChatMessage_v1_19_3(UUID senderUUID, int index, byte[] signature, String
         this.chatType = chatType;
     }
 
-    public UUID getSenderUUID() {
-        return senderUUID;
-    }
-
-    public void setSenderUUID(UUID senderUUID) {
-        this.senderUUID = senderUUID;
-    }
-
     public int getIndex() {
         return index;
     }