Skip to content

Commit a521d75

Browse files
xISRAPILxxISRAPILx
committed
Make Nukkit more kotlin friendly: Commands
1 parent 9739275 commit a521d75

Some content is hidden

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

47 files changed

+102
-46
lines changed

‎pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@
167167
<version>${jline.version}</version>
168168
<scope>compile</scope>
169169
</dependency>
170+
<dependency>
171+
<groupId>org.jetbrains</groupId>
172+
<artifactId>annotations</artifactId>
173+
<version>23.0.0</version>
174+
</dependency>
170175
</dependencies>
171176

172177
<build>

‎src/main/java/cn/nukkit/command/Command.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import cn.nukkit.utils.TextFormat;
1010
import co.aikar.timings.Timing;
1111
import co.aikar.timings.Timings;
12+
import org.jetbrains.annotations.NotNull;
1213

1314
import java.util.*;
1415

@@ -135,7 +136,11 @@ public Map<String, CommandOverload> getOverloads() {
135136
return this.commandData.overloads;
136137
}
137138

138-
public abstract boolean execute(CommandSender sender, String commandLabel, String[] args);
139+
public abstract boolean execute(
140+
@NotNull CommandSender sender,
141+
@NotNull String commandLabel,
142+
@NotNull String[] args
143+
);
139144

140145
public String getName() {
141146
return name;

‎src/main/java/cn/nukkit/command/FormattedCommandAlias.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import cn.nukkit.lang.TranslationContainer;
55
import cn.nukkit.utils.MainLogger;
66
import cn.nukkit.utils.TextFormat;
7+
import org.jetbrains.annotations.NotNull;
78

89
import java.util.ArrayList;
910
import java.util.List;
@@ -27,7 +28,7 @@ public FormattedCommandAlias(String alias, List<String> formatStrings) {
2728
}
2829

2930
@Override
30-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
31+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3132
boolean result = false;
3233
ArrayList<String> commands = new ArrayList<>();
3334
for (String formatString : formatStrings) {

‎src/main/java/cn/nukkit/command/PluginCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import cn.nukkit.lang.TranslationContainer;
44
import cn.nukkit.plugin.Plugin;
5+
import org.jetbrains.annotations.NotNull;
56

67
/**
78
* author: MagicDroidX
@@ -21,7 +22,7 @@ public PluginCommand(String name, T owner) {
2122
}
2223

2324
@Override
24-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
25+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2526
if (!this.owningPlugin.isEnabled()) {
2627
return false;
2728
}

‎src/main/java/cn/nukkit/command/defaults/BanCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import cn.nukkit.command.data.CommandParameter;
88
import cn.nukkit.event.player.PlayerKickEvent;
99
import cn.nukkit.lang.TranslationContainer;
10+
import org.jetbrains.annotations.NotNull;
1011

1112
/**
1213
* author: MagicDroidX
@@ -26,7 +27,7 @@ public BanCommand(String name) {
2627
}
2728

2829
@Override
29-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
30+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3031
if (!this.testPermission(sender)) {
3132
return true;
3233
}

‎src/main/java/cn/nukkit/command/defaults/BanIpCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import cn.nukkit.lang.TranslationContainer;
1010
import cn.nukkit.nbt.NBTIO;
1111
import cn.nukkit.nbt.tag.CompoundTag;
12+
import org.jetbrains.annotations.NotNull;
1213

1314
import java.io.File;
1415
import java.io.FileInputStream;
@@ -40,7 +41,7 @@ public BanIpCommand(String name) {
4041
}
4142

4243
@Override
43-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
44+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
4445
if (!this.testPermission(sender)) {
4546
return true;
4647
}

‎src/main/java/cn/nukkit/command/defaults/BanListCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import cn.nukkit.lang.TranslationContainer;
77
import cn.nukkit.permission.BanEntry;
88
import cn.nukkit.permission.BanList;
9+
import org.jetbrains.annotations.NotNull;
910

1011
import java.util.Iterator;
1112

@@ -24,7 +25,7 @@ public BanListCommand(String name) {
2425
}
2526

2627
@Override
27-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
28+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2829
if (!this.testPermission(sender)) {
2930
return true;
3031
}

‎src/main/java/cn/nukkit/command/defaults/DebugPasteCommand.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import cn.nukkit.utils.HastebinUtility;
1010
import cn.nukkit.utils.MainLogger;
1111
import cn.nukkit.utils.Utils;
12+
import org.jetbrains.annotations.NotNull;
13+
1214
import java.io.File;
1315
import java.io.IOException;
1416
import java.lang.management.ManagementFactory;
@@ -22,7 +24,7 @@ public DebugPasteCommand(String name) {
2224
}
2325

2426
@Override
25-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
27+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2628
if (!this.testPermission(sender)) {
2729
return true;
2830
}

‎src/main/java/cn/nukkit/command/defaults/DefaultGamemodeCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import cn.nukkit.command.data.CommandParamType;
77
import cn.nukkit.command.data.CommandParameter;
88
import cn.nukkit.lang.TranslationContainer;
9+
import org.jetbrains.annotations.NotNull;
910

1011
/**
1112
* Created on 2015/11/12 by xtypr.
@@ -26,7 +27,7 @@ public DefaultGamemodeCommand(String name) {
2627
}
2728

2829
@Override
29-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
30+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3031
if (!this.testPermission(sender)) {
3132
return true;
3233
}

‎src/main/java/cn/nukkit/command/defaults/DeopCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cn.nukkit.command.data.CommandParameter;
99
import cn.nukkit.lang.TranslationContainer;
1010
import cn.nukkit.utils.TextFormat;
11+
import org.jetbrains.annotations.NotNull;
1112

1213
/**
1314
* Created on 2015/11/12 by xtypr.
@@ -23,7 +24,7 @@ public DeopCommand(String name) {
2324
}
2425

2526
@Override
26-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
27+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2728
if (!this.testPermission(sender)) {
2829
return true;
2930
}

‎src/main/java/cn/nukkit/command/defaults/DifficultyCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cn.nukkit.command.data.CommandParameter;
99
import cn.nukkit.lang.TranslationContainer;
1010
import cn.nukkit.network.protocol.SetDifficultyPacket;
11+
import org.jetbrains.annotations.NotNull;
1112

1213
import java.util.ArrayList;
1314

@@ -30,7 +31,7 @@ public DifficultyCommand(String name) {
3031
}
3132

3233
@Override
33-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
34+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3435
if (!this.testPermission(sender)) {
3536
return true;
3637
}

‎src/main/java/cn/nukkit/command/defaults/EffectCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import cn.nukkit.potion.InstantEffect;
1212
import cn.nukkit.utils.ServerException;
1313
import cn.nukkit.utils.TextFormat;
14+
import org.jetbrains.annotations.NotNull;
1415

1516
import java.lang.reflect.Field;
1617
import java.lang.reflect.Modifier;
@@ -48,7 +49,7 @@ public EffectCommand(String name) {
4849
}
4950

5051
@Override
51-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
52+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
5253
if (!this.testPermission(sender)) {
5354
return true;
5455
}

‎src/main/java/cn/nukkit/command/defaults/EnchantCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import cn.nukkit.item.enchantment.Enchantment;
1111
import cn.nukkit.lang.TranslationContainer;
1212
import cn.nukkit.utils.TextFormat;
13+
import org.jetbrains.annotations.NotNull;
1314

1415
/**
1516
* Created by Pub4Game on 23.01.2016.
@@ -38,7 +39,7 @@ public EnchantCommand(String name) {
3839
}
3940

4041
@Override
41-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
42+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
4243
if (!this.testPermission(sender)) {
4344
return true;
4445
}

‎src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import cn.nukkit.command.data.CommandParameter;
1010
import cn.nukkit.lang.TranslationContainer;
1111
import cn.nukkit.utils.TextFormat;
12+
import org.jetbrains.annotations.NotNull;
1213

1314
/**
1415
* Created on 2015/11/13 by xtypr.
@@ -36,7 +37,7 @@ public GamemodeCommand(String name) {
3637
}
3738

3839
@Override
39-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
40+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
4041
if (args.length == 0) {
4142
sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));
4243
return false;

‎src/main/java/cn/nukkit/command/defaults/GameruleCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cn.nukkit.lang.TranslationContainer;
99
import cn.nukkit.level.GameRule;
1010
import cn.nukkit.level.GameRules;
11+
import org.jetbrains.annotations.NotNull;
1112

1213
import java.util.ArrayList;
1314
import java.util.Arrays;
@@ -73,7 +74,7 @@ public GameruleCommand(String name) {
7374
}
7475

7576
@Override
76-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
77+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
7778
if (!this.testPermission(sender)) {
7879
return true;
7980
}

‎src/main/java/cn/nukkit/command/defaults/GarbageCollectorCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import cn.nukkit.level.Level;
55
import cn.nukkit.math.NukkitMath;
66
import cn.nukkit.utils.TextFormat;
7+
import org.jetbrains.annotations.NotNull;
78

89
/**
910
* Created on 2015/11/11 by xtypr.
@@ -18,7 +19,7 @@ public GarbageCollectorCommand(String name) {
1819
}
1920

2021
@Override
21-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
22+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2223
if (!this.testPermission(sender)) {
2324
return true;
2425
}

‎src/main/java/cn/nukkit/command/defaults/GiveCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import cn.nukkit.item.Item;
1010
import cn.nukkit.lang.TranslationContainer;
1111
import cn.nukkit.utils.TextFormat;
12+
import org.jetbrains.annotations.NotNull;
1213

1314
/**
1415
* Created on 2015/12/9 by xtypr.
@@ -40,7 +41,7 @@ public GiveCommand(String name) {
4041
}
4142

4243
@Override
43-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
44+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
4445
if (!this.testPermission(sender)) {
4546
return true;
4647
}

‎src/main/java/cn/nukkit/command/defaults/HelpCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import cn.nukkit.command.data.CommandParameter;
88
import cn.nukkit.lang.TranslationContainer;
99
import cn.nukkit.utils.TextFormat;
10+
import org.jetbrains.annotations.NotNull;
1011

1112
import java.util.Map;
1213
import java.util.TreeMap;
@@ -27,7 +28,7 @@ public HelpCommand(String name) {
2728
}
2829

2930
@Override
30-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
31+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3132
if (!this.testPermission(sender)) {
3233
return true;
3334
}

‎src/main/java/cn/nukkit/command/defaults/KickCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cn.nukkit.event.player.PlayerKickEvent;
99
import cn.nukkit.lang.TranslationContainer;
1010
import cn.nukkit.utils.TextFormat;
11+
import org.jetbrains.annotations.NotNull;
1112

1213
/**
1314
* Created on 2015/11/11 by xtypr.
@@ -26,7 +27,7 @@ public KickCommand(String name) {
2627
}
2728

2829
@Override
29-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
30+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3031
if (!this.testPermission(sender)) {
3132
return true;
3233
}

‎src/main/java/cn/nukkit/command/defaults/KillCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import cn.nukkit.lang.TranslationContainer;
1313
import cn.nukkit.level.Level;
1414
import cn.nukkit.utils.TextFormat;
15+
import org.jetbrains.annotations.NotNull;
1516

1617
import java.util.StringJoiner;
1718

@@ -32,7 +33,7 @@ public KillCommand(String name) {
3233
}
3334

3435
@Override
35-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
36+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
3637
if (!this.testPermission(sender)) {
3738
return true;
3839
}

‎src/main/java/cn/nukkit/command/defaults/ListCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import cn.nukkit.Player;
44
import cn.nukkit.command.CommandSender;
55
import cn.nukkit.lang.TranslationContainer;
6+
import org.jetbrains.annotations.NotNull;
67

78
/**
89
* Created on 2015/11/11 by xtypr.
@@ -17,7 +18,7 @@ public ListCommand(String name) {
1718
}
1819

1920
@Override
20-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
21+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2122
if (!this.testPermission(sender)) {
2223
return true;
2324
}

‎src/main/java/cn/nukkit/command/defaults/MeCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import cn.nukkit.command.data.CommandParameter;
77
import cn.nukkit.lang.TranslationContainer;
88
import cn.nukkit.utils.TextFormat;
9+
import org.jetbrains.annotations.NotNull;
910

1011
/**
1112
* Created on 2015/11/12 by xtypr.
@@ -23,7 +24,7 @@ public MeCommand(String name) {
2324
}
2425

2526
@Override
26-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
27+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2728
if (!this.testPermission(sender)) {
2829
return true;
2930
}

‎src/main/java/cn/nukkit/command/defaults/OpCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cn.nukkit.command.data.CommandParameter;
99
import cn.nukkit.lang.TranslationContainer;
1010
import cn.nukkit.utils.TextFormat;
11+
import org.jetbrains.annotations.NotNull;
1112

1213
/**
1314
* Created on 2015/11/12 by xtypr.
@@ -25,7 +26,7 @@ public OpCommand(String name) {
2526
}
2627

2728
@Override
28-
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
29+
public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String @NotNull [] args) {
2930
if (!this.testPermission(sender)) {
3031
return true;
3132
}

0 commit comments

Comments
 (0)