Improved local keys

Auxilor · Dec 3, 2023 · 1a75dd8 · 1a75dd8
1 parent 77de51b
commit 1a75dd8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java
@@ -32,24 +32,24 @@ public final class PersistentDataKey<T> {
     /**
      * If the key uses local storage.
      */
-    private final boolean local;
+    private final boolean isLocal;
 
     /**
      * Create a new Persistent Data Key.
      *
      * @param key          The key.
      * @param type         The data type.
      * @param defaultValue The default value.
-     * @param local        If the key uses local storage.
+     * @param isLocal        If the key uses local storage.
      */
     public PersistentDataKey(@NotNull final NamespacedKey key,
                              @NotNull final PersistentDataKeyType<T> type,
                              @NotNull final T defaultValue,
-                             final boolean local) {
+                             final boolean isLocal) {
         this.key = key;
         this.defaultValue = defaultValue;
         this.type = type;
-        this.local = local;
+        this.isLocal = isLocal;
 
         Eco.get().registerPersistentKey(this);
     }
@@ -67,7 +67,7 @@ public PersistentDataKey(@NotNull final NamespacedKey key,
         this.key = key;
         this.defaultValue = defaultValue;
         this.type = type;
-        this.local = false;
+        this.isLocal = false;
 
         Eco.get().registerPersistentKey(this);
     }
@@ -108,7 +108,14 @@ public PersistentDataKeyType<T> getType() {
         return this.type;
     }
 
-    public boolean isLocalStorage() { return this.local; }
+    /**
+     * Get if the key uses local storage.
+     *
+     * @return If the key uses local storage.
+     */
+    public boolean isLocal() {
+        return this.isLocal;
+    }
 
     /**
      * Get all persistent data keys.

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfile.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/EcoProfile.kt
@@ -29,7 +29,7 @@ abstract class EcoProfile(
             return this.data[key] as T
         }
 
-        this.data[key] = if (key.isLocal) {
+        this.data[key] = if (key.isSavedLocally) {
             localHandler.read(uuid, key)
         } else {
             handler.read(uuid, key)
@@ -104,6 +104,7 @@ class EcoServerProfile(
     }
 }
 
-private val PersistentDataKey<*>.isLocal: Boolean
-    get() = this == localServerIDKey || EcoPlugin.getPlugin(this.key.namespace)?.isUsingLocalStorage == true
-            || this.isLocalStorage
+private val PersistentDataKey<*>.isSavedLocally: Boolean
+    get() = this == localServerIDKey
+            || EcoPlugin.getPlugin(this.key.namespace)?.isUsingLocalStorage == true
+            || this.isLocal