aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>2024-06-02 00:44:29 +1000
committerGitHub <noreply@github.com>2024-06-01 16:44:29 +0200
commit3ddc148597a0f9e94b1187e6f95a94c071ee62b6 (patch)
tree25d08a50c61177f254c3d14aa4b04142e228fcde
parentc74ff62d3fb211d4cd7fc3df18b16fb0cbcc978c (diff)
downloadNotEnoughUpdates-3ddc148597a0f9e94b1187e6f95a94c071ee62b6.tar.gz
NotEnoughUpdates-3ddc148597a0f9e94b1187e6f95a94c071ee62b6.tar.bz2
NotEnoughUpdates-3ddc148597a0f9e94b1187e6f95a94c071ee62b6.zip
Fix Dwarven Overlay showing incorrect rows if spacing between Commissions and Powder is disabled (#1169)
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java2
-rw-r--r--src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/tablisttutorial/TablistAPI.kt6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
index adecb334..676a4f9b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java
@@ -395,7 +395,7 @@ public class MiningOverlay extends TextTabOverlay {
commissionProgress.put(split[0], progress);
} catch (Exception ignored) {
}
- } else {
+ } else if (split[1].endsWith("DONE")) {
commissionProgress.put(split[0], 1.0f);
}
}
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/tablisttutorial/TablistAPI.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/tablisttutorial/TablistAPI.kt
index 2ec0b5d4..c9f1c60e 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/tablisttutorial/TablistAPI.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/tablisttutorial/TablistAPI.kt
@@ -57,8 +57,10 @@ object TablistAPI {
}
if (list.isNotEmpty()) {
- // Empty line, the widget ends here.
- if (entry == "§r") {
+ // Empty line
+ // Or there is no spacing between two widgets
+ // The widget ends here.
+ if (entry == "§r" || entry.startsWith("§r§")) {
break
}