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

checkstyle fix for bootstrap

Browse Source 
use RuneLite.RuneLitVersion for splash
update bootstrap to live
This commit is contained in:
Zeruth
2019-07-07 22:23:10 -04:00
parent b440389b1f
commit 75e4c63948
3 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ 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;
@@ -127,7 +128,7 @@ public class RuneLiteSplashScreen
panel.add(version, versionConstraints);
// version
final JLabel litVersion = new JLabel("Plus Version : " + runeLiteProperties.getRunelitVersion());
final JLabel litVersion = new JLabel("Plus Version : " + RuneLite.RUNELIT_VERSION);
litVersion.setForeground(Color.GREEN);
litVersion.setFont(FontManager.getRunescapeSmallFont());
litVersion.setForeground(litVersion.getForeground().darker());

45
runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
View File

@@ -15,16 +15,7 @@ import org.codehaus.plexus.util.FileUtils;
public class Bootstrap
{
class Artifact
{
String hash;
String name;
String path;
String size;
}
String buildCommit = "2d0c2b8eb66a8088b41b29d42ec2a58ead460581";
private Artifact[] artifacts = getArtifacts();
String buildCommit = "b82c8903c64695d44b255d45b449440e4eaa17ef";
Client client = new Client();
String[] clientJvm9Arguments = new String[]{
"-XX:+DisableAttachMechanism",
@@ -53,7 +44,7 @@ public class Bootstrap
"-XX:+UseConcMarkSweepGC",
"-XX:+UseParNewGC",
"-Djna.nosys=true"};
private Artifact[] artifacts = getArtifacts();
Bootstrap()
{
}
@@ -77,7 +68,9 @@ public class Bootstrap
try (DigestInputStream dis = new DigestInputStream(new FileInputStream(filepath), md))
{
//empty loop to clear the data
while (dis.read() != -1);
while (dis.read() != -1)
{
}
md = dis.getMessageDigest();
}
@@ -85,14 +78,6 @@ public class Bootstrap
}
public void copyTodir(String origPath, String newPath) {
try {
FileUtils.copyFileToDirectory(new File(origPath), new File(newPath));
} catch (IOException e) {
e.printStackTrace();
}
}
private static String bytesToHex(byte[] hashInBytes)
{
@@ -105,6 +90,18 @@ public class Bootstrap
}
public void copyTodir(String origPath, String newPath)
{
try
{
FileUtils.copyFileToDirectory(new File(origPath), new File(newPath));
}
catch (IOException e)
{
e.printStackTrace();
}
}
private Artifact[] getArtifacts()
{
try
@@ -348,4 +345,12 @@ public class Bootstrap
return f.length();
}
class Artifact
{
String hash;
String name;
String path;
String size;
}
}