From 87e56473791c56bea97834ae27b5a588db354caa Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 18 Feb 2024 19:02:56 +1030 Subject: [PATCH] Refactored logos into assets/distanthorizons --- .../distanthorizons/core/jar/gui/BaseJFrame.java | 5 ++--- .../resources/{ => assets/distanthorizons}/icon.png | Bin .../resources/{ => assets/distanthorizons}/icon.svg | 0 .../{ => assets/distanthorizons}/iconLegacy.svg | 0 .../resources/{ => assets/distanthorizons}/logo.png | Bin 5 files changed, 2 insertions(+), 3 deletions(-) rename core/src/main/resources/{ => assets/distanthorizons}/icon.png (100%) rename core/src/main/resources/{ => assets/distanthorizons}/icon.svg (100%) rename core/src/main/resources/{ => assets/distanthorizons}/iconLegacy.svg (100%) rename core/src/main/resources/{ => assets/distanthorizons}/logo.png (100%) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java index 023ada081..25c2908de 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java @@ -29,7 +29,6 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.BufferedReader; import java.io.InputStreamReader; -import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.List; @@ -58,7 +57,7 @@ public class BaseJFrame extends JFrame setTitle(SingletonInjector.INSTANCE.get(ILangWrapper.class).getLang("lod.title")); try { - setIconImage(ImageIO.read(JarUtils.accessFile("icon.png"))); + setIconImage(ImageIO.read(JarUtils.accessFile("assets/distanthorizons/icon.png"))); } catch (Exception e) { @@ -165,7 +164,7 @@ public class BaseJFrame extends JFrame super.paintComponent(g); try { - BufferedImage image = ImageIO.read(JarUtils.accessFile("logo.png")); + BufferedImage image = ImageIO.read(JarUtils.accessFile("assets/distanthorizons/logo.png")); int logoWidth = (int) ((double) logoHeight * ((double) image.getWidth() / (double) image.getHeight())); // Calculate the aspect ratio and set the height correctly to not stretch it g.drawImage(image, (getWidth() / 2) - (logoWidth / 2), 0, logoWidth, logoHeight, this); // Resize image and draw it } diff --git a/core/src/main/resources/icon.png b/core/src/main/resources/assets/distanthorizons/icon.png similarity index 100% rename from core/src/main/resources/icon.png rename to core/src/main/resources/assets/distanthorizons/icon.png diff --git a/core/src/main/resources/icon.svg b/core/src/main/resources/assets/distanthorizons/icon.svg similarity index 100% rename from core/src/main/resources/icon.svg rename to core/src/main/resources/assets/distanthorizons/icon.svg diff --git a/core/src/main/resources/iconLegacy.svg b/core/src/main/resources/assets/distanthorizons/iconLegacy.svg similarity index 100% rename from core/src/main/resources/iconLegacy.svg rename to core/src/main/resources/assets/distanthorizons/iconLegacy.svg diff --git a/core/src/main/resources/logo.png b/core/src/main/resources/assets/distanthorizons/logo.png similarity index 100% rename from core/src/main/resources/logo.png rename to core/src/main/resources/assets/distanthorizons/logo.png