diff --git a/pom.xml b/pom.xml index 70e57c3..fb483aa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ pk.ajneb97 PlayerKits2 - 1.22.2 + 1.23.1 21 @@ -41,13 +41,13 @@ io.papermc.paper paper-api - 1.21.11-R0.1-SNAPSHOT + 26.1.2.build.69-stable provided org.spigotmc spigot-api - 26.1-R0.1-SNAPSHOT + 26.2-R0.1-SNAPSHOT provided diff --git a/src/main/java/pk/ajneb97/PlayerKits2.java b/src/main/java/pk/ajneb97/PlayerKits2.java index 81694e7..ac2e0e5 100644 --- a/src/main/java/pk/ajneb97/PlayerKits2.java +++ b/src/main/java/pk/ajneb97/PlayerKits2.java @@ -118,8 +118,8 @@ public class PlayerKits2 extends JavaPlugin { public void setVersion(){ String packageName = Bukkit.getServer().getClass().getPackage().getName(); - String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0]; - switch(bukkitVersion){ + String minecraftVersion = ServerVersion.getMinecraftVersion(); + switch(minecraftVersion){ case "1.20.5": case "1.20.6": serverVersion = ServerVersion.v1_20_R4; @@ -151,13 +151,18 @@ public class PlayerKits2 extends JavaPlugin { serverVersion = ServerVersion.v1_21_R7; break; case "26.1": + case "26.1.1": + case "26.1.2": serverVersion = ServerVersion.v26_1; break; + case "26.2": + serverVersion = ServerVersion.v26_2; + break; default: try{ serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", "")); }catch(Exception e){ - serverVersion = ServerVersion.v26_1; + serverVersion = ServerVersion.v26_2; } } } diff --git a/src/main/java/pk/ajneb97/utils/ServerVersion.java b/src/main/java/pk/ajneb97/utils/ServerVersion.java index 991b295..24b9981 100644 --- a/src/main/java/pk/ajneb97/utils/ServerVersion.java +++ b/src/main/java/pk/ajneb97/utils/ServerVersion.java @@ -1,5 +1,9 @@ package pk.ajneb97.utils; +import org.bukkit.Bukkit; + +import java.lang.reflect.Method; + public enum ServerVersion { v1_8_R1, v1_8_R2, @@ -33,9 +37,19 @@ public enum ServerVersion { v1_21_R5, v1_21_R6, v1_21_R7, - v26_1; + v26_1, + v26_2; public boolean serverVersionGreaterEqualThan(ServerVersion version1,ServerVersion version2){ return version1.ordinal() >= version2.ordinal(); } + + public static String getMinecraftVersion() { + try { + Method method = Bukkit.class.getMethod("getMinecraftVersion"); + return (String) method.invoke(null); + } catch (Exception ignored) { + return Bukkit.getServer().getBukkitVersion().split("-")[0]; + } + } }