Make Nukkit more kotlin friendly: Commands

CloudburstMC · Aug 19, 2022 · 52ecf3a · 52ecf3a
1 parent 9739275
commit 52ecf3a
Show file tree

Hide file tree

Showing 47 changed files with 98 additions and 46 deletions.
diff --git a/pom.xml b/pom.xml
@@ -167,6 +167,11 @@
             <version>${jline.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>23.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/cn/nukkit/command/Command.java b/src/main/java/cn/nukkit/command/Command.java
@@ -9,6 +9,7 @@
 import cn.nukkit.utils.TextFormat;
 import co.aikar.timings.Timing;
 import co.aikar.timings.Timings;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
@@ -135,7 +136,7 @@ public Map<String, CommandOverload> getOverloads() {
         return this.commandData.overloads;
     }
 
-    public abstract boolean execute(CommandSender sender, String commandLabel, String[] args);
+    public abstract boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args);
 
     public String getName() {
         return name;

diff --git a/src/main/java/cn/nukkit/command/FormattedCommandAlias.java b/src/main/java/cn/nukkit/command/FormattedCommandAlias.java
@@ -4,6 +4,7 @@
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.MainLogger;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +28,7 @@ public FormattedCommandAlias(String alias, List<String> formatStrings) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         boolean result = false;
         ArrayList<String> commands = new ArrayList<>();
         for (String formatString : formatStrings) {

diff --git a/src/main/java/cn/nukkit/command/PluginCommand.java b/src/main/java/cn/nukkit/command/PluginCommand.java
@@ -2,6 +2,7 @@
 
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * author: MagicDroidX
@@ -21,7 +22,7 @@ public PluginCommand(String name, T owner) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.owningPlugin.isEnabled()) {
             return false;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/BanCommand.java b/src/main/java/cn/nukkit/command/defaults/BanCommand.java
@@ -7,6 +7,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.event.player.PlayerKickEvent;
 import cn.nukkit.lang.TranslationContainer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * author: MagicDroidX
@@ -26,7 +27,7 @@ public BanCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/BanIpCommand.java b/src/main/java/cn/nukkit/command/defaults/BanIpCommand.java
@@ -9,6 +9,7 @@
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.nbt.NBTIO;
 import cn.nukkit.nbt.tag.CompoundTag;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -40,7 +41,7 @@ public BanIpCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/BanListCommand.java b/src/main/java/cn/nukkit/command/defaults/BanListCommand.java
@@ -6,6 +6,7 @@
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.permission.BanEntry;
 import cn.nukkit.permission.BanList;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;
 
@@ -24,7 +25,7 @@ public BanListCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/DebugPasteCommand.java b/src/main/java/cn/nukkit/command/defaults/DebugPasteCommand.java
@@ -9,6 +9,8 @@
 import cn.nukkit.utils.HastebinUtility;
 import cn.nukkit.utils.MainLogger;
 import cn.nukkit.utils.Utils;
+import org.jetbrains.annotations.NotNull;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -22,7 +24,7 @@ public DebugPasteCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/DefaultGamemodeCommand.java b/src/main/java/cn/nukkit/command/defaults/DefaultGamemodeCommand.java
@@ -6,6 +6,7 @@
 import cn.nukkit.command.data.CommandParamType;
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/12 by xtypr.
@@ -26,7 +27,7 @@ public DefaultGamemodeCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/DeopCommand.java b/src/main/java/cn/nukkit/command/defaults/DeopCommand.java
@@ -8,6 +8,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/12 by xtypr.
@@ -23,7 +24,7 @@ public DeopCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/DifficultyCommand.java b/src/main/java/cn/nukkit/command/defaults/DifficultyCommand.java
@@ -8,6 +8,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.network.protocol.SetDifficultyPacket;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 
@@ -30,7 +31,7 @@ public DifficultyCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/EffectCommand.java b/src/main/java/cn/nukkit/command/defaults/EffectCommand.java
@@ -11,6 +11,7 @@
 import cn.nukkit.potion.InstantEffect;
 import cn.nukkit.utils.ServerException;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -48,7 +49,7 @@ public EffectCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java b/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
@@ -10,6 +10,7 @@
 import cn.nukkit.item.enchantment.Enchantment;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created by Pub4Game on 23.01.2016.
@@ -38,7 +39,7 @@ public EnchantCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java b/src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java
@@ -9,6 +9,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/13 by xtypr.
@@ -36,7 +37,7 @@ public GamemodeCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (args.length == 0) {
             sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));
             return false;

diff --git a/src/main/java/cn/nukkit/command/defaults/GameruleCommand.java b/src/main/java/cn/nukkit/command/defaults/GameruleCommand.java
@@ -8,6 +8,7 @@
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.level.GameRule;
 import cn.nukkit.level.GameRules;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,7 +74,7 @@ public GameruleCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/GarbageCollectorCommand.java b/src/main/java/cn/nukkit/command/defaults/GarbageCollectorCommand.java
@@ -4,6 +4,7 @@
 import cn.nukkit.level.Level;
 import cn.nukkit.math.NukkitMath;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/11 by xtypr.
@@ -18,7 +19,7 @@ public GarbageCollectorCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/GiveCommand.java b/src/main/java/cn/nukkit/command/defaults/GiveCommand.java
@@ -9,6 +9,7 @@
 import cn.nukkit.item.Item;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/12/9 by xtypr.
@@ -40,7 +41,7 @@ public GiveCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/HelpCommand.java b/src/main/java/cn/nukkit/command/defaults/HelpCommand.java
@@ -7,6 +7,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -27,7 +28,7 @@ public HelpCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/KickCommand.java b/src/main/java/cn/nukkit/command/defaults/KickCommand.java
@@ -8,6 +8,7 @@
 import cn.nukkit.event.player.PlayerKickEvent;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/11 by xtypr.
@@ -26,7 +27,7 @@ public KickCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/KillCommand.java b/src/main/java/cn/nukkit/command/defaults/KillCommand.java
@@ -12,6 +12,7 @@
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.level.Level;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.StringJoiner;
 
@@ -32,7 +33,7 @@ public KillCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/ListCommand.java b/src/main/java/cn/nukkit/command/defaults/ListCommand.java
@@ -3,6 +3,7 @@
 import cn.nukkit.Player;
 import cn.nukkit.command.CommandSender;
 import cn.nukkit.lang.TranslationContainer;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/11 by xtypr.
@@ -17,7 +18,7 @@ public ListCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/MeCommand.java b/src/main/java/cn/nukkit/command/defaults/MeCommand.java
@@ -6,6 +6,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/12 by xtypr.
@@ -23,7 +24,7 @@ public MeCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }

diff --git a/src/main/java/cn/nukkit/command/defaults/OpCommand.java b/src/main/java/cn/nukkit/command/defaults/OpCommand.java
@@ -8,6 +8,7 @@
 import cn.nukkit.command.data.CommandParameter;
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.utils.TextFormat;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Created on 2015/11/12 by xtypr.
@@ -25,7 +26,7 @@ public OpCommand(String name) {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, String commandLabel, String[] args) {
         if (!this.testPermission(sender)) {
             return true;
         }