diff --git a/pom.xml b/pom.xml index 54fdd0c..89ddd21 100755 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.parabot internal-api - 1.03.2 + 1.4.3 diff --git a/src/main/java/org/parabot/core/ui/images/Images.java b/src/main/java/org/parabot/core/ui/images/Images.java index 5a51cb7..1421d79 100644 --- a/src/main/java/org/parabot/core/ui/images/Images.java +++ b/src/main/java/org/parabot/core/ui/images/Images.java @@ -1,30 +1,9 @@ package org.parabot.core.ui.images; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.util.HashMap; - /** - * * Caches and loads images from resource - * - * @author Everel * + * @author Everel, JKetelaar */ -public final class Images { - private static final HashMap IMAGE_CACHE = new HashMap(); - - public static BufferedImage getResource(final String resource) { - if(IMAGE_CACHE.containsKey(resource)) { - return IMAGE_CACHE.get(resource); - } - try { - final BufferedImage img = ImageIO.read(Images.class.getResourceAsStream(resource)); - IMAGE_CACHE.put(resource, img); - return img; - } catch (Throwable t) { - throw new RuntimeException("Failed to load image from resource. " + t.getMessage()); - } - } - +public final class Images extends org.parabot.api.io.images.Images { } diff --git a/src/main/java/org/parabot/core/ui/images/add.png b/src/main/java/org/parabot/core/ui/images/add.png deleted file mode 100644 index 627fc65..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/add.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/background.png b/src/main/java/org/parabot/core/ui/images/background.png deleted file mode 100644 index fd302e3..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/background.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/agility.png b/src/main/java/org/parabot/core/ui/images/category/agility.png deleted file mode 100644 index 1b1dd9a..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/agility.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/combat.png b/src/main/java/org/parabot/core/ui/images/category/combat.png deleted file mode 100644 index f77e318..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/combat.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/cooking.png b/src/main/java/org/parabot/core/ui/images/category/cooking.png deleted file mode 100644 index 3094054..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/cooking.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/crafting.png b/src/main/java/org/parabot/core/ui/images/category/crafting.png deleted file mode 100644 index d54e21e..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/crafting.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/dungeoneering.png b/src/main/java/org/parabot/core/ui/images/category/dungeoneering.png deleted file mode 100644 index 790e26c..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/dungeoneering.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/farming.png b/src/main/java/org/parabot/core/ui/images/category/farming.png deleted file mode 100644 index e62cac0..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/farming.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/firemaking.png b/src/main/java/org/parabot/core/ui/images/category/firemaking.png deleted file mode 100644 index 677d147..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/firemaking.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/fishing.png b/src/main/java/org/parabot/core/ui/images/category/fishing.png deleted file mode 100644 index 0f8d493..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/fishing.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/fletching.png b/src/main/java/org/parabot/core/ui/images/category/fletching.png deleted file mode 100644 index e06f06a..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/fletching.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/herblore.png b/src/main/java/org/parabot/core/ui/images/category/herblore.png deleted file mode 100644 index e2da9e3..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/herblore.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/hunter.png b/src/main/java/org/parabot/core/ui/images/category/hunter.png deleted file mode 100644 index dc62110..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/hunter.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/magic.png b/src/main/java/org/parabot/core/ui/images/category/magic.png deleted file mode 100644 index a9369cf..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/magic.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/minigames.png b/src/main/java/org/parabot/core/ui/images/category/minigames.png deleted file mode 100644 index 5ccd0b4..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/minigames.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/mining.png b/src/main/java/org/parabot/core/ui/images/category/mining.png deleted file mode 100644 index f854d64..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/mining.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/other.png b/src/main/java/org/parabot/core/ui/images/category/other.png deleted file mode 100644 index fcca457..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/other.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/prayer.png b/src/main/java/org/parabot/core/ui/images/category/prayer.png deleted file mode 100644 index 36934be..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/prayer.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/runecrafting.png b/src/main/java/org/parabot/core/ui/images/category/runecrafting.png deleted file mode 100644 index c7dc257..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/runecrafting.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/script.png b/src/main/java/org/parabot/core/ui/images/category/script.png deleted file mode 100644 index 739afda..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/script.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/slayer.png b/src/main/java/org/parabot/core/ui/images/category/slayer.png deleted file mode 100644 index 4d09db3..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/slayer.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/smithing.png b/src/main/java/org/parabot/core/ui/images/category/smithing.png deleted file mode 100644 index c6f7a3b..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/smithing.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/thieving.png b/src/main/java/org/parabot/core/ui/images/category/thieving.png deleted file mode 100644 index 35082e2..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/thieving.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/utility.png b/src/main/java/org/parabot/core/ui/images/category/utility.png deleted file mode 100644 index 53b8d03..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/utility.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/category/woodcutting.png b/src/main/java/org/parabot/core/ui/images/category/woodcutting.png deleted file mode 100644 index fa30e5c..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/category/woodcutting.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/close.png b/src/main/java/org/parabot/core/ui/images/close.png deleted file mode 100644 index f1ccf5d..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/close.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/close_red.png b/src/main/java/org/parabot/core/ui/images/close_red.png deleted file mode 100644 index 80afed1..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/close_red.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/icon.png b/src/main/java/org/parabot/core/ui/images/icon.png deleted file mode 100644 index 33ef49f..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/icon.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/para.png b/src/main/java/org/parabot/core/ui/images/para.png deleted file mode 100644 index 53facaf..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/para.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/pause.png b/src/main/java/org/parabot/core/ui/images/pause.png deleted file mode 100644 index f80b488..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/pause.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/run.png b/src/main/java/org/parabot/core/ui/images/run.png deleted file mode 100644 index 071f287..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/run.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/stop.png b/src/main/java/org/parabot/core/ui/images/stop.png deleted file mode 100644 index 02612d4..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/stop.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/images/trash.png b/src/main/java/org/parabot/core/ui/images/trash.png deleted file mode 100644 index 53867b6..0000000 Binary files a/src/main/java/org/parabot/core/ui/images/trash.png and /dev/null differ diff --git a/src/main/java/org/parabot/core/ui/utils/SwingUtil.java b/src/main/java/org/parabot/core/ui/utils/SwingUtil.java index 52b7e1a..0e54590 100644 --- a/src/main/java/org/parabot/core/ui/utils/SwingUtil.java +++ b/src/main/java/org/parabot/core/ui/utils/SwingUtil.java @@ -1,48 +1,8 @@ package org.parabot.core.ui.utils; -import org.parabot.core.ui.images.Images; -import org.parabot.environment.OperatingSystem; - -import javax.swing.*; -import java.awt.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - /** - * - * Holds various swing util based methods - * - * @author Dane - * + * @author JKetelaar */ -public class SwingUtil { - - /** - * Packs, centers, and shows the frame. - * - * @param f - */ - public static void finalize(JFrame f) { - f.pack(); - f.setLocationRelativeTo(null); - f.setVisible(true); - } - - public static void setParabotIcons(JFrame f) { - f.setIconImage(Images.getResource("/storage/images/icon.png")); - - if(OperatingSystem.getOS() == OperatingSystem.MAC) { - /** Adds the dock icon to mac users */ - try { - Class util = Class.forName("com.apple.eawt.Application"); - Object application = util.getMethod("getApplication", new Class[] { }).invoke(null); - Method setDockIconImage = util.getMethod("setDockIconImage", new Class[] { Image.class }); - setDockIconImage.invoke(application, Images.getResource("/storage/images/icon.png")); - } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) { - } catch (Throwable t) { - t.printStackTrace(); - } - } - } +public class SwingUtil extends org.parabot.api.ui.SwingUtil { } diff --git a/src/main/resources/storage/images/icon.png b/src/main/resources/storage/images/icon.png deleted file mode 100755 index 33ef49f..0000000 Binary files a/src/main/resources/storage/images/icon.png and /dev/null differ