handle new minecraft versioning system better

Author: ajgeiss0702

build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     implementation("net.kyori:adventure-text-minimessage:4.26.1")
     implementation("net.kyori:adventure-platform-bukkit:4.4.1")
 
-    implementation("us.ajg0702:ajUtils:1.2.29")
+    implementation("us.ajg0702:ajUtils:1.2.38")
     implementation("us.ajg0702.commands.platforms.bukkit:bukkit:1.0.0")
     implementation("us.ajg0702.commands.api:api:1.0.0")
 

nms/nms-19/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     compileOnly(project(":nms:nms-legacy"))
-    compileOnly("us.ajg0702:ajUtils:1.2.29")
+    compileOnly("us.ajg0702:ajUtils:1.2.38")
     compileOnly("net.skinsrestorer:skinsrestorer-api:14.1.10")
 }
 

nms/nms-legacy/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
     compileOnly(group = "org.spigotmc", name = "spigot", version = "1.19-R0.1-SNAPSHOT")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    compileOnly("us.ajg0702:ajUtils:1.2.29")
+    compileOnly("us.ajg0702:ajUtils:1.2.38")
     compileOnly("net.skinsrestorer:skinsrestorer-api:14.1.10")
     compileOnly("com.squareup.okhttp3:okhttp:4.11.0")
 }

nms/nms-legacy/src/main/java/us/ajg0702/leaderboards/nms/legacy/HeadUtils.java

@@ -56,7 +56,7 @@ public HeadUtils(Logger logger, DebugWrapper debug, CompatScheduler scheduler) {
 
         debug.infoW("Detected minor minecraft version: " + minorVersion);
 
-        if(minorVersion >= 19) {
+        if(VersionSupport.getMajorVersion() >= 26 || minorVersion >= 19) {
             try {
                 versionedHeadUtils = (VersionedHeadUtils) Class.forName("us.ajg0702.leaderboards.nms.nms19.HeadUtils19")
                         .getDeclaredConstructor(DebugWrapper.class, CompatScheduler.class, Logger.class)
@@ -76,10 +76,10 @@ public VersionedHeadUtils getVersionedHeadUtils() {
     public ItemStack getHeadItem(UUID uuid, String name) {
 
         ItemStack skull = null;
-        if(VersionSupport.getMinorVersion() <= 12) {
+        if(VersionSupport.getMajorVersion() < 26 && VersionSupport.getMinorVersion() <= 12) {
             //noinspection deprecation
             skull = new ItemStack(Material.valueOf("SKULL_ITEM"), 1 , (short) 3);
-        } else if(VersionSupport.getMinorVersion() > 12) {
+        } else {
             skull = new ItemStack(Material.PLAYER_HEAD, 1);
         }
         String value;

src/main/java/us/ajg0702/leaderboards/displays/armorstands/ArmorStandManager.java

@@ -67,7 +67,7 @@ private void setArmorstandHead(ArmorStand stand, String name, UUID uuid) {
         }
 
         Runnable runnable = () -> {
-            if(VersionSupport.getMinorVersion() >= 10) {
+            if(VersionSupport.getMajorVersion() >= 26 || VersionSupport.getMinorVersion() >= 10) {
                 stand.setSilent(true);
             }
             //noinspection deprecation
@@ -88,7 +88,7 @@ public void search(BoardSign sign, String name, UUID id) {
             Sign ss = sign.getSign();
             if(ss == null) return;
             BlockFace face;
-            if(VersionSupport.getMinorVersion() > 12) {
+            if(VersionSupport.minorVersionEqualGreaterThan(13)) {
                 BlockData bd = ss.getBlockData();
                 if(bd instanceof org.bukkit.block.data.type.Sign) {
                     org.bukkit.block.data.type.Sign bs = (org.bukkit.block.data.type.Sign) bd;

src/main/java/us/ajg0702/leaderboards/displays/heads/HeadManager.java

@@ -33,7 +33,7 @@ public void search(BoardSign sign, String name, UUID id) {
         Sign ss = sign.getSign();
         if(ss == null) return;
         BlockFace face;
-        if(VersionSupport.getMinorVersion() > 12) {
+        if(VersionSupport.minorVersionEqualGreaterThan(13)) {
             BlockData bd = ss.getBlockData();
             if(bd instanceof org.bukkit.block.data.type.Sign) {
                 org.bukkit.block.data.type.Sign bs = (org.bukkit.block.data.type.Sign) bd;
@@ -138,7 +138,7 @@ public void checkHead(Location loc, String name, UUID id) {
 
         Debug.info("Updating head with "+id);
 
-        OfflinePlayer op = VersionSupport.getMinorVersion() > 9 ? Bukkit.getOfflinePlayer(id) : null;
+        OfflinePlayer op = VersionSupport.getMajorVersion() >= 26 || VersionSupport.getMinorVersion() > 9 ? Bukkit.getOfflinePlayer(id) : null;
 
         if(plugin.getHeadUtils().getVersionedHeadUtils() != null) {
             plugin.getScheduler().runTaskAsynchronously(

src/main/java/us/ajg0702/leaderboards/displays/signs/SignManager.java

@@ -52,7 +52,7 @@ public void reload() {
         cfgFile = new File(plugin.getDataFolder(), "displays.yml");
         cfg = YamlConfiguration.loadConfiguration(cfgFile);
         String headerText = "This file is for storing sign location, npcs, and other things in the plugin that might display data";
-        if(VersionSupport.getMinorVersion() > 18) {
+        if(VersionSupport.getMajorVersion() >= 26 || VersionSupport.getMinorVersion() > 18) {
             cfg.options().setHeader(Collections.singletonList(headerText));
         } else {
             //noinspection deprecation