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

1. Optionally display the award title. 

2. Added the banner pattern name display.
This commit is contained in:
ApacheZy 2021-03-15 01:31:21 +08:00
parent 34aa1b7a0b
commit 77aab7cb7f
11 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,37 +1,19 @@
package world.bentobox.challenges.panel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.*;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationContext;
import org.bukkit.conversations.ConversationFactory;
import org.bukkit.conversations.Prompt;
import org.bukkit.conversations.StringPrompt;
import org.bukkit.block.banner.Pattern;
import org.bukkit.conversations.*;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.KnowledgeBookMeta;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.inventory.meta.SkullMeta;
import org.bukkit.inventory.meta.SpawnEggMeta;
import org.bukkit.inventory.meta.TropicalFishBucketMeta;
import org.bukkit.inventory.meta.*;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionType;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.panels.PanelItem;
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
@ -47,6 +29,12 @@ import world.bentobox.challenges.database.object.requirements.OtherRequirements;
import world.bentobox.challenges.utils.LevelStatus;
import world.bentobox.challenges.utils.Utils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
/**
* This class contains common methods that will be used over all GUIs. It also allows
@ -511,14 +499,16 @@ public abstract class CommonGUI
else
{
// Show a title to the rewards
result.add(this.user.getTranslation("challenges.gui.challenge-description.rewards-title"));
if (isCompletedOnce)
// If there is no reward text, do not display title
String rewardText = isCompletedOnce ? challenge.getRepeatRewardText() : challenge.getRewardText();
if (rewardText != null)
{
result.add(challenge.getRepeatRewardText());
}
else
{
result.add(challenge.getRewardText());
String testText = ChatColor.translateAlternateColorCodes('&', rewardText);
if (!ChatColor.stripColor(testText.replaceAll("[\\r\\n]", "")).isEmpty())
{
result.add(this.user.getTranslation("challenges.gui.challenge-description.rewards-title"));
result.add(rewardText);
}
}
}
break;
@ -1036,6 +1026,12 @@ public abstract class CommonGUI
"[body-color]", LangUtilsHook.getDyeColorName(fishMeta.getBodyColor(), user)));
}
}
else if (meta instanceof BannerMeta) {
for (Pattern pattern : ((BannerMeta) meta).getPatterns()) {
result.add(this.user.getTranslation("challenges.gui.item-description.banner-pattern",
"[pattern]", LangUtilsHook.getBannerPatternName(pattern, user)));
}
}
if (meta.hasEnchants())
{

1
src/main/resources/locales/cs.yml
View File

@ -430,6 +430,7 @@ challenges:
egg-meta: " [mob]"
fish-meta: " [body-color] s [pattern-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
questions:
prefix: "&2[SERVER]: "
admin:

1
src/main/resources/locales/de.yml
View File

@ -513,6 +513,7 @@ challenges:
egg-meta: "[mob]"
fish-meta: "[body-color] mit [pattern-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
questions:
prefix: "&2[SERVER]:"
admin:

1
src/main/resources/locales/en-US.yml
View File

@ -503,6 +503,7 @@ challenges:
egg-meta: ' [mob]'
fish-meta: ' [body-color] with [pattern-color] [pattern]'
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
questions:
prefix: "&2 [SERVER]: "

1
src/main/resources/locales/es.yml
View File

@ -561,6 +561,7 @@ challenges:
potion-effect: "[effect] x [amplifier] por [duration]t"
fish-meta: "[body-color] con [patter-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
item-meta: "([meta])"
armor-color: "[color]"
custom-effects: 'Efectos personalizados:'

1
src/main/resources/locales/ja.yml
View File

@ -355,6 +355,7 @@ challenges:
egg-meta: "[mob]"
fish-meta: "[body-color] と [pattern-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
item: "-[count] x [item]"
item-enchant: "-[enchant] [level]"
item-lore: アイテム伝承：

1
src/main/resources/locales/lv.yml
View File

@ -422,6 +422,7 @@ challenges:
egg-meta: " [mob]"
fish-meta: " [body-color] ar [pattern-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
item: "- [count] x [item]"
item-enchant: " - [enchant] [level]"
item-lore: " Lietas apraksts:"

1
src/main/resources/locales/pl.yml
View File

@ -525,6 +525,7 @@ challenges:
egg-meta: "[tłum]"
fish-meta: "[body-color] with [pattern-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
questions:
prefix: "& 2 [SERWER]:"
admin:

1
src/main/resources/locales/ru.yml
View File

@ -486,6 +486,7 @@ challenges:
potion-effect: "[effect] x [amplifier] для [duration]t"
fish-meta: "[body-color] с [pattern-color] [pattern]"
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
item-meta: "([meta])"
item-enchant: "- [enchant] [level]"
item-name: "[name]"

3
src/main/resources/locales/zh-CN.yml
View File

@ -36,7 +36,7 @@ challenges:
description: '将现有挑战导出到 default.json 文件。'
parameters: '[overwrite] - 允许覆盖现有文件。'
complete:
description: '将玩家的某个设置为完成为一个玩家完成挑战。'
description: '为玩家完成挑战。'
parameters: '<player> <challenge_id>'
reset:
description: '重设玩家的挑战。如果将参数 <challenge_id> 设置为 "all"， 则将重置该玩家所有挑战。'
@ -489,6 +489,7 @@ challenges:
egg-meta: '&7 [mob]'
fish-meta: '&7&o [body-color]-[pattern-color] [pattern]'
predefined-fish: '&7&o [fish-name]'
banner-pattern: '&7 [pattern]'
questions:
prefix: "&7[&e服务器&7]： &r"

1
src/main/resources/locales/zh-TW.yml
View File

@ -317,6 +317,7 @@ challenges:
egg-meta: ' [mob]'
fish-meta: ' [body-color]-[pattern-color] [pattern]'
predefined-fish: ' [fish-name]'
banner-pattern: ' [pattern]'
questions:
prefix: "&2[SERVER]: "