diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-05-02 11:15:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 11:15:53 +0200 |
| commit | 88a955969c550657ded7387c91e84d2bf37bec4d (patch) | |
| tree | fc8c81ab07d148824c19e52a07089c1186005481 | |
| parent | f6fefac5b5ee7298dbc34f82b277a030e808ca2a (diff) | |
| download | skyhanni-88a955969c550657ded7387c91e84d2bf37bec4d.tar.gz skyhanni-88a955969c550657ded7387c91e84d2bf37bec4d.tar.bz2 skyhanni-88a955969c550657ded7387c91e84d2bf37bec4d.zip | |
Improvement: Hide garden guis in cf (#1648)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
3 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 2b8ca5ab8..5e017eb90 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -645,7 +645,7 @@ class SkyHanniMod { loadModule(HoppityEggsManager) loadModule(HoppityEggLocator) loadModule(HoppityEggsShared) - loadModule(HoppityCollectionStats()) + loadModule(HoppityCollectionStats) loadModule(SpawnTimers()) loadModule(MarkedPlayerManager()) loadModule(SlayerMiniBossFeatures()) diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt index 425503c75..e632bf12e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt @@ -18,7 +18,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.renderables.Renderable import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class HoppityCollectionStats { +object HoppityCollectionStats { private val config get() = ChocolateFactoryAPI.config @@ -47,7 +47,7 @@ class HoppityCollectionStats { private var display = emptyList<Renderable>() private val loggedRabbits = mutableMapOf<String, RabbitCollectionInfo>() private var totalRabbits = 0 - private var inInventory = false + var inInventory = false private var currentPage = 0 @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index c386bb3b1..107959f95 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -14,6 +14,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent +import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats import at.hannibal2.skyhanni.features.garden.CropType.Companion.getCropType import at.hannibal2.skyhanni.features.garden.composter.ComposterOverlay import at.hannibal2.skyhanni.features.garden.contest.FarmingContestAPI @@ -170,7 +171,8 @@ object GardenAPI { fun hideExtraGuis() = ComposterOverlay.inInventory || AnitaMedalProfit.inInventory || SkyMartCopperPrice.inInventory || FarmingContestAPI.inInventory || VisitorAPI.inInventory || - FFGuideGUI.isInGui() || ChocolateShopPrice.inInventory || ChocolateFactoryAPI.inChocolateFactory + FFGuideGUI.isInGui() || ChocolateShopPrice.inInventory || ChocolateFactoryAPI.inChocolateFactory || + ChocolateFactoryAPI.chocolateFactoryPaused || HoppityCollectionStats.inInventory fun clearCropSpeed() { storage?.cropsPerSecond?.clear() |