2.11.27 - Memeory leak fix attempt didn't work.

Author: Waterpicker

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "gg.generations"
-version = "2.11.26"
+version = "2.11.27"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 

src/library/java/gg/generations/rarecandy/pokeutils/PixelAsset.java

@@ -280,8 +280,6 @@ public PixelAsset(SevenZFile is, @Nullable String debugName) {
             }
 
             updateSettings();
-
-            is.close();
         } catch (IOException | NullPointerException e) {
             throw new RuntimeException("Failed to load " + debugName, e);
         }

src/library/java/gg/generations/rarecandy/renderer/loading/ModelLoader.java

@@ -599,8 +599,6 @@ public static AIScene read(PixelAsset asset) {
 
         var scene = Assimp.aiImportFileEx(name, Assimp.aiProcess_Triangulate | Assimp.aiProcess_ImproveCacheLocality, fileIo);
 
-        fileIo.free();
-
         if (scene == null) throw new RuntimeException(Assimp.aiGetErrorString());
 
         return scene;

src/main/java/gg/generations/rarecandy/tools/gui/GuiHandler.java

@@ -113,30 +113,28 @@ public static Map<String, byte[]> move(Path path) throws IOException {
         FileUtils.deleteDirectory(TEMP.toFile());
         Files.createDirectories(TEMP);
 
-        try(var seven = PixelAsset.getSevenZipFile(path)) {
+        var seven = PixelAsset.getSevenZipFile(path);
 
+        var files = new HashMap<String, byte[]>();
 
-            var files = new HashMap<String, byte[]>();
-
-            for (var entry : seven.getEntries()) {
-                files.put(entry.getName(), seven.getInputStream(entry).readAllBytes());
-            }
+        for (var entry : seven.getEntries()) {
+            files.put(entry.getName(), seven.getInputStream(entry).readAllBytes());
+        }
 
 //        System.out.println(files.keySet());
 
-            for (var file : files.entrySet()) {
-                if (file.getKey().isEmpty()) continue;
+        for (var file : files.entrySet()) {
+            if(file.getKey().isEmpty()) continue;
 
-                var filePath = TEMP.resolve(file.getKey());
+            var filePath = TEMP.resolve(file.getKey());
 //            System.out.println(filePath);
 
-                if (Files.isDirectory(filePath)) continue;
-                Files.createFile(filePath);
-                Files.write(filePath, file.getValue());
-            }
-
-            return files;
+            if(Files.isDirectory(filePath)) continue;
+            Files.createFile(filePath);
+            Files.write(filePath, file.getValue());
         }
+
+        return files;
     }
 
     @Override