Upstream
/
addon-challenges
mirror of https://github.com/BentoBoxWorld/Challenges.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added music disk description. Follow style.

This commit is contained in:
ApacheZy 2021-03-16 10:56:25 +08:00
parent 23b02e6ce4
commit 9e779f58a1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/world/bentobox/challenges/panel/CommonGUI.java
View File

@ -907,7 +907,8 @@ public abstract class CommonGUI
"[count]", Integer.toString(itemStack.getAmount()))); "[count]", Integer.toString(itemStack.getAmount())));
String cdDesc = LangUtilsHook.getMusicDiskDesc(itemStack.getType(), user); String cdDesc = LangUtilsHook.getMusicDiskDesc(itemStack.getType(), user);
if (cdDesc != null) { if (cdDesc != null)
{
result.add(this.user.getTranslation("challenges.gui.item-description.music-disk-desc", result.add(this.user.getTranslation("challenges.gui.item-description.music-disk-desc",
"[desc]", cdDesc)); "[desc]", cdDesc));
} }
@ -984,7 +985,8 @@ public abstract class CommonGUI
{ {
result.add(this.user.getTranslation("challenges.gui.item-description.custom-effects")); result.add(this.user.getTranslation("challenges.gui.item-description.custom-effects"));
((PotionMeta) meta).getCustomEffects().forEach(potionEffect -> { ((PotionMeta) meta).getCustomEffects().forEach(potionEffect ->
{
int duration = potionEffect.getDuration(); int duration = potionEffect.getDuration();
int m = duration / 20 / 60; int m = duration / 20 / 60;
int s = duration / 20 % 60; int s = duration / 20 % 60;
@ -998,11 +1000,12 @@ public abstract class CommonGUI
else if (meta instanceof SkullMeta) else if (meta instanceof SkullMeta)
{ {
OfflinePlayer ofp = ((SkullMeta) meta).getOwningPlayer(); OfflinePlayer ofp = ((SkullMeta) meta).getOwningPlayer();
if (ofp != null) { if (ofp != null)
{
String ownerName = ofp.getName(); String ownerName = ofp.getName();
if (ownerName != null && !ownerName.isEmpty()) { if (ownerName != null && !ownerName.isEmpty())
result.add(this.user.getTranslation( {
"challenges.gui.item-description.skull-owner", result.add(this.user.getTranslation("challenges.gui.item-description.skull-owner",
"[owner]", ownerName)); "[owner]", ownerName));
} }
} }
@ -1019,12 +1022,12 @@ public abstract class CommonGUI
// First try to use LangUtilsHook to get the predefined tropical // First try to use LangUtilsHook to get the predefined tropical
// fish names so that the description looks like vanilla names. // fish names so that the description looks like vanilla names.
String predefined = LangUtilsHook.getPredefinedTropicalFishName(fishMeta, user); String predefined = LangUtilsHook.getPredefinedTropicalFishName(fishMeta, user);
if (predefined != null) { if (predefined != null)
{
result.add(this.user.getTranslation("challenges.gui.item-description.predefined-fish", result.add(this.user.getTranslation("challenges.gui.item-description.predefined-fish",
"[fish-name]", predefined)); "[fish-name]", predefined));
} }
else else if ((fishMeta).hasVariant())
if ((fishMeta).hasVariant())
{ {
result.add(this.user.getTranslation("challenges.gui.item-description.fish-meta", result.add(this.user.getTranslation("challenges.gui.item-description.fish-meta",
"[pattern]", LangUtilsHook.getTropicalFishTypeName(fishMeta.getPattern(), user), "[pattern]", LangUtilsHook.getTropicalFishTypeName(fishMeta.getPattern(), user),
@ -1032,8 +1035,10 @@ public abstract class CommonGUI
"[body-color]", LangUtilsHook.getDyeColorName(fishMeta.getBodyColor(), user))); "[body-color]", LangUtilsHook.getDyeColorName(fishMeta.getBodyColor(), user)));
} }
} }
else if (meta instanceof BannerMeta) { else if (meta instanceof BannerMeta)
for (Pattern pattern : ((BannerMeta) meta).getPatterns()) { {
for (Pattern pattern : ((BannerMeta) meta).getPatterns())
{
result.add(this.user.getTranslation("challenges.gui.item-description.banner-pattern", result.add(this.user.getTranslation("challenges.gui.item-description.banner-pattern",
"[pattern]", LangUtilsHook.getBannerPatternName(pattern, user))); "[pattern]", LangUtilsHook.getBannerPatternName(pattern, user)));
} }