fix: Try fix some native image stuff.

IMB11 · Jul 7, 2024 · b32e2d6 · b32e2d6
1 parent 7f1f7d0
commit b32e2d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/com/mineblock11/skinshuffle/client/skin/FileBackedSkin.java b/src/main/java/com/mineblock11/skinshuffle/client/skin/FileBackedSkin.java
@@ -37,12 +37,11 @@ protected Object getTextureUniqueness() {
     @Override
     protected @Nullable AbstractTexture loadTexture(Runnable completionCallback) {
         try (var inputStream = Files.newInputStream(getFile())) {
-            var image = LegacySkinConverter.processTexture(NativeImage.read(NativeImage.Format.RGBA, inputStream));
-
-            var texture = new NativeImageBackedTexture(image);
-
-            completionCallback.run();
-            return texture;
+            try (var image = LegacySkinConverter.processTexture(NativeImage.read(NativeImage.Format.RGBA, inputStream))) {
+                var texture = new NativeImageBackedTexture(image);
+                completionCallback.run();
+                return texture;
+            }
         } catch (Exception e) {
             SkinShuffle.LOGGER.warn("Failed to load skin from file: " + getFile(), e);
             return null;

diff --git a/src/main/java/com/mineblock11/skinshuffle/util/LegacySkinConverter.java b/src/main/java/com/mineblock11/skinshuffle/util/LegacySkinConverter.java
@@ -23,6 +23,10 @@ public class LegacySkinConverter {
      * @return The converted image.
      */
     public static NativeImage processTexture(NativeImage image) {
+        if (image == null) {
+            return image;
+        }
+
         int imageHeight = image.getHeight();
         int imageWidth = image.getWidth();