From 8619e0dd945ecc5adffc94da98cb11927362d939 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Wed, 5 Jan 2022 22:19:55 +0100
Subject: [PATCH] Added total points to buy/sell message

---
 src/main/java/com/alttd/GUI/windows/BuyGUI.java  | 10 +++++++---
 src/main/java/com/alttd/GUI/windows/SellGUI.java |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/alttd/GUI/windows/BuyGUI.java b/src/main/java/com/alttd/GUI/windows/BuyGUI.java
index 9429fc3..fbd3398 100644
--- a/src/main/java/com/alttd/GUI/windows/BuyGUI.java
+++ b/src/main/java/com/alttd/GUI/windows/BuyGUI.java
@@ -88,16 +88,20 @@ public class BuyGUI extends GUIMerchant {
         econ.withdrawPlayer(player, cost);
         econUser.addPoints(villagerType.getName(), transPts);
         player.getInventory().addItem(new ItemStack(material, amount));
+
+        int newPoints = econUser.getPointsMap().get(villagerType.getName());
         player.sendMiniMessage(Config.PURCHASED_ITEM, List.of(
                 Template.template("amount", String.valueOf(amount)),
                 Template.template("item", StringUtils.capitalize(material.name()
                         .toLowerCase().replaceAll("_", " "))),
                 Template.template("price", String.valueOf(cost)),
-                Template.template("points", String.valueOf(transPts))));
+                Template.template("points", String.valueOf(transPts)),
+                Template.template("total_points", String.valueOf(newPoints))
+        ));
 
         Bukkit.getServer().getPluginManager()
                 .callEvent(new SpawnShopEvent(player, amount, cost, material,
-                        oldPoints, econUser.getPointsMap().get(villagerType.getName()), true));
+                        oldPoints, newPoints, true));
     }
 
     private ItemStack getPriceItem(double price) {
@@ -110,7 +114,7 @@ public class BuyGUI extends GUIMerchant {
 
     private ItemStack nameItem(ItemStack itemStack, double price) {
         ItemMeta itemMeta = itemStack.getItemMeta();
-        itemMeta.displayName(miniMessage.deserialize("<green>" + price + "</green>")); //TODO configurable
+        itemMeta.displayName(miniMessage.deserialize("<red>" + price + "</red>")); //TODO configurable
         itemStack.setItemMeta(itemMeta);
         return itemStack;
     }
diff --git a/src/main/java/com/alttd/GUI/windows/SellGUI.java b/src/main/java/com/alttd/GUI/windows/SellGUI.java
index 4570eeb..d005dfd 100644
--- a/src/main/java/com/alttd/GUI/windows/SellGUI.java
+++ b/src/main/java/com/alttd/GUI/windows/SellGUI.java
@@ -77,16 +77,19 @@ public class SellGUI extends GUIMerchant {
 
         removeItems(inventory, material, amount);
 
+        int newPoints = econUser.getPointsMap().get(villagerType.getName());
         player.sendMiniMessage(Config.SOLD_ITEM, List.of(
                 Template.template("amount", String.valueOf(amount)),
                 Template.template("item", StringUtils.capitalize(material.name()
                         .toLowerCase().replaceAll("_", " "))),
                 Template.template("price", String.valueOf(cost)),
-                Template.template("points", String.valueOf(transPts))));
+                Template.template("points", String.valueOf(transPts)),
+                Template.template("total_points", String.valueOf(newPoints))
+        ));
 
         Bukkit.getServer().getPluginManager()
                 .callEvent(new SpawnShopEvent(player, amount, cost, material,
-                        oldPoints, econUser.getPointsMap().get(villagerType.getName()), false));
+                        oldPoints, newPoints, false));
     }
 
     private void removeItems(Inventory inventory, Material material, int amount) {
@@ -120,7 +123,7 @@ public class SellGUI extends GUIMerchant {
 
     private ItemStack nameItem(ItemStack itemStack, double price) {
         ItemMeta itemMeta = itemStack.getItemMeta();
-        itemMeta.displayName(miniMessage.deserialize("<red>" + price * -1 + "</red>")); //TODO configurable
+        itemMeta.displayName(miniMessage.deserialize("<green>" + price + "</green>")); //TODO configurable
         itemStack.setItemMeta(itemMeta);
         return itemStack;
     }