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

2.2.006

Browse Source
This commit is contained in:
nossr50
2024-04-13 15:18:12 -07:00
parent c0952a2ba3
commit 1cac6b1165
7 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@ 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;

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

@ -4,7 +4,6 @@ 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;

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

@ -19,6 +19,7 @@ import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
@ -235,8 +236,8 @@ public class TextComponentFactory {
}
private static Component getSubSkillTextComponent(Player player, SubSkillType subSkillType) {
//Get skill name
final String skillName = subSkillType.getLocaleName();
//Get skill name and strip it of color
final String skillName = ChatColor.stripColor(subSkillType.getLocaleName());
boolean skillUnlocked = RankUtils.hasUnlockedSubskill(player, subSkillType);
@ -290,11 +291,6 @@ 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);
}
@ -311,7 +307,7 @@ public class TextComponentFactory {
* @return the hover basecomponent object for this subskill
*/
private static Component getSubSkillHoverEventJSON(AbstractSubSkill abstractSubSkill, Player player) {
String skillName = abstractSubSkill.getNiceName();
String skillName = ChatColor.stripColor(abstractSubSkill.getNiceName());
/*
* Hover Event BaseComponent color table
@ -404,7 +400,8 @@ public class TextComponentFactory {
}
private static Component getSubSkillHoverEventJSON(SubSkillType subSkillType, Player player) {
String skillName = subSkillType.getLocaleName();
// Get skill name and strip it of color
String skillName = ChatColor.stripColor(subSkillType.getLocaleName());
/*
* Hover Event BaseComponent color table
@ -438,11 +435,9 @@ public class TextComponentFactory {
}
componentBuilder.append(Component.newline());
componentBuilder.append(Component.text(LocaleLoader.getString("JSON.DescriptionHeader")));
componentBuilder.color(ccDescriptionHeader);
componentBuilder.append(Component.text(LocaleLoader.getString("JSON.DescriptionHeader")).color(ccDescriptionHeader));
componentBuilder.append(Component.newline());
componentBuilder.append(Component.text(subSkillType.getLocaleDescription()));
componentBuilder.color(ccDescription);
componentBuilder.append(Component.text(ChatColor.stripColor(subSkillType.getLocaleDescription())).color(ccDescription));
}
return componentBuilder.build();