Mirrors/mcMMO
1
0
Fork 1
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-20 02:33:15 +01:00
Code Packages Releases Activity

Fixed the loading of the Serialized configs

Browse Source
This commit is contained in:
nossr50
2019-03-12 04:21:46 -07:00
parent 77b4ade885
commit a8bf6357aa
6 changed files with 247 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package com.gmail.nossr50.config;
import com.gmail.nossr50.config.collectionconfigs.RepairConfig;
import com.gmail.nossr50.config.collectionconfigs.SalvageConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.config.hocon.SerializedConfigLoader;
import com.gmail.nossr50.config.hocon.database.ConfigDatabase;
import com.gmail.nossr50.config.party.ItemWeightConfig;
import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
@@ -59,7 +60,7 @@ public final class ConfigManager {
/* CONFIG INSTANCES */
private ConfigDatabase configDatabase;
private SerializedConfigLoader<ConfigDatabase> configDatabase;
private MainConfig mainConfig;
private FishingTreasureConfig fishingTreasureConfig;
private ExcavationTreasureConfig excavationTreasureConfig;
@@ -90,7 +91,7 @@ public final class ConfigManager {
// I'm pretty these are supposed to be done in a specific order, so don't rearrange them willy nilly
//TODO: Not sure about the order of MainConfig
configDatabase = new ConfigDatabase();
configDatabase = new SerializedConfigLoader<>(ConfigDatabase.class, "database_settings.conf", null);
mainConfig = new MainConfig();
fishingTreasureConfig = new FishingTreasureConfig();
@@ -304,5 +305,5 @@ public final class ConfigManager {
return experienceMapManager;
}
public ConfigDatabase getConfigDatabase() { return configDatabase; }
public ConfigDatabase getConfigDatabase() { return configDatabase.getConfig(); }
}