EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Add support for hex color codes in locale

Browse Source
This commit is contained in:
nossr50
2024-04-13 12:58:52 -07:00
parent 4d98d25215
commit c0952a2ba3
11 changed files with 176 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java
View File

@ -20,6 +20,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.text.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.PluginCommand;
import java.util.ArrayList;
@ -42,8 +43,8 @@ public final class CommandRegistrationManager {
command.setDescription(LocaleLoader.getString("Commands.Description.Skill", StringUtils.getCapitalized(localizedName)));
command.setPermission("mcmmo.commands." + commandName);
command.setPermissionMessage(permissionsMessage);
command.setUsage(LocaleLoader.getString("Commands.Usage.0", localizedName));
command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.2", localizedName, "?", "[" + LocaleLoader.getString("Commands.Usage.Page") + "]"));
command.setUsage(LocaleLoader.getString("Commands.Usage.0", commandName));
command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.2", commandName, "?", "[" + LocaleLoader.getString("Commands.Usage.Page") + "]"));
switch (skill) {
case ACROBATICS:

1
src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
View File

@ -4,6 +4,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.player.PlayerLevelUtils;
import com.gmail.nossr50.util.text.StringUtils;
import org.bukkit.boss.BarColor;

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

@ -349,8 +349,7 @@ public class SkillTools {
* @return the localized name for a {@link PrimarySkillType}
*/
public String getLocalizedSkillName(PrimarySkillType primarySkillType) {
//TODO: Replace with current impl
return StringUtils.getCapitalized(LocaleLoader.getString(StringUtils.getCapitalized(primarySkillType.toString()) + ".SkillName"));
return LocaleLoader.getString(StringUtils.getCapitalized(primarySkillType.toString()) + ".SkillName");
}
public boolean doesPlayerHaveSkillPermission(Player player, PrimarySkillType primarySkillType) {

7
src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java
View File

@ -236,7 +236,7 @@ public class TextComponentFactory {
private static Component getSubSkillTextComponent(Player player, SubSkillType subSkillType) {
//Get skill name
String skillName = subSkillType.getLocaleName();
final String skillName = subSkillType.getLocaleName();
boolean skillUnlocked = RankUtils.hasUnlockedSubskill(player, subSkillType);
@ -290,6 +290,11 @@ public class TextComponentFactory {
return textComponent;
}
private static TextComponent.Builder detectLegacyColors(String msg) {
// TODO: Impl
return null;
}
private static Component getSubSkillHoverComponent(Player player, AbstractSubSkill abstractSubSkill) {
return getSubSkillHoverEventJSON(abstractSubSkill, player);
}