Merge pull request #5 from ProfliX/master

4.0

Author: KodySimpson

pom.xml

@@ -83,6 +83,12 @@
             <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 <!--    <reporting>-->

src/main/java/me/kodysimpson/simpapi/colors/ColorTranslator.java

@@ -3,6 +3,7 @@
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
+import org.jetbrains.annotations.NotNull;
 
 public class ColorTranslator {
 
@@ -12,7 +13,7 @@ public class ColorTranslator {
      * @param text The string of text to apply color/effects to
      * @return Returns a string of text with color/effects applied
      */
-    public static String translateColorCodes(String text){
+    public static String translateColorCodes(@NotNull String text){
 
         String[] texts = text.split(String.format(WITH_DELIMITER, "&"));
 
@@ -23,7 +24,7 @@ public static String translateColorCodes(String text){
                 //get the next string
                 i++;
                 if (texts[i].charAt(0) == '#'){
-                    finalText.append(ChatColor.of(texts[i].substring(0, 7)) + texts[i].substring(7));
+                    finalText.append(ChatColor.of(texts[i].substring(0, 7))).append(texts[i].substring(7));
                 }else{
                     finalText.append(ChatColor.translateAlternateColorCodes('&', "&" + texts[i]));
                 }
@@ -39,7 +40,7 @@ public static String translateColorCodes(String text){
      * @param text The text with color codes that you want to turn into a TextComponent
      * @return the TextComponent with hex colors and regular colors
      */
-    public static TextComponent translateColorCodesToTextComponent(String text){
+    public static TextComponent translateColorCodesToTextComponent(@NotNull String text){
 
         String[] texts = text.split(String.format(WITH_DELIMITER, "&"));
 
@@ -53,7 +54,6 @@ public static TextComponent translateColorCodesToTextComponent(String text){
                 if (texts[i].charAt(0) == '#'){
                     subComponent.setText(texts[i].substring(7));
                     subComponent.setColor(net.md_5.bungee.api.ChatColor.of(texts[i].substring(0, 7)));
-                    builder.append(subComponent);
                 }else{
                     if (texts[i].length() > 1){
                         subComponent.setText(texts[i].substring(1));
@@ -130,8 +130,8 @@ public static TextComponent translateColorCodesToTextComponent(String text){
                             break;
                     }
 
-                    builder.append(subComponent);
                 }
+                builder.append(subComponent);
             }else{
                 builder.append(texts[i]);
             }
@@ -140,6 +140,4 @@ public static TextComponent translateColorCodesToTextComponent(String text){
         return new TextComponent(builder.create());
 
     }
-
-
 }

src/main/java/me/kodysimpson/simpapi/command/CommandManager.java

@@ -36,13 +36,13 @@ public static void createCoreCommand(JavaPlugin plugin, String commandName,
 
         Arrays.stream(subcommands).map(subcommand -> {
             try{
-                Constructor constructor = subcommand.getConstructor();
+                Constructor<? extends SubCommand> constructor = subcommand.getConstructor();
                 return constructor.newInstance();
             } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
                 e.printStackTrace();
             }
             return null;
-        }).forEach(o -> commands.add((SubCommand) o));
+        }).forEach(commands::add);
 
         //THANK YOU OZZYMAR <3 YOUR THE HOMIE
         Field commandField = plugin.getServer().getClass().getDeclaredField("commandMap");

src/main/java/me/kodysimpson/simpapi/command/CoreCommand.java

@@ -3,6 +3,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -13,8 +14,8 @@
  */
 class CoreCommand extends Command {
 
-    private ArrayList<SubCommand> subcommands;
-    private CommandList commandList;
+    private final ArrayList<SubCommand> subcommands;
+    private final CommandList commandList;
 
     public CoreCommand(String name, String description, String usageMessage, CommandList commandList, List<String> aliases, ArrayList<SubCommand> subCommands){
         super(name, description, usageMessage, aliases);
@@ -28,7 +29,7 @@ public ArrayList<SubCommand> getSubCommands(){
     }
 
     @Override
-    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
+    public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String[] args) {
 
         if (sender instanceof Player){
             Player p = (Player) sender;
@@ -57,7 +58,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
     }
 
     @Override
-    public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
+    public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, String[] args) throws IllegalArgumentException {
         if (args.length == 1){ //prank <subcommand> <args>
             ArrayList<String> subcommandsArguments = new ArrayList<>();
 

src/main/java/me/kodysimpson/simpapi/command/SubCommand.java

@@ -29,14 +29,14 @@ public abstract class SubCommand {
      * @param player The player who ran the command
      * @param args The args passed into the command when run
      */
-    public abstract void perform(Player player, String args[]);
+    public abstract void perform(Player player, String[] args);
 
     /**
      * @param player The player who ran the command
      * @param args The args passed into the command when run
      * @return A list of arguments to be suggested for autocomplete
      */
-    public abstract List<String> getSubcommandArguments(Player player, String args[]);
+    public abstract List<String> getSubcommandArguments(Player player, String[] args);
 
 }
 

src/main/java/me/kodysimpson/simpapi/heads/SkullCreator.java

@@ -10,6 +10,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Base64;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -80,7 +81,7 @@ public static ItemStack itemWithUuid(ItemStack item, UUID id) {
         notNull(id, "id");
 
         SkullMeta meta = (SkullMeta) item.getItemMeta();
-        meta.setOwningPlayer(Bukkit.getOfflinePlayer(id));
+        Objects.requireNonNull(meta).setOwningPlayer(Bukkit.getOfflinePlayer(id));
         item.setItemMeta(meta);
 
         return item;

src/main/java/me/kodysimpson/simpapi/menu/AbstractPlayerMenuUtility.java

@@ -11,7 +11,7 @@
 
 public abstract class AbstractPlayerMenuUtility {
 
-    private Player owner;
+    private final Player owner;
 
     public AbstractPlayerMenuUtility(Player p) {
         this.owner = p;

src/main/java/me/kodysimpson/simpapi/menu/Menu.java

@@ -9,6 +9,7 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 
@@ -59,7 +60,7 @@ public void open() {
 
     //Overridden method from the InventoryHolder interface
     @Override
-    public Inventory getInventory() {
+    public @NotNull Inventory getInventory() {
         return inventory;
     }
 

src/main/java/me/kodysimpson/simpapi/menu/MenuManager.java

@@ -18,7 +18,7 @@
 public class MenuManager {
 
     //each player will be assigned their own PlayerMenuUtility object
-    private static HashMap<Player, AbstractPlayerMenuUtility> playerMenuUtilityMap = new HashMap<>();
+    private static final HashMap<Player, AbstractPlayerMenuUtility> playerMenuUtilityMap = new HashMap<>();
     private static Class<? extends AbstractPlayerMenuUtility> pmuClass;
     private static boolean isSetup = false;
     //private static Class<? extends Menu>[] menus;
@@ -106,7 +106,7 @@ public static AbstractPlayerMenuUtility getPlayerMenuUtility(Player p) throws Me
         if (!(playerMenuUtilityMap.containsKey(p))) { //See if the player has a pmu "saved" for them
 
             //Construct PMU using reflection
-            Constructor<? extends AbstractPlayerMenuUtility> constructor = null;
+            Constructor<? extends AbstractPlayerMenuUtility> constructor;
             try {
                 constructor = pmuClass.getConstructor(Player.class);