Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-27 21:26:29 +01:00
Code Issues Projects Releases Wiki Activity

Display block goal in journal, see #2271

Browse Source
This commit is contained in:
PikaMug 2024-08-03 00:51:00 -04:00
parent 237aa29864
commit f9a1c2961c
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/me/pikamug/quests/item/BukkitQuestJournal.java
View File

@ -12,12 +12,13 @@ package me.pikamug.quests.item;
import me.pikamug.quests.BukkitQuestsPlugin; import me.pikamug.quests.BukkitQuestsPlugin;
import me.pikamug.quests.player.Quester; import me.pikamug.quests.player.Quester;
import me.pikamug.quests.quests.components.BukkitObjective;
import me.pikamug.quests.quests.Quest; import me.pikamug.quests.quests.Quest;
import me.pikamug.quests.quests.components.BukkitObjective;
import me.pikamug.quests.quests.components.Objective; import me.pikamug.quests.quests.components.Objective;
import me.pikamug.quests.util.BukkitItemUtil; import me.pikamug.quests.util.BukkitItemUtil;
import me.pikamug.quests.util.BukkitLang; import me.pikamug.quests.util.BukkitLang;
import me.pikamug.quests.util.BukkitMiscUtil; import me.pikamug.quests.util.BukkitMiscUtil;
import me.pikamug.quests.util.stack.BlockItemStack;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.chat.TranslatableComponent; import net.md_5.bungee.api.chat.TranslatableComponent;
@ -84,22 +85,34 @@ public class BukkitQuestJournal {
continue; continue;
} }
String[] split = null; String[] split = null;
if (message.contains("<item>") && objective.getGoalAsItem() != null) { if (message.contains("<item>")) {
split = message.split("<item>"); split = message.split("<item>");
builder.add(split[0]); builder.add(split[0]);
final ItemStack goal = objective.getGoalAsItem(); if (objective.getGoalAsBlockItem() != null) {
if (goal.getItemMeta() != null && goal.getItemMeta().hasDisplayName()) { final BlockItemStack goal = objective.getGoalAsBlockItem();
builder.add("" + ChatColor.DARK_AQUA + ChatColor.ITALIC
+ goal.getItemMeta().getDisplayName());
} else {
if (plugin.getConfigSettings().canTranslateNames()) { if (plugin.getConfigSettings().canTranslateNames()) {
final TranslatableComponent tc = new TranslatableComponent(plugin.getLocaleManager() final TranslatableComponent tc = new TranslatableComponent(plugin.getLocaleManager()
.queryItemStack(goal)); .queryMaterial(goal.getType(), goal.getDurability(), null));
tc.setColor(net.md_5.bungee.api.ChatColor.DARK_AQUA); tc.setColor(net.md_5.bungee.api.ChatColor.DARK_AQUA);
builder.add(tc); builder.add(tc);
} else { } else {
builder.add(ChatColor.AQUA + BukkitItemUtil.getPrettyItemName(goal.getType().name())); builder.add(ChatColor.AQUA + BukkitItemUtil.getPrettyItemName(goal.getType().name()));
} }
} else if (objective.getGoalAsItem() != null) {
final ItemStack goal = objective.getGoalAsItem();
if (goal.getItemMeta() != null && goal.getItemMeta().hasDisplayName()) {
builder.add("" + ChatColor.DARK_AQUA + ChatColor.ITALIC
+ goal.getItemMeta().getDisplayName());
} else {
if (plugin.getConfigSettings().canTranslateNames()) {
final TranslatableComponent tc = new TranslatableComponent(plugin.getLocaleManager()
.queryItemStack(goal));
tc.setColor(net.md_5.bungee.api.ChatColor.DARK_AQUA);
builder.add(tc);
} else {
builder.add(ChatColor.AQUA + BukkitItemUtil.getPrettyItemName(goal.getType().name()));
}
}
} }
if (split.length > 1) { if (split.length > 1) {
builder.add(split[1]).newLine(); builder.add(split[1]).newLine();