From 05cd0b625c1c5abd37dddf30946403508f50ae76 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Sun, 21 Feb 2021 23:08:51 -0700
Subject: [PATCH] notnull annotations

---
 .../main/java/com/dfsek/terra/addons/annotations/Addon.java   | 4 +++-
 .../main/java/com/dfsek/terra/addons/annotations/Author.java  | 4 +++-
 .../main/java/com/dfsek/terra/addons/annotations/Depends.java | 4 +++-
 .../main/java/com/dfsek/terra/addons/annotations/Version.java | 4 +++-
 .../main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java   | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/addons/annotations/Addon.java b/common/src/main/java/com/dfsek/terra/addons/annotations/Addon.java
index 79db4b24b..fc3fd8f23 100644
--- a/common/src/main/java/com/dfsek/terra/addons/annotations/Addon.java
+++ b/common/src/main/java/com/dfsek/terra/addons/annotations/Addon.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.annotations;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -14,5 +16,5 @@ public @interface Addon {
     /**
      * @return The ID of the addon.
      */
-    String value();
+    @NotNull String value();
 }
diff --git a/common/src/main/java/com/dfsek/terra/addons/annotations/Author.java b/common/src/main/java/com/dfsek/terra/addons/annotations/Author.java
index b7bd416e3..5df87c2e8 100644
--- a/common/src/main/java/com/dfsek/terra/addons/annotations/Author.java
+++ b/common/src/main/java/com/dfsek/terra/addons/annotations/Author.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.annotations;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -14,5 +16,5 @@ public @interface Author {
     /**
      * @return Name of the addon author.
      */
-    String value();
+    @NotNull String value();
 }
diff --git a/common/src/main/java/com/dfsek/terra/addons/annotations/Depends.java b/common/src/main/java/com/dfsek/terra/addons/annotations/Depends.java
index ded30d6ba..cf0b05b5a 100644
--- a/common/src/main/java/com/dfsek/terra/addons/annotations/Depends.java
+++ b/common/src/main/java/com/dfsek/terra/addons/annotations/Depends.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.annotations;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -14,5 +16,5 @@ public @interface Depends {
     /**
      * @return All addons this addon is dependent upon.
      */
-    String[] value();
+    @NotNull String[] value();
 }
diff --git a/common/src/main/java/com/dfsek/terra/addons/annotations/Version.java b/common/src/main/java/com/dfsek/terra/addons/annotations/Version.java
index 87ce44984..48f5f44c2 100644
--- a/common/src/main/java/com/dfsek/terra/addons/annotations/Version.java
+++ b/common/src/main/java/com/dfsek/terra/addons/annotations/Version.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.annotations;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -14,5 +16,5 @@ public @interface Version {
     /**
      * @return Version of the addon.
      */
-    String value();
+    @NotNull String value();
 }
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
index ce150c8e7..bbc9a004d 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -290,7 +290,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         }
     }
 
-    @Addon("Terra")
+    @Addon("Terra-Bukkit")
     @Version("1.0.0")
     @Author("Terra")
     private static final class BukkitAddon extends TerraAddon {