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

Added points in message and fixed price and point calculations

Browse Source
This commit is contained in:
Teriuihi 2022-01-02 20:30:33 +01:00
parent d45c2f9ace
commit 97860c7da5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/alttd/GUI/windows/BuyGUI.java
View File

@ -49,7 +49,7 @@ public class BuyGUI extends GUIMerchant {
private void buy(VillagerType villagerType, Player player, Material material, int amount, Price price) { private void buy(VillagerType villagerType, Player player, Material material, int amount, Price price) {
Economy econ = VillagerUI.getInstance().getEconomy(); Economy econ = VillagerUI.getInstance().getEconomy();
double balance = econ.getBalance(player); double balance = econ.getBalance(player);
int itemPts = (int) (Math.floor(price.getPrice(amount) / WorthConfig.POINT_MOD) + 1); int itemPts = (int) (Math.floor(price.getPrice(1) / WorthConfig.POINT_MOD) + 1);
int transPts = itemPts * amount; int transPts = itemPts * amount;
EconUser econUser = EconUser.getUser(player.getUniqueId()); EconUser econUser = EconUser.getUser(player.getUniqueId());
int oldPoints = Objects.requireNonNullElse(econUser.getPointsMap().get(villagerType.getName()), 0); int oldPoints = Objects.requireNonNullElse(econUser.getPointsMap().get(villagerType.getName()), 0);
@ -69,7 +69,8 @@ public class BuyGUI extends GUIMerchant {
Template.template("amount", String.valueOf(amount)), Template.template("amount", String.valueOf(amount)),
Template.template("item", StringUtils.capitalize(material.name() Template.template("item", StringUtils.capitalize(material.name()
.toLowerCase().replaceAll("_", " "))), .toLowerCase().replaceAll("_", " "))),
Template.template("price", String.valueOf(cost)))); Template.template("price", String.valueOf(cost)),
Template.template("points", String.valueOf(transPts))));
Bukkit.getServer().getPluginManager() Bukkit.getServer().getPluginManager()
.callEvent(new SpawnShopEvent(player, amount, cost, material, .callEvent(new SpawnShopEvent(player, amount, cost, material,

9
src/main/java/com/alttd/GUI/windows/SellGUI.java
View File

@ -61,12 +61,12 @@ public class SellGUI extends GUIMerchant {
Economy econ = VillagerUI.getInstance().getEconomy(); Economy econ = VillagerUI.getInstance().getEconomy();
EconUser econUser = EconUser.getUser(player.getUniqueId()); EconUser econUser = EconUser.getUser(player.getUniqueId());
int oldPoints = Objects.requireNonNullElse(econUser.getPointsMap().get(villagerType.getName()), 0); int oldPoints = Objects.requireNonNullElse(econUser.getPointsMap().get(villagerType.getName()), 0);
int itemPts = (int) (Math.floor(price.getPrice(amount) / WorthConfig.POINT_MOD) + 1); int itemPts = (int) (Math.floor(price.getPrice(1) / WorthConfig.POINT_MOD) + 1);
int transPts = itemPts * amount; int transPts = (itemPts * amount) * -1;
double cost = price.calculatePriceThing(oldPoints, transPts, false, itemPts); double cost = price.calculatePriceThing(oldPoints, transPts, false, itemPts);
econ.depositPlayer(player, cost); econ.depositPlayer(player, cost);
econUser.addPoints(villagerType.getName(), -price.getPoints()); econUser.addPoints(villagerType.getName(), transPts);
removeItems(inventory, material, amount); removeItems(inventory, material, amount);
@ -74,7 +74,8 @@ public class SellGUI extends GUIMerchant {
Template.template("amount", String.valueOf(amount)), Template.template("amount", String.valueOf(amount)),
Template.template("item", StringUtils.capitalize(material.name() Template.template("item", StringUtils.capitalize(material.name()
.toLowerCase().replaceAll("_", " "))), .toLowerCase().replaceAll("_", " "))),
Template.template("price", String.valueOf(cost)))); Template.template("price", String.valueOf(cost)),
Template.template("points", String.valueOf(transPts))));
Bukkit.getServer().getPluginManager() Bukkit.getServer().getPluginManager()
.callEvent(new SpawnShopEvent(player, amount, cost, material, .callEvent(new SpawnShopEvent(player, amount, cost, material,

2
src/main/java/com/alttd/config/Config.java
View File

@ -88,7 +88,7 @@ public final class Config extends AbstractConfig {
public static String NOT_ENOUGH_MONEY = "<red>You only have $<money>, you need at least $<price> for this purchase.</red>"; public static String NOT_ENOUGH_MONEY = "<red>You only have $<money>, you need at least $<price> for this purchase.</red>";
public static String NOT_ENOUGH_ITEMS = "<red>You only have don't have enough <type> you need at least <amount>.</red>"; public static String NOT_ENOUGH_ITEMS = "<red>You only have don't have enough <type> you need at least <amount>.</red>";
public static String PURCHASED_ITEM = "<green>You bought <amount> <item> for <price>!</green>"; public static String PURCHASED_ITEM = "<green>You bought <amount> <item> for <price> and got <points> points!</green>";
public static String SOLD_ITEM = "<green>You sold <amount> <item> for <price>!</green>"; public static String SOLD_ITEM = "<green>You sold <amount> <item> for <price>!</green>";
public static String REMOVED_VILLAGER = "<green>Removed villager with uuid <uuid></green>"; public static String REMOVED_VILLAGER = "<green>Removed villager with uuid <uuid></green>";