More work on migrating commands to new API

This commit is contained in:
nossr50
2020-12-23 15:29:39 -08:00
parent 537b120ffc
commit 9b9ffbb982
46 changed files with 352 additions and 341 deletions

View File

@@ -4,7 +4,6 @@ import com.gmail.nossr50.datatypes.skills.CoreSkills;
import com.gmail.nossr50.mcMMO;
import com.neetgames.mcmmo.exceptions.UnknownSkillException;
import com.neetgames.mcmmo.skill.RootSkill;
import com.neetgames.mcmmo.skill.SkillIdentity;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -25,16 +24,16 @@ public class FamilyTree {
smeltingParents = new HashSet<>();
salvageParents = new HashSet<>();
smeltingParents.add(CoreSkills.MINING_CS);
smeltingParents.add(CoreSkills.REPAIR_CS);
smeltingParents.add(CoreSkills.MINING);
smeltingParents.add(CoreSkills.REPAIR);
salvageParents.add(CoreSkills.FISHING_CS);
salvageParents.add(CoreSkills.REPAIR_CS);
salvageParents.add(CoreSkills.FISHING);
salvageParents.add(CoreSkills.REPAIR);
}
if(rootSkill.equals(CoreSkills.SALVAGE_CS)) {
if(rootSkill.equals(CoreSkills.SALVAGE)) {
return salvageParents;
} else if (rootSkill.equals(CoreSkills.SMELTING_CS)) {
} else if (rootSkill.equals(CoreSkills.SMELTING)) {
return smeltingParents;
} else {
mcMMO.p.getLogger().severe("root skill argument is not a child skill! " + rootSkill.toString());