Added default values to ExternalDataStore.get

eco-api/src/main/java/com/willfp/eco/core/data/ExternalDataStore.java

@@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
+import java.util.function.Supplier;
 
 /**
  * A simple store key-value store for data to be stored outside of plugins.
@@ -45,6 +46,39 @@ public final class ExternalDataStore {
         }
     }
 
+    /**
+     * Get data from the store.
+     *
+     * @param key          The key.
+     * @param clazz        The class.
+     * @param defaultValue The default value.
+     * @param <T>          The type.
+     * @return The value.
+     */
+    @NotNull
+    public static <T> T get(@NotNull final String key,
+                            @NotNull final Class<T> clazz,
+                            @NotNull final T defaultValue) {
+        T value = get(key, clazz);
+        return value == null ? defaultValue : value;
+    }
+
+    /**
+     * Get data from the store.
+     *
+     * @param key          The key.
+     * @param clazz        The class.
+     * @param defaultValue The default value.
+     * @param <T>          The type.
+     * @return The value.
+     */
+    @NotNull
+    public static <T> T get(@NotNull final String key,
+                            @NotNull final Class<T> clazz,
+                            @NotNull final Supplier<T> defaultValue) {
+        return get(key, clazz, defaultValue.get());
+    }
+
     private ExternalDataStore() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

eco-api/src/main/kotlin/com/willfp/eco/core/data/ExternalDataStore.kt

@@ -16,3 +16,19 @@ fun writeExternalData(
 inline fun <reified T> readExternalData(
     key: String
 ): T? = ExternalDataStore.get(key, T::class.java)
+
+/**
+ * @see ExternalDataStore.get
+ */
+inline fun <reified T> readExternalData(
+    key: String,
+    default: T
+): T = ExternalDataStore.get(key, T::class.java) ?: default
+
+/**
+ * @see ExternalDataStore.get
+ */
+inline fun <reified T> readExternalData(
+    key: String,
+    default: () -> T
+): T = readExternalData(key, default())