Add support class-wide setting prefix in CloudConfig

Mumfrey
1 parent 4c081d78
Showing 1 changed file with 37 additions and 3 deletions
src/client/java/com/mumfrey/liteloader/modconfig/CloudConfig.java
@@ -19,6 +19,7 @@ import com.mumfrey.liteloader.InitCompleteListener;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.mumfrey.webprefs.WebPreferencesManager;
+import com.mumfrey.webprefs.exceptions.InvalidKeyException;
 import com.mumfrey.webprefs.interfaces.IWebPreferences;
 import net.minecraft.client.Minecraft;
@@ -65,9 +66,14 @@ public abstract class CloudConfig
     private static final int POLL_RESET_INTERVAL = 60 * CloudConfig.TICKS_PER_SECOND;
     /**
+     * Pattern for validating keys
+     */
+    protected static final Pattern keyPattern = Pattern.compile("^[a-z0-9_\\-\\.]{1,32}$");
+
+    /**
      * Same as normal key pattern except that $ gets translated to . for key
      */
-    private static final Pattern keyPattern = Pattern.compile("(?i)^[a-z0-9_\\-\\$]{1,32}$");
+    protected static final Pattern fieldKeyPattern = Pattern.compile("(?i)^[a-z0-9_\\-\\$]{1,32}$");
     /**
      * A field value tracker
@@ -85,7 +91,24 @@ public abstract class CloudConfig
         TrackedField(Field handle)
         {
             this.handle = handle;
-            this.name = handle.getName().replace("$", ".").toLowerCase();
+            this.name = this.getName(handle);
+        }
+
+        private String getName(Field handle)
+        {
+            String name = handle.getName().replace("$", ".").toLowerCase();
+            String prefix = CloudConfig.this.getPrefix();
+            if (prefix == null)
+            {
+                return name;
+            }
+            
+            String key = prefix + name;
+            if (!CloudConfig.keyPattern.matcher(key).matches())
+            {
+                throw new InvalidKeyException("[" + key + "] is not a valid key PREFIX=" + prefix + " NAME=" + name);
+            }
+            return key;
         }
         @SuppressWarnings("unchecked")
@@ -491,7 +514,7 @@ public abstract class CloudConfig
                 continue;
             }
-            if (!CloudConfig.keyPattern.matcher(field.getName()).matches())
+            if (!CloudConfig.fieldKeyPattern.matcher(field.getName()).matches())
             {
                 LiteLoaderLogger.warning("Skipping field with invalid name %s in %s", field.getName(), this.getClass().getName());
                 continue;
@@ -586,4 +609,15 @@ public abstract class CloudConfig
     protected void onUpdated()
     {
     }
+    
+    /**
+     * Stub for subclasses, used to provide a prefix for all field names in this
+     * class.
+     * 
+     * @return
+     */
+    protected String getPrefix()
+    {
+        return null;
+    }
 }