aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-07 12:14:36 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-07 12:14:36 +0200
commit80266495d516d585ed40ab5f345b9e6f6d3e5e40 (patch)
tree70a4f778de9b50bc70b528f3c5dc5f33f38eae35 /src/main
parent59919faeaece5152ee6f7a4402155698f3f6292d (diff)
downloadskyhanni-80266495d516d585ed40ab5f345b9e6f6d3e5e40.tar.gz
skyhanni-80266495d516d585ed40ab5f345b9e6f6d3e5e40.tar.bz2
skyhanni-80266495d516d585ed40ab5f345b9e6f6d3e5e40.zip
enabled the double hook toggle per default, since shortenFishingMessage is already default disabled
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
index 8041e4234..61c435afb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java
@@ -190,7 +190,7 @@ public class FishingConfig {
public boolean shortenFishingMessage = false;
@Expose
- @ConfigOption(name = "Compact Double Hook Message", desc = "Adds Double Hook to the sea creature chat message instead of in a previous line.")
+ @ConfigOption(name = "Compact Double Hook", desc = "Adds Double Hook to the sea creature chat message instead of in a previous line.")
@ConfigEditorBoolean
- public boolean compactDoubleHook = false;
+ public boolean compactDoubleHook = true;
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt
index 9f3c10b6d..848601751 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt
@@ -1,11 +1,9 @@
package at.hannibal2.skyhanni.features.fishing
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.ChatManager
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.SeaCreatureFishEvent
import at.hannibal2.skyhanni.utils.LorenzUtils
-import net.minecraft.util.IChatComponent
import net.minecraftforge.fml.common.eventhandler.EventPriority
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -17,6 +15,7 @@ class SeaCreatureMessageShortener {
@SubscribeEvent(priority = EventPriority.LOW)
fun onChatMessage(event: LorenzChatEvent) {
if (!LorenzUtils.inSkyBlock) return
+ if (!config.shortenFishingMessage && !config.compactDoubleHook) return
if (doubleHookMessages.contains(event.message)) {
event.blockedReason = "double_hook"
nextIsDoubleHook = true
@@ -25,6 +24,7 @@ class SeaCreatureMessageShortener {
@SubscribeEvent
fun onSeaCreatureFish(event: SeaCreatureFishEvent) {
+ if (!LorenzUtils.inSkyBlock) return
if (!config.shortenFishingMessage && !config.compactDoubleHook) return
val seaCreature = event.seaCreature
event.chatEvent.blockedReason = "sea_creature_caught"