Merge pull request #11 from Zwazel-Teaching-Projects/fix/add-unique-messages

no more duplicate messages (if unique) on java side!

Author: zwazel

src/main/java/dev/zwazel/internal/GameSimulationThread.java

@@ -12,8 +12,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.BlockingQueue;
 
 @RequiredArgsConstructor
@@ -79,6 +78,31 @@ private void sendTickMessages() throws IOException {
             return;
         }
 
+        // Use a set to track which unique message types have been encountered (from the end)
+        Set<Class<?>> seenUniqueTypes = new HashSet<>();
+        // Iterate backward to keep the most recent message and remove older duplicates
+        ListIterator<MessageContainer> iterator = messageList.listIterator(messageList.size());
+        while (iterator.hasPrevious()) {
+            MessageContainer current = iterator.previous();
+            if (current.getMessage().isUnique()) {
+                if (seenUniqueTypes.contains(current.getMessage().getClass())) {
+                    // Remove this outdated message of the same unique type
+                    iterator.remove();
+
+                    if (internalWorld.isInternalDebug()) {
+                        System.out.println("Duplicate message type removed: " + current.getMessage().getClass().getSimpleName());
+                    }
+                } else {
+                    // Mark this unique type as encountered
+                    seenUniqueTypes.add(current.getMessage().getClass());
+
+                    if (internalWorld.isInternalDebug()) {
+                        System.out.println("Unique message type: " + current.getMessage().getClass().getSimpleName());
+                    }
+                }
+            }
+        }
+
         messageList.forEach(message -> message.applyBeforeSend(internalWorld));
 
         String json = objectMapper.writeValueAsString(messageList);

src/main/java/dev/zwazel/internal/message/MessageData.java

@@ -1,5 +1,6 @@
 package dev.zwazel.internal.message;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import dev.zwazel.internal.InternalGameWorld;
@@ -57,4 +58,16 @@ default void applyBeforeSend(InternalGameWorld world) {
      */
     default void applyOnAddingToQueue(InternalGameWorld world) {
     }
+
+    /**
+     * Determines if the message is unique.
+     * If it is unique, before sending all messages to the server at the end of the tick, we remove all other messages of the same type.
+     * So only the latest message of this type is sent.
+     *
+     * @return if the message is unique
+     */
+    @JsonIgnore
+    default boolean isUnique() {
+        return false;
+    }
 }

src/main/java/dev/zwazel/internal/message/data/tank/MoveTankCommand.java

@@ -24,4 +24,9 @@ public void applyOnAddingToQueue(InternalGameWorld world) {
                 predictedState.transformTurret(), predictedState.state(), predictedState.shootCooldown(), predictedState.currentHealth());
         world.updatePredictedState(predictedState);
     }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
 }

src/main/java/dev/zwazel/internal/message/data/tank/RotateTankBodyCommand.java

@@ -23,4 +23,9 @@ public void applyOnAddingToQueue(InternalGameWorld world) {
                 predictedState.transformTurret(), predictedState.state(), predictedState.shootCooldown(), predictedState.currentHealth());
         world.updatePredictedState(predictedState);
     }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
 }

src/main/java/dev/zwazel/internal/message/data/tank/RotateTankTurretCommand.java

@@ -28,4 +28,9 @@ public void applyOnAddingToQueue(InternalGameWorld world) {
         predictedState = new ClientState(predictedState.id(), currentBodyTransform, newTurretTransform, predictedState.state(), predictedState.shootCooldown(), predictedState.currentHealth());
         world.updatePredictedState(predictedState);
     }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
 }

src/main/java/dev/zwazel/internal/message/data/tank/ShootCommand.java

@@ -24,4 +24,9 @@ public void applyOnAddingToQueue(InternalGameWorld world) {
         world.updatePredictedState(new ClientState(predictedState.id(), predictedState.transformBody(),
                 predictedState.transformTurret(), predictedState.state(), tankConfig.shootCooldown(), predictedState.currentHealth()));
     }
+
+    @Override
+    public boolean isUnique() {
+        return true;
+    }
 }