1.4 release ^-^

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ankoki</groupId>
     <artifactId>SkJade</artifactId>
-    <version>1.3.4</version>
+    <version>1.4</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -54,6 +54,11 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>skript-releases</id>
+            <name>Skript Repository</name>
+            <url>https://repo.skriptlang.org/releases</url>
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -88,26 +93,7 @@
         <dependency>
             <groupId>com.github.SkriptLang</groupId>
             <artifactId>Skript</artifactId>
-            <version>2.6-alpha1</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sk89q</groupId>
-                    <artifactId>worldguard</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sk89q.worldguard</groupId>
-                    <artifactId>worldguard-legacy</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.github.marcelo-mason</groupId>
-                    <artifactId>PreciousStones</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>net.milkbowl.vault</groupId>
-                    <artifactId>Vault</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.6.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.Ankoki-Dev</groupId>

src/main/java/com/ankoki/skjade/SkJade.java

@@ -37,7 +37,6 @@ public class SkJade extends JavaPlugin {
     private boolean beta;
     private static SkJade instance;
     private String version;
-    private Version serverVersion;
     private PluginManager pluginManager;
     private SkriptAddon addon;
     private boolean nmsEnabled = false;
@@ -94,7 +93,6 @@ public void onEnable() {
         }
         new Metrics(this, 10131);
         this.getServer().getPluginCommand("skjade").setExecutor(new SkJadeCmd());
-        this.loadServerVersion();
         this.startRealTime();
 
         long fin = System.currentTimeMillis() - start;
@@ -112,17 +110,18 @@ public void onEnable() {
             }).start();
         }
 
-        if (serverVersion.isLegacy()) {
+        if (Version.currentIsLegacy()) {
             Console.warning("Please note SkJade does not support legacy versions. The supported versions are 1.13+.");
             Console.warning("You have no reason to not use the latest server version. SkJade will still be enabled, " +
                     "however you may encounter some issues which may not get fixed due to not supporting fossil versions.");
         }
     }
 
     private void loadNMS() {
-        if (Utils.getServerMajorVersion() < 13) {
+        if (Version.currentIsLegacy() || Version.CURRENT_VERSION == Version.UNKNOWN) {
             Console.warning("Could not find any NMS support for " + version + "! Please note SkJade only supports " +
                     "the latest sub-version of each version above 1.13.");
+            Console.warning("There is also a chance you are using a version I haven't implemented support for yet.");
             Console.info("SkJade will remain enabled, however anything using NMS will not be enabled!");
         } else {
             nmsEnabled = true;
@@ -166,16 +165,6 @@ private void loadHDElements() {
         }
     }
 
-    private void loadServerVersion() {
-        String packageName = this.getServer().getClass().getPackage().getName();
-        String ver = packageName.substring(packageName.lastIndexOf('.') + 1);
-        try {
-            serverVersion = Version.valueOf(ver);
-        } catch (Exception ex) {
-            Console.warning("You are using an unknown version (" + ver + ")! SkJade will not function as intended");
-        }
-    }
-
     private void loadElementalsElements() {
         try {
             addon.loadClasses("com.ankoki.skjade.hooks.elementals");

src/main/java/com/ankoki/skjade/elements/conditions/CondBoolean.java

@@ -10,7 +10,7 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Boolean")
 @Description("Shortens statements such as true = true to just true.")

src/main/java/com/ankoki/skjade/elements/conditions/CondCanBreak.java

@@ -9,7 +9,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Can Break Block")
 @Description("Checks if an item type can break a block.")

src/main/java/com/ankoki/skjade/elements/conditions/CondCanSee.java

@@ -12,7 +12,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Can See")
 @Description("Checks if a living entity can see another living entity.")

src/main/java/com/ankoki/skjade/elements/conditions/CondLocIsWithin.java

@@ -11,7 +11,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Location is Within")
 @Description("Checks if a location is between two locations")

src/main/java/com/ankoki/skjade/elements/conditions/CondMultiple.java

@@ -10,7 +10,7 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Multiple Conditions")
 @Description("Allows you to use multiple conditions.")

src/main/java/com/ankoki/skjade/elements/effects/EffDropTool.java

@@ -11,7 +11,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Drop Item")
 @Description("Makes the player drop one of their current item, or their inventory.")

src/main/java/com/ankoki/skjade/elements/effects/EffEvaluate.java

@@ -11,7 +11,7 @@
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 

src/main/java/com/ankoki/skjade/elements/effects/EffFakeDamage.java

@@ -14,7 +14,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Fake Damage")
 @Description("Makes a player look like they took damage.")

src/main/java/com/ankoki/skjade/elements/effects/EffForceSleep.java

@@ -12,7 +12,7 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 

src/main/java/com/ankoki/skjade/elements/effects/EffForceWake.java

@@ -11,7 +11,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 

src/main/java/com/ankoki/skjade/elements/effects/EffRefreshChunks.java

@@ -11,7 +11,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.Chunk;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 

src/main/java/com/ankoki/skjade/elements/effects/EffShowDemo.java

@@ -15,7 +15,7 @@
 import com.ankoki.skjade.utils.Utils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Show Demo")
 @Description("Shows the minecraft demonstration screen to a player.")

src/main/java/com/ankoki/skjade/elements/events/EvtAsyncPreLogin.java

@@ -10,7 +10,7 @@
 import ch.njol.skript.util.Getter;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.UUID;
 

src/main/java/com/ankoki/skjade/elements/expressions/ExprBorderSlots.java

@@ -17,7 +17,7 @@
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/ankoki/skjade/elements/expressions/ExprChunkAt.java

@@ -13,7 +13,7 @@
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Chunk at Location")
 @Description("Returns the chunk in a world from the x and y coordinates.")

src/main/java/com/ankoki/skjade/elements/expressions/ExprCircle.java

@@ -13,7 +13,7 @@
 import com.ankoki.skjade.utils.Shapes;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Circle")
 @Description("Returns the points of the outline of a circle which ")

src/main/java/com/ankoki/skjade/elements/expressions/ExprEnglishPlural.java

@@ -8,7 +8,7 @@
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.util.Utils;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("English Plural")
 @Description("Returns the english plural of a word. This may be inaccurate.")

src/main/java/com/ankoki/skjade/elements/expressions/ExprFlippedBool.java

@@ -11,7 +11,7 @@
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Flipped Boolean")
 @Description("Returns the flipped value of a boolean")

src/main/java/com/ankoki/skjade/elements/expressions/ExprMidnight.java

@@ -12,7 +12,7 @@
 import ch.njol.skript.util.Date;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Midnight")
 @Description("Returns the date of midnight.")

src/main/java/com/ankoki/skjade/elements/expressions/ExprNearestEntity.java

@@ -15,7 +15,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Nearest Entity")
 @Description("Returns the nearest entity to a location.")

src/main/java/com/ankoki/skjade/elements/expressions/ExprProgressBar.java

@@ -6,7 +6,7 @@
 import ch.njol.util.Kleenean;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 

src/main/java/com/ankoki/skjade/elements/expressions/ExprRomanNumerals.java

@@ -12,7 +12,7 @@
 import ch.njol.util.Kleenean;
 import com.ankoki.skjade.utils.Utils;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Roman Numerals")
 @Description("Returns the given number in roman numerals.")

src/main/java/com/ankoki/skjade/elements/expressions/ExprStar.java

@@ -13,7 +13,7 @@
 import com.ankoki.skjade.utils.Shapes;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Star")
 @Description("Returns the points of the outline of a star from the center, radius, and density")

src/main/java/com/ankoki/skjade/elements/expressions/ExprTimeAtPlayer.java

@@ -16,7 +16,7 @@
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Time at Player")
 @Description("Returns the player's time.")