Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-24 17:47:44 +01:00
Code Issues Projects Releases Wiki Activity

Convert RankConfig to the new system

Browse Source
This commit is contained in:
nossr50 2019-02-21 14:33:36 -08:00
parent 26b66b550c
commit b0b0167ee2
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/gmail/nossr50/config/RankConfig.java
View File

@ -8,6 +8,8 @@ import java.util.ArrayList;
import java.util.List;
public class RankConfig extends ConfigValidated {
public static final String RETRO_MODE = "RetroMode";
public static final String STANDARD = "Standard";
//private static RankConfig instance;
public RankConfig() {
@ -28,13 +30,6 @@ public class RankConfig extends ConfigValidated {
return mcMMO.getConfigManager().getRankConfig();
}
/*public static RankConfig getInstance() {
if (instance == null)
return new RankConfig();
return instance;
}*/
@Override
public void unload() {
//Do nothing
@ -70,9 +65,7 @@ public class RankConfig extends ConfigValidated {
* @return the level requirement for a subskill at this particular rank
*/
public int getSubSkillUnlockLevel(SubSkillType subSkillType, int rank) {
String key = subSkillType.getRankConfigAddress();
return findRankByRootAddress(rank, key);
return findRankByRootAddress(rank, subSkillType.getRankConfigAddress());
}
/**
@ -83,9 +76,7 @@ public class RankConfig extends ConfigValidated {
* @return the level requirement for a subskill at this particular rank
*/
public int getSubSkillUnlockLevel(AbstractSubSkill abstractSubSkill, int rank) {
String key = abstractSubSkill.getPrimaryKeyName() + "." + abstractSubSkill.getConfigKeyName();
return findRankByRootAddress(rank, key);
return findRankByRootAddress(rank, abstractSubSkill.getSubSkillType().getRankConfigAddress());
}
/**
@ -95,15 +86,13 @@ public class RankConfig extends ConfigValidated {
* @param rank the rank we are checking
* @return the level requirement for a subskill at this particular rank
*/
private int findRankByRootAddress(int rank, String key) {
String scalingKey = MainConfig.getInstance().getIsRetroMode() ? ".RetroMode." : ".Standard.";
private int findRankByRootAddress(int rank, String[] key) {
String scalingKey = mcMMO.isRetroModeEnabled() ? RETRO_MODE : STANDARD;
String targetRank = "Rank_" + rank;
key += scalingKey;
key += targetRank;
return getIntValue(key);
//key[0] = parent skill config node, key[1] subskill child node, scalingkey = retro/standard, targetrank = rank node
return getIntValue(key[0], key[1], scalingKey, targetRank);
}
/**
@ -122,14 +111,9 @@ public class RankConfig extends ConfigValidated {
curRank = getSubSkillUnlockLevel(subSkillType, x);
//Do we really care if its below 0? Probably not
if (curRank < 0) {
reasons.add(subSkillType.getAdvConfigAddress() + ".Rank_Levels.Rank_" + curRank + ".LevelReq should be above or equal to 0!");
}
if (prevRank > curRank) {
//We're going to allow this but we're going to warn them
mcMMO.p.getLogger().info("You have the ranks for the subskill " + subSkillType.toString() + " set up poorly, sequential ranks should have ascending requirements");
mcMMO.p.getLogger().severe("You have the ranks for the subskill " + subSkillType.toString() + " in skillranks config set up poorly, sequential ranks should have ascending requirements");
}
}
}