add enchantsrcconfig

Author: cyilin

src/main/java/cat/nyaa/nyaautils/CommandHandler.java

@@ -40,7 +40,7 @@ public String getHelpPrefix() {
     @SubCommand(value = "addenchsrc", permission = "nu.addenchsrc")
     public void commandAddEnchSrc(CommandSender sender, Arguments args) {
         ItemStack item = getItemInHand(sender);
-        if (BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrc, item)) {
+        if (BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrcConfig.enchantSrc, item)) {
             sender.sendMessage(I18n._("user.enchant.enchantsrc_already_exists"));
             return;
         }
@@ -49,7 +49,7 @@ public void commandAddEnchSrc(CommandSender sender, Arguments args) {
         matcher.enchantMatch = BasicItemMatcher.MatchingMode.ARBITRARY;
         matcher.nameMatch = BasicItemMatcher.MatchingMode.EXACT;
         matcher.repairCostMatch = BasicItemMatcher.MatchingMode.EXACT;
-        NyaaUtils.instance.cfg.enchantSrc.add(matcher);
+        NyaaUtils.instance.cfg.enchantSrcConfig.enchantSrc.add(matcher);
         NyaaUtils.instance.cfg.save();
     }
 
@@ -76,7 +76,7 @@ public void commandEnchant(CommandSender sender, Arguments args) {
         } else {
             ItemStack main = getItemInHand(sender);
             ItemStack off = getItemInOffHand(sender);
-            if (!BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrc, off)) {
+            if (!BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrcConfig.enchantSrc, off)) {
                 sender.sendMessage(I18n._("user.enchant.invalid_src"));
                 return;
             }
@@ -200,7 +200,7 @@ public void commandEnchantInfo(CommandSender sender, Arguments args) {
         Player p = asPlayer(sender);
         ItemStack item = getItemInOffHand(sender);
 
-        if (!BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrc, item)) {
+        if (!BasicItemMatcher.containsMatch(NyaaUtils.instance.cfg.enchantSrcConfig.enchantSrc, item)) {
             sender.sendMessage(I18n._("user.enchant.invalid_src"));
             return;
         }

src/main/java/cat/nyaa/nyaautils/Configuration.java

@@ -87,12 +87,12 @@ public class Configuration implements ISerializable {
     @Serializable(name = "mail.timeoutTicks")
     public int mailTimeout = 200;
 
-    public List<BasicItemMatcher> enchantSrc = new ArrayList<>();
     public HashMap<Enchantment, Integer> enchantMaxLevel = new HashMap<>();
 
     public final MailboxLocations mailbox;
     public final RepairConfig repair;
     public final Acl acl;
+    public final EnchantSrcConfig enchantSrcConfig;
 
     private final NyaaUtils plugin;
 
@@ -101,6 +101,7 @@ public Configuration(NyaaUtils plugin) {
         this.mailbox = new MailboxLocations(plugin);
         this.repair = new RepairConfig(plugin);
         this.acl = new Acl(plugin);
+        this.enchantSrcConfig = new EnchantSrcConfig(plugin);
         for (Enchantment e : Enchantment.values()) {
             if (e == null) {
                 plugin.getLogger().warning("Bad enchantment: null");
@@ -121,7 +122,7 @@ public void save() {
     public void deserialize(ConfigurationSection config) {
         ISerializable.deserialize(config, this);
 
-        enchantSrc = new ArrayList<>();
+        List<BasicItemMatcher> enchantSrc = new ArrayList<>();   
         if (config.isConfigurationSection("enchantSrc")) {
             ConfigurationSection src = config.getConfigurationSection("enchantSrc");
             for (String key : src.getKeys(false)) {
@@ -131,6 +132,7 @@ public void deserialize(ConfigurationSection config) {
                     enchantSrc.add(tmp);
                 }
             }
+            config.set("enchantSrc",null);
         }
 
         enchantMaxLevel = new HashMap<>();
@@ -152,19 +154,16 @@ public void deserialize(ConfigurationSection config) {
         if (plugin.isServerEnabled()) mailbox.load();
         repair.load();
         acl.load();
+        enchantSrcConfig.load();
+        if(!enchantSrc.isEmpty() && enchantSrcConfig.enchantSrc.isEmpty()){
+            enchantSrcConfig.enchantSrc = enchantSrc;
+        }
     }
 
     @Override
     public void serialize(ConfigurationSection config) {
         ISerializable.serialize(config, this);
 
-        ConfigurationSection dst = config.createSection("enchantSrc");
-        int idx = 0;
-        for (BasicItemMatcher m : enchantSrc) {
-            m.serialize(dst.createSection(Integer.toString(idx)));
-            idx++;
-        }
-
         ConfigurationSection list = config.createSection("enchantMaxLevel");
         for (Enchantment k : enchantMaxLevel.keySet()) {
             if (k == null || k.getName() == null) continue;
@@ -174,6 +173,7 @@ public void serialize(ConfigurationSection config) {
         if (plugin.isServerEnabled()) mailbox.save();
         repair.save();
         acl.save();
+        enchantSrcConfig.save();
     }
 
     public enum LootProtectMode {

src/main/java/cat/nyaa/nyaautils/EnchantSrcConfig.java

@@ -0,0 +1,58 @@
+package cat.nyaa.nyaautils;
+
+import cat.nyaa.utils.BasicItemMatcher;
+import cat.nyaa.utils.FileConfigure;
+import cat.nyaa.utils.ISerializable;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EnchantSrcConfig extends FileConfigure {
+    public List<BasicItemMatcher> enchantSrc = new ArrayList<>();
+    private NyaaUtils plugin = null;
+
+    public EnchantSrcConfig(NyaaUtils pl) {
+        plugin = pl;
+    }
+
+    @Override
+    protected String getFileName() {
+        return "enchantsrc.yml";
+    }
+
+    @Override
+    protected JavaPlugin getPlugin() {
+        return plugin;
+    }
+
+    @Override
+    public void deserialize(ConfigurationSection config) {
+        ISerializable.deserialize(config, this);
+
+        enchantSrc = new ArrayList<>();
+        if (config.isConfigurationSection("enchantSrc")) {
+            ConfigurationSection src = config.getConfigurationSection("enchantSrc");
+            for (String key : src.getKeys(false)) {
+                if (src.isConfigurationSection(key)) {
+                    BasicItemMatcher tmp = new BasicItemMatcher();
+                    tmp.deserialize(src.getConfigurationSection(key));
+                    enchantSrc.add(tmp);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serialize(ConfigurationSection config) {
+        ISerializable.serialize(config, this);
+
+        ConfigurationSection dst = config.createSection("enchantSrc");
+        int idx = 0;
+        for (BasicItemMatcher m : enchantSrc) {
+            m.serialize(dst.createSection(Integer.toString(idx)));
+            idx++;
+        }
+    }
+}