aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt14
3 files changed, 2 insertions, 16 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index cc0711452..33cad95fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -123,7 +123,7 @@ import org.apache.logging.log4j.Logger
clientSideOnly = true,
useMetadata = true,
guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
- version = "0.20.Beta.2",
+ version = "0.20.Beta.3",
)
class SkyHanniMod {
@Mod.EventHandler
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
index f777fc903..6a6979b11 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java
@@ -57,7 +57,7 @@ public class Bingo {
@Expose
@ConfigOption(name = "Enable", desc = "Shortens chat messages about skill level ups, collection gains, " +
- "new area discoveries, bestiary upgrades and skyblock level up messages while on bingo.")
+ "new area discoveries and skyblock level up messages while on bingo.")
@ConfigEditorBoolean
public boolean enabled = true;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
index 23991e31c..c73806877 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
@@ -15,7 +15,6 @@ class CompactBingoChat {
private var inCollectionLevelUp = false
private var collectionLevelUpLastLine: String? = null
private var newArea = 0//0 = nothing, 1 = after first message, 2 = after second message
- private var inBestiarity = false
private val healthPattern = " §r§7§8\\+§a.* §c❤ Health".toPattern()
private val strengthPattern = " §r§7§8\\+§a. §c❁ Strength".toPattern()
@@ -31,7 +30,6 @@ class CompactBingoChat {
inSkillLevelUp = false
inSkyblockLevelUp = false
inCollectionLevelUp = false
- inBestiarity = false
if (config.hideBorder) {
event.blockedReason = "compact_bingo_border"
}
@@ -42,7 +40,6 @@ class CompactBingoChat {
if (onSkyBlockLevelUp(message)) event.blockedReason = "compact_skyblock_level_up"
if (onCollectionLevelUp(message)) event.blockedReason = "compact_collection_level_up"
if (onNewAreaDiscovered(message)) event.blockedReason = "compact_new_area_discovered"
- if (onBestiarityUpgrade(message)) event.blockedReason = "compact_skill_level_up"
}
private fun onSkillLevelUp(message: String): Boolean {
@@ -130,15 +127,4 @@ class CompactBingoChat {
}
return false
}
-
- private fun onBestiarityUpgrade(message: String): Boolean {
- if (message.startsWith(" §r§3§lBESTIARY §b§l")) {
- inBestiarity = true
- return false
- }
-
- if (message.contains("§r§6§lBESTIARY MILESTONE")) return false
-
- return inBestiarity
- }
} \ No newline at end of file