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

Some color tweaks

Browse Source
This commit is contained in:
nossr50
2019-01-17 10:45:16 -08:00
parent 292fc8eff2
commit 1585d8157e
23 changed files with 2896 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
View File

@ -65,10 +65,6 @@ public abstract class SkillCommand implements TabExecutor {
permissionsCheck(player);
dataCalculations(player, skillValue, isLucky);
if (Config.getInstance().getSkillUseBoard()) {
ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
}
sendSkillCommandHeader(player, mcMMOPlayer, (int) skillValue);
//Make JSON text components
@ -89,17 +85,17 @@ public abstract class SkillCommand implements TabExecutor {
//Stats
getStatMessages(player, isLucky, hasEndurance, skillValue);
ChatColor hd1 = ChatColor.DARK_AQUA;
ChatColor c1 = ChatColor.GOLD;
ChatColor c2 = ChatColor.RED;
//Header
player.sendMessage(hd1+"[]=====[]"+c1+" mcMMO "+c2+"Overhaul"+c1+" Era "+hd1+"[]=====[]");
player.sendMessage(LocaleLoader.getString("Overhaul.mcMMO.Header"));
//Link Header
TextComponentFactory.sendPlayerUrlHeader(player);
return true;
if (Config.getInstance().getSkillUseBoard()) {
ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
}
return true;
default:
return skillGuideCommand.onCommand(sender, command, label, args);
}

4
src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
View File

@ -164,7 +164,9 @@ public class TamingCommand extends SkillCommand {
}
if (canGore) {
messages.add(LocaleLoader.getString("Taming.Combat.Chance.Gore", goreChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", goreChanceLucky) : ""));
messages.add(LocaleLoader.getString("Ability.Generic.Template",
LocaleLoader.getString("Taming.Combat.Chance.Gore"),
goreChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", goreChanceLucky) : ""));
}
return messages;

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

@ -35,7 +35,8 @@ public class TextComponentFactory {
public static TextComponent getNotificationMultipleValues(String localeKey, NotificationType notificationType, String... values)
{
String preColoredString = LocaleLoader.getString(localeKey, (Object[]) values);
return new TextComponent(preColoredString);
TextComponent msg = new TextComponent(preColoredString);
return new TextComponent(msg);
}
public static TextComponent getNotificationTextComponentFromLocale(String localeKey, NotificationType notificationType)