Skip to content

Commit d316ee3

Browse files
RefracRefrac
committed
update to 26.1 + fix commands converting from long to double
1 parent d967501 commit d316ee3

7 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<dependency>
132132
<groupId>org.spigotmc</groupId>
133133
<artifactId>spigot-api</artifactId>
134-
<version>1.21.11-R0.1-SNAPSHOT</version>
134+
<version>26.1-R0.1-SNAPSHOT</version>
135135
<scope>provided</scope>
136136
</dependency>
137137
<dependency>

‎src/main/java/me/refracdevelopment/simplegems/commands/GiveCommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ public void perform(CommandSender commandSender, String[] args) {
6363

6464
if (target.isOnline()) {
6565
Player targetPlayer = target.getPlayer();
66-
long amount;
66+
double amount;
6767

6868
try {
69-
amount = Long.parseLong(args[2]);
69+
amount = Double.parseDouble(args[2]);
7070
} catch (NumberFormatException exception) {
7171
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
7272
return;
7373
}
7474

75-
if (amount <= 0) {
75+
if (amount < 0) {
7676
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
7777
return;
7878
}
@@ -85,20 +85,20 @@ public void perform(CommandSender commandSender, String[] args) {
8585
.build();
8686

8787
if (commandSender instanceof Player player)
88-
SimpleGems.getInstance().getGemsAPI().giveGems(player, targetPlayer, (double)amount);
88+
SimpleGems.getInstance().getGemsAPI().giveGems(player, targetPlayer, amount);
8989
else
90-
SimpleGems.getInstance().getGemsAPI().giveGems(targetPlayer, (double)amount);
90+
SimpleGems.getInstance().getGemsAPI().giveGems(targetPlayer, amount);
9191

9292
if (message.contains("-s"))
9393
return;
9494

9595
RyMessageUtils.sendPluginMessage(commandSender, "gems-given", placeholders);
9696
RyMessageUtils.sendPluginMessage(targetPlayer, "gems-gained", placeholders);
9797
} else if (target.hasPlayedBefore()) {
98-
long amount;
98+
double amount;
9999

100100
try {
101-
amount = Long.parseLong(args[2]);
101+
amount = Double.parseDouble(args[2]);
102102
} catch (NumberFormatException exception) {
103103
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
104104
return;

‎src/main/java/me/refracdevelopment/simplegems/commands/PayCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ public void perform(CommandSender commandSender, String[] args) {
6666
}
6767

6868
if (target.isOnline()) {
69-
long amount;
69+
double amount;
7070

7171
try {
72-
amount = Long.parseLong(args[2]);
72+
amount = Double.parseDouble(args[2]);
7373
} catch (NumberFormatException exception) {
7474
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
7575
return;
@@ -80,12 +80,12 @@ public void perform(CommandSender commandSender, String[] args) {
8080
return;
8181
}
8282

83-
SimpleGems.getInstance().getGemsAPI().payGems(player, target.getPlayer(), (double)amount, message.contains("-s"));
83+
SimpleGems.getInstance().getGemsAPI().payGems(player, target.getPlayer(), amount, message.contains("-s"));
8484
} else if (target.hasPlayedBefore()) {
85-
long amount;
85+
double amount;
8686

8787
try {
88-
amount = Long.parseLong(args[2]);
88+
amount = Double.parseDouble(args[2]);
8989
} catch (NumberFormatException exception) {
9090
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
9191
return;
@@ -96,7 +96,7 @@ public void perform(CommandSender commandSender, String[] args) {
9696
return;
9797
}
9898

99-
SimpleGems.getInstance().getGemsAPI().payOfflineGems(player, target, (double)amount);
99+
SimpleGems.getInstance().getGemsAPI().payOfflineGems(player, target, amount);
100100
} else
101101
RyMessageUtils.sendPluginMessage(player, "invalid-player");
102102
}

‎src/main/java/me/refracdevelopment/simplegems/commands/RandomGiveCommand.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,28 +57,28 @@ public void perform(CommandSender commandSender, String[] args) {
5757
if (target.isOnline()) {
5858
Player targetPlayer = target.getPlayer();
5959

60-
long min;
61-
long max;
62-
long amount;
60+
double min;
61+
double max;
62+
double amount;
6363

6464
try {
65-
min = Long.parseLong(args[2]);
66-
max = Long.parseLong(args[3]);
67-
amount = ThreadLocalRandom.current().nextLong(min, max);
65+
min = Double.parseDouble(args[2]);
66+
max = Double.parseDouble(args[3]);
67+
amount = ThreadLocalRandom.current().nextDouble(min, max);
6868
} catch (NumberFormatException exception) {
6969
RyMessageUtils.sendSender(commandSender, "invalid-number");
7070
return;
7171
}
7272

73-
if (amount <= 0) {
73+
if (amount < 0) {
7474
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
7575
return;
7676
}
7777

7878
if (commandSender instanceof Player player)
79-
SimpleGems.getInstance().getGemsAPI().giveGems(player, targetPlayer, (double)amount);
79+
SimpleGems.getInstance().getGemsAPI().giveGems(player, targetPlayer, amount);
8080
else
81-
SimpleGems.getInstance().getGemsAPI().giveGems(targetPlayer, (double)amount);
81+
SimpleGems.getInstance().getGemsAPI().giveGems(targetPlayer, amount);
8282

8383
StringPlaceholders placeholders = StringPlaceholders.builder()
8484
.addAll(Placeholders.setPlaceholders(targetPlayer))
@@ -94,25 +94,25 @@ public void perform(CommandSender commandSender, String[] args) {
9494
RyMessageUtils.sendPluginMessage(commandSender, "gems-given", placeholders);
9595
RyMessageUtils.sendPluginMessage(targetPlayer, "gems-gained", placeholders);
9696
} else if (target.hasPlayedBefore()) {
97-
long min;
98-
long max;
99-
long amount;
97+
double min;
98+
double max;
99+
double amount;
100100

101101
try {
102-
min = Long.parseLong(args[2]);
103-
max = Long.parseLong(args[3]);
104-
amount = ThreadLocalRandom.current().nextLong(min, max);
102+
min = Double.parseDouble(args[2]);
103+
max = Double.parseDouble(args[3]);
104+
amount = ThreadLocalRandom.current().nextDouble(min, max);
105105
} catch (NumberFormatException exception) {
106106
RyMessageUtils.sendSender(commandSender, "invalid-number");
107107
return;
108108
}
109109

110-
if (amount <= 0) {
110+
if (amount < 0) {
111111
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
112112
return;
113113
}
114114

115-
SimpleGems.getInstance().getGemsAPI().giveOfflineGems(target, (double)amount);
115+
SimpleGems.getInstance().getGemsAPI().giveOfflineGems(target, amount);
116116

117117
StringPlaceholders placeholders = StringPlaceholders.builder()
118118
.addAll(Placeholders.setPlaceholders(commandSender))

‎src/main/java/me/refracdevelopment/simplegems/commands/SetCommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void perform(CommandSender commandSender, String[] args) {
6363

6464
if (target.isOnline()) {
6565
Player targetPlayer = target.getPlayer();
66-
long amount;
66+
double amount;
6767

6868
try {
6969
amount = Long.parseLong(args[2]);
@@ -72,7 +72,7 @@ public void perform(CommandSender commandSender, String[] args) {
7272
return;
7373
}
7474

75-
if (amount <= 0) {
75+
if (amount < 0) {
7676
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
7777
return;
7878
}
@@ -85,20 +85,20 @@ public void perform(CommandSender commandSender, String[] args) {
8585
.build();
8686

8787
if (commandSender instanceof Player player)
88-
SimpleGems.getInstance().getGemsAPI().setGems(player, targetPlayer, (double)amount);
88+
SimpleGems.getInstance().getGemsAPI().setGems(player, targetPlayer, amount);
8989
else
90-
SimpleGems.getInstance().getGemsAPI().setGems(targetPlayer, (double)amount);
90+
SimpleGems.getInstance().getGemsAPI().setGems(targetPlayer, amount);
9191

9292
if (message.contains("-s"))
9393
return;
9494

9595
RyMessageUtils.sendPluginMessage(commandSender, "gems-set", placeholders);
9696
RyMessageUtils.sendPluginMessage(targetPlayer, "gems-setted", placeholders);
9797
} else if (target.hasPlayedBefore()) {
98-
long amount;
98+
double amount;
9999

100100
try {
101-
amount = Long.parseLong(args[2]);
101+
amount = Double.parseDouble(args[2]);
102102
} catch (NumberFormatException exception) {
103103
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number");
104104
return;
@@ -109,7 +109,7 @@ public void perform(CommandSender commandSender, String[] args) {
109109
return;
110110
}
111111

112-
SimpleGems.getInstance().getGemsAPI().setOfflineGems(target, (double)amount);
112+
SimpleGems.getInstance().getGemsAPI().setOfflineGems(target, amount);
113113

114114
StringPlaceholders placeholders = StringPlaceholders.builder()
115115
.addAll(Placeholders.setOfflinePlaceholders(target))

‎src/main/java/me/refracdevelopment/simplegems/commands/TakeCommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ public void perform(CommandSender commandSender, String[] args) {
6363

6464
if (target.isOnline()) {
6565
Player targetPlayer = target.getPlayer();
66-
long amount;
66+
double amount;
6767

6868
try {
69-
amount = Long.parseLong(args[2]);
69+
amount = Double.parseDouble(args[2]);
7070
} catch (NumberFormatException exception) {
7171
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
7272
return;
@@ -90,20 +90,20 @@ public void perform(CommandSender commandSender, String[] args) {
9090
}
9191

9292
if (commandSender instanceof Player player)
93-
SimpleGems.getInstance().getGemsAPI().takeGems(player, targetPlayer, (double)amount);
93+
SimpleGems.getInstance().getGemsAPI().takeGems(player, targetPlayer, amount);
9494
else
95-
SimpleGems.getInstance().getGemsAPI().takeGems(targetPlayer, (double)amount);
95+
SimpleGems.getInstance().getGemsAPI().takeGems(targetPlayer, amount);
9696

9797
if (message.contains("-s"))
9898
return;
9999

100100
RyMessageUtils.sendPluginMessage(commandSender, "gems-taken", placeholders);
101101
RyMessageUtils.sendPluginMessage(targetPlayer, "gems-lost", placeholders);
102102
} else if (target.hasPlayedBefore()) {
103-
long amount;
103+
double amount;
104104

105105
try {
106-
amount = Long.parseLong(args[2]);
106+
amount = Double.parseDouble(args[2]);
107107
} catch (NumberFormatException exception) {
108108
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
109109
return;
@@ -126,7 +126,7 @@ public void perform(CommandSender commandSender, String[] args) {
126126
return;
127127
}
128128

129-
SimpleGems.getInstance().getGemsAPI().takeOfflineGems(target, (double)amount);
129+
SimpleGems.getInstance().getGemsAPI().takeOfflineGems(target, amount);
130130

131131
if (message.contains("-s"))
132132
return;

‎src/main/java/me/refracdevelopment/simplegems/commands/WithdrawCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public void perform(CommandSender commandSender, String[] args) {
5757
return;
5858
}
5959

60-
long amount;
60+
double amount;
6161

6262
try {
63-
amount = Long.parseLong(args[1]);
63+
amount = Double.parseDouble(args[1]);
6464
} catch (NumberFormatException exception) {
6565
RyMessageUtils.sendPluginMessage(commandSender, "invalid-number", Placeholders.setPlaceholders(commandSender));
6666
return;

0 commit comments

Comments
 (0)