From b1ff611e4f764c5fba338571540f0ad2389994ac Mon Sep 17 00:00:00 2001 From: Iceshadow1404 <50039154+Iceshadow1404@users.noreply.github.com> Date: Sun, 9 Jun 2024 22:38:54 +0200 Subject: Improvement: Add an exclude dungeon toggle to hide far entities (#2036) --- .../skyhanni/config/features/misc/HideFarEntitiesConfig.java | 5 +++++ src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/HideFarEntitiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/HideFarEntitiesConfig.java index 2ac5ad4ed..3ae186395 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/HideFarEntitiesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/HideFarEntitiesConfig.java @@ -27,4 +27,9 @@ public class HideFarEntitiesConfig { @ConfigOption(name = "Exclude Garden", desc = "Disable this feature while in the Garden.") @ConfigEditorBoolean public boolean excludeGarden = false; + + @Expose + @ConfigOption(name = "Exclude Dungeon", desc = "Disable this feature while in Dungeon.") + @ConfigEditorBoolean + public boolean excludeDungeon = false; } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt index e7a96f9e6..d12953b98 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/HideFarEntities.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.CheckRenderEntityEvent import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.EntityUtils @@ -40,5 +41,6 @@ object HideFarEntities { } } - fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && !(GardenAPI.inGarden() && config.excludeGarden) + fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && (!(GardenAPI.inGarden() && config.excludeGarden) && !(DungeonAPI.inDungeon() && config.excludeDungeon)) + } -- cgit