diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c24e8a26..56eeb4bf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -2,6 +2,9 @@ name: CI on: [ push, pull_request ] +env: + RUNELITE_PROFILE: ${{ vars.RUNELITE_PROFILE }} + jobs: windows: runs-on: windows-2022 @@ -48,7 +51,7 @@ jobs: cd detours/src nmake - name: build launcher - run: mvn verify -B + run: mvn verify -B -P $env:RUNELITE_PROFILE - name: x64 installer shell: bash run: ./build-win64.sh @@ -88,7 +91,7 @@ jobs: java-version: 11 distribution: temurin - name: build - run: mvn verify -B + run: mvn verify -B -P $RUNELITE_PROFILE - name: linux-x64 run: ./build-linux-x86_64.sh - name: linux-aarch64 @@ -128,7 +131,7 @@ jobs: java-version: 11 distribution: temurin - name: build - run: mvn verify -B + run: mvn verify -B -P $RUNELITE_PROFILE - name: clone create-dmg run: git clone https://github.com/runelite/create-dmg -b runelite-1.0 - name: build create-dmg diff --git a/pom.xml b/pom.xml index 13d70be3..db9ca9f3 100644 --- a/pom.xml +++ b/pom.xml @@ -392,4 +392,15 @@ + + + + runelite + + runelite.net + runelite_128.png + runelite_splash.png + + + diff --git a/src/main/java/net/runelite/launcher/ConfigurationFrame.java b/src/main/java/net/runelite/launcher/ConfigurationFrame.java index 14bad6b3..a633e6bf 100644 --- a/src/main/java/net/runelite/launcher/ConfigurationFrame.java +++ b/src/main/java/net/runelite/launcher/ConfigurationFrame.java @@ -68,7 +68,7 @@ private ConfigurationFrame(LauncherSettings settings) setTitle("RuneLite Launcher Configuration"); BufferedImage iconImage; - try (var in = ConfigurationFrame.class.getResourceAsStream("runelite_128.png")) + try (var in = ConfigurationFrame.class.getResourceAsStream(LauncherProperties.getRuneLite128())) { iconImage = ImageIO.read(in); } diff --git a/src/main/java/net/runelite/launcher/FatalErrorDialog.java b/src/main/java/net/runelite/launcher/FatalErrorDialog.java index 5c40e1c1..259e118f 100644 --- a/src/main/java/net/runelite/launcher/FatalErrorDialog.java +++ b/src/main/java/net/runelite/launcher/FatalErrorDialog.java @@ -83,7 +83,7 @@ public FatalErrorDialog(String message) UIManager.put("Button.select", DARKER_GRAY_COLOR); - try (var in = FatalErrorDialog.class.getResourceAsStream("runelite_128.png")) + try (var in = FatalErrorDialog.class.getResourceAsStream(LauncherProperties.getRuneLite128())) { setIconImage(ImageIO.read(in)); } @@ -91,7 +91,7 @@ public FatalErrorDialog(String message) { } - try (var in = FatalErrorDialog.class.getResourceAsStream("runelite_splash.png")) + try (var in = FatalErrorDialog.class.getResourceAsStream(LauncherProperties.getRuneLiteSplash())) { BufferedImage logo = ImageIO.read(in); JLabel runelite = new JLabel(); diff --git a/src/main/java/net/runelite/launcher/LauncherProperties.java b/src/main/java/net/runelite/launcher/LauncherProperties.java index 4904c660..ed4a7e42 100644 --- a/src/main/java/net/runelite/launcher/LauncherProperties.java +++ b/src/main/java/net/runelite/launcher/LauncherProperties.java @@ -40,6 +40,8 @@ public class LauncherProperties private static final String BOOTSTRAP = "runelite.bootstrap"; private static final String BOOTSTRAPSIG = "runelite.bootstrapsig"; private static final String MAIN = "runelite.main"; + private static final String RUNELITE_128 = "runelite.128"; + private static final String RUNELITE_SPLASH = "runelite.splash"; private static final Properties properties = new Properties(); @@ -101,4 +103,14 @@ public static String getMain() { return properties.getProperty(MAIN); } + + public static String getRuneLite128() + { + return properties.getProperty(RUNELITE_128); + } + + public static String getRuneLiteSplash() + { + return properties.getProperty(RUNELITE_SPLASH); + } } diff --git a/src/main/java/net/runelite/launcher/SplashScreen.java b/src/main/java/net/runelite/launcher/SplashScreen.java index 855db15f..75b2ce9c 100644 --- a/src/main/java/net/runelite/launcher/SplashScreen.java +++ b/src/main/java/net/runelite/launcher/SplashScreen.java @@ -73,7 +73,7 @@ private SplashScreen() throws IOException setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setUndecorated(true); - try (var in = SplashScreen.class.getResourceAsStream("runelite_128.png")) + try (var in = SplashScreen.class.getResourceAsStream(LauncherProperties.getRuneLite128())) { setIconImage(ImageIO.read(in)); } @@ -84,7 +84,7 @@ private SplashScreen() throws IOException Font font = new Font(Font.DIALOG, Font.PLAIN, 12); BufferedImage logo; - try (var in = SplashScreen.class.getResourceAsStream("runelite_splash.png")) + try (var in = SplashScreen.class.getResourceAsStream(LauncherProperties.getRuneLiteSplash())) { logo = ImageIO.read(in); } diff --git a/src/main/resources/net/runelite/launcher/launcher.properties b/src/main/resources/net/runelite/launcher/launcher.properties index 5f7667d7..21f22234 100644 --- a/src/main/resources/net/runelite/launcher/launcher.properties +++ b/src/main/resources/net/runelite/launcher/launcher.properties @@ -1,8 +1,10 @@ runelite.launcher.version=${project.version} -runelite.discord.invite=https://runelite.net/redirect/launcher/discord -runelite.wiki.troubleshooting.link=https://runelite.net/redirect/launcher/troubleshooting +runelite.discord.invite=https://${runelite.net}/redirect/launcher/discord +runelite.wiki.troubleshooting.link=https://${runelite.net}/redirect/launcher/troubleshooting runelite.dnschange.link=https://1.1.1.1/dns/#setup-instructions -runelite.download.link=https://runelite.net/ +runelite.download.link=https://${runelite.net}/ runelite.bootstrap=https://static.runelite.net/bootstrap.json runelite.bootstrapsig=https://static.runelite.net/bootstrap.json.sha256 -runelite.main=net.runelite.client.RuneLite \ No newline at end of file +runelite.main=net.runelite.client.RuneLite +runelite.128=${runelite.128} +runelite.splash=${runelite.splash} \ No newline at end of file