From f8da90482f7d4a2530491c102de81035e893ce65 Mon Sep 17 00:00:00 2001 From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> Date: Wed, 8 Apr 2026 19:30:18 -0700 Subject: [PATCH 1/2] Fix version fetcher for 26.1, bump version to 3.0.5 --- plugman-assembly/pom.xml | 2 +- plugman-bukkit/pom.xml | 2 +- plugman-bungee/pom.xml | 2 +- plugman-core/pom.xml | 2 +- plugman-paper/pom.xml | 2 +- .../rylinaux/plugman/PaperInitializer.java | 24 ++++++++++++------- plugman-velocity/pom.xml | 2 +- .../com/rylinaux/plugman/PlugManVelocity.java | 2 +- pom.xml | 4 ++-- 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/plugman-assembly/pom.xml b/plugman-assembly/pom.xml index ae0ce976..8bbf6cb7 100644 --- a/plugman-assembly/pom.xml +++ b/plugman-assembly/pom.xml @@ -7,7 +7,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 ../pom.xml diff --git a/plugman-bukkit/pom.xml b/plugman-bukkit/pom.xml index db8aa7dd..675c835d 100644 --- a/plugman-bukkit/pom.xml +++ b/plugman-bukkit/pom.xml @@ -7,7 +7,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 ../pom.xml diff --git a/plugman-bungee/pom.xml b/plugman-bungee/pom.xml index 5da19cbd..9467622c 100644 --- a/plugman-bungee/pom.xml +++ b/plugman-bungee/pom.xml @@ -7,7 +7,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 ../pom.xml diff --git a/plugman-core/pom.xml b/plugman-core/pom.xml index b8218149..f584a262 100644 --- a/plugman-core/pom.xml +++ b/plugman-core/pom.xml @@ -8,7 +8,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 ../pom.xml diff --git a/plugman-paper/pom.xml b/plugman-paper/pom.xml index a59c7944..4f6368a5 100644 --- a/plugman-paper/pom.xml +++ b/plugman-paper/pom.xml @@ -7,7 +7,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 ../pom.xml diff --git a/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java b/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java index d725fc36..2f0f4cb3 100644 --- a/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java +++ b/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java @@ -55,14 +55,9 @@ public PluginManager initializePaperPluginManager(BukkitPluginManager bukkitPlug return bukkitPluginManager; } - var version = Bukkit.getBukkitVersion().split("-")[0].split("\\."); - - var paperVersion = Integer.parseInt(version[1]) * 100; - if (version.length >= 3) paperVersion += Integer.parseInt(version[2]); - - return paperVersion >= 2005? - new ModernPaperPluginManager(bukkitPluginManager) : - new PaperPluginManager(bukkitPluginManager); + return obtainVersion() >= 12005 ? + new ModernPaperPluginManager(bukkitPluginManager) : + new PaperPluginManager(bukkitPluginManager); } /** @@ -84,4 +79,17 @@ public void showPaperWarningIfNeeded(PluginManager pluginManager) { plugin.getLogger().info("You can disable this warning by setting 'showPaperWarning' to false in the config.yml"); } + /** + * Returns the Minecraft version integer id. 1.20 -> 12000, 1.21.4 -> 12104, 26.1 -> 26100. + */ + private static int obtainVersion() { + try { + String[] versions = Bukkit.getMinecraftVersion().split("\\."); + return Integer.parseInt(versions[0]) * 10000 + + (versions.length > 1 ? Integer.parseInt(versions[1]) : 0) * 100 + + versions.length > 2 ? Integer.parseInt(versions[2]): 0; + } catch (Exception ignored) { + } + return -1; + } } \ No newline at end of file diff --git a/plugman-velocity/pom.xml b/plugman-velocity/pom.xml index 5a9b3612..d21aa6c5 100644 --- a/plugman-velocity/pom.xml +++ b/plugman-velocity/pom.xml @@ -7,7 +7,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 ../pom.xml diff --git a/plugman-velocity/src/main/java/velocity/com/rylinaux/plugman/PlugManVelocity.java b/plugman-velocity/src/main/java/velocity/com/rylinaux/plugman/PlugManVelocity.java index 1d5d2aa5..fb796230 100644 --- a/plugman-velocity/src/main/java/velocity/com/rylinaux/plugman/PlugManVelocity.java +++ b/plugman-velocity/src/main/java/velocity/com/rylinaux/plugman/PlugManVelocity.java @@ -52,7 +52,7 @@ @Plugin( id = "plugmanvelocity", name = "PlugManVelocity", - version = "3.0.4", + version = "3.0.5", description = "Plugin manager for Velocity servers.", authors = {"rylinaux", "TestAccount666"} ) diff --git a/pom.xml b/pom.xml index 218a0a6b..2fc6c07e 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.rylinaux PlugManX - 3.0.4 + 3.0.5 pom @@ -57,7 +57,7 @@ UTF-8 - 3.0.4 + 3.0.5 2025.1.31 2.13.5 From fb36c9ccb1b7eb96e6396f192e9391502c1680e1 Mon Sep 17 00:00:00 2001 From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> Date: Thu, 9 Apr 2026 14:26:06 -0700 Subject: [PATCH 2/2] Fix stupid mistake --- .../java/paper/com/rylinaux/plugman/PaperInitializer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java b/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java index 2f0f4cb3..9145c8eb 100644 --- a/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java +++ b/plugman-paper/src/main/java/paper/com/rylinaux/plugman/PaperInitializer.java @@ -80,14 +80,14 @@ public void showPaperWarningIfNeeded(PluginManager pluginManager) { } /** - * Returns the Minecraft version integer id. 1.20 -> 12000, 1.21.4 -> 12104, 26.1 -> 26100. + * Returns the Minecraft version integer id. 1.20 -> 12000, 1.21.4 -> 12104, 26.1 -> 260100. */ private static int obtainVersion() { try { String[] versions = Bukkit.getMinecraftVersion().split("\\."); return Integer.parseInt(versions[0]) * 10000 + (versions.length > 1 ? Integer.parseInt(versions[1]) : 0) * 100 - + versions.length > 2 ? Integer.parseInt(versions[2]): 0; + + (versions.length > 2 ? Integer.parseInt(versions[2]) : 0); } catch (Exception ignored) { } return -1;