Cleanup & Make update checking work, gonna do updates later. & bump version [release]

Author: RGBCube

pom.xml

@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
+<project>
     <groupId>network.skulk.plugin</groupId>
+    <url>skulk.network</url>
     <artifactId>SNP</artifactId>
-    <version>2.6.0b1</version>
-    <packaging>jar</packaging>
-
     <name>SNP</name>
-
+    <version>2.6.0</version>
     <description>The main plugin used for the Skulk Network Minecraft server.</description>
+
+    <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
     <properties>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <url>skulk.network</url>
 
     <build>
         <plugins>
@@ -39,11 +35,18 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <!--                    <artifactSet>-->
+                    <!--                        <includes>-->
+                    <!--                            <include>org.jetbrains.kotlin:kotlin-stdlib</include>-->
+                    <!--                            <include>com.squareup.okio:okio-jvm</include>-->
+                    <!--                            <include>com.squareup.okhttp3:okhttp</include>-->
+                    <!--                        </includes>-->
+                    <!--                    </artifactSet>-->
+                </configuration>
             </plugin>
         </plugins>
 
@@ -60,6 +63,12 @@
             <id>papermc-repo</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
+
+        <repository>
+            <id>okhttp-repo</id>
+            <url>https://okhttp3.squareup.com/</url>
+        </repository>
+
     </repositories>
 
     <dependencies>
@@ -69,5 +78,11 @@
             <version>1.19-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/network/skulk/plugin/core/extensions/entityoverride/listeners/DragonDropElytraListener.java

@@ -28,7 +28,7 @@
 
 // Entity.getKiller() returns null when it's the ender dragon for some reason.
 public final class DragonDropElytraListener extends BaseListener<EntityOverrideExtension> {
-    private static final ItemStack OP_ELYTRA = new ItemStack(Material.ELYTRA, 1);
+    private static final @NotNull ItemStack OP_ELYTRA = new ItemStack(Material.ELYTRA, 1);
 
     static {
 
@@ -55,7 +55,7 @@ public final class DragonDropElytraListener extends BaseListener<EntityOverrideE
         DragonDropElytraListener.OP_ELYTRA.setItemMeta(elytraItemMeta);
     }
 
-    private final NamespacedKey hasGottenElytraKey = new NamespacedKey(this.getExtension().getPlugin(), "hasGottenElytra");
+    private final @NotNull NamespacedKey hasGottenElytraKey = new NamespacedKey(this.getExtension().getPlugin(), "hasGottenElytra");
     private @Nullable Player lastDragonDamager = null;
 
     public DragonDropElytraListener(final @NotNull EntityOverrideExtension extension) {
@@ -77,7 +77,7 @@ public void onEntityDeath(final @NotNull EntityDeathEvent event) {
 
         final var player = this.lastDragonDamager;
         final var playerPersistentDataContainer = player.getPersistentDataContainer();
-        final var booleanPersistentDataType = Singletons.getBooleanPersistentDataType();
+        final var booleanPersistentDataType = Singletons.BOOLEAN_PERSISTENT_DATA_TYPE;
 
         if (playerPersistentDataContainer.getOrDefault(this.hasGottenElytraKey, booleanPersistentDataType, false)) {
             return;

src/main/java/network/skulk/plugin/core/extensions/foodbehaviour/FoodBehaviourExtension.java

@@ -3,9 +3,10 @@
 import network.skulk.plugin.core.Plugin;
 import network.skulk.plugin.core.extensions.foodbehaviour.listeners.CookieResetInsomniaListener;
 import network.skulk.plugin.wrapper.BaseExtension;
+import org.jetbrains.annotations.NotNull;
 
 public final class FoodBehaviourExtension extends BaseExtension {
-    public FoodBehaviourExtension(final Plugin plugin) {
+    public FoodBehaviourExtension(final @NotNull Plugin plugin) {
         super(plugin);
     }
 

src/main/java/network/skulk/plugin/core/extensions/foodbehaviour/listeners/CookieResetInsomniaListener.java

@@ -7,16 +7,17 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
+import org.jetbrains.annotations.NotNull;
 
 import static network.skulk.plugin.helpers.MiniMessageHelper.sendMessage;
 
 public final class CookieResetInsomniaListener extends BaseListener<FoodBehaviourExtension> {
-    public CookieResetInsomniaListener(final FoodBehaviourExtension extension) {
+    public CookieResetInsomniaListener(final @NotNull FoodBehaviourExtension extension) {
         super(extension);
     }
 
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onPlayerItemConsume(final PlayerItemConsumeEvent event) {
+    public void onPlayerItemConsume(final @NotNull PlayerItemConsumeEvent event) {
         if (event.getItem().getType() != Material.COOKIE) {
             return;
         }

src/main/java/network/skulk/plugin/core/extensions/homes/HomesExtension.java

@@ -18,11 +18,11 @@
 import java.io.FileWriter;
 
 public final class HomesExtension extends BaseExtension {
-    private final File homesFile = new File(this.getPlugin().getDataFolder(), "homes.yml");
+    private final @NotNull File homesFile = new File(this.getPlugin().getDataFolder(), "homes.yml");
     private FileWriter homesFileWriter;
-    private UUID2CaseInsensitiveMap<Location> homes = new UUID2CaseInsensitiveMap<>();
+    private @NotNull UUID2CaseInsensitiveMap<@NotNull Location> homes = new UUID2CaseInsensitiveMap<>();
 
-    public HomesExtension(final Plugin plugin) {
+    public HomesExtension(final @NotNull Plugin plugin) {
         super(plugin);
     }
 
@@ -39,32 +39,31 @@ public HomesExtension(final Plugin plugin) {
 
     @Override protected void onEnableHook() throws Exception {
         final var plugin = this.getPlugin();
-        final var yaml = Singletons.getYaml();
 
         FileHelper.createFile(this.homesFile);
         this.homesFileWriter = new FileWriter(homesFile);
 
         plugin.runRepeatingAsync(30 * 60 * 20, () -> {
             try {
-                yaml.dump(this.homes, this.homesFileWriter);
+                Singletons.YAML.dump(this.homes, this.homesFileWriter);
             } catch (final Exception error) {
                 plugin.reportError("There was an error while trying to save homes:", error);
             }
         });
 
-        this.homes = yaml.load(new FileInputStream(this.homesFile));
+        this.homes = Singletons.YAML.load(new FileInputStream(this.homesFile));
 
         if (this.homes == null) {
             this.homes = new UUID2CaseInsensitiveMap<>();
         }
     }
 
     @Override protected void onDisableHook() {
-        Singletons.getYaml().dump(this.homes, this.homesFileWriter);
+        Singletons.YAML.dump(this.homes, this.homesFileWriter);
     }
 
     // Getters.
-    public @NotNull UUID2CaseInsensitiveMap<Location> getHomes() {
+    public @NotNull UUID2CaseInsensitiveMap<@NotNull Location> getHomes() {
         return this.homes;
     }
 }

src/main/java/network/skulk/plugin/core/extensions/homes/commands/HomeCommand.java

@@ -21,9 +21,7 @@ public HomeCommand(final @NotNull HomesExtension extension) {
         this.setName("home");
         this.setDescription("Teleports you to one of your homes.");
         this.setUsage("/home [name]");
-        this.setPlayerOnly(true);
         this.setMaxArgs(1);
-        this.setMinArgs(0);
     }
 
     @Override protected @Nullable ArrayList<String> tabComplete(final @NotNull Player player, final @NotNull String[] args) {

src/main/java/network/skulk/plugin/core/extensions/homes/commands/HomeDeleteCommand.java

@@ -16,9 +16,7 @@ public HomeDeleteCommand(final @NotNull HomesExtension extension) {
         this.setName("home-delete");
         this.setDescription("Deletes a home.");
         this.setUsage("/home-delete [name]");
-        this.setPlayerOnly(true);
         this.setMaxArgs(1);
-        this.setMinArgs(0);
     }
 
     @Override protected boolean execute(final @NotNull Player player, final @NotNull String[] args) {

src/main/java/network/skulk/plugin/core/extensions/homes/commands/HomeListCommand.java

@@ -21,9 +21,6 @@ public HomeListCommand(final @NotNull HomesExtension extension) {
         this.setName("home-list");
         this.setDescription("Tells you all your homes.");
         this.setUsage("/home-list");
-        this.setPlayerOnly(true);
-        this.setMaxArgs(0);
-        this.setMinArgs(0);
     }
 
     @Override protected boolean execute(final @NotNull Player player) {

src/main/java/network/skulk/plugin/core/extensions/homes/commands/HomeSetCommand.java

@@ -17,9 +17,7 @@ public HomeSetCommand(final @NotNull HomesExtension extension) {
         this.setName("home-set");
         this.setDescription("Makes the current location a home.");
         this.setUsage("/home-set [name]");
-        this.setPlayerOnly(true);
         this.setMaxArgs(1);
-        this.setMinArgs(0);
     }
 
     @Override protected boolean execute(final @NotNull Player player, final @NotNull String[] args) {

src/main/java/network/skulk/plugin/core/extensions/messageoverride/listeners/PlayerAdvancementDoneListener.java

@@ -5,19 +5,20 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerAdvancementDoneEvent;
+import org.jetbrains.annotations.NotNull;
 
 import static network.skulk.plugin.helpers.MiniMessageHelper.makeMessageWithComponent;
 
 
 // FIXME
 public final class PlayerAdvancementDoneListener extends BaseListener<MessageOverrideExtension> {
-    public PlayerAdvancementDoneListener(final MessageOverrideExtension extension) {
+    public PlayerAdvancementDoneListener(final @NotNull MessageOverrideExtension extension) {
         super(extension);
     }
 
     @SuppressWarnings("ConstantConditions")
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onPlayerAdvancementDone(final PlayerAdvancementDoneEvent event) {
+    public void onPlayerAdvancementDone(final @NotNull PlayerAdvancementDoneEvent event) {
         event.message(makeMessageWithComponent("blue", '✓', "<0>.", event.message()));
     }
 }