aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/MiningNotifications.kt16
2 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java
index 30394ba34..f5a1d0b76 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java
@@ -47,9 +47,17 @@ public class MiningNotificationsConfig {
@Expose
@ConfigOption(
name = "Get Ascension Rope",
- desc = "Click on a chat message to get an Ascension Rope when you're at 90 Cold and in the §bMineshaft§7. " +
+ desc = "Click on a chat message to get an Ascension Rope when you're at a certain amount of Cold and in the §bMineshaft§7. " +
"§cOnly works if you have an Ascension Rope in your sacks."
)
@ConfigEditorBoolean
public boolean getAscensionRope = true;
+
+ @Expose
+ @ConfigOption(
+ name = "Cold Amount to Show Message",
+ desc = "Customise the amount of Cold you need to have to get the Ascension Rope message."
+ )
+ @ConfigEditorSlider(minValue = 1, maxValue = 100, minStep = 1)
+ public int coldAmount = 90;
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MiningNotifications.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MiningNotifications.kt
index 012a13240..370fd1815 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MiningNotifications.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MiningNotifications.kt
@@ -54,10 +54,6 @@ object MiningNotifications {
"goblin.diamondspawn",
"§6A §r§bDiamond Goblin §r§6has spawned!"
)
- private val frostbitePattern by patternGroup.pattern(
- "cold.frostbite",
- "§9§lBRRR! §r§bYou're freezing! All you can think about is getting out of here to a warm campfire\\.\\.\\."
- )
private val config get() = SkyHanniMod.feature.mining.notifications
@@ -73,13 +69,6 @@ object MiningNotifications {
scrapDrop.matches(message) -> sendNotification(MiningNotificationList.SCRAP)
goldenGoblinSpawn.matches(message) -> sendNotification(MiningNotificationList.GOLDEN_GOBLIN)
diamondGoblinSpawn.matches(message) -> sendNotification(MiningNotificationList.DIAMOND_GOBLIN)
- frostbitePattern.matches(message) -> {
- if (IslandType.MINESHAFT.isInIsland() && config.getAscensionRope) {
- runDelayed(0.5.seconds) {
- GetFromSackAPI.getFromChatMessageSackItems(ASCENSION_ROPE)
- }
- }
- }
}
}
@@ -93,6 +82,11 @@ object MiningNotifications {
hasSentCold = true
sendNotification(MiningNotificationList.COLD)
}
+ if (IslandType.MINESHAFT.isInIsland() && config.getAscensionRope && config.coldAmount == event.cold) {
+ runDelayed(0.5.seconds) {
+ GetFromSackAPI.getFromChatMessageSackItems(ASCENSION_ROPE)
+ }
+ }
}
@SubscribeEvent