diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index 7a2714c1..16b11e00 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/Core/src/main/java/com/songoda/core/SongodaCore.java @@ -281,6 +281,10 @@ public class SongodaCore { return new ArrayList<>(registeredPlugins); } + public static String getVersion() { + return SongodaCoreConstants.getCoreVersion(); + } + /** * @deprecated Use {@link #getCoreMajorVersion()} instead, but careful, coreRevision is at 9 while major version is at 2 */ @@ -289,12 +293,13 @@ public class SongodaCore { return coreRevision; } + @Deprecated public static String getCoreLibraryVersion() { return SongodaCoreConstants.getCoreVersion(); } public static int getCoreMajorVersion() { - String fullVersion = getCoreLibraryVersion(); + String fullVersion = getVersion(); if (fullVersion.contains(".")) { return Integer.parseInt(fullVersion.substring(0, fullVersion.indexOf("."))); } diff --git a/Core/src/main/java/com/songoda/core/SongodaPlugin.java b/Core/src/main/java/com/songoda/core/SongodaPlugin.java index 278df118..18adefc0 100644 --- a/Core/src/main/java/com/songoda/core/SongodaPlugin.java +++ b/Core/src/main/java/com/songoda/core/SongodaPlugin.java @@ -211,7 +211,7 @@ public abstract class SongodaPlugin extends JavaPlugin { "Unexpected error while loading %s v%s (core v%s): Disabling plugin!", getDescription().getName(), getDescription().getVersion(), - SongodaCore.getCoreLibraryVersion() + SongodaCore.getVersion() ), th); emergencyStop(); diff --git a/NMS/NMS-v1_19_R1/pom.xml b/NMS/NMS-v1_19_R1/pom.xml index 78a33541..fcbf8d30 100644 --- a/NMS/NMS-v1_19_R1/pom.xml +++ b/NMS/NMS-v1_19_R1/pom.xml @@ -75,19 +75,12 @@ jar - - org.spigotmc - spigot-api - ${nms.ver} - provided - - org.spigotmc spigot ${nms.ver} - provided remapped-mojang + provided