Starting the conversion to HOCON, splitting up configs, and more

src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -7,7 +7,6 @@ import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.ArcaneForging;
-import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;

src/main/java/com/gmail/nossr50/config/experience/HerbalismExperienceConfig.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.experience;
+
+import com.gmail.nossr50.config.ConfigValidated;
+
+public class HerbalismExperienceConfig extends ConfigValidated {
+
+}

src/main/java/com/gmail/nossr50/config/experience/MiningExperienceConfig.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.experience;
+
+import com.gmail.nossr50.config.ConfigValidated;
+
+public class MiningExperienceConfig extends ConfigValidated {
+
+}

src/main/java/com/gmail/nossr50/config/experience/WoodcuttingExperienceConfig.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.experience;
+
+import com.gmail.nossr50.config.ConfigValidated;
+
+public class WoodcuttingExperienceConfig extends ConfigValidated {
+
+}

src/main/java/com/gmail/nossr50/config/hocon/AntiExploit.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class AntiExploit {
+}

src/main/java/com/gmail/nossr50/config/hocon/Backups.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Backups {
+}

src/main/java/com/gmail/nossr50/config/hocon/Commands.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Commands {
+}

src/main/java/com/gmail/nossr50/config/hocon/General.java

@@ -0,0 +1,10 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class General {
+
+
+}

src/main/java/com/gmail/nossr50/config/hocon/Hardcore.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Hardcore {
+}

src/main/java/com/gmail/nossr50/config/hocon/Items.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Items {
+}

src/main/java/com/gmail/nossr50/config/hocon/Language.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Language {
+}

src/main/java/com/gmail/nossr50/config/hocon/Leveling.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Leveling {
+}

src/main/java/com/gmail/nossr50/config/hocon/Metrics.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Metrics {
+}

src/main/java/com/gmail/nossr50/config/hocon/Particles.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Particles {
+}

src/main/java/com/gmail/nossr50/config/hocon/Party.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Party {
+}

src/main/java/com/gmail/nossr50/config/hocon/PlayerNotifications.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class PlayerNotifications {
+}

src/main/java/com/gmail/nossr50/config/hocon/Scoreboard.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class Scoreboard {
+}

src/main/java/com/gmail/nossr50/config/hocon/SuperAbilities.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.config.hocon;
+
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class SuperAbilities {
+}

src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryDatabase.java

@@ -0,0 +1,20 @@
+package com.gmail.nossr50.config.hocon.database;
+
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class ConfigCategoryDatabase {
+
+    @Setting(value = "User_Name", comment = "The authorized user for your MySQL/MariaDB DB")
+    private String username;
+
+    @Setting(value = "User_Password", comment = "The password for your authorized user")
+    private String password;
+
+    @Setting(value = "Database_Name", comment = "The database name for your DB, this DB must already exist on the SQL server.")
+    private String databaseName;
+
+    @Setting(value = "Table_Prefix", comment = "The Prefix that will be used for tables in your DB")
+    private String tablePrefix;
+}

src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryMySQL.java

@@ -0,0 +1,16 @@
+package com.gmail.nossr50.config.hocon.database;
+
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class ConfigCategoryMySQL {
+
+    @Setting(value = "Enabled", comment = "If set to true, mcMMO will use MySQL/MariaDB instead of FlatFile storage")
+    private boolean enabled;
+
+    @Setting(value = "Database", comment = "Database settings for MySQL/MariaDB")
+    private ConfigCategoryDatabase configCategoryDatabase;
+
+
+}

src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryServer.java

@@ -0,0 +1,17 @@
+package com.gmail.nossr50.config.hocon.database;
+
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class ConfigCategoryServer {
+
+    @Setting(value = "Use_SSL", comment = "Enables SSL for MySQL/MariaDB connections, newer versions of MySQL will spam your console if you aren't using SSL")
+    private boolean useSSL;
+
+    @Setting(value = "Server_Port", comment = "Your MySQL/MariaDB server port")
+    private String serverPort;
+
+    @Setting(value = "Server_Address", comment = "The address for your MySQL/MariaDB server")
+    private String serverAddress;
+}

src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java

@@ -0,0 +1,12 @@
+package com.gmail.nossr50.config.hocon.database;
+
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+@ConfigSerializable
+public class ConfigDatabase {
+
+    @Setting(value = "MySQL", comment = "Settings for using MySQL or MariaDB database")
+    private ConfigCategoryMySQL configCategoryMySQL;
+
+}

src/main/java/com/gmail/nossr50/util/BlockUtils.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.util;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.salvage.Salvage;