Merge pull request #72 from ParallelMC/maggie-shop-fixes

Fixes for rewritten Maggie shop

Author: UnknownSilicon

modules/src/main/java/parallelmc/parallelutils/modules/npcshops/maggieshop/MaggieHomeInventory.java

@@ -33,6 +33,11 @@ public MaggieHomeInventory(ParallelUtils puPlugin) {
         String url = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTA4OWY0ODU0YzczYTg4Yjg1ODQ3NWM5MTg2MzNjYjgxZWIyODJkYThlNzVhMTdkM2Y2ODAwODBjNThiNjVmNSJ9fX0=";
         ItemStack head = new ItemStack(Material.PLAYER_HEAD);
         SkullMeta headMeta = (SkullMeta)head.getItemMeta();
+        headMeta.displayName(Component.text("Maggie", NamedTextColor.YELLOW).decoration(TextDecoration.ITALIC, false));
+        List<Component> lore = new ArrayList<>();
+        lore.add(Component.text("Welcome to my charms shop!", NamedTextColor.YELLOW).decoration(TextDecoration.ITALIC, false));
+        lore.add(Component.text("Spruce up your items here!", NamedTextColor.YELLOW).decoration(TextDecoration.ITALIC, false));
+        headMeta.lore(lore);
         CraftPlayerProfile profile = new CraftPlayerProfile(UUID.randomUUID(), null);
         profile.setProperty("textures", new Property("textures", url));
         headMeta.setPlayerProfile(profile);
@@ -43,14 +48,14 @@ public MaggieHomeInventory(ParallelUtils puPlugin) {
         ItemStack open = new ItemStack(Material.NAME_TAG);
         ItemMeta meta = open.getItemMeta();
         meta.displayName(Component.text("Open Charms Shop", NamedTextColor.YELLOW, TextDecoration.BOLD).decoration(TextDecoration.ITALIC, false));
-        List<Component> lore = new ArrayList<>();
+        lore.clear();
         lore.add(Component.text("This shop is open to all ranks!", NamedTextColor.GRAY).decoration(TextDecoration.ITALIC, false));
         lore.add(Component.empty());
         lore.add(Component.text("Click here to browse charms for sale!", NamedTextColor.AQUA).decoration(TextDecoration.ITALIC, false));
         meta.lore(lore);
         open.setItemMeta(meta);
 
-        inventory.setItem(14, open);
+        inventory.setItem(13, open);
 
         ItemStack ranked = new ItemStack(Material.NAME_TAG);
         meta = ranked.getItemMeta();
@@ -63,7 +68,7 @@ public MaggieHomeInventory(ParallelUtils puPlugin) {
         meta.lore(lore);
         ranked.setItemMeta(meta);
 
-        inventory.setItem(15, ranked);
+        inventory.setItem(14, ranked);
 
         ItemStack remover = new ItemStack(Material.PAPER);
         meta = remover.getItemMeta();
@@ -76,7 +81,7 @@ public MaggieHomeInventory(ParallelUtils puPlugin) {
         meta.setCustomModelData(1000000);
         remover.setItemMeta(meta);
 
-        inventory.setItem(16, remover);
+        inventory.setItem(15, remover);
 
         this.puPlugin = puPlugin;
     }
@@ -103,7 +108,7 @@ else if (player.getInventory().firstEmpty() == -1) {
                 else {
                     EconomyManager.get().removeRiftcoins(player, 20);
                     puPlugin.getServer().dispatchCommand(puPlugin.getServer().getConsoleSender(), "pu giveremover " + player.getName());
-                    ParallelChat.sendParallelMessageTo(player, Component.text("You purchased a ", NamedTextColor.AQUA)
+                    ParallelChat.sendParallelMessageTo(player, Component.text("You purchased a", NamedTextColor.AQUA)
                             .append(Component.text(" Charm Remover!", NamedTextColor.WHITE)));
                 }
             }

modules/src/main/java/parallelmc/parallelutils/modules/npcshops/maggieshop/MaggieOpenInventory.java

@@ -42,7 +42,7 @@ public MaggieOpenInventory() {
     public void onOpen(Player player) {
         ItemStack charm = new ItemStack(Material.NAME_TAG);
         ItemMeta meta = charm.getItemMeta();
-        meta.displayName(Component.text("Charm Applicator", NamedTextColor.YELLOW));
+        meta.displayName(Component.text("Charm Applicator", NamedTextColor.YELLOW).decoration(TextDecoration.ITALIC, false));
         meta.setCustomModelData(1000000);
         List<Component> lore = new ArrayList<>();
         List<ShopCharm> charms = NPCShops.get().getMaggieShop().getAllOpenCharms();
@@ -80,7 +80,7 @@ else if (player.getInventory().firstEmpty() == -1) {
                 EconomyManager.get().removeRiftcoins(player, charm.price());
                 Bukkit.dispatchCommand(Bukkit.getConsoleSender(), String.format("pu givecharm %s %s", player.getName(), charm.charmName()));
                 ParallelChat.sendParallelMessageTo(player,
-                        MiniMessage.miniMessage().deserialize(String.format("<aqua>You bought a <yellow>Charm Applicator <aqua>(%s) for <orange> %d riftcoins!", charm.charmName(), charm.price())));
+                        MiniMessage.miniMessage().deserialize(String.format("<aqua>You bought a <yellow>Charm Applicator <aqua>(%s) for <gold>%d riftcoins!", charm.charmName(), charm.price())));
             }
         }
     }

modules/src/main/java/parallelmc/parallelutils/modules/npcshops/maggieshop/MaggieRankedInventory.java

@@ -44,7 +44,7 @@ public MaggieRankedInventory() {
     public void onOpen(Player player) {
         ItemStack charm = new ItemStack(Material.NAME_TAG);
         ItemMeta meta = charm.getItemMeta();
-        meta.displayName(Component.text("Charm Applicator", NamedTextColor.YELLOW));
+        meta.displayName(Component.text("Charm Applicator", NamedTextColor.YELLOW).decoration(TextDecoration.ITALIC, false));
         meta.setCustomModelData(1000000);
         List<Component> lore = new ArrayList<>();
         List<ShopCharm> charms = NPCShops.get().getMaggieShop().getAllRankedCharms();
@@ -88,7 +88,7 @@ else if (player.getInventory().firstEmpty() == -1) {
                 EconomyManager.get().removeRiftcoins(player, charm.price());
                 Bukkit.dispatchCommand(Bukkit.getConsoleSender(), String.format("pu givecharm %s %s", player.getName(), charm.charmName()));
                 ParallelChat.sendParallelMessageTo(player,
-                        MiniMessage.miniMessage().deserialize(String.format("<aqua>You bought a <yellow>Charm Applicator <aqua>(%s) for <orange> %d riftcoins!", charm.charmName(), charm.price())));
+                        MiniMessage.miniMessage().deserialize(String.format("<aqua>You bought a <yellow>Charm Applicator <aqua>(%s) for <gold>%d riftcoins!", charm.charmName(), charm.price())));
             }
         }
     }
@@ -101,7 +101,7 @@ private Component getFormattingFromPermission(String permission) {
             case "diamond" -> MiniMessage.miniMessage().deserialize("<bold><aqua>Diamond");
             case "rift_master" ->
                 // really don't want to convert this lol
-                    LegacyComponentSerializer.legacySection().deserialize("&x&5&B&1&6&D&B&lR&x&6&4&1&8&D&C&li&x&6&B&1&B&D&C&lf&x&7&3&1&D&D&D&lt &x&7&A&2&0&D&D&lM&x&8&1&2&3&D&E&la&x&8&7&2&6&D&E&ls&x&8&D&2&9&D&F&lt&x&9&3&2&C&D&F&le&x&9&9&2&F&E&0&lr");
+                    LegacyComponentSerializer.legacyAmpersand().deserialize("&x&5&B&1&6&D&B&lR&x&6&4&1&8&D&C&li&x&6&B&1&B&D&C&lf&x&7&3&1&D&D&D&lt &x&7&A&2&0&D&D&lM&x&8&1&2&3&D&E&la&x&8&7&2&6&D&E&ls&x&8&D&2&9&D&F&lt&x&9&3&2&C&D&F&le&x&9&9&2&F&E&0&lr");
             default -> Component.empty();
         };
     }