hyro/lighteco
1
0
Fork 0
mirror of https://github.com/xHyroM/lighteco.git synced 2024-12-22 12:31:05 +01:00
Code Issues Projects Releases Wiki Activity

fix: handle franctional digits

Browse source
This commit is contained in:
Jozef Steinhübl 2023-08-27 18:01:16 +02:00
parent c902a6a989
commit c82b04970b
10 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/src/main/java/dev/xhyrom/lighteco/api/model/currency/Currency.java
View file

@ -17,12 +17,11 @@ public abstract class Currency {
public abstract boolean isPayable();
/**
* Get the number of decimal places this currency has
* If zero, the currency is considered to be a whole number (integer)
* Get the number of fractional digits this currency has
*
* @return The number of decimal places
* @return The number of fractional digits
*/
public int getDecimalPlaces() {
public int fractionalDigits() {
return 0;
};

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/BalanceCommand.java
View file

@ -10,8 +10,6 @@ import lombok.RequiredArgsConstructor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import java.util.List;
@RequiredArgsConstructor
public class BalanceCommand implements Command {
private final BukkitCommandManager manager;

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/GiveCommand.java
View file

@ -26,7 +26,7 @@ public class GiveCommand implements Command {
.withPermission(permissionBase + "give")
.withArguments(
new OfflinePlayerArgument("target"),
currency.getProxy().getDecimalPlaces() > 0
currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 1)
: new IntegerArgument("amount", 1)
)

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/PayCommand.java
View file

@ -26,7 +26,7 @@ public class PayCommand implements Command {
.withPermission(permissionBase + "pay")
.withArguments(
new OfflinePlayerArgument("target"),
currency.getProxy().getDecimalPlaces() > 0
currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 1)
: new IntegerArgument("amount", 1)
)

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/SetCommand.java
View file

@ -26,7 +26,7 @@ public class SetCommand implements Command {
.withPermission(permissionBase + "set")
.withArguments(
new OfflinePlayerArgument("target"),
currency.getProxy().getDecimalPlaces() > 0
currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 0)
: new IntegerArgument("amount", 0)
)

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/TakeCommand.java
View file

@ -26,7 +26,7 @@ public class TakeCommand implements Command {
.withPermission(permissionBase + "take")
.withArguments(
new OfflinePlayerArgument("target"),
currency.getProxy().getDecimalPlaces() > 0
currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 1)
: new IntegerArgument("amount", 1)
)

2
bukkittest/src/main/java/dev/xhyrom/lighteco/bukkittest/TestCurrency2.java
View file

@ -22,7 +22,7 @@ public class TestCurrency2 extends Currency {
}
@Override
public int getDecimalPlaces() {
public int fractionalDigits() {
return 2;
}

2
bukkittest/src/main/java/dev/xhyrom/lighteco/bukkittest/TestPlugin.java
View file

@ -19,7 +19,7 @@ public class TestPlugin extends JavaPlugin {
getLogger().info("TestCurrency registered!");
currencyManager.getRegisteredCurrencies().forEach(currency -> {
getLogger().info("Currency: " + currency.getIdentifier() + " (" + currency.getType() + ", " + currency.getDecimalPlaces() + ", " + currency.isPayable() + ")");
getLogger().info("Currency: " + currency.getIdentifier() + " (" + currency.getType() + ", " + currency.fractionalDigits() + ", " + currency.isPayable() + ")");
});
provider.getCommandManager().registerCurrencyCommand(currencyManager.getCurrency("test"));

16
common/src/main/java/dev/xhyrom/lighteco/common/manager/command/AbstractCommandManager.java
View file

@ -7,6 +7,7 @@ import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin;
import net.kyori.adventure.text.minimessage.MiniMessage;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.UUID;
@ -73,6 +74,7 @@ public abstract class AbstractCommandManager implements CommandManager {
@Override
public void onSet(CommandSender sender, Currency currency, User target, BigDecimal amount) {
addToMustWait(sender.getUniqueId(), target.getUniqueId());
amount = amount.setScale(currency.getProxy().fractionalDigits(), RoundingMode.DOWN);
target.setBalance(currency, amount);
@ -87,6 +89,7 @@ public abstract class AbstractCommandManager implements CommandManager {
@Override
public void onGive(CommandSender sender, Currency currency, User target, BigDecimal amount) {
addToMustWait(sender.getUniqueId(), target.getUniqueId());
amount = amount.setScale(currency.getProxy().fractionalDigits(), RoundingMode.DOWN);
target.setBalance(currency, target.getBalance(currency).add(amount));
@ -101,6 +104,7 @@ public abstract class AbstractCommandManager implements CommandManager {
@Override
public void onTake(CommandSender sender, Currency currency, User target, BigDecimal amount) {
addToMustWait(sender.getUniqueId(), target.getUniqueId());
amount = amount.setScale(currency.getProxy().fractionalDigits(), RoundingMode.DOWN);
target.setBalance(currency, target.getBalance(currency).subtract(amount));
@ -122,11 +126,19 @@ public abstract class AbstractCommandManager implements CommandManager {
return;
}
addToMustWait(sender.getUniqueId(), target.getUniqueId());
amount = amount.setScale(currency.getProxy().fractionalDigits(), RoundingMode.DOWN);
User user = this.plugin.getUserManager().getIfLoaded(sender.getUniqueId());
// TODO: ADD CHECKS FOR IF USER HAS ENOUGH MONEY
if (user.getBalance(currency).compareTo(amount) < 0) {
sender.sendMessage(
miniMessage.deserialize("<red>You do not have enough money!")
);
return;
}
addToMustWait(sender.getUniqueId(), target.getUniqueId());
// calculate tax using Currency#calculateTax
BigDecimal tax = currency.getProxy().calculateTax(user.getProxy(), amount);

2
currency-money/src/main/java/dev/xhyrom/lighteco/currency/money/common/MoneyCurrency.java
View file

@ -26,7 +26,7 @@ public class MoneyCurrency extends Currency {
}
@Override
public int getDecimalPlaces() {
public int fractionalDigits() {
return 2;
}
}