hyro/lighteco
1
0
Fork 0
mirror of https://github.com/xHyroM/lighteco.git synced 2024-11-10 01:18:07 +01:00
Code Issues Projects Releases Wiki Activity

fix(bukkit): remove max value from commands

Browse source
This commit is contained in:
Jozef Steinhübl 2023-10-07 13:34:03 +02:00
parent 4c832f11f1
commit ca5086621b
No known key found for this signature in database
GPG key ID: E944BC293F5FF7E7
5 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import dev.jorel.commandapi.arguments.OfflinePlayerArgument;
import dev.jorel.commandapi.executors.CommandArguments; import dev.jorel.commandapi.executors.CommandArguments;
import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender; import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender;
import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager; import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager;
import dev.xhyrom.lighteco.bukkit.util.Util;
import dev.xhyrom.lighteco.common.model.currency.Currency; import dev.xhyrom.lighteco.common.model.currency.Currency;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -28,8 +27,8 @@ public class GiveCommand implements Command {
.withArguments( .withArguments(
new OfflinePlayerArgument("target"), new OfflinePlayerArgument("target"),
currency.getProxy().fractionalDigits() > 0 currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 1, Util.bigDecimalToDouble(this.manager.plugin.getConfig().maximumBalance)) ? new DoubleArgument("amount", 1)
: new IntegerArgument("amount", 1, this.manager.plugin.getConfig().maximumBalance.intValue()) : new IntegerArgument("amount", 1)
) )
.executes((sender, args) -> { .executes((sender, args) -> {
this.handleGive(sender, args, currency); this.handleGive(sender, args, currency);

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

@ -7,7 +7,6 @@ import dev.jorel.commandapi.arguments.OfflinePlayerArgument;
import dev.jorel.commandapi.executors.CommandArguments; import dev.jorel.commandapi.executors.CommandArguments;
import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender; import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender;
import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager; import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager;
import dev.xhyrom.lighteco.bukkit.util.Util;
import dev.xhyrom.lighteco.common.model.currency.Currency; import dev.xhyrom.lighteco.common.model.currency.Currency;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -28,8 +27,8 @@ public class PayCommand implements Command {
.withArguments( .withArguments(
new OfflinePlayerArgument("target"), new OfflinePlayerArgument("target"),
currency.getProxy().fractionalDigits() > 0 currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 1, Util.bigDecimalToDouble(this.manager.plugin.getConfig().maximumBalance)) ? new DoubleArgument("amount", 1)
: new IntegerArgument("amount", 1, this.manager.plugin.getConfig().maximumBalance.intValue()) : new IntegerArgument("amount", 1)
) )
.executesPlayer((sender, args) -> { .executesPlayer((sender, args) -> {
this.handlePay(sender, args, currency); this.handlePay(sender, args, currency);

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

@ -7,7 +7,6 @@ import dev.jorel.commandapi.arguments.OfflinePlayerArgument;
import dev.jorel.commandapi.executors.CommandArguments; import dev.jorel.commandapi.executors.CommandArguments;
import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender; import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender;
import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager; import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager;
import dev.xhyrom.lighteco.bukkit.util.Util;
import dev.xhyrom.lighteco.common.model.currency.Currency; import dev.xhyrom.lighteco.common.model.currency.Currency;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -28,8 +27,8 @@ public class SetCommand implements Command {
.withArguments( .withArguments(
new OfflinePlayerArgument("target"), new OfflinePlayerArgument("target"),
currency.getProxy().fractionalDigits() > 0 currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 0, Util.bigDecimalToDouble(this.manager.plugin.getConfig().maximumBalance)) ? new DoubleArgument("amount", 0)
: new IntegerArgument("amount", 0, this.manager.plugin.getConfig().maximumBalance.intValue()) : new IntegerArgument("amount", 0)
) )
.executes((sender, args) -> { .executes((sender, args) -> {
this.handleSet(sender, args, currency); this.handleSet(sender, args, currency);

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

@ -7,7 +7,6 @@ import dev.jorel.commandapi.arguments.OfflinePlayerArgument;
import dev.jorel.commandapi.executors.CommandArguments; import dev.jorel.commandapi.executors.CommandArguments;
import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender; import dev.xhyrom.lighteco.bukkit.chat.BukkitCommandSender;
import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager; import dev.xhyrom.lighteco.bukkit.manager.BukkitCommandManager;
import dev.xhyrom.lighteco.bukkit.util.Util;
import dev.xhyrom.lighteco.common.model.currency.Currency; import dev.xhyrom.lighteco.common.model.currency.Currency;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -28,8 +27,8 @@ public class TakeCommand implements Command {
.withArguments( .withArguments(
new OfflinePlayerArgument("target"), new OfflinePlayerArgument("target"),
currency.getProxy().fractionalDigits() > 0 currency.getProxy().fractionalDigits() > 0
? new DoubleArgument("amount", 1, Util.bigDecimalToDouble(this.manager.plugin.getConfig().maximumBalance)) ? new DoubleArgument("amount", 1)
: new IntegerArgument("amount", 1, this.manager.plugin.getConfig().maximumBalance.intValue()) : new IntegerArgument("amount", 1)
) )
.executes((sender, args) -> { .executes((sender, args) -> {
this.handleTake(sender, args, currency); this.handleTake(sender, args, currency);

19
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/util/Util.java
View file

@ -1,19 +0,0 @@
package dev.xhyrom.lighteco.bukkit.util;
import lombok.experimental.UtilityClass;
import java.math.BigDecimal;
@UtilityClass
public class Util {
public double bigDecimalToDouble(final BigDecimal value) {
double amount = value.doubleValue();
// Don't return bigger balance than user actually has
if (BigDecimal.valueOf(amount).compareTo(value) > 0) {
amount = Math.nextAfter(amount, Double.NEGATIVE_INFINITY);
}
return amount;
}
}