Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions src/Client/ConfigWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -7722,33 +7722,48 @@ public void updateRSCPlusDescription() {
}

public void updateAuthorTabAboutText() {
StringBuilder authorText = new StringBuilder(String.format("<html><head><style>p{font-size:%dpx; padding-top:%dpx;}ul{list-style-type:none;padding-left:0px;margin-left:0px;}</style></head>",osScaleMul(10), osScaleMul(15)));
authorText.append("<p><b>RSC</b>Plus is a RuneLite-like client ")
.append("based on the 234 RSC client.<br/> Learn more at https://rsc.plus.<br/><br/>")
.append("Thanks to the authors who made this software possible:<br/><ul>");
StringBuilder authorText =
new StringBuilder(
String.format(
"<html><head><style>p{font-size:%dpx; padding-top:%dpx;}ul{list-style-type:none;padding-left:0px;margin-left:0px;}</style></head>",
osScaleMul(10), osScaleMul(15)));
authorText
.append("<p><b>RSC</b>Plus is a RuneLite-like client ")
.append("based on the 234 RSC client.<br/> Learn more at https://rsc.plus.<br/><br/>")
.append("Thanks to the authors who made this software possible:<br/><ul>");
if (Launcher.binaryPrefix.equals("Open")) {
authorText.append("<li><b>● conker</b>, for creating the OpenRSC+ client and native binaries</li>")
.append("<li><b>● Ornox</b>, for creating the RSC+ base client & most of its features</li>");
authorText
.append("<li><b>● conker</b>, for creating the OpenRSC+ client and native binaries</li>")
.append(
"<li><b>● Ornox</b>, for creating the RSC+ base client & most of its features</li>");
} else {
authorText.append("<li><b>● Ornox</b>, for creating the RSC+ client & most of its features</li>");
authorText.append(
"<li><b>● Ornox</b>, for creating the RSC+ client & most of its features</li>");
}
authorText.append("<li><b>● Logg</b>, currently maintains the RSC+ project, new interfaces & improvements</li>");
authorText.append(
"<li><b>● Logg</b>, currently maintains the RSC+ project, new interfaces & improvements</li>");
if (Launcher.binaryPrefix.equals("Open")) {
authorText.append("<li><b>● conker again</b>, client scaling, fonts, general UX, & many other improvements</li>");
authorText.append(
"<li><b>● conker again</b>, client scaling, fonts, general UX, & many other improvements</li>");
} else if (Launcher.binaryPrefix.isEmpty()) {
authorText.append("<li><b>● conker</b>, binaries, client scaling, fonts, general UX, & many other improvements</li>");
authorText.append(
"<li><b>● conker</b>, binaries, client scaling, fonts, general UX, & many other improvements</li>");
} else {
authorText.append("<li><b>● conker</b>, server extensions, client scaling, fonts, general UX, & many other improvements</li>");
}
authorText.append("<li><b>● Brian</b>, who laid a lot of the groundwork for the user interface</li>")
.append("<li><b>● Luis</b>, who found a lot of important hooks & fixed a lot of bugs</li>")
.append("<li><b>● Talkarcabbage</b>, generic notifications, UI backend, & keybind overhaul</li>")
.append("<li><b>● nickzuber</b>, fixed some bugs, highlight/block items</li>")
.append("<li><b>● Ryan</b>, keybind to reset camera zoom, toggle statuses in corner always</li>")
.append("<li><b>● Yumeko</b>, fixed Twitch chat integration in 2023</li>")
.append("<li><b>● sammy123k</b>, added an option to center the XP progress bar</li>")
.append("<li><b>● The Jagex team of 2000 to 2004</b></li>")
.append("</ul></p></html>");
authorText.append(
"<li><b>● conker</b>, server extensions, client scaling, fonts, general UX, & many other improvements</li>");
}
authorText
.append("<li><b>● Brian</b>, who laid a lot of the groundwork for the user interface</li>")
.append("<li><b>● Luis</b>, who found a lot of important hooks & fixed a lot of bugs</li>")
.append(
"<li><b>● Talkarcabbage</b>, generic notifications, UI backend, & keybind overhaul</li>")
.append("<li><b>● nickzuber</b>, fixed some bugs, highlight/block items</li>")
.append(
"<li><b>● Ryan</b>, keybind to reset camera zoom, toggle statuses in corner always</li>")
.append("<li><b>● Yumeko</b>, fixed Twitch chat integration in 2023</li>")
.append("<li><b>● sammy123k</b>, added an option to center the XP progress bar</li>")
.append("<li><b>● The Jagex team of 2000 to 2004</b></li>")
.append("</ul></p></html>");

reindexSearch(() -> aboutText.setText(authorText.toString()));
frame.revalidate();
Expand Down
3 changes: 1 addition & 2 deletions src/Client/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -2811,8 +2811,7 @@ public static void initDir() {
JOptionPane.INFORMATION_MESSAGE,
null,
options,
null
);
null);

if (response == JOptionPane.YES_OPTION) {
String portableModeAcceptMessage =
Expand Down
6 changes: 3 additions & 3 deletions src/Client/WorldPopulations.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ public void run() {
} catch (UnknownHostException uhe) {
Arrays.fill(worldOnlineTexts, "You're offline");
} catch (SocketTimeoutException ste) {
Arrays.fill(worldOnlineTexts, "Socket timeout");
Arrays.fill(worldOnlineTexts, "? online");
} catch (IOException ioe) {
if (ioe.toString().contains("Server returned HTTP response code: 521")) {
Arrays.fill(worldOnlineTexts, "Webserver offline");
Arrays.fill(worldOnlineTexts, "offline");
} else {
Arrays.fill(worldOnlineTexts, "Webserver offline?");
Arrays.fill(worldOnlineTexts, "?? online");
}
} finally {
running = false;
Expand Down
9 changes: 7 additions & 2 deletions src/Game/Renderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -1758,8 +1758,13 @@ public static void present(Image image) {
setAlpha(g2, 1.0f);
g2.setColor(Color.WHITE);
drawShadowText(
g2, errorInfo1, 7, height - 23 - (int) errorInfoBounds.getHeight(), Color.red, false);
drawShadowText(g2, errorInfo2, 7, height - 23, Color.red, false);
g2,
errorInfo1,
7,
height - 23 - (int) errorInfoBounds.getHeight(),
Color.orange,
false);
drawShadowText(g2, errorInfo2, 7, height - 23, Color.orange, false);
}
}

Expand Down