Enable limited array support for persistence

CitizensDev · Sep 6, 2019 · 74f8394 · 74f8394
1 parent 0c7b375
commit 74f8394
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 0 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/persistence/PersistenceLoader.java b/src/main/java/net/citizensnpcs/api/persistence/PersistenceLoader.java
@@ -146,6 +146,33 @@ private static void deserialise(PersistField field, DataKey root) throws Excepti
             }
             deserialiseMap(map, root, field);
             value = map;
+        } else if (float[].class.isAssignableFrom(type)) {
+            List<Float> floats = Lists.newArrayList();
+            for (DataKey sub : root.getRelative(field.key).getIntegerSubKeys()) {
+                floats.add((float) sub.getDouble(""));
+            }
+            value = new float[floats.size()];
+            for (int i = 0; i < floats.size(); i++) {
+                ((float[]) value)[i] = floats.get(i);
+            }
+        } else if (double[].class.isAssignableFrom(type)) {
+            List<Double> doubles = Lists.newArrayList();
+            for (DataKey sub : root.getRelative(field.key).getIntegerSubKeys()) {
+                doubles.add(sub.getDouble(""));
+            }
+            value = new double[doubles.size()];
+            for (int i = 0; i < doubles.size(); i++) {
+                ((double[]) value)[i] = doubles.get(i);
+            }
+        } else if (int[].class.isAssignableFrom(type)) {
+            List<Integer> ints = Lists.newArrayList();
+            for (DataKey sub : root.getRelative(field.key).getIntegerSubKeys()) {
+                ints.add(sub.getInt(""));
+            }
+            value = new int[ints.size()];
+            for (int i = 0; i < ints.size(); i++) {
+                ((int[]) value)[i] = ints.get(i);
+            }
         } else
             value = deserialiseValue(field, root.getRelative(field.key));
         if (value == null && field.isRequired())
@@ -399,6 +426,27 @@ private static void serialise(PersistField field, DataKey root) {
                 String key = createRelativeKey(field.key, entry.getKey());
                 serialiseValue(field, root.getRelative(key), entry.getValue());
             }
+        } else if (float[].class.isAssignableFrom(field.getType())) {
+            float[] floats = field.get();
+            root.removeKey(field.key);
+            for (int i = 0; i < floats.length; i++) {
+                String key = createRelativeKey(field.key, i);
+                serialiseValue(field, root.getRelative(key), floats[i]);
+            }
+        } else if (double[].class.isAssignableFrom(field.getType())) {
+            double[] doubles = field.get();
+            root.removeKey(field.key);
+            for (int i = 0; i < doubles.length; i++) {
+                String key = createRelativeKey(field.key, i);
+                serialiseValue(field, root.getRelative(key), doubles[i]);
+            }
+        } else if (int[].class.isAssignableFrom(field.getType())) {
+            int[] ints = field.get();
+            root.removeKey(field.key);
+            for (int i = 0; i < ints.length; i++) {
+                String key = createRelativeKey(field.key, i);
+                serialiseValue(field, root.getRelative(key), ints[i]);
+            }
         } else {
             serialiseValue(field, root.getRelative(field.key), field.get());
         }

diff --git a/src/test/java/net/citizensnpcs/api/persistence/PersistenceLoaderTest.java b/src/test/java/net/citizensnpcs/api/persistence/PersistenceLoaderTest.java
@@ -34,6 +34,13 @@ public void canAccessPrivateMembers() {
         assertThat(PersistenceLoader.load(SaveLoadTest.class, root).integer, is(5));
     }
 
+    @Test
+    public void floatArrays() {
+        root.setDouble("array.0", 1.2);
+        root.setDouble("array.1", 2.4);
+        assertThat(PersistenceLoader.load(SaveLoadTest.class, root).array, is(new float[] { 1.2F, 2.4F }));
+    }
+
     @Test
     public void illegalCollectionClass() {
         assertThat(PersistenceLoader.load(IllegalCollectionClassTest.class, root), is(nullValue()));
@@ -157,6 +164,9 @@ public static class RequiredTest {
     }
 
     public static class SaveLoadTest implements Cloneable {
+        @Persist
+        public float[] array = {};
+
         @Persist
         public double d = 0.5;