feat: merge upstream (CloudburstMC/NBT@8c4f814)

Author: smartcmd

src/main/java/org/cloudburstmc/nbt/NbtList.java

@@ -69,9 +69,12 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        if (this.hashCodeGenerated) return this.hashCode;
-        int result = Objects.hash(super.hashCode(), type);
-        result = 31 * result + Arrays.deepHashCode(array);
+        if (this.hashCodeGenerated)
+            return this.hashCode;
+        int result = type.hashCode();
+        for (Object object : array) {
+            result = 31 * result + NbtUtils.hashCode(object);
+        }
         this.hashCode = result;
         this.hashCodeGenerated = true;
         return result;

src/main/java/org/cloudburstmc/nbt/NbtMap.java

@@ -408,12 +408,14 @@ public boolean equals(Object o) {
     public int hashCode() {
         if (this.hashCodeGenerated)
             return this.hashCode;
-        int h = 0;
-        for (Entry<String, Object> stringObjectEntry : this.map.entrySet())
-            h += stringObjectEntry.hashCode();
-        this.hashCode = h;
+        int result = 1;
+        for (Entry<String, Object> stringObjectEntry : this.map.entrySet()) {
+            result = 31 * result + (stringObjectEntry.getKey().hashCode()
+                                    ^ NbtUtils.hashCode(stringObjectEntry.getValue()));
+        }
+        this.hashCode = result;
         this.hashCodeGenerated = true;
-        return h;
+        return result;
     }
 
     @Override

src/main/java/org/cloudburstmc/nbt/NbtUtils.java

@@ -183,6 +183,19 @@ public static String printHexBinary(byte[] data) {
         return r.toString();
     }
 
+    public static int hashCode(Object object) {
+        if (object instanceof byte[]) {
+            return Arrays.hashCode((byte[]) object);
+        }
+        if (object instanceof int[]) {
+            return Arrays.hashCode((int[]) object);
+        }
+        if (object instanceof long[]) {
+            return Arrays.hashCode((long[]) object);
+        }
+        return object.hashCode();
+    }
+
     /**
      * Write each {@link java.lang.reflect.RecordComponent RecordComponent} from record that be marked {@link NBT} to the specified nbtMap
      *

src/test/java/org/cloudburstmc/nbt/NbtTest.java

@@ -105,6 +105,7 @@ void networkTest() {
         try (NBTInputStream in = NbtUtils.createNetworkReader(bais)) {
             Object o = in.readTag();
             Assertions.assertEquals(TEST_MAP, o);
+            Assertions.assertEquals(TEST_MAP.hashCode(), o.hashCode());
         } catch (Exception e) {
             throw new AssertionError("Error whilst decoding tag", e);
         }