EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-17 01:23:39 +02:00
Code Issues Projects Releases Wiki Activity

parent node renamed to something more specific

Browse Source
This commit is contained in:
nossr50 2019-03-21 17:31:57 -07:00
parent 0c58f5073c
commit ff986ec97d
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/gmail/nossr50/config/ConfigManager.java
View File

@ -216,43 +216,43 @@ public final class ConfigManager {
mcMMO.p.getLogger().info("Deserializing configs..."); mcMMO.p.getLogger().info("Deserializing configs...");
//TODO: Not sure about the order of MainConfig //TODO: Not sure about the order of MainConfig
//Serialized Configs //Serialized Configs
configDatabase = new SerializedConfigLoader<>(ConfigDatabase.class, "database_settings.conf", null); configDatabase = new SerializedConfigLoader<>(ConfigDatabase.class, "database_settings.conf", "Database", null);
configScoreboard = new SerializedConfigLoader<>(ConfigScoreboard.class, "scoreboard.conf", null); configScoreboard = new SerializedConfigLoader<>(ConfigScoreboard.class, "scoreboard.conf", "Scoreboard", null);
configLeveling = new SerializedConfigLoader<>(ConfigLeveling.class, "player_leveling.conf", null); configLeveling = new SerializedConfigLoader<>(ConfigLeveling.class, "player_leveling.conf", "Player-Leveling", null);
configWorldBlacklist = new SerializedConfigLoader<>(ConfigWorldBlacklist.class, "world_blacklist.conf", null); configWorldBlacklist = new SerializedConfigLoader<>(ConfigWorldBlacklist.class, "world_blacklist.conf", "World-Blacklist", null);
configExploitPrevention = new SerializedConfigLoader<>(ConfigExploitPrevention.class, "exploit_prevention.conf", null); configExploitPrevention = new SerializedConfigLoader<>(ConfigExploitPrevention.class, "anti_exploit.conf", "Anti-Exploit", null);
configMOTD = new SerializedConfigLoader<>(ConfigMOTD.class, "message_of_the_day.conf", null); configMOTD = new SerializedConfigLoader<>(ConfigMOTD.class, "message_of_the_day.conf", "MOTD", null);
configHardcore = new SerializedConfigLoader<>(ConfigHardcore.class, "hardcore_mode.conf", null); configHardcore = new SerializedConfigLoader<>(ConfigHardcore.class, "hardcore_mode.conf", "Hardcore-Mode", null);
configMetrics = new SerializedConfigLoader<>(ConfigMetrics.class, "analytics_reporting.conf", null); configMetrics = new SerializedConfigLoader<>(ConfigMetrics.class, "analytics_reporting.conf", "Analytic-Reporting", null);
configAuthorAdvertisements = new SerializedConfigLoader<>(ConfigAuthorAdvertisements.class, "author_support_advertisements.conf", null); configAuthorAdvertisements = new SerializedConfigLoader<>(ConfigAuthorAdvertisements.class, "author_support_advertisements.conf", "mcMMO", null);
configAutomatedBackups = new SerializedConfigLoader<>(ConfigAutomatedBackups.class, "automated_backups.conf", null); configAutomatedBackups = new SerializedConfigLoader<>(ConfigAutomatedBackups.class, "automated_backups.conf", "Automated-Backups", null);
configCommands = new SerializedConfigLoader<>(ConfigCommands.class, "commands.conf", null); configCommands = new SerializedConfigLoader<>(ConfigCommands.class, "commands.conf", "Commands", null);
configItems = new SerializedConfigLoader<>(ConfigItems.class, "custom_items.conf", null); configItems = new SerializedConfigLoader<>(ConfigItems.class, "custom_items.conf", "Items", null);
configLanguage = new SerializedConfigLoader<>(ConfigLanguage.class, "language.conf", null); configLanguage = new SerializedConfigLoader<>(ConfigLanguage.class, "language.conf", "Language", null);
configParticles = new SerializedConfigLoader<>(ConfigParticles.class, "particle_spawning.conf", null); configParticles = new SerializedConfigLoader<>(ConfigParticles.class, "particle_spawning.conf", "Particles", null);
configParty = new SerializedConfigLoader<>(ConfigParty.class, "party.conf", null); configParty = new SerializedConfigLoader<>(ConfigParty.class, "party.conf", "Party", null);
configNotifications = new SerializedConfigLoader<>(ConfigNotifications.class, "chat_and_hud_notifications.conf", null); configNotifications = new SerializedConfigLoader<>(ConfigNotifications.class, "alerts_and_notifications.conf", "Notifications", null);
configSuperAbilities = new SerializedConfigLoader<>(ConfigSuperAbilities.class, "skill_super_abilities.conf", null); configSuperAbilities = new SerializedConfigLoader<>(ConfigSuperAbilities.class, "skill_super_abilities.conf", "Super-Abilities", null);
configAdmin = new SerializedConfigLoader<>(ConfigAdmin.class, "admin.conf", null); configAdmin = new SerializedConfigLoader<>(ConfigAdmin.class, "admin.conf", "Admin", null);
configMobs = new SerializedConfigLoader<>(ConfigMobs.class, "creatures.conf", null); configMobs = new SerializedConfigLoader<>(ConfigMobs.class, "creatures.conf", "Creatures", null);
configAcrobatics = new SerializedConfigLoader<>(ConfigAcrobatics.class, "acrobatics.conf", null); configAcrobatics = new SerializedConfigLoader<>(ConfigAcrobatics.class, "acrobatics.conf", "Acrobatics", null);
configSalvage = new SerializedConfigLoader<>(ConfigSalvage.class, "salvage.conf", null); configSalvage = new SerializedConfigLoader<>(ConfigSalvage.class, "salvage.conf", "Salvage", null);
configArchery = new SerializedConfigLoader<>(ConfigArchery.class, "archery.conf", null); configArchery = new SerializedConfigLoader<>(ConfigArchery.class, "archery.conf", "Archery", null);
configAxes = new SerializedConfigLoader<>(ConfigAxes.class, "axes.conf", null); configAxes = new SerializedConfigLoader<>(ConfigAxes.class, "axes.conf", "Axes", null);
configExcavation = new SerializedConfigLoader<>(ConfigExcavation.class, "excavation.conf", null); configExcavation = new SerializedConfigLoader<>(ConfigExcavation.class, "excavation.conf", "Excavation", null);
configFishing = new SerializedConfigLoader<>(ConfigFishing.class, "fishing.conf", null); configFishing = new SerializedConfigLoader<>(ConfigFishing.class, "fishing.conf", "Fishing", null);
configHerbalism = new SerializedConfigLoader<>(ConfigHerbalism.class, "herbalism.conf", null); configHerbalism = new SerializedConfigLoader<>(ConfigHerbalism.class, "herbalism.conf", "Herbalism", null);
configMining = new SerializedConfigLoader<>(ConfigMining.class, "mining.conf", null); configMining = new SerializedConfigLoader<>(ConfigMining.class, "mining.conf", "Mining", null);
configRepair = new SerializedConfigLoader<>(ConfigRepair.class, "repair.conf", null); configRepair = new SerializedConfigLoader<>(ConfigRepair.class, "repair.conf", "Repair", null);
configSwords = new SerializedConfigLoader<>(ConfigSwords.class, "swords.conf", null); configSwords = new SerializedConfigLoader<>(ConfigSwords.class, "swords.conf", "Swords", null);
configTaming = new SerializedConfigLoader<>(ConfigTaming.class, "taming.conf", null); configTaming = new SerializedConfigLoader<>(ConfigTaming.class, "taming.conf", "Taming", null);
configUnarmed = new SerializedConfigLoader<>(ConfigUnarmed.class, "unarmed.conf", null); configUnarmed = new SerializedConfigLoader<>(ConfigUnarmed.class, "unarmed.conf", "Unarmed", null);
configWoodcutting = new SerializedConfigLoader<>(ConfigWoodcutting.class, "woodcutting.conf", null); configWoodcutting = new SerializedConfigLoader<>(ConfigWoodcutting.class, "woodcutting.conf", "Woodcutting", null);
configSmelting = new SerializedConfigLoader<>(ConfigSmelting.class, "smelting.conf", null); configSmelting = new SerializedConfigLoader<>(ConfigSmelting.class, "smelting.conf", "Smelting", null);
//Serialized Data //Serialized Data
partyData = new SerializedConfigLoader<>(ConfigPartyData.class, "partydata.conf", null); partyData = new SerializedConfigLoader<>(ConfigPartyData.class, "partydata.conf", "PartyData", null);
//Assign Maps //Assign Maps
partyItemWeights = Maps.newHashMap(configParty.getConfig().getPartyItemShare().getItemShareMap()); //Item Share Weights partyItemWeights = Maps.newHashMap(configParty.getConfig().getPartyItemShare().getItemShareMap()); //Item Share Weights

6
src/main/java/com/gmail/nossr50/config/hocon/SerializedConfigLoader.java
View File

@ -63,7 +63,8 @@ public class SerializedConfigLoader<T> {
"\nhttps://mcmmo.org/wiki - Keep in mind the wiki is a WIP and may not have information about everything in mcMMO!"; "\nhttps://mcmmo.org/wiki - Keep in mind the wiki is a WIP and may not have information about everything in mcMMO!";
private static final ConfigurationOptions LOADER_OPTIONS = ConfigurationOptions.defaults().setHeader(CONFIG_HEADER); private static final ConfigurationOptions LOADER_OPTIONS = ConfigurationOptions.defaults().setHeader(CONFIG_HEADER);
private static final String ROOT_NODE_ADDRESS = "mcMMO";
private final String ROOT_NODE_ADDRESS;
private final Path path; private final Path path;
@ -92,7 +93,8 @@ public class SerializedConfigLoader<T> {
*/ */
private ObjectMapper<T>.BoundInstance configMapper; private ObjectMapper<T>.BoundInstance configMapper;
public SerializedConfigLoader(Class<T> clazz, String fileName, SerializedConfigLoader parent) { public SerializedConfigLoader(Class<T> clazz, String fileName, String rootNodeName, SerializedConfigLoader parent) {
ROOT_NODE_ADDRESS = rootNodeName;
this.parent = parent; this.parent = parent;
this.path = getPathFromFileName(fileName); this.path = getPathFromFileName(fileName);