Minor Version Update 1.1.0

Changes:
  - Converted messaging to Kyori Adventure Components
  - Miscellaneous code tweaks and organization

Author: Paldiu

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 version project.properties["pluginVersion"]
-targetCompatibility = sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
@@ -13,10 +13,7 @@ repositories {
     [
             "https://jitpack.io",
             "https://papermc.io/repo/repository/maven-public/",
-            "https://oss.sonatype.org/content/groups/public/",
-            "https://repo.extendedclip.com/content/repositories/placeholderapi/",
-            "http://repo.comphenix.net/content/repositories/releases/",
-            "http://repo.comphenix.net/content/repositories/snapshots/"
+            "https://os1.oss.sonatype.org/content/groups/public/"
     ].each { s ->
         maven {
             url s
@@ -27,24 +24,15 @@ repositories {
 dependencies {
     //provided
     [
-            "com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT",
-            "net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT",
-            "io.github.waterfallmc:waterfall-api:1.16-R0.4-SNAPSHOT",
-            "me.clip:placeholderapi:2.10.9",
-            files("libs/spigot-1.16.5.jar"),
-            files("libs/spigot-1.16.4.jar")
+            "io.papermc.paper:paper-api:1.18-R0.1-SNAPSHOT",
     ].each {s ->
         compileOnly s
     }
 
-    compileOnly ("com.github.dmulloy2:ProtocolLib:4.5.1") {
-        exclude group: "com.comphenix.executors"
-    }
-
     //compile
     [
-            "org.jetbrains:annotations:20.1.0",
-            "org.reflections:reflections:0.9.12"
+            "org.jetbrains:annotations:23.0.0",
+            "org.reflections:reflections:0.10.2"
     ].each {s ->
         implementation s
     }
@@ -63,6 +51,17 @@ shadowJar {
     }
 }
 
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+signing {
+    sign configurations.archives
+}
+
+group = "io.github.simplexdevelopment"
+archivesBaseName = "simplex-core"
+version = "1.0.0"
+
 processResources {
     //update resources when building
     doFirst {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/github/simplexdev/api/IBan.java

@@ -1,6 +1,7 @@
 package io.github.simplexdev.api;
 
 import io.github.simplexdev.simplexcore.ban.BanType;
+import net.kyori.adventure.text.Component;
 
 import java.util.Date;
 import java.util.UUID;
@@ -10,7 +11,7 @@ public interface IBan {
 
     String getSender();
 
-    String getBanReason();
+    Component getBanReason();
 
     String getBanId();
 

src/main/java/io/github/simplexdev/api/IGUI.java

@@ -1,6 +1,7 @@
 package io.github.simplexdev.api;
 
 import io.github.simplexdev.api.func.ClickAction;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -74,10 +75,10 @@ public interface IGUI {
      * Creates a new ItemStack instance to place in the inventory provided by the interface instance.
      * @param material The item material
      * @param name The name of the item
-     * @param lore Optional item descriptions
+     * @param lore Optional item descriptions, as components.
      * @return The newly created item
      */
-    ItemStack newItem(@NotNull Material material, @NotNull String name, String... lore);
+    ItemStack newItem(@NotNull Material material, @NotNull String name, Component... lore);
 
     /**
      * Creates a new ItemStack instance to place in the inventory provided by the interface instance.

src/main/java/io/github/simplexdev/api/func/VoidSupplier.java

@@ -1,10 +1,12 @@
 package io.github.simplexdev.api.func;
 
+import org.jetbrains.annotations.NotNull;
+
 @FunctionalInterface
 public interface VoidSupplier {
     void get();
 
-    default VoidSupplier after(VoidSupplier supplier) {
+    default VoidSupplier after(@NotNull VoidSupplier supplier) {
         supplier.get();
         return this;
     }

src/main/java/io/github/simplexdev/simplexcore/CoreState.java

@@ -7,18 +7,10 @@ public class CoreState {
     public CoreState(SimplexCorePlugin plugin) {
         this.plugin = plugin;
         switch (getState()) {
-            case ON:
-                message = "The Core is currently ON";
-                break;
-            case SUSPENDED:
-                message = "The Core is currently SUSPENDED. Please report this to the developer.";
-                break;
-            case DEBUG:
-                message = "The Core is currently in DEBUG mode. Do not use this if you don't know what you're doing.";
-                break;
-            case VOLATILE:
-                message = "The Core state is currently unknown! Please report this to the developer!";
-                break;
+            case ON -> message = "The Core is currently ON";
+            case SUSPENDED -> message = "The Core is currently SUSPENDED. Please report this to the developer.";
+            case DEBUG -> message = "The Core is currently in DEBUG mode. Do not use this if you don't know what you're doing.";
+            case VOLATILE -> message = "The Core state is currently unknown! Please report this to the developer!";
         }
     }
 

src/main/java/io/github/simplexdev/simplexcore/ban/Ban.java

@@ -9,6 +9,7 @@
 import io.github.simplexdev.simplexcore.module.SimplexModule;
 import io.github.simplexdev.simplexcore.utils.TickedTime;
 import io.github.simplexdev.simplexcore.utils.Utilities;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
@@ -33,7 +34,7 @@ public abstract class Ban implements IBan {
     private final SimplexModule<?> plugin;
 
     private final String banId;
-    private final String banReason;
+    private final Component banReason;
 
     /**
      * Creates a new Ban Entry.
@@ -79,7 +80,7 @@ public Ban(SimplexModule<?> plugin, Player player, CommandSender sender, BanType
      * @param banDate The date when the ban was created.
      * @param banDuration How long the ban should last.
      */
-    public Ban(SimplexModule<?> plugin, Player player, CommandSender sender, BanType type, String banId, String banReason, Date banDate, long banDuration) {
+    public Ban(SimplexModule<?> plugin, Player player, CommandSender sender, BanType type, String banId, Component banReason, Date banDate, long banDuration) {
         this.plugin = plugin;
         this.player = player;
         this.sender = sender;
@@ -92,18 +93,20 @@ public Ban(SimplexModule<?> plugin, Player player, CommandSender sender, BanType
 
     /**
      * Writes the Ban to a file.
-     * @param separateFiles Whether or not to create individual files for players or store them all in one bans.yml file.
+     * @param separateFiles Whether to create individual files for players or store
+     *                     them all in one bans.yml file.
      */
     public void writeToFile(boolean separateFiles) {
         File fileLocation = new File(plugin.getParentFolder(), "bans");
 
+        Yaml yaml;
         if (separateFiles) {
-            Yaml yaml = new YamlFactory(plugin).from(null, fileLocation, player.getName() + ".yml");
+            yaml = new YamlFactory(plugin).from(null, fileLocation, player.getName() + ".yml");
             ConfigurationSection section = yaml.getConfig().createSection(getOffender().toString());
             section.set("name", player.getName());
             section.set("ban_id", banId);
             section.set("sender", sender.getName());
-            section.set("reason", banReason);
+            section.set("reason", banReason.toString());
             section.set("duration", banDuration);
             section.set("date", banDate.getTime());
             section.set("type", type.toString());
@@ -112,14 +115,13 @@ public void writeToFile(boolean separateFiles) {
             } catch (IOException e) {
                 plugin.getLogger().severe(e.getMessage());
             }
-            yaml.reload();
         } else {
-            Yaml yaml = new YamlFactory(plugin).from(null, fileLocation, "bans.yml");
+            yaml = new YamlFactory(plugin).from(null, fileLocation, "bans.yml");
             ConfigurationSection section = yaml.getConfig().createSection(getOffender().toString());
             section.set("name", player.getName());
             section.set("ban_id", banId);
             section.set("sender", sender.getName());
-            section.set("reason", banReason);
+            section.set("reason", banReason.toString());
             section.set("duration", banDuration);
             section.set("date", banDate.getTime());
             section.set("type", type.toString());
@@ -128,7 +130,7 @@ public void writeToFile(boolean separateFiles) {
             } catch (IOException ex) {
                 plugin.getLogger().severe(ex.getMessage());
             }
-            yaml.reload();
         }
+        yaml.reload();
     }
 }

src/main/java/io/github/simplexdev/simplexcore/ban/BanFactory.java

@@ -4,12 +4,15 @@
 import io.github.simplexdev.api.func.VoidSupplier;
 import io.github.simplexdev.simplexcore.chat.Messages;
 import io.github.simplexdev.simplexcore.config.Yaml;
-import io.github.simplexdev.simplexcore.config.YamlFactory;
 import io.github.simplexdev.simplexcore.module.SimplexModule;
 import io.github.simplexdev.simplexcore.utils.TickedTime;
 import io.github.simplexdev.simplexcore.utils.Utilities;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.util.Date;
@@ -24,7 +27,7 @@ public final class BanFactory {
     private final Date banDate;
     private final BanType type;
     private final String banId;
-    private String banReason;
+    private Component banReason;
     private long banDuration;
 
     public BanFactory(SimplexModule<?> plugin, Player player, CommandSender sender, Date banDate, BanType type) {
@@ -46,13 +49,13 @@ public BanFactory(SimplexModule<?> plugin, Player player, CommandSender sender,
      * @param banReason   The reason for the ban. By default, this uses Messages#BAN for the message.
      * @return The current instance of BanFactory.
      */
-    public BanFactory defineOptional(long banDuration, String banReason) {
+    public BanFactory defineOptional(long banDuration, Component banReason) {
         this.banDuration = banDuration;
         this.banReason = banReason;
         return this;
     }
 
-    public void write(Yaml yaml, IBan ban) {
+    public void write(@NotNull Yaml yaml, @NotNull IBan ban) {
         yaml.set(pathway("offender"), ban.getOffender());
         yaml.set(pathway("sender"), ban.getSender());
         yaml.set(pathway("duration"), ban.getBanDuration());
@@ -63,7 +66,8 @@ public void write(Yaml yaml, IBan ban) {
         yaml.create();
     }
 
-    public Yaml read(File yamlFile) {
+    @Contract(pure = true)
+    public @Nullable Yaml read(File yamlFile) {
         return null;
     }
 
@@ -72,7 +76,8 @@ public Yaml read(File yamlFile) {
      *
      * @return A new ban instance.
      */
-    public Ban create() {
+    @Contract(" -> new")
+    public @NotNull Ban create() {
         return new Ban(plugin, player, sender, type, banDuration) {
             @Override
             public UUID getOffender() {
@@ -85,7 +90,7 @@ public String getSender() {
             }
 
             @Override
-            public String getBanReason() {
+            public Component getBanReason() {
                 return banReason;
             }
 
@@ -115,19 +120,23 @@ public void deleteBan(IBan ban) {
         // TODO
     }
 
-    public IBan getBan(String banId) {
+    @Contract(pure = true)
+    public @Nullable IBan getBan(String banId) {
         return null;
     }
 
-    public IBan getBan(Player player) {
+    @Contract(pure = true)
+    public @Nullable IBan getBan(Player player) {
         return null;
     }
 
-    public IBan getBan(UUID offenderUUID) {
+    @Contract(pure = true)
+    public @Nullable IBan getBan(UUID offenderUUID) {
         return null;
     }
 
-    private VoidSupplier assignBanDuration(Long... time) {
+    @Contract(pure = true)
+    private @NotNull VoidSupplier assignBanDuration(Long... time) {
         return () -> {
             if (type.equals(BanType.PERMANENT)) {
                 banDuration = TickedTime.YEAR * 99;
@@ -145,7 +154,7 @@ private VoidSupplier assignBanDuration(Long... time) {
         };
     }
 
-    private String createBanId() {
+    private @NotNull String createBanId() {
         return Utilities.generateBanId(type);
     }
 }

src/main/java/io/github/simplexdev/simplexcore/ban/BanManager.java

@@ -7,6 +7,7 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Date;
@@ -19,11 +20,9 @@
 
 public final class BanManager extends SimplexListener {
     private final Map<Ban, BanType> banMap = new HashMap<>();
-    private final SimplexModule<?> plugin;
 
     BanManager(SimplexModule<?> plugin) {
-        this.plugin = plugin;
-        register(this, plugin);
+        super(plugin);
     }
 
     public void addBan(Ban ban) {
@@ -47,7 +46,7 @@ public Ban getBan(OfflinePlayer player) {
     }
 
     @EventHandler
-    public void banHandler(AsyncPlayerPreLoginEvent event) {
+    public void banHandler(@NotNull AsyncPlayerPreLoginEvent event) {
         UUID player = event.getUniqueId();
         OfflinePlayer op = Bukkit.getOfflinePlayer(player);
         Ban ban = getBan(op);

src/main/java/io/github/simplexdev/simplexcore/ban/BanType.java

@@ -1,5 +1,7 @@
 package io.github.simplexdev.simplexcore.ban;
 
+import org.jetbrains.annotations.NotNull;
+
 public enum BanType {
     PERMANENT("P-"),
     TEMPORARY("T-"),
@@ -12,7 +14,7 @@ public enum BanType {
         this.prefix = prefix;
     }
 
-    public static String value(BanType type) {
+    public static @NotNull String value(@NotNull BanType type) {
         if (type.equals(PERMANENT)) {
             return "Permanent";
         } else if (type.equals(TEMPORARY)) {
@@ -22,7 +24,7 @@ public static String value(BanType type) {
         }
     }
 
-    public static BanType getFromId(String banId) {
+    public static BanType getFromId(@NotNull String banId) {
         if (banId.startsWith("P")) {
             return PERMANENT;
         } else if (banId.startsWith("T")) {