From 493d6b0a67e21fcd5015550ad4eb358e77382675 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 7 Mar 2019 21:09:57 -0800 Subject: [PATCH] Starting the conversion to HOCON, splitting up configs, and more --- .../commands/skills/RepairCommand.java | 1 - .../experience/HerbalismExperienceConfig.java | 7 +++++++ .../experience/MiningExperienceConfig.java | 7 +++++++ .../WoodcuttingExperienceConfig.java | 7 +++++++ .../nossr50/config/hocon/AntiExploit.java | 7 +++++++ .../gmail/nossr50/config/hocon/Backups.java | 7 +++++++ .../gmail/nossr50/config/hocon/Commands.java | 7 +++++++ .../gmail/nossr50/config/hocon/General.java | 10 ++++++++++ .../gmail/nossr50/config/hocon/Hardcore.java | 7 +++++++ .../com/gmail/nossr50/config/hocon/Items.java | 7 +++++++ .../gmail/nossr50/config/hocon/Language.java | 7 +++++++ .../gmail/nossr50/config/hocon/Leveling.java | 7 +++++++ .../gmail/nossr50/config/hocon/Metrics.java | 7 +++++++ .../gmail/nossr50/config/hocon/Particles.java | 7 +++++++ .../com/gmail/nossr50/config/hocon/Party.java | 7 +++++++ .../config/hocon/PlayerNotifications.java | 7 +++++++ .../nossr50/config/hocon/Scoreboard.java | 7 +++++++ .../nossr50/config/hocon/SuperAbilities.java | 7 +++++++ .../database/ConfigCategoryDatabase.java | 20 +++++++++++++++++++ .../hocon/database/ConfigCategoryMySQL.java | 16 +++++++++++++++ .../hocon/database/ConfigCategoryServer.java | 17 ++++++++++++++++ .../config/hocon/database/ConfigDatabase.java | 12 +++++++++++ .../com/gmail/nossr50/util/BlockUtils.java | 1 + src/main/resources/config/anti_exploit.conf | 0 src/main/resources/config/backups.conf | 0 src/main/resources/config/commands.conf | 0 src/main/resources/config/database.conf | 0 src/main/resources/config/general.conf | 0 src/main/resources/config/hardcore.conf | 0 src/main/resources/config/items.conf | 0 src/main/resources/config/language.conf | 0 src/main/resources/config/leveling.conf | 0 src/main/resources/config/metrics.conf | 0 src/main/resources/config/notifications.conf | 0 src/main/resources/config/particles.conf | 0 src/main/resources/config/party.conf | 0 src/main/resources/config/scoreboard.conf | 0 .../resources/config/skills/acrobatics.conf | 0 src/main/resources/config/skills/alchemy.conf | 0 .../resources/config/super_abilities.conf | 0 40 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gmail/nossr50/config/experience/HerbalismExperienceConfig.java create mode 100644 src/main/java/com/gmail/nossr50/config/experience/MiningExperienceConfig.java create mode 100644 src/main/java/com/gmail/nossr50/config/experience/WoodcuttingExperienceConfig.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/AntiExploit.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Backups.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Commands.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/General.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Hardcore.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Items.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Language.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Leveling.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Metrics.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Particles.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Party.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/PlayerNotifications.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/Scoreboard.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/SuperAbilities.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryDatabase.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryMySQL.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryServer.java create mode 100644 src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java create mode 100644 src/main/resources/config/anti_exploit.conf create mode 100644 src/main/resources/config/backups.conf create mode 100644 src/main/resources/config/commands.conf create mode 100644 src/main/resources/config/database.conf create mode 100644 src/main/resources/config/general.conf create mode 100644 src/main/resources/config/hardcore.conf create mode 100644 src/main/resources/config/items.conf create mode 100644 src/main/resources/config/language.conf create mode 100644 src/main/resources/config/leveling.conf create mode 100644 src/main/resources/config/metrics.conf create mode 100644 src/main/resources/config/notifications.conf create mode 100644 src/main/resources/config/particles.conf create mode 100644 src/main/resources/config/party.conf create mode 100644 src/main/resources/config/scoreboard.conf create mode 100644 src/main/resources/config/skills/acrobatics.conf create mode 100644 src/main/resources/config/skills/alchemy.conf create mode 100644 src/main/resources/config/super_abilities.conf diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index d0846621c..45f6e22ff 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/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; diff --git a/src/main/java/com/gmail/nossr50/config/experience/HerbalismExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/HerbalismExperienceConfig.java new file mode 100644 index 000000000..2d3cb0c6d --- /dev/null +++ b/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 { + +} diff --git a/src/main/java/com/gmail/nossr50/config/experience/MiningExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/MiningExperienceConfig.java new file mode 100644 index 000000000..8a1bde298 --- /dev/null +++ b/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 { + +} diff --git a/src/main/java/com/gmail/nossr50/config/experience/WoodcuttingExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/WoodcuttingExperienceConfig.java new file mode 100644 index 000000000..7d5ce50bc --- /dev/null +++ b/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 { + +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/AntiExploit.java b/src/main/java/com/gmail/nossr50/config/hocon/AntiExploit.java new file mode 100644 index 000000000..82fc4f70c --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Backups.java b/src/main/java/com/gmail/nossr50/config/hocon/Backups.java new file mode 100644 index 000000000..6ebf5f901 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Commands.java b/src/main/java/com/gmail/nossr50/config/hocon/Commands.java new file mode 100644 index 000000000..297c8c7b0 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/General.java b/src/main/java/com/gmail/nossr50/config/hocon/General.java new file mode 100644 index 000000000..9ca5bd8f9 --- /dev/null +++ b/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 { + + +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Hardcore.java b/src/main/java/com/gmail/nossr50/config/hocon/Hardcore.java new file mode 100644 index 000000000..bdff1513f --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Items.java b/src/main/java/com/gmail/nossr50/config/hocon/Items.java new file mode 100644 index 000000000..2e698cc0f --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Language.java b/src/main/java/com/gmail/nossr50/config/hocon/Language.java new file mode 100644 index 000000000..33fd8ddf4 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Leveling.java b/src/main/java/com/gmail/nossr50/config/hocon/Leveling.java new file mode 100644 index 000000000..5a46c2a21 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Metrics.java b/src/main/java/com/gmail/nossr50/config/hocon/Metrics.java new file mode 100644 index 000000000..9f08e0956 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Particles.java b/src/main/java/com/gmail/nossr50/config/hocon/Particles.java new file mode 100644 index 000000000..90f4bbb71 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Party.java b/src/main/java/com/gmail/nossr50/config/hocon/Party.java new file mode 100644 index 000000000..bcd5edb45 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/PlayerNotifications.java b/src/main/java/com/gmail/nossr50/config/hocon/PlayerNotifications.java new file mode 100644 index 000000000..a1425af70 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/Scoreboard.java b/src/main/java/com/gmail/nossr50/config/hocon/Scoreboard.java new file mode 100644 index 000000000..cddad3fb9 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/SuperAbilities.java b/src/main/java/com/gmail/nossr50/config/hocon/SuperAbilities.java new file mode 100644 index 000000000..83014c48c --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryDatabase.java b/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryDatabase.java new file mode 100644 index 000000000..0a0af5077 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryMySQL.java b/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryMySQL.java new file mode 100644 index 000000000..5c7cd8eef --- /dev/null +++ b/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; + + +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryServer.java b/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigCategoryServer.java new file mode 100644 index 000000000..46daf484a --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java b/src/main/java/com/gmail/nossr50/config/hocon/database/ConfigDatabase.java new file mode 100644 index 000000000..b7572243a --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 6b6b335db..46b0ef519 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/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; diff --git a/src/main/resources/config/anti_exploit.conf b/src/main/resources/config/anti_exploit.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/backups.conf b/src/main/resources/config/backups.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/commands.conf b/src/main/resources/config/commands.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/database.conf b/src/main/resources/config/database.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/general.conf b/src/main/resources/config/general.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/hardcore.conf b/src/main/resources/config/hardcore.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/items.conf b/src/main/resources/config/items.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/language.conf b/src/main/resources/config/language.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/leveling.conf b/src/main/resources/config/leveling.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/metrics.conf b/src/main/resources/config/metrics.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/notifications.conf b/src/main/resources/config/notifications.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/particles.conf b/src/main/resources/config/particles.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/party.conf b/src/main/resources/config/party.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/scoreboard.conf b/src/main/resources/config/scoreboard.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/skills/acrobatics.conf b/src/main/resources/config/skills/acrobatics.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/skills/alchemy.conf b/src/main/resources/config/skills/alchemy.conf new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/config/super_abilities.conf b/src/main/resources/config/super_abilities.conf new file mode 100644 index 000000000..e69de29bb