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

minor cleanup on skill register impl

Browse Source
This commit is contained in:
nossr50 2020-12-24 16:43:27 -08:00
parent 21ac44ee61
commit 6f88c282cf
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/gmail/nossr50/datatypes/skills/CoreSkills.java
View File

@ -50,10 +50,9 @@ public class CoreSkills {
public static final @NotNull SuperSkill SKULL_SPLITTER, GIGA_DRILL_BREAKER, GREEN_TERRA, SUPER_BREAKER, public static final @NotNull SuperSkill SKULL_SPLITTER, GIGA_DRILL_BREAKER, GREEN_TERRA, SUPER_BREAKER,
BLAST_MINING, SERRATED_STRIKES, CALL_OF_THE_WILD, BERSERK, TREE_FELLER, TRIDENTS_SUPER, SUPER_SHOT_GUN; BLAST_MINING, SERRATED_STRIKES, CALL_OF_THE_WILD, BERSERK, TREE_FELLER, TRIDENTS_SUPER, SUPER_SHOT_GUN;
public static final CoreSkill ROLL; public static final @NotNull CoreSkill ROLL;
private static @NotNull private static final @NotNull HackySkillMappings hackySkillMappings = new HackySkillMappings();
final HackySkillMappings hackySkillMappings = new HackySkillMappings();
static { static {
HashSet<CoreRootSkill> rootSkillSet = new HashSet<>(); HashSet<CoreRootSkill> rootSkillSet = new HashSet<>();
@ -139,10 +138,6 @@ public class CoreSkills {
CORE_NON_CHILD_SKILLS = ImmutableSet.copyOf(generateNonChildSkillSet()); CORE_NON_CHILD_SKILLS = ImmutableSet.copyOf(generateNonChildSkillSet());
CORE_SUB_SKILLS = ImmutableSet.copyOf(subSkillSet); CORE_SUB_SKILLS = ImmutableSet.copyOf(subSkillSet);
CORE_SUPER_SKILLS = ImmutableSet.copyOf(superSkillSet); CORE_SUPER_SKILLS = ImmutableSet.copyOf(superSkillSet);
/*
* Define managers
*/
} }
/** /**
@ -162,7 +157,17 @@ public class CoreSkills {
* @return a set of all root skills built into mcMMO * @return a set of all root skills built into mcMMO
*/ */
public static @NotNull Set<CoreSkill> getCoreSkills() { public static @NotNull Set<CoreSkill> getCoreSkills() {
return CORE; return CORE_SUB_SKILLS;
}
/**
* Returns a set of built in skills for mcMMO
* No guarantees for whether or not the skills are registered or active or inactive
*
* @return a set of all root skills built into mcMMO
*/
public static @NotNull Set<SuperSkill> getCoreSkills() {
return CORE_SUPER_SKILLS;
} }
/** /**