diff options
| author | jani270 <69345714+jani270@users.noreply.github.com> | 2023-11-29 10:29:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-29 20:29:32 +1100 |
| commit | 31704187c8527b03199e5abdddb982327ccfac53 (patch) | |
| tree | db1c8f200bc3cd77327a5b0cea262fcfc7161305 /src/main | |
| parent | 0c870fd83d6dd23d75e4308523eb35985b23f1ec (diff) | |
| download | NotEnoughUpdates-31704187c8527b03199e5abdddb982327ccfac53.tar.gz NotEnoughUpdates-31704187c8527b03199e5abdddb982327ccfac53.tar.bz2 NotEnoughUpdates-31704187c8527b03199e5abdddb982327ccfac53.zip | |
Made MiningOverlay SkyMall preview work in Crystal Hollows (#958)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java | 8 | ||||
| -rw-r--r-- | src/main/kotlin/io/github/moulberry/notenoughupdates/guifeatures/SkyMallDisplay.kt | 4 |
2 files changed, 3 insertions, 9 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 8dc44976..2f0388f4 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java @@ -443,14 +443,10 @@ public class MiningOverlay extends TextTabOverlay { break; case 5: overlayStrings.add( - DARK_AQUA + "Star Cult: " + GREEN + - StarCultCalculator.getNextStarCult()); + DARK_AQUA + "Star Cult: " + GREEN + StarCultCalculator.getNextStarCult()); break; case 6: - - if (Objects.equals(SBInfo.getInstance().getLocation(), "mining_3")) { overlayStrings.add("§3Sky Mall: §a" + SkyMallDisplay.Companion.getDisplayText()); - } break; } } @@ -763,9 +759,7 @@ public class MiningOverlay extends TextTabOverlay { } else if (beforeColon.contains("Titanium")) { icon = miningOverlayCommissionItems.get("Titanium"); } else if (beforeColon.contains("Sky Mall")) { - if (Objects.equals(SBInfo.getInstance().getLocation(), "mining_3")) { icon = SkyMallDisplay.Companion.getDisplayItem(); - } } } diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/guifeatures/SkyMallDisplay.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/guifeatures/SkyMallDisplay.kt index 2821473b..2332da13 100644 --- a/src/main/kotlin/io/github/moulberry/notenoughupdates/guifeatures/SkyMallDisplay.kt +++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/guifeatures/SkyMallDisplay.kt @@ -40,7 +40,7 @@ class SkyMallDisplay { @SubscribeEvent(receiveCanceled = true) fun onChatReceive(event: ClientChatReceivedEvent) { if (!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return - if (SBInfo.getInstance().getLocation() != "mining_3") return + if (SBInfo.getInstance().getLocation() != "mining_3" && SBInfo.getInstance().getLocation() != "crystal_hollows") return val matcher = pattern.matcher(event.message.formattedText) if (!matcher.matches()) return @@ -93,7 +93,7 @@ class SkyMallDisplay { MORE_POWDER("+15% more §6Powder", "MITHRIL_ORE", "§r§fGain §r§a+15% §r§fmore Powder while mining."), MINING_FORTUNE("+50 §6☘ Mining Fortune", "ENCHANTED_RABBIT_FOOT", "§r§fGain §r§a+50 §r§6☘ Mining Fortune§r§f."), MINING_SPEED("+100 §6⸕ Mining Speed", "ENCHANTED_FEATHER", "§r§fGain §r§a+100 §r§6⸕ Mining Speed§r§f."), - MORE_GOBLINS("10x §6Goblin chance", "GOBLIN_HELMET", "§r§f§r§a10x §r§fchance to find Goblins while mining."), + MORE_GOBLINS("10x §6Goblin chance", "GOBLIN_HELMET", "§r§f§r§a10x §r§fchance to find Golden and Diamond Goblins."), TITANIUM_DROPS("5x §9Titanium drops", "TITANIUM_ORE", "§r§fGain §r§a5x §r§9Titanium §r§fdrops"), // In case hypixel finds some day the missing dot at the end. |