- Create sub dirs for resources if they do not exist

- Cache images

Author: Explv

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.explv.explv_osbot_manager</groupId>
     <artifactId>explvs_aio</artifactId>
-    <version>v3.1.10</version>
+    <version>v3.1.11</version>
     <repositories>
         <repository>
             <id>local-repo</id>

src/main/java/gui/IconButton.java

@@ -25,12 +25,12 @@ public void paintComponent(Graphics g) {
         };
         button.setToolTipText(toolTip);
 
-        BufferedImage iconImage = ImageManager.loadImage(icon);
+        BufferedImage iconImage = ImageManager.getInstance().loadImage(icon);
         if (iconImage != null) {
             button.setIcon(new ImageIcon(iconImage));
         }
 
-        BufferedImage rolloverIconImage = ImageManager.loadImage(rolloverIcon);
+        BufferedImage rolloverIconImage = ImageManager.getInstance().loadImage(rolloverIcon);
         if (rolloverIconImage != null) {
             button.setRolloverIcon(new ImageIcon(rolloverIconImage));
         }

src/main/java/gui/utils/LoadoutPanel.java

@@ -29,7 +29,7 @@
 public class LoadoutPanel extends JPanel {
 
     private static final String IMAGE_DIR = "images/loadout/";
-    private static final BufferedImage SLOT_BACKGROUND_IMAGE = ImageManager.loadImage(IMAGE_DIR + "slot_background.png");
+    private static final BufferedImage SLOT_BACKGROUND_IMAGE = ImageManager.getInstance().loadImage(IMAGE_DIR + "slot_background.png");
 
     private Map<EquipmentSlot, String> equipmentMap = new HashMap<>();
 
@@ -186,7 +186,7 @@ private JButton createButton(final EquipmentSlot equipmentSlot, final String ima
         button.setBorder(BorderFactory.createEmptyBorder());
         button.setFocusPainted(false);
 
-        button.setIcon(new ImageIcon(ImageManager.loadImage(IMAGE_DIR + imageName)));
+        button.setIcon(new ImageIcon(ImageManager.getInstance().loadImage(IMAGE_DIR + imageName)));
         button.addActionListener(new EquipmentButtonActionListener(equipmentSlot));
 
         return button;

src/main/java/paint/Paint.java

@@ -27,7 +27,7 @@ public class Paint implements Painter {
     private boolean paintHidden;
     private boolean toggleButtonHovered;
 
-    private static final Image mouseImage = ImageManager.loadImage("images/cursor.png");
+    private static final Image mouseImage = ImageManager.getInstance().loadImage("images/cursor.png");
 
     private boolean paused;
 

src/main/java/script/AIO.java

@@ -28,7 +28,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    static final String VERSION = "v3.1.10";
+    static final String VERSION = "v3.1.11";
 
     private Gui gui;
     private Paint paint;

src/main/java/util/file_managers/ImageManager.java

@@ -4,16 +4,40 @@
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ImageManager extends ResourceManager {
 
-    public static BufferedImage loadImage(final String relativeImagePath) {
+    private static ImageManager instance;
+
+    private final Map<String, BufferedImage> imageCache = new HashMap<>();
+
+    private ImageManager() {
+    }
+
+    synchronized public static ImageManager getInstance() {
+        if (instance == null) {
+            instance = new ImageManager();
+        }
+        return instance;
+    }
+
+    public BufferedImage loadImage(final String relativeImagePath) {
+        if (imageCache.containsKey(relativeImagePath)) {
+            return imageCache.get(relativeImagePath);
+        }
+
         try (InputStream imageInputStream = loadFile(relativeImagePath)) {
             if (imageInputStream == null) {
                 return null;
             }
 
-            return ImageIO.read(imageInputStream);
+            BufferedImage image =  ImageIO.read(imageInputStream);
+
+            imageCache.put(relativeImagePath, image);
+
+            return image;
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/util/file_managers/ResourceManager.java

@@ -1,11 +1,8 @@
 package util.file_managers;
 
 import java.io.*;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,7 +32,7 @@ public static InputStream loadFile(final String relativeFilePath) {
         saveFileFromGitHubToDataDirectory(relativeFilePath);
         return loadFileFromDataDir(relativeFilePath);
 
-//
+
 //        InputStream jarInputStream = loadFileFromJar(relativeFilePath);
 //
 //        if (jarInputStream != null) {
@@ -48,7 +45,8 @@ public static InputStream loadFile(final String relativeFilePath) {
     }
 
     private static InputStream loadFileFromJar(final String relativeFilePath) {
-        String jarFilePath = "/" + relativeFilePath;
+        String jarFilePath = "/resources/" + relativeFilePath;
+        System.out.println(jarFilePath);
         return ResourceManager.class.getResourceAsStream(jarFilePath);
     }
 
@@ -85,7 +83,12 @@ private static void saveFileFromGitHubToDataDirectory(final String relativeFileP
 
             ReadableByteChannel readableByteChannel = Channels.newChannel(url.openStream());
 
-            FileOutputStream fileOutputStream = new FileOutputStream(Paths.get(DIRECTORY, relativeFilePath).toFile());
+            File outputFile = Paths.get(DIRECTORY, relativeFilePath).toFile();
+
+            outputFile.getParentFile().mkdirs();
+            outputFile.createNewFile();
+
+            FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
             fileOutputStream.getChannel().transferFrom(readableByteChannel, 0, Long.MAX_VALUE);
         } catch (IOException e) {
             e.printStackTrace();