EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 20:15:28 +02:00
Code Issues Projects Releases Wiki Activity

Read and register commands from config

Browse Source
This commit is contained in:
nossr50
2023-08-20 13:42:55 -07:00
parent 656beb34ef
commit 753834e1fc
5 changed files with 193 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/gmail/nossr50/util/skills/SkillTools.java
View File

@@ -17,6 +17,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.VisibleForTesting;
import java.util.*;
@@ -236,14 +237,15 @@ public class SkillTools {
/**
* Matches a string of a skill to a skill
* This is NOT case sensitive
* This is NOT case-sensitive
* First it checks the locale file and tries to match by the localized name of the skill
* Then if nothing is found it checks against the hard coded "name" of the skill, which is just its name in English
*
* @param skillName target skill name
* @return the matching PrimarySkillType if one is found, otherwise null
*/
public PrimarySkillType matchSkill(String skillName) {
@Nullable
public PrimarySkillType matchSkill(@NotNull String skillName) {
if (!pluginRef.getGeneralConfig().getLocale().equalsIgnoreCase("en_US")) {
for (PrimarySkillType type : PrimarySkillType.values()) {
if (skillName.equalsIgnoreCase(LocaleLoader.getString(StringUtils.getCapitalized(type.name()) + ".SkillName"))) {
@@ -258,11 +260,29 @@ public class SkillTools {
}
}
if (!skillName.equalsIgnoreCase("all")) {
pluginRef.getLogger().warning("Invalid mcMMO skill (" + skillName + ")"); //TODO: Localize
return null;
}
/**
* Matches an array of strings of skills to skills
* This is NOT case-sensitive
* First it checks the locale file and tries to match by the localized name of the skill
* Then if nothing is found it checks against the hard coded "name" of the skill, which is just its name in English
*
* @param skills target skill names
* @return the matching PrimarySkillType if one is found, otherwise null
*/
@NotNull
public Set<PrimarySkillType> matchSkills(@NotNull Collection<String> skills) {
Set<PrimarySkillType> matchingSkills = new HashSet<>();
for (String skillName : skills) {
PrimarySkillType primarySkillType = matchSkill(skillName);
if(primarySkillType != null) {
matchingSkills.add(primarySkillType);
}
}
return null;
return matchingSkills;
}
/**