Use the new configuration system

Author: Techcable

base/src/main/java/net/techcable/spawnshield/BlockMode.java

@@ -22,11 +22,9 @@
  */
 package net.techcable.spawnshield;
 
-import lombok.RequiredArgsConstructor;
-import net.techcable.techutils.yamler.InternalConverter;
-import net.techcable.techutils.yamler.converter.Converter;
+import net.techcable.techutils.config.ConfigSerializer;
 
-import java.lang.reflect.ParameterizedType;
+import org.bukkit.configuration.InvalidConfigurationException;
 
 public enum BlockMode {
     TELEPORT,
@@ -38,30 +36,28 @@ public String toString() {
         return name().toLowerCase();
     }
 
-    public static class BlockModeConverter implements Converter {
-        public BlockModeConverter(InternalConverter internalConverter) {
-            //I don't know what to do with an internal converter
-        }
+    public static class BlockModeConverter implements ConfigSerializer<BlockMode> {
+
 
         @Override
-        public Object toConfig(Class<?> aClass, Object o, ParameterizedType parameterizedType) throws Exception {
-            BlockMode mode = (BlockMode) o;
-            return o.toString();
+        public Object serialize(BlockMode blockMode) {
+            return blockMode.toString();
         }
 
         @Override
-        public Object fromConfig(Class<?> aClass, Object o, ParameterizedType parameterizedType) throws Exception {
-            String name = o.toString();
+        public BlockMode deserialize(Object o, Class<? extends BlockMode> aClass) throws InvalidConfigurationException {
+            if (!(o instanceof String)) throw new InvalidConfigurationException("block mode must be a string");
+            String name = (String) o;
             try {
                 return BlockMode.valueOf(name.toUpperCase());
             } catch (IllegalArgumentException e) {
-                throw new RuntimeException(name + " is not a valid mode for SpawnShield");
+                throw new InvalidConfigurationException(name + " is not a valid mode for SpawnShield");
             }
         }
 
         @Override
-        public boolean supports(Class<?> aClass) {
-            return BlockMode.class.isAssignableFrom(aClass);
+        public boolean canHandle(Class<?> aClass) {
+            return BlockMode.class.equals(aClass);
         }
     }
 }

base/src/main/java/net/techcable/spawnshield/SpawnShield.java

@@ -33,8 +33,10 @@
 import net.techcable.spawnshield.tasks.TeleportSafezoningTask;
 import net.techcable.techutils.TechPlugin;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.UUID;
 
@@ -59,10 +61,16 @@ protected void startup() {
             setEnabled(false);
             return;
         }
-        settings = new SpawnShieldConfig(this);
-        messages = new SpawnShieldMessages(this);
-        settings.init();
-        messages.init();
+        settings = new SpawnShieldConfig();
+        messages = new SpawnShieldMessages();
+        try {
+            settings.load(new File(getDataFolder(), "config.yml"), SpawnShield.class.getResource("/config.yml"));
+            messages.load(new File(getDataFolder(), "messages.yml"), SpawnShield.class.getResource("/messages.yml"));
+        } catch (IOException | InvalidConfigurationException e) {
+            Utils.severe("Disabling, Unable to load configuration files", e);
+            setEnabled(false);
+            return;
+        }
         try {
             Metrics metrics = new Metrics(this);
             Metrics.Graph mode = metrics.createGraph("Mode");
@@ -138,7 +146,12 @@ public void clearRequest(UUID id) {
 
     @Override
     protected void shutdown() {
-        getSettings().save();
+        try {
+            getSettings().save(new File(getDataFolder(), "config.yml"), SpawnShield.class.getResource("/config.yml"));
+            getMessages().save(new File(getDataFolder(), "messages.yml"), SpawnShield.class.getResource("/messages.yml"));
+        } catch (InvalidConfigurationException | IOException e) {
+            Utils.severe("Unable to save configuration", e);
+        }
     }
 
     @Override

base/src/main/java/net/techcable/spawnshield/Utils.java

@@ -34,6 +34,7 @@
 
 import java.lang.reflect.Constructor;
 import java.util.Collection;
+import java.util.logging.Level;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Utils {
@@ -71,6 +72,10 @@ public static void severe(String error) {
         Bukkit.getLogger().severe("[SpawnShield] " + error);
     }
 
+    public static void severe(String error, Throwable t) {
+        Bukkit.getLogger().log(Level.SEVERE, "[SpawnShield] " + error, t);
+    }
+
     public static void warning(String error) {
         Bukkit.getLogger().warning("[SpawnShield] " + error);
     }

base/src/main/java/net/techcable/spawnshield/config/SpawnShieldConfig.java

@@ -29,15 +29,15 @@
 import lombok.Getter;
 import lombok.Synchronized;
 import net.techcable.spawnshield.BlockMode;
+import net.techcable.spawnshield.BlockMode.BlockModeConverter;
 import net.techcable.spawnshield.SpawnShield;
 import net.techcable.spawnshield.Utils;
 import net.techcable.spawnshield.compat.ProtectionPlugin;
 import net.techcable.spawnshield.compat.Region;
 import net.techcable.techutils.collect.Pair;
-import net.techcable.techutils.yamler.Comments;
-import net.techcable.techutils.yamler.Config;
-import net.techcable.techutils.yamler.InvalidConfigurationException;
-import net.techcable.techutils.yamler.InvalidConverterException;
+import net.techcable.techutils.config.AnnotationConfig;
+import net.techcable.techutils.config.Setting;
+
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
@@ -49,47 +49,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 @Getter
-public class SpawnShieldConfig extends Config {
-    public SpawnShieldConfig(SpawnShield plugin) {
-        CONFIG_FILE = new File(plugin.getDataFolder(), "config.yml");
-        try {
-            addConverter(BlockMode.BlockModeConverter.class);
-        } catch (InvalidConverterException e) {
-            throw Throwables.propagate(e);
-        }
-    }
-
-    @Override
-    @Synchronized("lock")
-    public void init() {
-        Utils.assertMainThread();
-        try {
-            super.init();
-        } catch (InvalidConfigurationException e) {
-            throw Throwables.propagate(e);
-        }
-    }
-
-    @Override
-    @Synchronized("lock")
-    public void load() {
-        Utils.assertMainThread();
-        try {
-            super.load();
-        } catch (InvalidConfigurationException e) {
-            throw Throwables.propagate(e);
-        }
-    }
-
-    @Override
-    @Synchronized("lock")
-    public void save() {
-        Utils.assertMainThread();
-        try {
-            super.save();
-        } catch (InvalidConfigurationException e) {
-            throw Throwables.propagate(e);
-        }
+public class SpawnShieldConfig extends AnnotationConfig {
+    static {
+        addSerializer(new BlockModeConverter());
     }
 
     public void addRegionToBlock(Region r) {
@@ -104,29 +66,17 @@ public void removeRegionToBlock(Region r) {
         refreshRegionsToBlock();
     }
 
-    @Comments({
-            "The list of regions to block entry into in combat",
-            "This option can be controlled by the command /spawnshield block command",
-            "Please use the command to edit this option, as it checks for errors when you add them"
-    })
+    @Setting("blockRegions")
     @Getter(AccessLevel.NONE) //Use the cached and thread safe version
     private List<String> blockRegions = Lists.newArrayList("example", "example2");
-    @Comments({
-            "The prevention mode to put the plugin in",
-            "'teleport' teleports the player to their last known location outside of the safezone if they enter a safezone",
-            "'knockback' knocks the player back when they enter a safezone and is experimental",
-            "'forcefield' is currently in development, and should not be used unless you know what you are doing"
-    })
+
+    @Setting("mode")
     private BlockMode mode = BlockMode.TELEPORT;
-    @Comments({
-            "Print out a ****load of information about the plugin",
-            "You probably shouldn't use this unless you are testing the plugin"
-    })
+
+    @Setting("debug")
     private boolean debug = false;
 
-    @Comments(
-            "The range in which players will see a forcefield"
-    )
+    @Setting("forcefieldRange")
     private int forcefieldRange = 50;
 
     @Synchronized("lock")

base/src/main/java/net/techcable/spawnshield/config/SpawnShieldMessages.java

@@ -22,43 +22,15 @@
  */
 package net.techcable.spawnshield.config;
 
-import com.google.common.base.Throwables;
 import net.techcable.spawnshield.SpawnShield;
-import net.techcable.techutils.collect.Pair;
-import net.techcable.techutils.yamler.Comments;
-import net.techcable.techutils.yamler.Config;
-import net.techcable.techutils.yamler.InvalidConfigurationException;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import net.techcable.techutils.config.AnnotationConfig;
+import net.techcable.techutils.config.Setting;
 
-public class SpawnShieldMessages extends Config {
-    public SpawnShieldMessages(SpawnShield plugin) {
-        CONFIG_FILE = new File(plugin.getDataFolder(), "messages.yml");
-        CONFIG_HEADER = new String[] {
-                "Messagse for spawnshield",
-                "Supports color codes with the '&' character"
-        };
-    }
+import org.bukkit.ChatColor;
 
-    @Override
-    public void init() {
-        try {
-            super.init();
-        } catch (InvalidConfigurationException e) {
-            throw Throwables.propagate(e);
-        }
-    }
+public class SpawnShieldMessages extends AnnotationConfig {
 
-    @Comments({
-            "In mode teleport this message will be sent if they enter a safezone in combat",
-            "Will be sent at max once a second"
-    })
+    @Setting("cantEnterSafezone")
     private String cantEnterSafezone = "&4[SpawnShield] You can't enter a safezone in combat!";
 
     public String getCantEnterSafezone() {

base/src/main/resources/config.yml

@@ -0,0 +1,21 @@
+# SpawnShield Config
+
+# The list of regions to block entry into in combat
+# This option can be controlled by the command /spawnshield block command
+# Please use the command to edit this option, as it checks for errors when you add them
+blockRegions:
+  - "example"
+  - "example2"
+
+# The prevention mode to put the plugin in
+# 'teleport' teleports the player to their last known location outside of the safezone if they enter a safezone
+# 'knockback' knocks the player back when they enter a safezone and is experimental
+# 'forcefield' is currently in development, and should not be used unless you know what you are doing
+mode: "teleport"
+
+# Print out a ****load of information about the plugin
+# You probably shouldn't use this unless you are testing the plugin
+debug: false
+
+# The range in which players will see a forcefield
+forcefieldRange: 50;

base/src/main/resources/messages.yml

@@ -0,0 +1,7 @@
+# SpawnShield Configuration
+# Messages for spawnshield
+# Supports color codes with the '&' character
+
+# In mode teleport this message will be sent if they enter a safezone in combat
+# Will be sent at max once a second
+cantEnterSafezone: "&4[SpawnShield] You can't enter a safezone in combat!"