Skip to content

Commit 343ea77

Browse files
EuphillyaEuphillya
committed
Remove old command gamerule + clean command
1 parent a13ca69 commit 343ea77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+266
-428
lines changed

‎addons/SkylliaBank/src/main/java/fr/euphyllia/skylliabank/commands/BankAdminCommand.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,15 @@ private void handleSetBalance(CommandSender sender, String[] args) {
220220
}
221221

222222
@Override
223-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
223+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
224224
if (!sender.hasPermission("skyllia.bank.admin")) {
225225
ConfigLoader.language.sendMessage(sender, "addons.bank.no-permissions");
226-
return true;
226+
return;
227227
}
228228

229229
if (args.length == 0) {
230230
ConfigLoader.language.sendMessage(sender, "addons.bank.admin.usage-root");
231-
return true;
231+
return;
232232
}
233233

234234
switch (args[0].toLowerCase()) {
@@ -238,7 +238,6 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
238238
case "setbalance" -> handleSetBalance(sender, args);
239239
default -> ConfigLoader.language.sendMessage(sender, "addons.bank.admin.unknown-command");
240240
}
241-
return true;
242241
}
243242

244243
@Override

‎addons/SkylliaBank/src/main/java/fr/euphyllia/skylliabank/commands/BankCommand.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ public BankCommand(Plugin plugin) {
5151
}
5252

5353
@Override
54-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
54+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
5555
// Vérifier si c'est un joueur
5656
if (!(sender instanceof Player player)) {
5757
ConfigLoader.language.sendMessage(sender, "addons.bank.player.player-only");
58-
return true;
58+
return;
5959
}
6060
UUID playerId = player.getUniqueId();
6161

6262
if (CommandCacheExecution.isAlreadyExecute(playerId, "bank")) {
6363
ConfigLoader.language.sendMessage(player, "island.generic.command-in-progress");
64-
return true;
64+
return;
6565
}
6666
CommandCacheExecution.addCommandExecute(playerId, "bank");
6767

@@ -70,13 +70,13 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
7070
if (island == null) {
7171
ConfigLoader.language.sendMessage(player, "addons.bank.player.no-island");
7272
CommandCacheExecution.removeCommandExec(playerId, "bank");
73-
return true;
73+
return;
7474
}
7575

7676
if (args.length == 0) {
7777
// Commande sans argument => afficher le solde
7878
handleBalance(player, island);
79-
return true;
79+
return;
8080
}
8181

8282
String subCommand = args[0].toLowerCase();
@@ -89,9 +89,6 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
8989
CommandCacheExecution.removeCommandExec(playerId, "bank");
9090
}
9191
}
92-
93-
94-
return true;
9592
}
9693

9794
/**

‎addons/SkylliaChallenge/src/main/java/fr/euphyllia/skylliachallenge/commands/ChallengeAdminCommand.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@ public record ChallengeAdminCommand(SkylliaChallenge plugin) implements SubComma
1313

1414

1515
@Override
16-
public boolean onCommand(@NotNull Plugin plugin0, @NotNull CommandSender sender, @NotNull String[] args) {
16+
public void onExecute(@NotNull Plugin plugin0, @NotNull CommandSender sender, @NotNull String[] args) {
1717
if (!(sender.hasPermission(permission()) || sender.hasPermission(permission()))) {
1818
ConfigLoader.language.sendMessage(sender, "addons.challenge.admin.no-permission");
19-
return true;
19+
return;
2020
}
2121
if (args.length == 0 || !args[0].equalsIgnoreCase("reload")) {
2222
ConfigLoader.language.sendMessage(sender, "addons.challenge.admin.unknown-command");
23-
return true;
23+
return;
2424
}
2525
plugin.reload();
2626
ConfigLoader.language.sendMessage(sender, "addons.challenge.admin.reload-success");
27-
return true;
2827
}
2928

3029

‎addons/SkylliaChallenge/src/main/java/fr/euphyllia/skylliachallenge/commands/ChallengeCommand.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
public record ChallengeCommand(SkylliaChallenge plugin) implements SubCommandInterface {
1616

1717
@Override
18-
public boolean onCommand(@NotNull Plugin plugin0, @NotNull CommandSender sender, @NotNull String[] args) {
18+
public void onExecute(@NotNull Plugin plugin0, @NotNull CommandSender sender, @NotNull String[] args) {
1919
if (!(sender instanceof Player p)) {
2020
ConfigLoader.language.sendMessage(sender, "addons.challenge.player.player-only");
21-
return true;
21+
return;
2222
}
2323
Island island = SkylliaAPI.getIslandByPlayerId(p.getUniqueId());
2424
if (island == null) {
2525
ConfigLoader.language.sendMessage(sender, "addons.challenge.player.no-island");
26-
return true;
26+
return;
2727
}
2828
plugin.getChallengeManager().openGui(p);
29-
return true;
3029
}
3130

3231
@Override

‎addons/SkylliaChat/src/main/java/fr/euphyllia/skylliachat/commands/IslandChatCommand.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@ public IslandChatCommand(SkylliaChat main) {
2121
}
2222

2323
@Override
24-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
24+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
2525
if (!(sender instanceof Player player)) {
2626
ConfigLoader.language.sendMessage(sender, "island.player.player-only-command");
27-
return true;
27+
return;
2828
}
2929
if (!sender.hasPermission("skylliachat.use")) {
3030
ConfigLoader.language.sendMessage(player, "addons.chat.no-permission");
31-
return true;
31+
return;
3232
}
3333
final UUID uuid = player.getUniqueId();
3434

35-
// Toggle island chat mode
3635
boolean isEnabled = this.plugin.getIslandChatEnabled().getOrDefault(uuid, false);
3736
this.plugin.getIslandChatEnabled().put(uuid, !isEnabled);
3837

@@ -41,7 +40,6 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
4140
} else {
4241
ConfigLoader.language.sendMessage(player, "addons.chat.enabled");
4342
}
44-
return true;
4543
}
4644

4745
@Override

‎addons/SkylliaChest/src/main/java/fr/euphyllia/skylliachest/commands/ChestCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ public ChestCommand(Plugin plugin) {
4040
}
4141

4242
@Override
43-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NonNull @NotNull String[] args) {
43+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NonNull @NotNull String[] args) {
4444
if (!(sender instanceof Player player)) {
4545
ConfigLoader.language.sendMessage(sender, "island.player.player-only-command");
46-
return true;
46+
return;
4747
}
4848

4949
UUID playerId = player.getUniqueId();
5050

5151
Island island = SkylliaAPI.getIslandByPlayerId(playerId);
5252
if (island == null) {
5353
ConfigLoader.language.sendMessage(player, "island.player.no-island");
54-
return true;
54+
return;
5555
}
5656

5757
boolean isAllowed = SkylliaAPI.getPermissionsManager().hasPermission(player, island, OPEN_ISLAND_CHEST_PERMISSION);
5858
if (!isAllowed) {
5959
ConfigLoader.language.sendMessage(player, "addons.island-chest.no-permission");
60-
return true;
60+
return;
6161
}
6262

6363
ChestManager chestManager = SkylliaChest.getInstance().getChestManager();
@@ -66,7 +66,7 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
6666
int size = chestManager.getChestSize(island);
6767

6868
openChest(player, island, size);
69-
return true;
69+
return;
7070
}
7171

7272
private void openChest(@NotNull Player player, @NotNull Island island, int size) {

‎addons/SkylliaOre/src/main/java/fr/euphyllia/skylliaore/commands/OreCommands.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@ public OreCommands(SkylliaOre plugin) {
3030
}
3131

3232
@Override
33-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
34-
if (!sender.hasPermission("skylliaore.use")) return true;
33+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
34+
if (!sender.hasPermission("skylliaore.use")) return;
3535
if (args.length < 2) {
3636
sender.sendMessage(Component.text("Usage: /skylliaadmin generator <player> <generator>").color(NamedTextColor.RED));
37-
return false;
37+
return;
3838
}
3939

4040
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(args[0]);
4141
Island island = SkylliaAPI.getIslandByPlayerId(offPlayer.getUniqueId());
4242
if (island == null) {
4343
sender.sendMessage(Component.text("No island found.").color(NamedTextColor.RED));
44-
return true;
44+
return;
4545
}
4646

4747
final String nameGenerator = args[1];
4848
Generator generator = SkylliaOre.getDefaultConfig().getGenerators().get(nameGenerator);
4949

5050
if (generator == null) {
5151
sender.sendMessage(Component.text("The generator '" + nameGenerator + "' does not exist.").color(NamedTextColor.RED));
52-
return true;
52+
return;
5353
}
5454

5555
boolean success = SkylliaOre.getGeneratorManager().updateGenerator(island.getId(), generator.name());
@@ -58,8 +58,6 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
5858
} else {
5959
sender.sendMessage(Component.text("An error occurred while changing the generator.").color(NamedTextColor.RED));
6060
}
61-
62-
return true;
6361
}
6462

6563
@Override

‎plugin/src/main/java/fr/euphyllia/skyllia/commands/admin/subcommands/CurrentSubCommands.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
public class CurrentSubCommands implements SubCommandInterface {
1919

2020
@Override
21-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NonNull @NotNull String[] args) {
21+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NonNull @NotNull String[] args) {
2222
if (!sender.hasPermission(permission())) {
2323
ConfigLoader.language.sendMessage(sender, "island.admin.current.no-permission");
24-
return true;
24+
return;
2525
}
2626

2727
if (!(sender instanceof Player player)) {
2828
ConfigLoader.language.sendMessage(sender, "island.player.player-only-command");
29-
return true;
29+
return;
3030
}
3131

3232
Location location = player.getLocation();
3333

3434
Island island = SkylliaAPI.getIslandByChunk(location.getBlockX() >> 4, location.getBlockZ() >> 4);
3535
if (island == null) {
3636
ConfigLoader.language.sendMessage(player, "island.admin.current.no-island-here");
37-
return true;
37+
return;
3838
}
3939

4040
Players owner = island.getOwner();
@@ -43,15 +43,14 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
4343
ConfigLoader.language.sendMessage(player, "island.admin.current.no-owner", Map.of(
4444
"%island_id%", String.valueOf(island.getId())
4545
));
46-
return true;
46+
return;
4747
}
4848

4949
ConfigLoader.language.sendMessage(player, "island.admin.current.info", Map.of(
5050
"%island_id%", String.valueOf(island.getId()),
5151
"%owner_name%", owner.getLastKnowName(),
5252
"%owner_uuid%", String.valueOf(owner.getMojangId())
5353
));
54-
return true;
5554
}
5655

5756
@Override

‎plugin/src/main/java/fr/euphyllia/skyllia/commands/admin/subcommands/ForceDeleteSubCommands.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ public class ForceDeleteSubCommands implements SubCommandInterface {
3434

3535

3636
@Override
37-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
37+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
3838
if (!sender.hasPermission("skyllia.admins.commands.island.delete")) {
3939
ConfigLoader.language.sendMessage(sender, "island.player.permission-denied");
40-
return true;
40+
return;
4141
}
4242

4343
if (args.length < 2) {
4444
ConfigLoader.language.sendMessage(sender, "island.admin.delete-args-missing");
45-
return true;
45+
return;
4646
}
4747

4848
String playerName = args[0];
4949
String confirm = args[1];
5050
if (!confirm.equalsIgnoreCase("confirm")) {
5151
ConfigLoader.language.sendMessage(sender, "island.admin.delete-no-confirm");
52-
return true;
52+
return;
5353
}
5454

5555
try {
@@ -63,7 +63,7 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
6363
Island island = skyblockManager.getIslandByPlayerId(playerId);
6464
if (island == null) {
6565
ConfigLoader.language.sendMessage(sender, "island.player.no-island");
66-
return true;
66+
return;
6767
}
6868

6969
boolean locked = skyblockManager.setLockedIsland(island, true);
@@ -83,7 +83,7 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
8383
logger.error("Failed to unlock island {} after deletion.", island.getId());
8484
}
8585

86-
return true;
86+
return;
8787
} else {
8888
ConfigLoader.worldManager.getWorldConfigs().forEach((name, environnements) -> {
8989
if (environnements.shouldDeleteIsland()) {
@@ -111,8 +111,6 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
111111
logger.log(Level.FATAL, e.getMessage(), e);
112112
ConfigLoader.language.sendMessage(sender, "island.generic.unexpected-error");
113113
}
114-
115-
return true;
116114
}
117115

118116
@Override

‎plugin/src/main/java/fr/euphyllia/skyllia/commands/admin/subcommands/ForceTransferSubCommands.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public class ForceTransferSubCommands implements SubCommandInterface {
2626
private final Logger logger = LogManager.getLogger(ForceTransferSubCommands.class);
2727

2828
@Override
29-
public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
29+
public void onExecute(@NotNull Plugin plugin, @NotNull CommandSender sender, @NotNull String[] args) {
3030
if (!sender.hasPermission("skyllia.admins.commands.island.transfer")) {
3131
ConfigLoader.language.sendMessage(sender, "island.player.permission-denied");
32-
return true;
32+
return;
3333
}
3434
if (args.length < 2) {
3535
ConfigLoader.language.sendMessage(sender, "island.admin.transfer-args-missing");
36-
return true;
36+
return;
3737
}
3838

3939
String previousOwnerName = args[0];
@@ -42,7 +42,7 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
4242

4343
if (!confirm.equalsIgnoreCase("confirm")) {
4444
ConfigLoader.language.sendMessage(sender, "island.admin.transfer-no-confirm");
45-
return true;
45+
return;
4646
}
4747

4848
try {
@@ -53,29 +53,29 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
5353
previousOwnerId = Bukkit.getPlayerUniqueId(previousOwnerName);
5454
}
5555

56-
SkyblockManager skyblockManager = Skyllia.getPlugin(Skyllia.class).getInterneAPI().getSkyblockManager();
56+
SkyblockManager skyblockManager = Skyllia.getInstance().getInterneAPI().getSkyblockManager();
5757
Island island = skyblockManager.getIslandByOwner(previousOwnerId);
5858

5959
if (island == null) {
6060
ConfigLoader.language.sendMessage(sender, "island.player.no-island");
61-
return true;
61+
return;
6262
}
6363

6464
Players oldOwner = skyblockManager.getOwnerByIslandID(island);
6565
if (oldOwner == null || !oldOwner.getMojangId().equals(previousOwnerId)) {
6666
ConfigLoader.language.sendMessage(sender, "island.only-owner");
67-
return true;
67+
return;
6868
}
6969

7070
Players newOwner = island.getMember(newOwnerName);
7171
if (newOwner == null) {
7272
ConfigLoader.language.sendMessage(sender, "island.player.not-on-island");
73-
return true;
73+
return;
7474
}
7575

7676
if (newOwner.getMojangId().equals(previousOwnerId)) {
7777
ConfigLoader.language.sendMessage(sender, "island.transfer.already-owner");
78-
return true;
78+
return;
7979
}
8080

8181
// Transfert de propriété
@@ -104,8 +104,6 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
104104
logger.log(Level.FATAL, e.getMessage(), e);
105105
ConfigLoader.language.sendMessage(sender, "island.generic.unexpected-error");
106106
}
107-
108-
return true;
109107
}
110108

111109
@Override

0 commit comments

Comments
 (0)