Skip to content

Commit a63e0a9

Browse files
committed
Updating commands
1 parent cea5ab6 commit a63e0a9

File tree

5 files changed

+20
-27
lines changed

5 files changed

+20
-27
lines changed

mcdevtools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>fr.alkanife</groupId>
88
<artifactId>mcdevtools</artifactId>
9-
<version>1.0.1</version>
9+
<version>1.1.0</version>
1010

1111
<properties>
1212
<maven.compiler.source>17</maven.compiler.source>

mcdevtools/src/main/java/fr/alkanife/mcdevtools/EchoCommands.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,23 @@
11
package fr.alkanife.mcdevtools;
22

33
import dev.jorel.commandapi.CommandAPICommand;
4+
import dev.jorel.commandapi.CommandPermission;
45
import dev.jorel.commandapi.arguments.GreedyStringArgument;
56
import net.kyori.adventure.text.Component;
67
import net.kyori.adventure.text.minimessage.MiniMessage;
78
import org.bukkit.Bukkit;
89

10+
import java.util.Objects;
11+
912
public class EchoCommands {
1013

1114
public void register() {
1215
new CommandAPICommand("echo")
13-
.withAliases("e")
14-
.withArguments(new GreedyStringArgument("text"))
15-
.executes((commandSender, objects) -> {
16-
if (!commandSender.isOp())
17-
return;
18-
19-
Bukkit.broadcast(Component.text(((String) objects.args()[0]).replaceAll("&", "§")));
20-
}).register();
21-
22-
new CommandAPICommand("echominimessage")
23-
.withAliases("em")
16+
.withFullDescription("Broadcast input")
17+
.withPermission(CommandPermission.OP)
2418
.withArguments(new GreedyStringArgument("minimessage"))
2519
.executes((commandSender, objects) -> {
26-
if (!commandSender.isOp())
27-
return;
28-
29-
Bukkit.broadcast(MiniMessage.miniMessage().deserialize((String) objects.args()[0]));
20+
Bukkit.broadcast(MiniMessage.miniMessage().deserialize((String) Objects.requireNonNull(objects.get(0))));
3021
}).register();
3122
}
3223

mcdevtools/src/main/java/fr/alkanife/mcdevtools/LoreCommand.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package fr.alkanife.mcdevtools;
22

33
import dev.jorel.commandapi.CommandAPICommand;
4+
import dev.jorel.commandapi.CommandPermission;
45
import dev.jorel.commandapi.arguments.GreedyStringArgument;
56
import dev.jorel.commandapi.arguments.PlayerArgument;
67
import net.kyori.adventure.text.Component;
@@ -20,7 +21,9 @@ public class LoreCommand {
2021

2122
public void register() {
2223
new CommandAPICommand("lore")
23-
.withArguments(new PlayerArgument("player"), new GreedyStringArgument("text"))
24+
.withFullDescription("Set a lore to a player's item")
25+
.withPermission(CommandPermission.OP)
26+
.withArguments(new PlayerArgument("player"), new GreedyStringArgument("minimessages"))
2427
.executes((commandSender, objects) -> {
2528
if (!commandSender.isOp())
2629
return;

mcdevtools/src/main/java/fr/alkanife/mcdevtools/MCDevTools.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void onEnable() {
1717

1818
new EchoCommands().register();
1919
new LoreCommand().register();
20-
new RenameCommand().register();
20+
new RenameCommands().register();
2121
}
2222

2323
@Override

mcdevtools/src/main/java/fr/alkanife/mcdevtools/RenameCommand.java renamed to mcdevtools/src/main/java/fr/alkanife/mcdevtools/RenameCommands.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package fr.alkanife.mcdevtools;
22

33
import dev.jorel.commandapi.CommandAPICommand;
4+
import dev.jorel.commandapi.CommandPermission;
45
import dev.jorel.commandapi.arguments.GreedyStringArgument;
56
import dev.jorel.commandapi.arguments.PlayerArgument;
67
import net.kyori.adventure.text.Component;
7-
import net.kyori.adventure.text.format.Style;
8-
import net.kyori.adventure.text.format.StyleBuilderApplicable;
98
import net.kyori.adventure.text.format.TextColor;
109
import net.kyori.adventure.text.format.TextDecoration;
1110
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -14,17 +13,17 @@
1413
import org.bukkit.inventory.ItemStack;
1514
import org.bukkit.inventory.meta.ItemMeta;
1615

17-
public class RenameCommand {
16+
import java.util.Objects;
17+
18+
public class RenameCommands {
1819

1920
public void register() {
2021
new CommandAPICommand("renameitem")
21-
.withAliases("ri")
22+
.withFullDescription("Rename a player's item")
23+
.withPermission(CommandPermission.OP)
2224
.withArguments(new PlayerArgument("player"), new GreedyStringArgument("text"))
2325
.executes((commandSender, objects) -> {
24-
if (!commandSender.isOp())
25-
return;
26-
27-
Player player = (Player) objects.args()[0];
26+
Player player = (Player) Objects.requireNonNull(objects.get(0));
2827

2928
ItemStack itemStack = player.getInventory().getItemInMainHand();
3029

@@ -35,7 +34,7 @@ public void register() {
3534

3635
Component component = Component.text("")
3736
.color(TextColor.color(255, 255, 255)).decoration(TextDecoration.ITALIC, false)
38-
.append(MiniMessage.miniMessage().deserialize((String) objects.args()[1]));
37+
.append(MiniMessage.miniMessage().deserialize((String) Objects.requireNonNull(objects.get(1))));
3938
itemMeta.displayName(component);
4039
itemStack.setItemMeta(itemMeta);
4140
}).register();

0 commit comments

Comments
 (0)