chore: remove TODO comment, add nullability annotations

Signed-off-by: TTtie <me@tttie.cz>

Author: TTtie

core/src/main/java/dev/pgm/community/serverlinks/ServerLinksConfig.java

@@ -12,7 +12,10 @@
 import java.util.Map;
 import java.util.Objects;
 import org.bukkit.configuration.Configuration;
+import org.jetbrains.annotations.NotNullByDefault;
+import org.jetbrains.annotations.Nullable;
 
+@NotNullByDefault
 public class ServerLinksConfig extends FeatureConfigImpl {
   private static final String KEY = "server-links";
   private static final String LINKS_KEY = "links";
@@ -21,13 +24,14 @@ public class ServerLinksConfig extends FeatureConfigImpl {
   private static final String LINK_CUSTOM_TEXT_KEY = "text";
   private static final String LINK_URI_KEY = "uri";
 
-  private List<ServerLink> links;
+  private @Nullable List<ServerLink> links;
 
   public ServerLinksConfig(Configuration config) {
     super(KEY, config);
   }
 
   public List<ServerLink> getLinks() {
+    assert links != null;
     return links;
   }
 

core/src/main/java/dev/pgm/community/serverlinks/ServerLinksFeature.java

@@ -9,7 +9,9 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.jetbrains.annotations.NotNullByDefault;
 
+@NotNullByDefault
 public class ServerLinksFeature extends FeatureBase {
   private static final ServerLinksPlatform PLATFORM = Platform.get(ServerLinksPlatform.class);
 

core/src/main/java/dev/pgm/community/serverlinks/types/ServerLink.java

@@ -2,6 +2,8 @@
 
 import java.net.URI;
 import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNullByDefault;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents a Minecraft server link.
@@ -10,4 +12,6 @@
  * @param customText The custom text for the server link, or null if builtinType is set.
  * @param uri The URI of the server link.
  */
-public record ServerLink(ServerLinkBuiltinType builtinType, Component customText, URI uri) {}
+@NotNullByDefault
+public record ServerLink(
+    @Nullable ServerLinkBuiltinType builtinType, @Nullable Component customText, URI uri) {}

core/src/main/java/dev/pgm/community/serverlinks/types/ServerLinkBuiltinType.java

@@ -1,9 +1,12 @@
 package dev.pgm.community.serverlinks.types;
 
+import org.jetbrains.annotations.NotNullByDefault;
+
 /**
  * Represents a built-in server link type that will be auto-translated by the Minecraft client and
  * possibly have special functionality. Keep in sync with Paper's org.bukkit.ServerLinks.Type.
  */
+@NotNullByDefault
 public enum ServerLinkBuiltinType {
   REPORT_BUG,
   COMMUNITY_GUIDELINES,

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/feature/serverlinks/ModernServerLinksPlatform.java

@@ -10,8 +10,10 @@
 import org.bukkit.ServerLinks;
 import org.bukkit.craftbukkit.CraftServerLinks;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNullByDefault;
 
 @Supports(PAPER)
+@NotNullByDefault
 public class ModernServerLinksPlatform implements ServerLinksFeature.ServerLinksPlatform {
   @Override
   public void sendToPlayer(Player player, List<ServerLink> serverLinks) {
@@ -24,6 +26,7 @@ private ServerLinks toPlatformServerLinks(List<ServerLink> links) {
       if (link.builtinType() != null) {
         bukkitLinks.addLink(toBukkitType(link.builtinType()), link.uri());
       } else {
+        assert link.customText() != null;
         bukkitLinks.addLink(link.customText(), link.uri());
       }
     }

platform/platform-sportpaper/src/main/java/dev/pgm/community/platform/sportpaper/features/serverlinks/SpServerLinksPlatform.java

@@ -7,8 +7,10 @@
 import dev.pgm.community.util.Supports;
 import java.util.List;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNullByDefault;
 
 @Supports(SPORTPAPER)
+@NotNullByDefault
 public class SpServerLinksPlatform implements ServerLinksFeature.ServerLinksPlatform {
   private static final boolean HAS_VIA = hasVia();
 

platform/platform-sportpaper/src/main/java/dev/pgm/community/platform/sportpaper/features/serverlinks/ViaServerLinks.java

@@ -1,5 +1,7 @@
 package dev.pgm.community.platform.sportpaper.features.serverlinks;
 
+import static tc.oc.pgm.util.Assert.assertNotNull;
+
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -15,7 +17,9 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNullByDefault;
 
+@NotNullByDefault
 public class ViaServerLinks {
   private static final Protocol<?, ?, ?, ?> serverLinkProtocol = findServerLinkProtocol();
 
@@ -37,12 +41,12 @@ private static PacketWrapper createPacket(UserConnection conn, List<ServerLink>
     var packetType = packetTypes.get(State.PLAY).typeByName("SERVER_LINKS");
     PacketWrapper packet = PacketWrapper.create(packetType, conn);
     packet.write(Types.VAR_INT, links.size());
-    // TODO: is there a better way to do this?
     for (ServerLink link : links) {
       packet.write(Types.BOOLEAN, link.builtinType() != null);
       if (link.builtinType() != null) {
         packet.write(Types.VAR_INT, link.builtinType().ordinal());
       } else {
+        assert link.customText() != null;
         packet.write(Types.TAG, toViaTag(link.customText()));
       }
       packet.write(Types.STRING, link.uri().toString());
@@ -52,13 +56,17 @@ private static PacketWrapper createPacket(UserConnection conn, List<ServerLink>
   }
 
   private static Tag toViaTag(Component component) {
-    return JsonNbtConverter.toNbt(
-        JsonParser.parseString(GsonComponentSerializer.gson().serialize(component)));
+    return assertNotNull(
+        JsonNbtConverter.toNbt(
+            JsonParser.parseString(GsonComponentSerializer.gson().serialize(component))),
+        "Component -> NBT conversion failed");
   }
 
   private static Protocol<?, ?, ?, ?> findServerLinkProtocol() {
-    return Via.getManager()
-        .getProtocolManager()
-        .getProtocol(/* to */ ProtocolVersion.v1_21, /* from */ ProtocolVersion.v1_20_5);
+    return assertNotNull(
+        Via.getManager()
+            .getProtocolManager()
+            .getProtocol(/* to */ ProtocolVersion.v1_21, /* from */ ProtocolVersion.v1_20_5),
+        "ViaVersion v1.20.5 -> v1.21 protocol was not found");
   }
 }