Skip to content

Commit 22d0919

Browse files
LarsEsDochLarsEsDoch
committed
Updated to new ApiManager version 4.3.2
1 parent 3c040bf commit 22d0919

22 files changed

+128
-133
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
compileOnly 'me.lucko:spark-api:0.1-SNAPSHOT'
2121
compileOnly 'net.dmulloy2:ProtocolLib:5.4.0'
2222
implementation 'net.dv8tion:JDA:5.0.0-beta.20'
23-
implementation 'com.github.LarsEsDoch:ApiManager:4.3.1'
23+
implementation 'com.github.LarsEsDoch:ApiManager:4.3.2'
2424
}
2525

2626
tasks {

‎src/main/java/de/lars/utilsmanager/commands/economy/AddCoinsCommand.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -43,11 +43,6 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
4343
return;
4444
}
4545

46-
if (!(args[0] instanceof String)) {
47-
sendUsage(player);
48-
return;
49-
}
50-
5146
for (String arg : args) {
5247
try {
5348
Integer.parseInt(args[1]);
@@ -71,7 +66,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
7166
}
7267
return;
7368
}
74-
CoinAPI.getApi().addCoins((Player) offlinePlayer, addcoins);
69+
EconomyAPI.getApi().increaseBalance((Player) offlinePlayer, addcoins);
7570
DecimalFormat formatter = new DecimalFormat("#,###");
7671
String formatierteZahl = formatter.format(addcoins);
7772
if (LanguageAPI.getApi().getLanguage(player) == 2) {
@@ -119,11 +114,11 @@ private void sendUsage(Player player) {
119114
if (LanguageAPI.getApi().getLanguage(player) == 2) {
120115
player.sendMessage(Component.text("Verwendung", NamedTextColor.GRAY)
121116
.append(Component.text(": ", NamedTextColor.DARK_GRAY))
122-
.append(Component.text("/addcoins <Spieler> <Coins>", NamedTextColor.BLUE)));
117+
.append(Component.text("/addcoins <Spieler> <Balance>", NamedTextColor.BLUE)));
123118
} else {
124119
player.sendMessage(Component.text("Use", NamedTextColor.GRAY)
125120
.append(Component.text(": ", NamedTextColor.DARK_GRAY))
126-
.append(Component.text("/addcoins <Player> <Coins>", NamedTextColor.BLUE)));
121+
.append(Component.text("/addcoins <Player> <Balance>", NamedTextColor.BLUE)));
127122
}
128123
}
129124
}

‎src/main/java/de/lars/utilsmanager/commands/economy/BuyCommand.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -72,7 +72,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
7272
case "copper": {
7373
PlayerInventory inventory = player.getInventory();
7474
ItemStack copper = new ItemStack(Material.COPPER_INGOT, nummber);
75-
balence = CoinAPI.getApi().getCoins(player);
75+
balence = EconomyAPI.getApi().getBalance(player);
7676
price = 10 * nummber;
7777
missing = price - balence;
7878
DecimalFormat formatterm = new DecimalFormat("#,###");
@@ -118,13 +118,13 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
118118
}
119119
}
120120

121-
CoinAPI.getApi().removeCoins(player, price);
121+
EconomyAPI.getApi().decreaseBalance(player, price);
122122
break;
123123
}
124124
case "amethyst": {
125125
PlayerInventory inventory = player.getInventory();
126126
ItemStack amethyst = new ItemStack(Material.AMETHYST_SHARD, nummber);
127-
balence = CoinAPI.getApi().getCoins(player);
127+
balence = EconomyAPI.getApi().getBalance(player);
128128
price = 30 * nummber;
129129
missing = price - balence;
130130
DecimalFormat formatterm = new DecimalFormat("#,###");
@@ -169,13 +169,13 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
169169
.append(Component.text(formatierteZahl + "$", NamedTextColor.LIGHT_PURPLE)));
170170
}
171171
}
172-
CoinAPI.getApi().removeCoins(player, price);
172+
EconomyAPI.getApi().decreaseBalance(player, price);
173173
break;
174174
}
175175
case "diamond": {
176176
PlayerInventory inventory = player.getInventory();
177177
ItemStack diamond = new ItemStack(Material.DIAMOND, nummber);
178-
balence = CoinAPI.getApi().getCoins(player);
178+
balence = EconomyAPI.getApi().getBalance(player);
179179
price = 150 * nummber;
180180
missing = price - balence;
181181
DecimalFormat formatterm = new DecimalFormat("#,###");
@@ -221,13 +221,13 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
221221
}
222222
}
223223

224-
CoinAPI.getApi().removeCoins(player, price);
224+
EconomyAPI.getApi().decreaseBalance(player, price);
225225
break;
226226
}
227227
case "netherite": {
228228
PlayerInventory inventory = player.getInventory();
229229
ItemStack netherite = new ItemStack(Material.NETHERITE_INGOT, nummber);
230-
balence = CoinAPI.getApi().getCoins(player);
230+
balence = EconomyAPI.getApi().getBalance(player);
231231
price = 1250 * nummber;
232232
missing = price - balence;
233233
DecimalFormat formatterm = new DecimalFormat("#,###");
@@ -273,13 +273,13 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
273273
}
274274
}
275275

276-
CoinAPI.getApi().removeCoins(player, price);
276+
EconomyAPI.getApi().decreaseBalance(player, price);
277277
break;
278278
}
279279
case "spawner": {
280280
PlayerInventory inventory = player.getInventory();
281281
ItemStack spawner = new ItemStack(Material.SPAWNER, nummber);
282-
balence = CoinAPI.getApi().getCoins(player);
282+
balence = EconomyAPI.getApi().getBalance(player);
283283
price = 10000 * nummber;
284284
missing = price - balence;
285285
DecimalFormat formatterm = new DecimalFormat("#,###");
@@ -308,7 +308,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
308308
.append(Component.text("Spawner, for ", NamedTextColor.YELLOW))
309309
.append(Component.text(formatierteZahl + "$", NamedTextColor.LIGHT_PURPLE)));
310310
}
311-
CoinAPI.getApi().removeCoins(player, price);
311+
EconomyAPI.getApi().decreaseBalance(player, price);
312312
break;
313313
}
314314

‎src/main/java/de/lars/utilsmanager/commands/economy/ClaimGiftCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -28,7 +28,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
2828
return;
2929
}
3030
String gift = args[0];
31-
if (!CoinAPI.getApi().getGifts(player).contains(gift)) {
31+
if (!EconomyAPI.getApi().getGifts(player).contains(gift)) {
3232
if (LanguageAPI.getApi().getLanguage(player) == 2) {
3333
player.sendMessage(Statements.getPrefix().append(Component.text("Dir steht nicht dieses Geschenk zu!", NamedTextColor.RED)));
3434
} else {
@@ -47,9 +47,9 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
4747
.append(Component.text(giftString, NamedTextColor.GOLD))
4848
.append(Component.text("$.", NamedTextColor.BLUE)));
4949
}
50-
CoinAPI.getApi().addCoins(player, Integer.parseInt(gift));
51-
CoinAPI.getApi().removeGift(player, Integer.parseInt(gift));
52-
if (!CoinAPI.getApi().getGifts(player).isEmpty()) {
50+
EconomyAPI.getApi().increaseBalance(player, Integer.parseInt(gift));
51+
EconomyAPI.getApi().removeGift(player, Integer.parseInt(gift));
52+
if (!EconomyAPI.getApi().getGifts(player).isEmpty()) {
5353
player.sendMessage(" ");
5454
player.performCommand("gifts");
5555
}

‎src/main/java/de/lars/utilsmanager/commands/economy/GiftCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -26,7 +26,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
2626
return;
2727
}
2828

29-
if (CoinAPI.getApi().getGifts(player).isEmpty()) {
29+
if (EconomyAPI.getApi().getGifts(player).isEmpty()) {
3030
if (LanguageAPI.getApi().getLanguage(player) == 2) {
3131
player.sendMessage(Statements.getPrefix().append(Component.text("Du hast keine Geschenke!", NamedTextColor.RED)));
3232
} else {
@@ -41,7 +41,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
4141
.append(Component.text(" ]", NamedTextColor.DARK_GRAY))
4242
.append(Component.text(" ", NamedTextColor.DARK_GRAY, TextDecoration.STRIKETHROUGH)));
4343
player.sendMessage(" ");
44-
for (Integer gift: CoinAPI.getApi().getGifts(player)) {
44+
for (Integer gift: EconomyAPI.getApi().getGifts(player)) {
4545
String giftString = formatter.format(gift);
4646
Component GiftClickText = Component.text("[Anfordern]", NamedTextColor.GREEN).clickEvent(ClickEvent.runCommand("/claimgift " + gift));
4747
Component GiftClickTextE = Component.text("[Claim]", NamedTextColor.GREEN).clickEvent(ClickEvent.runCommand("/claimgift " + gift));

‎src/main/java/de/lars/utilsmanager/commands/economy/PayCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.CheckPlayers;
66
import de.lars.utilsmanager.utils.Statements;
@@ -51,7 +51,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
5151
sendUsage(player);
5252
return;
5353
}
54-
sendercoins = CoinAPI.getApi().getCoins(sendplayer);
54+
sendercoins = EconomyAPI.getApi().getBalance(sendplayer);
5555
OfflinePlayer recipient = Bukkit.getPlayer(args[0]);
5656
if (CheckPlayers.checkOfflinePlayer(sendplayer, recipient)) return;
5757
if (paying > sendercoins) {
@@ -63,8 +63,8 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
6363
return;
6464
}
6565

66-
CoinAPI.getApi().removeCoins(sendplayer, paying);
67-
CoinAPI.getApi().addCoins(player, paying);
66+
EconomyAPI.getApi().decreaseBalance(sendplayer, paying);
67+
EconomyAPI.getApi().increaseBalance(player, paying);
6868
DecimalFormat formatter = new DecimalFormat("#,###");
6969
String formatierteZahl = formatter.format(paying);
7070
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
@@ -96,9 +96,9 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
9696
}
9797
private void sendUsage(CommandSender sender) {
9898
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
99-
sender.sendMessage(NamedTextColor.GRAY + "Verwendung" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/pay <Spieler> <Coins>");
99+
sender.sendMessage(NamedTextColor.GRAY + "Verwendung" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/pay <Spieler> <Balance>");
100100
} else {
101-
sender.sendMessage(NamedTextColor.GRAY + "Use" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/pay <Player> <Coins>");
101+
sender.sendMessage(NamedTextColor.GRAY + "Use" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/pay <Player> <Balance>");
102102
}
103103
}
104104
}

‎src/main/java/de/lars/utilsmanager/commands/economy/SellCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -114,7 +114,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
114114
}
115115
}
116116

117-
CoinAPI.getApi().addCoins(player, sellprice);
117+
EconomyAPI.getApi().increaseBalance(player, sellprice);
118118
break;
119119
}
120120
case "amethyst": {
@@ -164,7 +164,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
164164
}
165165
}
166166

167-
CoinAPI.getApi().addCoins(player, sellprice);
167+
EconomyAPI.getApi().increaseBalance(player, sellprice);
168168
break;
169169
}
170170
case "diamond": {
@@ -213,7 +213,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
213213
.append(Component.text("$.")));
214214
}
215215
}
216-
CoinAPI.getApi().addCoins(player, sellprice);
216+
EconomyAPI.getApi().increaseBalance(player, sellprice);
217217
break;
218218
}
219219
case "netherite": {
@@ -263,7 +263,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
263263
}
264264
}
265265

266-
CoinAPI.getApi().addCoins(player, sellprice);
266+
EconomyAPI.getApi().increaseBalance(player, sellprice);
267267
break;
268268
}
269269
case "spawner": {
@@ -296,7 +296,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
296296
.append(Component.text(formatierteZahl, NamedTextColor.BLACK))
297297
.append(Component.text("$.")));
298298
}
299-
CoinAPI.getApi().addCoins(player, sellprice);
299+
EconomyAPI.getApi().increaseBalance(player, sellprice);
300300
break;
301301
}
302302

‎src/main/java/de/lars/utilsmanager/commands/economy/SetCoinsCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -56,7 +56,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
5656
}
5757
return;
5858
}
59-
CoinAPI.getApi().setCoins((Player) player, setcoins);
59+
EconomyAPI.getApi().setBalance((Player) player, setcoins);
6060
DecimalFormat formatter = new DecimalFormat("#,###");
6161
String formatierteZahl = formatter.format(setcoins);
6262
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
@@ -87,9 +87,9 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
8787

8888
private void sendUsage(CommandSender sender) {
8989
if (LanguageAPI.getApi().getLanguage((Player) sender) == 2) {
90-
sender.sendMessage(NamedTextColor.GRAY + "Verwendung" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/setcoins <Spieler> <Coins>");
90+
sender.sendMessage(NamedTextColor.GRAY + "Verwendung" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/setcoins <Spieler> <Balance>");
9191
} else {
92-
sender.sendMessage(NamedTextColor.GRAY + "Use" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/setcoins <Player> <Coins>");
92+
sender.sendMessage(NamedTextColor.GRAY + "Use" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/setcoins <Player> <Balance>");
9393
}
9494
}
9595
}

‎src/main/java/de/lars/utilsmanager/commands/economy/WalletCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.lars.utilsmanager.commands.economy;
22

3-
import de.lars.apimanager.apis.coinAPI.CoinAPI;
3+
import de.lars.apimanager.apis.economyAPI.EconomyAPI;
44
import de.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import de.lars.utilsmanager.utils.Statements;
66
import io.papermc.paper.command.brigadier.BasicCommand;
@@ -32,7 +32,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
3232
}
3333
if (args.length == 0) {
3434

35-
coins = CoinAPI.getApi().getCoins(sendplayer);
35+
coins = EconomyAPI.getApi().getBalance(sendplayer);
3636
DecimalFormat formatter = new DecimalFormat("#,###");
3737
String formatierteZahl = formatter.format(coins);
3838
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {
@@ -56,7 +56,7 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
5656
}
5757
return;
5858
}
59-
coins = CoinAPI.getApi().getCoins((Player) player);
59+
coins = EconomyAPI.getApi().getBalance((Player) player);
6060
DecimalFormat formatter = new DecimalFormat("#,###");
6161
String formatierteZahl = formatter.format(coins);
6262
if (LanguageAPI.getApi().getLanguage(sendplayer) == 2) {

0 commit comments

Comments
 (0)