aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
diff options
context:
space:
mode:
authorYasin <LifeIsAParadox@users.noreply.github.com>2022-03-09 09:52:33 +0100
committerGitHub <noreply@github.com>2022-03-09 09:52:33 +0100
commit33e27b83b7ac873312c415aed82728caf9f70d00 (patch)
tree05cacd32948e60828c91bccb6d4a57b810022e3b /src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
parent270f37c727233d5400eaa9f18357218bca437484 (diff)
parent31ad86829ef86b82d4f4307171f31b9cf2b73a4c (diff)
downloadSkyblocker-33e27b83b7ac873312c415aed82728caf9f70d00.tar.gz
Skyblocker-33e27b83b7ac873312c415aed82728caf9f70d00.tar.bz2
Skyblocker-33e27b83b7ac873312c415aed82728caf9f70d00.zip
Merge pull request #54 from LifeIsAParadox/1.6.0-update
1.6.0 update
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index 21c30ada..66d04b50 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -45,12 +45,13 @@ public class Utils {
String location = null;
List<String> sidebarLines = getSidebar();
try {
- assert sidebarLines != null;
- for (String sidebarLine : sidebarLines) {
- if (sidebarLine.contains("⏣")) location = sidebarLine;
+ if( sidebarLines != null) {
+ for (String sidebarLine : sidebarLines) {
+ if (sidebarLine.contains("⏣")) location = sidebarLine;
+ }
+ if (location == null) location = "Unknown";
+ location = location.replace('⏣', ' ').strip();
}
- if (location == null) location = "Unknown";
- location = location.replace('⏣', ' ').strip();
} catch (IndexOutOfBoundsException e) {
e.printStackTrace();
}
@@ -63,10 +64,12 @@ public class Utils {
List<String> sidebarLines = getSidebar();
try {
- assert sidebarLines != null;
- for (String sidebarLine : sidebarLines) {
- if (sidebarLine.contains("Piggy:")) purseString = sidebarLine;
- if (sidebarLine.contains("Purse:")) purseString = sidebarLine;
+
+ if (sidebarLines != null) {
+ for (String sidebarLine : sidebarLines) {
+ if (sidebarLine.contains("Piggy:")) purseString = sidebarLine;
+ if (sidebarLine.contains("Purse:")) purseString = sidebarLine;
+ }
}
if (purseString != null) purse = Double.parseDouble(purseString.replaceAll("[^0-9.]", "").strip());
else purse = 0;
@@ -82,9 +85,10 @@ public class Utils {
String bitsString = null;
List<String> sidebarLines = getSidebar();
try {
- assert sidebarLines != null;
- for (String sidebarLine : sidebarLines) {
- if (sidebarLine.contains("Bits")) bitsString = sidebarLine;
+ if (sidebarLines != null) {
+ for (String sidebarLine : sidebarLines) {
+ if (sidebarLine.contains("Bits")) bitsString = sidebarLine;
+ }
}
if (bitsString != null) {
bits = Integer.parseInt(bitsString.replaceAll("[^0-9.]", "").strip());