ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

project: RL: 1.5.31-SNAPSHOT, RL+: 2.1.2.0

Browse Source
This commit is contained in:
Owain van Brakel
2019-08-01 14:57:13 +02:00
parent 69d3258e7b 203251778f
commit 0b51226f72
6 changed files with 98 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@@ -28,11 +28,12 @@ allprojects {
apply plugin: 'checkstyle'
group = 'net.runelite'
version = '1.5.30-SNAPSHOT'
version = '1.5.31-SNAPSHOT'
ext {
rsversion = 181
cacheversion = 165
plusVersion = '2.1.2.0'
gitCommit = localGitCommit
gitCommitShort = localGitCommitShort

20
runelite-client/build.gradle
View File

@@ -1,3 +1,6 @@
import org.apache.tools.ant.filters.ReplaceTokens
import java.text.SimpleDateFormat
plugins {
id 'com.github.johnrengelman.shadow' version '5.1.0'
id 'java'
@@ -60,6 +63,23 @@ dependencies {
compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0'
}
static def getDate() {
return new SimpleDateFormat("MM-dd-yyyy", Locale.forLanguageTag("en-US")).format(new Date())
}
def buildDate = getDate()
processResources {
from file("src/main/resources/runelite.plus.properties"), {
filter(ReplaceTokens, tokens: [
"project.version": project.version,
"rs.version": rsversion.toString(),
"runelite.plus.version": plusVersion.toString(),
"runelite.plus.builddate": buildDate.toString()
])
}
}
tasks.withType(AbstractArchiveTask) {
preserveFileTimestamps = false
reproducibleFileOrder = true

47
runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
View File

@@ -24,18 +24,29 @@
*/
package net.runelite.client;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.client.config.RuneLitePlusConfig;
import net.runelite.http.api.RuneLiteAPI;
@Singleton
@Slf4j
public class RuneLiteProperties
{
private static final String DISCORD_APP_ID_PLUS = "560644885250572289";
private static final String RUNELITE_TITLE = "runelite.plus.title";
private static final String RUNELITE_VERSION = "runelite.version";
private static final String RUNELITE_PLUS_VERSION = "runelite.plus.version";
private static final String RUNELITE_PLUS_DATE = "runelite.plus.builddate";
private static final String RUNESCAPE_VERSION = "runescape.version";
private static final String DISCORD_APP_ID = "runelite.plus.discord.appid";
private static final String DISCORD_INVITE = "runelite.discord.invite";
private static final String GITHUB_LINK = "runelite.github.link";
private static final String WIKI_LINK = "runelite.wiki.link";
private static final String PATREON_LINK = "runelite.patreon.link";
private static final String LAUNCHER_VERSION_PROPERTY = "runelite.launcher.version";
private final Properties properties = new Properties();
@@ -45,6 +56,15 @@ public class RuneLiteProperties
public RuneLiteProperties(final RuneLitePlusConfig runeLiteConfig)
{
this.runeLitePlusConfig = runeLiteConfig;
try (InputStream in = getClass().getResourceAsStream("/runelite.plus.properties"))
{
properties.load(in);
}
catch (IOException ex)
{
log.warn("unable to load propertries", ex);
}
}
public RuneLiteProperties()
@@ -54,7 +74,7 @@ public class RuneLiteProperties
public String getTitle()
{
final StringBuilder sb = new StringBuilder("RuneLitePlus");
final StringBuilder sb = new StringBuilder(properties.getProperty(RUNELITE_TITLE));
String proxy;
if ((proxy = System.getProperty("socksProxyHost")) != null)
{
@@ -65,41 +85,46 @@ public class RuneLiteProperties
public String getVersion()
{
return RuneLiteAPI.getVersion();
return properties.getProperty(RUNELITE_VERSION);
}
public String getPlusVersion()
{
return RuneLite.PLUS_VERSION;
return properties.getProperty(RUNELITE_PLUS_VERSION);
}
public String getPlusDate()
{
return properties.getProperty(RUNELITE_PLUS_DATE);
}
public String getRunescapeVersion()
{
return "" + RuneLiteAPI.getRsVersion();
return properties.getProperty(RUNESCAPE_VERSION);
}
public String getDiscordAppId()
{
return DISCORD_APP_ID_PLUS;
return properties.getProperty(DISCORD_APP_ID);
}
public String getDiscordInvite()
{
return "https://discord.gg/HN5gf3m";
return properties.getProperty(DISCORD_INVITE);
}
public String getGithubLink()
{
return "https://github.com/runelite-extended/runelite";
return properties.getProperty(GITHUB_LINK);
}
public String getWikiLink()
{
return "https://github.com/runelite-extended/runelite/wiki";
return properties.getProperty(WIKI_LINK);
}
public String getPatreonLink()
{
return "https://www.patreon.com/RuneLitePlus";
return properties.getProperty(PATREON_LINK);
}
}

46
runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
View File

@@ -30,6 +30,8 @@ import java.awt.GridBagLayout;
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import javax.imageio.ImageIO;
import javax.inject.Singleton;
import javax.swing.ImageIcon;
@@ -40,8 +42,6 @@ import javax.swing.JProgressBar;
import javax.swing.SwingUtilities;
import javax.swing.plaf.basic.BasicProgressBarUI;
import lombok.extern.slf4j.Slf4j;
import net.runelite.client.RuneLite;
import net.runelite.client.RuneLiteProperties;
import net.runelite.client.util.SwingUtil;
import org.pushingpixels.substance.internal.SubstanceSynapse;
@@ -53,7 +53,9 @@ import org.pushingpixels.substance.internal.SubstanceSynapse;
@Singleton
public class RuneLiteSplashScreen
{
private final RuneLiteProperties runeLiteProperties = new RuneLiteProperties();
private static final String RUNELITE_VERSION = "runelite.version";
private static final String RUNELITE_PLUS_VERSION = "runelite.plus.version";
private static final String RUNELITE_PLUS_DATE = "runelite.plus.builddate";
private JFrame frame;
private final JPanel panel = new JPanel();
@@ -61,6 +63,20 @@ public class RuneLiteSplashScreen
private JLabel subMessageLabel;
private final JProgressBar progressBar = new JProgressBar();
private final Properties properties = new Properties();
public RuneLiteSplashScreen()
{
try (InputStream in = getClass().getResourceAsStream("/runelite.plus.properties"))
{
properties.load(in);
}
catch (IOException ex)
{
log.warn("unable to load propertries", ex);
}
}
/**
* This is not done in the constructor in order to avoid processing in case the user chooses to not load
* the splash screen.
@@ -90,7 +106,7 @@ public class RuneLiteSplashScreen
panel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
final GridBagLayout layout = new GridBagLayout();
layout.columnWeights = new double[]{1};
layout.rowWeights = new double[]{1, 0, 0, 1, 0, 1};
layout.rowWeights = new double[]{1, 0, 0, 1, 0, 0, 1};
panel.setLayout(layout);
// logo
@@ -119,7 +135,7 @@ public class RuneLiteSplashScreen
panel.add(title, titleConstraints);
// version
final JLabel version = new JLabel("RuneLite Version : " + runeLiteProperties.getVersion());
final JLabel version = new JLabel("RuneLite Version : " + properties.getProperty(RUNELITE_VERSION));
version.setForeground(Color.GREEN);
version.setFont(FontManager.getRunescapeSmallFont());
version.setForeground(version.getForeground().darker());
@@ -128,34 +144,42 @@ public class RuneLiteSplashScreen
panel.add(version, versionConstraints);
// version
final JLabel litVersion = new JLabel("Plus Version : " + RuneLite.PLUS_VERSION);
final JLabel litVersion = new JLabel("Plus Version : " + properties.getProperty(RUNELITE_PLUS_VERSION));
litVersion.setForeground(Color.GREEN);
litVersion.setFont(FontManager.getRunescapeSmallFont());
litVersion.setForeground(litVersion.getForeground().darker());
final GridBagConstraints litVersionConstraints = new GridBagConstraints();
litVersionConstraints.gridy = 3;
litVersionConstraints.weightx = 4;
panel.add(litVersion, litVersionConstraints);
// build date
final JLabel litBuildDate = new JLabel("Build date : " + properties.getProperty(RUNELITE_PLUS_DATE));
litBuildDate.setForeground(Color.GREEN);
litBuildDate.setFont(FontManager.getRunescapeSmallFont());
litBuildDate.setForeground(litBuildDate.getForeground().darker());
final GridBagConstraints litBuildDateConstraints = new GridBagConstraints();
litBuildDateConstraints.gridy = 4;
panel.add(litBuildDate, litBuildDateConstraints);
// progressbar
final GridBagConstraints progressConstraints = new GridBagConstraints();
progressConstraints.fill = GridBagConstraints.HORIZONTAL;
progressConstraints.anchor = GridBagConstraints.SOUTH;
progressConstraints.gridy = 4;
progressConstraints.gridy = 5;
panel.add(progressBar, progressConstraints);
// main message
messageLabel.setFont(FontManager.getRunescapeSmallFont());
final GridBagConstraints messageConstraints = new GridBagConstraints();
messageConstraints.gridy = 5;
messageConstraints.gridy = 6;
panel.add(messageLabel, messageConstraints);
// alternate message
final GridBagConstraints subMessageConstraints = new GridBagConstraints();
subMessageLabel.setForeground(subMessageLabel.getForeground().darker());
subMessageLabel.setFont(FontManager.getRunescapeSmallFont());
subMessageConstraints.gridy = 6;
subMessageConstraints.gridy = 7;
panel.add(subMessageLabel, subMessageConstraints);
frame.setContentPane(panel);
@@ -235,7 +259,7 @@ public class RuneLiteSplashScreen
final GridBagConstraints progressConstraints = new GridBagConstraints();
progressConstraints.fill = GridBagConstraints.HORIZONTAL;
progressConstraints.anchor = GridBagConstraints.SOUTH;
progressConstraints.gridy = 4;
progressConstraints.gridy = 5;
panel.add(progressBar, progressConstraints);
panel.validate();
}

10
runelite-client/src/main/resources/net/runelite/client/runelite.properties → runelite-client/src/main/resources/runelite.plus.properties
View File

@@ -1,10 +1,10 @@
runelite.title=RuneLite
runelite.version=${project.version}
runescape.version=${rs.version}
runelite.discord.appid=409416265891971072
runelite.version=@project.version@
runescape.version=@rs.version@
runelite.plus.discord.appid=560644885250572289
runelite.discord.invite=https://discord.gg/HN5gf3m
runelite.github.link=https://github.com/runelite-extended/runelite
runelite.wiki.link=https://github.com/runelite-extended/runelite/wiki
runelite.patreon.link=https://www.patreon.com/RuneLitePlus
runelit.version =2.0.1-1
runelite.plus.title=RuneLitePlus
runelite.plus.version=@runelite.plus.version@
runelite.plus.builddate=@runelite.plus.builddate@

43
scripts/pom.xml
View File

@@ -1,43 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, Adam <Adam@sigterm.info>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.runelite</groupId>
<artifactId>scripts</artifactId>
<version>1.0.0</version>
<name>Scripts</name>
<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>2.12</version>
</extension>
</extensions>
</build>
</project>