Altitude/PlayerShops
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small tweaks

Browse Source
This commit is contained in:
Len 2022-08-25 17:45:11 +02:00
parent abf53fbbbe
commit 3be53703be
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
View File

@ -4,6 +4,7 @@ import com.alttd.playershops.PlayerShops;
import com.alttd.playershops.conversation.ConversationManager; import com.alttd.playershops.conversation.ConversationManager;
import com.alttd.playershops.conversation.ConversationType; import com.alttd.playershops.conversation.ConversationType;
import com.alttd.playershops.shop.PlayerShop; import com.alttd.playershops.shop.PlayerShop;
import com.alttd.playershops.utils.ShopUtil;
import com.alttd.playershops.utils.Util; import com.alttd.playershops.utils.Util;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -35,7 +36,7 @@ public class ShopManagementGui extends AbstractGui {
ItemMeta meta = shopIcon.getItemMeta(); ItemMeta meta = shopIcon.getItemMeta();
List<Component> lore = new ArrayList<>(); List<Component> lore = new ArrayList<>();
lore.add(Util.parseMiniMessage("Balance: " + shop.getBalance(), null)); lore.add(Util.parseMiniMessage("Balance: " + shop.getBalance(), null));
lore.add(Util.parseMiniMessage("item: " + shop.getItemStack(), null)); lore.add(Util.parseMiniMessage("item: " + ShopUtil.itemNameComponent(shop.getItemStack()), null));
lore.add(Util.parseMiniMessage("amount: " + shop.getAmount(), null)); lore.add(Util.parseMiniMessage("amount: " + shop.getAmount(), null));
lore.add(Util.parseMiniMessage("Type: " + shop.getType(), null)); lore.add(Util.parseMiniMessage("Type: " + shop.getType(), null));
lore.add(Util.parseMiniMessage("Price: " + shop.getPrice(), null)); lore.add(Util.parseMiniMessage("Price: " + shop.getPrice(), null));

2
src/main/java/com/alttd/playershops/shop/PlayerShop.java
View File

@ -155,7 +155,7 @@ public class PlayerShop {
Placeholder.unparsed("ownername", getOwnerName()), Placeholder.unparsed("ownername", getOwnerName()),
Placeholder.unparsed("price", String.valueOf(getPrice())), Placeholder.unparsed("price", String.valueOf(getPrice())),
Placeholder.unparsed("amount", String.valueOf(getAmount())), Placeholder.unparsed("amount", String.valueOf(getAmount())),
Placeholder.unparsed("item", ShopUtil.getItemName(getItemStack())) Placeholder.component("itemname", ShopUtil.itemNameComponent(getItemStack()))
); );
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
signBlock.line(i, miniMessage.deserialize(signLines.get(i), tagResolver)); signBlock.line(i, miniMessage.deserialize(signLines.get(i), tagResolver));

29
src/main/java/com/alttd/playershops/utils/ShopUtil.java
View File

@ -1,10 +1,11 @@
package com.alttd.playershops.utils; package com.alttd.playershops.utils;
import com.alttd.playershops.shop.PlayerShop; import com.alttd.playershops.shop.PlayerShop;
import com.destroystokyo.paper.profile.PlayerProfile; import net.kyori.adventure.text.Component;
import org.bukkit.*; import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
@ -155,20 +156,18 @@ public class ShopUtil {
return false; return false;
} }
public static String getItemName(ItemStack item) { public static Component itemNameComponent(ItemStack item) {
if (item == null || !item.getType().equals(Material.AIR)) Component component = Component.empty();
return "Nothing"; if(item == null || item.getType().equals(Material.AIR))
return Component.text("Nothing");
String NAME = "{item}";
boolean dname = item.hasItemMeta() && item.getItemMeta().hasDisplayName(); boolean dname = item.hasItemMeta() && item.getItemMeta().hasDisplayName();
String replacer = ChatColor.translateAlternateColorCodes('&',NAME+"&r"); if(dname) {
if (dname) { component = component.append(item.getItemMeta().displayName());
String trp = item.getItemMeta().getDisplayName();
replacer = replacer.replace(NAME, trp);
} else { } else {
replacer = replacer.replace(NAME, materialToName(item.getType())); component = component.append(Component.text(materialToName(item.getType()), NamedTextColor.WHITE));
} }
return replacer;
return component;
} }
private static String materialToName(Material m) { private static String materialToName(Material m) {