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

Added a way to manually overwrite points per item

Browse Source
This commit is contained in:
Teriuihi 2022-03-03 02:33:18 +01:00
parent c3e49735f0
commit 640aed9a48
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,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) {
int itemPts = (int) (Math.floor(price.getPrice(1) / WorthConfig.POINT_MOD) + 1); int itemPts = price.getPoints();
int transPts = itemPts * amount; int transPts = itemPts * amount;
EconUser econUser = EconUser.getUser(player.getUniqueId()); EconUser econUser = EconUser.getUser(player.getUniqueId());
int oldPoints = econUser.getPointsMap().getOrDefault(villagerType.getName(), 0); int oldPoints = econUser.getPointsMap().getOrDefault(villagerType.getName(), 0);

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

@ -73,7 +73,7 @@ public class SellGUI extends GUIMerchant {
EconUser econUser = EconUser.getUser(player.getUniqueId()); EconUser econUser = EconUser.getUser(player.getUniqueId());
int oldPoints = econUser.getPointsMap().getOrDefault(villagerType.getName(), 0); int oldPoints = econUser.getPointsMap().getOrDefault(villagerType.getName(), 0);
int itemPts = (int) (Math.floor(price.getPrice(1) / WorthConfig.POINT_MOD) + 1); int itemPts = price.getPoints();
int transPts = (itemPts * amount) * -1; int transPts = (itemPts * amount) * -1;
double cost = price.calculatePriceThing(oldPoints, transPts, false, itemPts); double cost = price.calculatePriceThing(oldPoints, transPts, false, itemPts);

3
src/main/java/com/alttd/config/WorthConfig.java
View File

@ -49,7 +49,8 @@ public class WorthConfig extends AbstractConfig {
Logger.severe("Null key in worth.yml?"); Logger.severe("Null key in worth.yml?");
continue; continue;
} }
map.put(Material.getMaterial(key), new Price(Utilities.round(worth.getDouble(key), 2))); Material material = Material.getMaterial(key);
map.put(material, new Price(Utilities.round(worth.getDouble(key), 2), material));
} }
} }

21
src/main/java/com/alttd/objects/Price.java
View File

@ -2,22 +2,29 @@ package com.alttd.objects;
import com.alttd.config.WorthConfig; import com.alttd.config.WorthConfig;
import com.alttd.util.Utilities; import com.alttd.util.Utilities;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
public final class Price { public final class Price {
private final double price; private final double price;
private final int points; private final int points;
private static final double[] xMult = {Integer.MIN_VALUE, -6000, -4000, -2000, -500, 500, 2000, 4000, 6000, Integer.MAX_VALUE}; private static final double[] xMult = {Integer.MIN_VALUE, -10000, -6000, -4000, -2000, -500, 500, 2000, 4000, 6000, 10000, Integer.MAX_VALUE};
private static final double[] yMultBuy = {0.5, 0.67, 0.8, 0.9, 1, 1.5, 2.5, 5, 10}; private static final double[] yMultBuy = {0.5, 0.5, 0.67, 0.8, 0.9, 1, 1.5, 2.5, 5, 10, 100};
private static final double[] yMultSell = {0.1, 0.2, 0.4, 0.67, 1, 1.1, 1.25, 1.5, 2}; private static final double[] yMultSell = {0.01, 0.1, 0.2, 0.4, 0.67, 1, 1.1, 1.25, 1.5, 2, 2};
public Price(double price) { public Price(double price, Material material) {
this.price = price; this.price = price;
this.points = (int) (Math.floor(price / WorthConfig.POINT_MOD) + 1); switch (material) {
case NETHER_STAR -> {
this.points = (int) (this.price / 2);
}
default -> this.points = (int) (Math.floor(price / WorthConfig.POINT_MOD) + 1);
}
} }
public static Price addPrice(Price one, Price two) { public static Price addPrice(Price one, Price two, Material material) {
return (new Price(Utilities.round(one.getPrice(1) + two.getPrice(1), 2))); return (new Price(Utilities.round(one.getPrice(1) + two.getPrice(1), 2), material));
} }
public static double getCurrentMultiplier(int points, boolean buy) { public static double getCurrentMultiplier(int points, boolean buy) {

2
src/main/java/com/alttd/util/Utilities.java
View File

@ -133,7 +133,7 @@ public class Utilities {
if (price == null) if (price == null)
price = tmp; price = tmp;
else else
price = Price.addPrice(price, tmp); price = Price.addPrice(price, tmp, item.getType());
} }
return (price); return (price);
} }