Various fixes to packet encoding, decoding and equals/hashCode

bedrock/bedrock-common/pom.xml

@@ -30,6 +30,12 @@
             <version>4.41.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.nukkitx</groupId>
+            <artifactId>fastutil-lite</artifactId>
+            <version>8.1.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/data/CommandData.java

@@ -28,12 +28,14 @@ public String toString() {
         overloads.append("]\r\n");
 
         StringBuilder builder = new StringBuilder("CommandData(\r\n");
-        List objects = Arrays.asList("name=" + name, "description=" + description, "flags=" + Arrays.toString(flags.toArray()), "permission=" + permission, "aliases=" + aliases, "overloads=" + overloads);
+        List<?> objects = Arrays.asList("name=" + name, "description=" + description,
+                "flags=" + Arrays.toString(flags.toArray()), "permission=" + permission, "aliases=" + aliases,
+                "overloads=" + overloads);
 
         for (Object object : objects) {
             builder.append("    ").append(Objects.toString(object).replaceAll("\r\n", "\r\n    ")).append("\r\n");
         }
-        return builder.toString();
+        return builder.append(")").toString();
     }
 
     @Value

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/data/CommandParamData.java

@@ -28,6 +28,7 @@ public enum Type {
         INT_RANGE,
         STRING,
         POSITION,
+        BLOCK_POSITION,
         MESSAGE,
         TEXT,
         JSON,

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/data/EntityDataMap.java

@@ -133,6 +133,15 @@ public EntityDataMap putVector3f(EntityData key, Vector3f value) {
         return this;
     }
 
+    @Nonnull
+    public EntityFlags getOrCreateFlags() {
+        EntityFlags flags = this.getFlags();
+        if (flags == null) {
+            this.putFlags(flags = new EntityFlags());
+        }
+        return flags;
+    }
+
     public EntityFlags getFlags() {
         return (EntityFlags) this.map.get(FLAGS);
     }
@@ -242,6 +251,19 @@ public Set<Entry<EntityData, Object>> entrySet() {
         return this.map.entrySet();
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        EntityDataMap that = (EntityDataMap) o;
+        return this.map.equals(that.map);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.map.hashCode();
+    }
+
     @Override
     public String toString() {
         return map.toString();

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/data/EntityFlags.java

@@ -8,7 +8,6 @@
 
 import javax.annotation.Nonnull;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 
 @ToString
@@ -17,24 +16,6 @@ public class EntityFlags {
 
     private final Set<EntityFlag> flags = new HashSet<>();
 
-    public static EntityFlags create(long value, int index, TIntHashBiMap<EntityFlag> flagMappings) {
-        EntityFlags flags = new EntityFlags();
-        final int lower = index * 64;
-        final int upper = lower + 64;
-        for (int i = lower; i < upper; i++) {
-            int idx = i & 0x3f;
-            if ((value & (1L << idx)) != 0) {
-                EntityFlag flag = flagMappings.get(i);
-                if (flag != null) {
-                    flags.flags.add(flag);
-                } else {
-                    log.debug("Unknown Metadata flag index {} detected", i);
-                }
-            }
-        }
-        return flags;
-    }
-
     /**
      * Set {@link EntityFlag} value
      *
@@ -79,12 +60,28 @@ public long get(int index, TIntHashBiMap<EntityFlag> flagMappings) {
         return value;
     }
 
+    public void set(long value, int index, TIntHashBiMap<EntityFlag> flagMappings) {
+        final int lower = index * 64;
+        final int upper = lower + 64;
+        for (int i = lower; i < upper; i++) {
+            int idx = i & 0x3f;
+            if ((value & (1L << idx)) != 0) {
+                EntityFlag flag = flagMappings.get(i);
+                if (flag != null) {
+                    flags.add(flag);
+                } else {
+                    log.debug("Unknown entity flag index {} detected", i);
+                }
+            }
+        }
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == this) return true;
         if (!(o instanceof EntityFlags)) return false;
         EntityFlags that = (EntityFlags) o;
-        return Objects.equals(this.flags, that.flags);
+        return this.flags.equals(that.flags);
     }
 
     @Override

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/data/GameRuleData.java

@@ -6,4 +6,9 @@
 public class GameRuleData<T> {
     private final String name;
     private final T value;
+
+    @Override
+    public String toString() {
+        return this.name + '=' + this.value;
+    }
 }

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/data/ImageData.java

@@ -1,9 +1,6 @@
 package com.nukkitx.protocol.bedrock.data;
 
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -12,6 +9,7 @@
 
 @Getter
 @ToString(exclude = {"image"})
+@EqualsAndHashCode(doNotUseGetters = true)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 public class ImageData {
     public static final ImageData EMPTY = new ImageData(0, 0, new byte[0]);

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AddBehaviorTreePacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AddBehaviorTreePacket extends BedrockPacket {
     private String behaviorTreeJson;
 

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AddEntityPacket.java

@@ -14,7 +14,7 @@
 import java.util.List;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AddEntityPacket extends BedrockPacket {
     private final List<Attribute> attributes = new ArrayList<>();
     private final EntityDataMap metadata = new EntityDataMap();

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AddHangingEntityPacket.java

@@ -8,7 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AddHangingEntityPacket extends BedrockPacket {
     private long uniqueEntityId;
     private long runtimeEntityId;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AddItemEntityPacket.java

@@ -10,7 +10,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AddItemEntityPacket extends BedrockPacket {
     private final EntityDataMap metadata = new EntityDataMap();
     private long uniqueEntityId;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AddPaintingPacket.java

@@ -7,7 +7,7 @@
 import lombok.ToString;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 @ToString(callSuper = false)
 public class AddPaintingPacket extends AddHangingEntityPacket {
     private String name;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AddPlayerPacket.java

@@ -15,7 +15,7 @@
 import java.util.UUID;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AddPlayerPacket extends BedrockPacket {
     private final EntityDataMap metadata = new EntityDataMap();
     private final List<EntityLink> entityLinks = new ArrayList<>();

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AdventureSettingsPacket.java

@@ -12,7 +12,7 @@
 import java.util.Set;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AdventureSettingsPacket extends BedrockPacket {
     private final Set<Flag> flags = new HashSet<>();
     private CommandPermission commandPermission;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AnimatePacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AnimatePacket extends BedrockPacket {
     private float rowingTime;
     private Action action;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AnvilDamagePacket.java

@@ -8,7 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AnvilDamagePacket extends BedrockPacket {
     private int damage;
     private Vector3i position;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AutomationClientConnectPacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AutomationClientConnectPacket extends BedrockPacket {
     private String address;
 

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AvailableCommandsPacket.java

@@ -11,7 +11,7 @@
 import java.util.List;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AvailableCommandsPacket extends BedrockPacket {
     private final List<CommandData> commands = new ArrayList<>();
 

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/AvailableEntityIdentifiersPacket.java

@@ -8,7 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class AvailableEntityIdentifiersPacket extends BedrockPacket {
     private Tag<?> tag;
 

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/BiomeDefinitionListPacket.java

@@ -8,7 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class BiomeDefinitionListPacket extends BedrockPacket {
     private Tag<?> tag;
 

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/BlockEntityDataPacket.java

@@ -9,7 +9,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class BlockEntityDataPacket extends BedrockPacket {
     private Vector3i blockPosition;
     private Tag<?> data;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/BlockEventPacket.java

@@ -39,7 +39,7 @@
  *
  **/
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class BlockEventPacket extends BedrockPacket {
 
     /**

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/BlockPickRequestPacket.java

@@ -8,7 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class BlockPickRequestPacket extends BedrockPacket {
     private Vector3i blockPosition;
     private boolean addUserData;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/BookEditPacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class BookEditPacket extends BedrockPacket {
     private Action action;
     private int inventorySlot;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/BossEventPacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class BossEventPacket extends BedrockPacket {
     private long bossUniqueEntityId;
     private Action action;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/CameraPacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class CameraPacket extends BedrockPacket {
     private long cameraUniqueEntityId;
     private long playerUniqueEntityId;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/ChangeDimensionPacket.java

@@ -8,7 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class ChangeDimensionPacket extends BedrockPacket {
     private int dimension;
     private Vector3f position;

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/ChunkRadiusUpdatedPacket.java

@@ -7,7 +7,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class ChunkRadiusUpdatedPacket extends BedrockPacket {
     private int radius;
 

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/ClientCacheBlobStatusPacket.java

@@ -3,16 +3,16 @@
 import com.nukkitx.protocol.bedrock.BedrockPacket;
 import com.nukkitx.protocol.bedrock.BedrockPacketType;
 import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler;
-import gnu.trove.list.TLongList;
-import gnu.trove.list.array.TLongArrayList;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+import it.unimi.dsi.fastutil.longs.LongList;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class ClientCacheBlobStatusPacket extends BedrockPacket {
-    private final TLongList acks = new TLongArrayList();
-    private final TLongList naks = new TLongArrayList();
+    private final LongList acks = new LongArrayList();
+    private final LongList naks = new LongArrayList();
 
     @Override
     public boolean handle(BedrockPacketHandler handler) {

bedrock/bedrock-common/src/main/java/com/nukkitx/protocol/bedrock/packet/ClientCacheMissResponsePacket.java

@@ -3,15 +3,15 @@
 import com.nukkitx.protocol.bedrock.BedrockPacket;
 import com.nukkitx.protocol.bedrock.BedrockPacketType;
 import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler;
-import gnu.trove.map.TLongObjectMap;
-import gnu.trove.map.hash.TLongObjectHashMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(doNotUseGetters = true, callSuper = false)
 public class ClientCacheMissResponsePacket extends BedrockPacket {
-    private final TLongObjectMap<byte[]> blobs = new TLongObjectHashMap<>();
+    private final Long2ObjectMap<byte[]> blobs = new Long2ObjectOpenHashMap<>();
 
     @Override
     public boolean handle(BedrockPacketHandler handler) {