Skip to content

Commit 9d6148f

Browse files
committed
Refactor commands into impl package and update command names/aliases for better clarity.
1 parent df6c282 commit 9d6148f

File tree

9 files changed

+26
-22
lines changed

9 files changed

+26
-22
lines changed

eternaleconomy-core/src/main/java/com/eternalcode/economy/EconomyBukkitPlugin.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
import com.eternalcode.economy.account.database.AccountRepository;
1212
import com.eternalcode.economy.account.database.AccountRepositoryImpl;
1313
import com.eternalcode.economy.bridge.BridgeManager;
14-
import com.eternalcode.economy.command.admin.AdminAddCommand;
15-
import com.eternalcode.economy.command.admin.AdminBalanceCommand;
16-
import com.eternalcode.economy.command.admin.AdminRemoveCommand;
17-
import com.eternalcode.economy.command.admin.AdminResetCommand;
18-
import com.eternalcode.economy.command.admin.AdminSetCommand;
14+
import com.eternalcode.economy.command.impl.admin.AdminAddCommand;
15+
import com.eternalcode.economy.command.impl.admin.AdminBalanceCommand;
16+
import com.eternalcode.economy.command.impl.admin.AdminRemoveCommand;
17+
import com.eternalcode.economy.command.impl.admin.AdminResetCommand;
18+
import com.eternalcode.economy.command.impl.admin.AdminSetCommand;
1919
import com.eternalcode.economy.command.argument.AccountArgument;
2020
import com.eternalcode.economy.command.context.AccountContext;
2121
import com.eternalcode.economy.command.cooldown.CommandCooldownEditor;
2222
import com.eternalcode.economy.command.cooldown.CommandCooldownMessage;
2323
import com.eternalcode.economy.command.handler.InvalidUsageHandlerImpl;
2424
import com.eternalcode.economy.command.handler.MissingPermissionHandlerImpl;
2525
import com.eternalcode.economy.command.message.InvalidBigDecimalMessage;
26-
import com.eternalcode.economy.command.player.MoneyBalanceCommand;
27-
import com.eternalcode.economy.command.player.MoneyTransferCommand;
26+
import com.eternalcode.economy.command.impl.MoneyBalanceCommand;
27+
import com.eternalcode.economy.command.impl.MoneyTransferCommand;
2828
import com.eternalcode.economy.database.DatabaseManager;
2929
import com.eternalcode.economy.leaderboard.LeaderboardCommand;
3030
import com.eternalcode.economy.command.validator.notsender.NotSender;
@@ -119,6 +119,10 @@ public void onEnable() {
119119
.invalidUsage(new InvalidUsageHandlerImpl(noticeService))
120120

121121
.message(LiteMessages.COMMAND_COOLDOWN, new CommandCooldownMessage(noticeService, commandsConfig))
122+
.message(LiteMessages.INVALID_NUMBER, (invocation, amount) -> noticeService.create()
123+
.notice(messageConfig.positiveNumberRequired)
124+
.placeholder("{AMOUNT}", amount)
125+
.viewer(invocation.sender()))
122126
.editorGlobal(new CommandCooldownEditor(commandsConfig))
123127

124128
.commands(

eternaleconomy-core/src/main/java/com/eternalcode/economy/EconomyReloadCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.time.Duration;
1313
import org.bukkit.command.CommandSender;
1414

15-
@Command(name = "economy admin reload")
15+
@Command(name = "economy reload")
1616
@Permission(EconomyPermissionConstant.ADMIN_RELOAD_PERMISSION)
1717
public class EconomyReloadCommand {
1818

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.player;
1+
package com.eternalcode.economy.command.impl;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -11,7 +11,7 @@
1111
import dev.rollczi.litecommands.annotations.permission.Permission;
1212
import org.bukkit.command.CommandSender;
1313

14-
@Command(name = "balance", aliases = "bal")
14+
@Command(name = "balance", aliases = {"bal", "money"})
1515
@Permission(EconomyPermissionConstant.PLAYER_BALANCE_PERMISSION)
1616
public class MoneyBalanceCommand {
1717

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.player;
1+
package com.eternalcode.economy.command.impl;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -15,7 +15,7 @@
1515
import jakarta.validation.constraints.Positive;
1616
import java.math.BigDecimal;
1717

18-
@Command(name = "pay")
18+
@Command(name = "pay", aliases = "transfer")
1919
@Permission(EconomyPermissionConstant.PLAYER_PAY_PERMISSION)
2020
public class MoneyTransferCommand {
2121

eternaleconomy-core/src/main/java/com/eternalcode/economy/command/admin/AdminAddCommand.java renamed to eternaleconomy-core/src/main/java/com/eternalcode/economy/command/impl/admin/AdminAddCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.admin;
1+
package com.eternalcode.economy.command.impl.admin;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -14,7 +14,7 @@
1414
import java.math.BigDecimal;
1515
import org.bukkit.command.CommandSender;
1616

17-
@Command(name = "economy admin add")
17+
@Command(name = "economy add", aliases = "eco add")
1818
@Permission(EconomyPermissionConstant.ADMIN_ADD_PERMISSION)
1919
public class AdminAddCommand {
2020

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.admin;
1+
package com.eternalcode.economy.command.impl.admin;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -11,7 +11,7 @@
1111
import dev.rollczi.litecommands.annotations.permission.Permission;
1212
import org.bukkit.command.CommandSender;
1313

14-
@Command(name = "economy admin balance")
14+
@Command(name = "balance", aliases = "bal")
1515
@Permission(EconomyPermissionConstant.ADMIN_BALANCE_PERMISSION)
1616
public class AdminBalanceCommand {
1717

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.admin;
1+
package com.eternalcode.economy.command.impl.admin;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -14,7 +14,7 @@
1414
import java.math.BigDecimal;
1515
import org.bukkit.command.CommandSender;
1616

17-
@Command(name = "economy admin remove")
17+
@Command(name = "economy remove", aliases = "eco remove")
1818
@Permission(EconomyPermissionConstant.ADMIN_REMOVE_PERMISSION)
1919
public class AdminRemoveCommand {
2020

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.admin;
1+
package com.eternalcode.economy.command.impl.admin;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -11,7 +11,7 @@
1111
import dev.rollczi.litecommands.annotations.permission.Permission;
1212
import org.bukkit.command.CommandSender;
1313

14-
@Command(name = "economy admin reset")
14+
@Command(name = "economy reset", aliases = "eco reset")
1515
@Permission(EconomyPermissionConstant.ADMIN_RESET_PERMISSION)
1616
public class AdminResetCommand {
1717

eternaleconomy-core/src/main/java/com/eternalcode/economy/command/admin/AdminSetCommand.java renamed to eternaleconomy-core/src/main/java/com/eternalcode/economy/command/impl/admin/AdminSetCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.eternalcode.economy.command.admin;
1+
package com.eternalcode.economy.command.impl.admin;
22

33
import com.eternalcode.economy.EconomyPermissionConstant;
44
import com.eternalcode.economy.account.Account;
@@ -14,7 +14,7 @@
1414
import java.math.BigDecimal;
1515
import org.bukkit.command.CommandSender;
1616

17-
@Command(name = "economy admin set")
17+
@Command(name = "economy set", aliases = "eco set")
1818
@Permission(EconomyPermissionConstant.ADMIN_SET_PERMISSION)
1919
public class AdminSetCommand {
2020

0 commit comments

Comments
 (0)