Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Collection manager init now handles mapping values from collections

Browse Source
This commit is contained in:
nossr50 2019-05-10 12:30:59 -07:00
parent 945359b408
commit 61ae372694
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,9 +183,6 @@ public final class ConfigManager {
partyItemWeights = Maps.newHashMap(configParty.getConfig().getPartyItemShare().getItemShareMap()); //Item Share Weights partyItemWeights = Maps.newHashMap(configParty.getConfig().getPartyItemShare().getItemShareMap()); //Item Share Weights
partyFeatureUnlocks = Maps.newHashMap(configParty.getConfig().getPartyXP().getPartyLevel().getPartyFeatureUnlockMap()); //Party Progression partyFeatureUnlocks = Maps.newHashMap(configParty.getConfig().getPartyXP().getPartyLevel().getPartyFeatureUnlockMap()); //Party Progression
//Register Bonus Drops
registerBonusDrops();
//YAML Configs //YAML Configs
initYAMLConfigs(); initYAMLConfigs();
@ -296,22 +293,6 @@ public final class ConfigManager {
TypeToken<Map<?, ?>> wildMapTok = new TypeToken<Map<?, ?>>() {}; TypeToken<Map<?, ?>> wildMapTok = new TypeToken<Map<?, ?>>() {};
*/ */
/*
List of default serializers for reference
DEFAULT_SERIALIZERS.registerType(TypeToken.of(URI.class), new URISerializer());
DEFAULT_SERIALIZERS.registerType(TypeToken.of(URL.class), new URLSerializer());
DEFAULT_SERIALIZERS.registerType(TypeToken.of(UUID.class), new UUIDSerializer());
DEFAULT_SERIALIZERS.registerPredicate(input -> input.getRawType().isAnnotationPresent(ConfigSerializable.class), new AnnotatedObjectSerializer());
DEFAULT_SERIALIZERS.registerPredicate(NumberSerializer.getPredicate(), new NumberSerializer());
DEFAULT_SERIALIZERS.registerType(TypeToken.of(String.class), new StringSerializer());
DEFAULT_SERIALIZERS.registerType(TypeToken.of(Boolean.class), new BooleanSerializer());
DEFAULT_SERIALIZERS.registerType(new TypeToken<Map<?, ?>>() {}, new MapSerializer());
DEFAULT_SERIALIZERS.registerType(new TypeToken<List<?>>() {}, new ListSerializer());
DEFAULT_SERIALIZERS.registerType(new TypeToken<Enum<?>>() {}, new EnumValueSerializer());
DEFAULT_SERIALIZERS.registerType(TypeToken.of(Pattern.class), new PatternSerializer());
*/
customSerializers = TypeSerializers.getDefaultSerializers().newChild(); customSerializers = TypeSerializers.getDefaultSerializers().newChild();
mcMMO.p.getLogger().info("Registering custom type serializers for Configurate..."); mcMMO.p.getLogger().info("Registering custom type serializers for Configurate...");
@ -368,6 +349,9 @@ public final class ConfigManager {
// Handles registration of bonus drops // Handles registration of bonus drops
bonusDropManager = new BonusDropManager(); bonusDropManager = new BonusDropManager();
unloadables.add(bonusDropManager); unloadables.add(bonusDropManager);
//Register Bonus Drops
registerBonusDrops();
} }
/** /**
@ -433,6 +417,10 @@ public final class ConfigManager {
} }
/**
* Reload the configs
* Technically this reloads a lot of stuff, not just configs
*/
public void reloadConfigs() { public void reloadConfigs() {
mcMMO.p.getLogger().info("Reloading config values..."); mcMMO.p.getLogger().info("Reloading config values...");
unloadAllConfigsAndRegisters(); //Unload Everything unloadAllConfigsAndRegisters(); //Unload Everything