feat(bukkit-nms): add 1.21.7 support

Author: Syrent

gradle/libs.versions.toml

@@ -42,7 +42,7 @@ skinsrestorer-api = "15.3.1"
 placeholderapi = "2.11.6"
 
 # bukkit - nms
-takenaka = "2.0.0-SNAPSHOT"
+takenaka = "1.2.1-SNAPSHOT"
 
 # proxy - velocity
 velocity = "3.3.0-SNAPSHOT"

stickynote-bukkit/stickynote-bukkit-nms/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     compileOnly(project(":stickynote-core"))
     compileOnly(project(":stickynote-bukkit"))
 
-    mappingBundle("me.kcra.takenaka:mappings:1.8.8+1.21.5")
+    mappingBundle("me.kcra.takenaka:mappings:1.8.8+1.21.7")
     implementation(accessorRuntime())
 }
 
@@ -45,7 +45,7 @@ accessors {
     namespaces("spigot", "mojang")
     accessorType(AccessorType.REFLECTION)
     codeLanguage(CodeLanguage.KOTLIN)
-    versionRange("1.8.8", "1.21.5")
+    versionRange("1.8.8", "1.21.7")
     mappingWebsite("https://mappings.dev/")
 
     val ClientboundPlayerInfoUpdatePacket = "net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket" // 1.19.3 and above

stickynote-bukkit/stickynote-bukkit-nms/src/main/kotlin/org/sayandev/stickynote/bukkit/nms/PacketUtils.kt

@@ -186,7 +186,7 @@ object PacketUtils {
 
     @JvmStatic
     fun getRemoveMobEffectPacket(player: Player, effect: PotionEffectType): Any {
-        val effectConstructor = if ((ServerVersion.supports(20) && ServerVersion.patchNumber() >= 5) || ServerVersion.supports(21))
+        val effectConstructor = if (ServerVersion.isAtLeast(21, 5))
             ClientboundRemoveMobEffectPacketAccessor.CONSTRUCTOR_1!!
         else
             ClientboundRemoveMobEffectPacketAccessor.CONSTRUCTOR_0!!

stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/StickyNoteLoader.java

@@ -113,8 +113,7 @@ public void load(String id, File dataDirectory, Logger logger, LibraryManager li
                     List<String> versions = getAllVersions(libDirectory, projectDependency.getGroup(), projectDependency.getName());
                     List<Dependency> toBeRemovedVersions = versions.stream().filter(version -> !version.equals(projectDependency.getVersion())).map(version -> new Dependency(projectDependency.getGroup(), projectDependency.getName(), version, projectDependency.getRelocation(), projectDependency.isStickyLoad())).toList();
                     for (Dependency dependency : toBeRemovedVersions) {
-                        // TODO: Test this
-//                        deleteOldVersionDirectory(libDirectory, dependency.getGroup(), dependency.getName(), dependency.getVersion());
+                        deleteOldVersionDirectory(libDirectory, dependency.getGroup(), dependency.getName(), dependency.getVersion());
                     }
                 }
             }
@@ -411,25 +410,38 @@ private File versionDirectory(File libFolder, String group, String name, String
         return new File(libFolder, groupPath + "/" + name + "/" + version);
     }
 
+    private boolean isFileInUse(File file) {
+        try (RandomAccessFile raf = new RandomAccessFile(file, "rw")) {
+            return false;
+        } catch (IOException e) {
+            return true;
+        }
+    }
+
     private void deleteDirectory(File directory) throws IOException {
         if (!directory.exists()) return;
 
+        // Check if directory or its files are in use or recently used (last modified < 5 minutes ago)
+        long now = System.currentTimeMillis();
+        long fiveMinutesMillis = 15 * 60 * 1000;
         File[] files = directory.listFiles();
         if (files != null) {
             for (File file : files) {
                 if (file.isDirectory()) {
+                    // Recursively check subdirectories
                     deleteDirectory(file);
                 } else {
-                    if (!file.delete()) {
-                        // Try to delete on JVM exit as a fallback
-                        file.deleteOnExit();
-                        // Log a warning instead of throwing
-                        System.err.println("Warning: Failed to delete file (in use?): " + file.getAbsolutePath());
+                    // If file is in use or recently used, skip deletion
+                    if (isFileInUse(file) || file.lastModified() > now - fiveMinutesMillis) {
+                        continue;
                     }
+                    file.delete();
                 }
             }
         }
-
+        if (isFileInUse(directory) || directory.lastModified() > now - fiveMinutesMillis) {
+            return;
+        }
         if (!directory.delete()) {
             directory.deleteOnExit();
             System.err.println("Warning: Failed to delete directory (in use?): " + directory.getAbsolutePath());