From dc619eea46194955ede129b6a7125be2c1e8fa74 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:49:47 +1000 Subject: Backend: Classes -> Objects with annotation (#1982) Co-authored-by: ThatGravyBoat --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 482 +-------------------- .../at/hannibal2/skyhanni/api/DataWatcherAPI.kt | 4 +- .../java/at/hannibal2/skyhanni/data/BlockData.kt | 6 +- .../skyhanni/data/FixedRateTimerManager.kt | 4 +- .../skyhanni/data/GardenComposterUpgradesData.kt | 4 +- .../at/hannibal2/skyhanni/data/ItemAddManager.kt | 4 +- .../at/hannibal2/skyhanni/data/ItemClickData.kt | 4 +- .../at/hannibal2/skyhanni/data/ItemTipHelper.kt | 6 +- .../at/hannibal2/skyhanni/data/OwnInventoryData.kt | 4 +- .../java/at/hannibal2/skyhanni/data/RenderData.kt | 4 +- .../java/at/hannibal2/skyhanni/data/TitleData.kt | 6 +- .../data/hypixel/chat/PlayerChatManager.kt | 4 +- .../data/hypixel/chat/PlayerNameFormatter.kt | 4 +- .../at/hannibal2/skyhanni/data/mob/MobDebug.kt | 4 +- .../at/hannibal2/skyhanni/data/mob/MobDetection.kt | 7 +- .../skyhanni/features/anvil/AnvilCombineHelper.kt | 4 +- .../skyhanni/features/bingo/CompactBingoChat.kt | 4 +- .../skyhanni/features/bingo/MinionCraftHelper.kt | 4 +- .../features/bingo/card/BingoCardReader.kt | 4 +- .../skyhanni/features/bingo/card/BingoCardTips.kt | 4 +- .../features/chat/ArachneChatMessageHider.kt | 4 +- .../hannibal2/skyhanni/features/chat/ChatFilter.kt | 4 +- .../features/chat/CompactBestiaryChatMessage.kt | 4 +- .../features/chat/CompactSplashPotionMessage.kt | 4 +- .../skyhanni/features/chat/PlayerDeathMessages.kt | 4 +- .../skyhanni/features/chat/RareDropMessages.kt | 4 +- .../skyhanni/features/chat/SkyblockXPInChat.kt | 4 +- .../features/chat/playerchat/PlayerChatModifier.kt | 5 +- .../skyhanni/features/combat/FerocityDisplay.kt | 5 +- .../skyhanni/features/combat/HideDamageSplash.kt | 4 +- .../features/combat/mobs/AreaMiniBossFeatures.kt | 4 +- .../combat/mobs/AshfangMinisNametagHider.kt | 4 +- .../skyhanni/features/combat/mobs/MobHighlight.kt | 4 +- .../skyhanni/features/combat/mobs/SpawnTimers.kt | 6 +- .../features/commands/SendCoordinatedCommand.kt | 4 +- .../skyhanni/features/commands/WarpIsCommand.kt | 4 +- .../skyhanni/features/cosmetics/ArrowTrail.kt | 4 +- .../features/cosmetics/CosmeticFollowingLine.kt | 4 +- .../features/dungeon/DungeonArchitectFeatures.kt | 4 +- .../dungeon/DungeonBossHideDamageSplash.kt | 4 +- .../features/dungeon/DungeonBossMessages.kt | 4 +- .../skyhanni/features/dungeon/DungeonChatFilter.kt | 4 +- .../skyhanni/features/dungeon/DungeonCleanEnd.kt | 4 +- .../skyhanni/features/dungeon/DungeonCopilot.kt | 4 +- .../features/dungeon/DungeonDeathCounter.kt | 4 +- .../features/dungeon/DungeonFinderFeatures.kt | 4 +- .../skyhanni/features/dungeon/DungeonHideItems.kt | 36 +- .../dungeon/DungeonHighlightClickedBlocks.kt | 4 +- .../features/dungeon/DungeonRankTabListColor.kt | 4 +- .../dungeon/DungeonShadowAssassinNotification.kt | 4 +- .../features/dungeon/DungeonTeammateOutlines.kt | 4 +- .../skyhanni/features/dungeon/DungeonsRaceGuide.kt | 4 +- .../features/dungeon/HighlightDungeonDeathmite.kt | 4 +- .../skyhanni/features/dungeon/TerracottaPhase.kt | 4 +- .../skyhanni/features/event/diana/DianaFixChat.kt | 4 +- .../features/event/diana/GriffinPetWarning.kt | 4 +- .../features/event/diana/HighlightInquisitors.kt | 4 +- .../features/event/diana/SoopyGuessBurrow.kt | 4 +- .../features/event/jerry/HighlightJerries.kt | 4 +- .../lobby/waypoints/christmas/PresentWaypoints.kt | 4 +- .../lobby/waypoints/easter/EasterEggWaypoints.kt | 4 +- .../lobby/waypoints/halloween/BasketWaypoints.kt | 4 +- .../skyhanni/features/event/spook/TheGreatSpook.kt | 4 +- .../skyhanni/features/event/winter/JyrreTimer.kt | 4 +- .../features/event/winter/NewYearCakeReminder.kt | 4 +- .../skyhanni/features/fishing/ChumBucketHider.kt | 4 +- .../features/fishing/FishingBaitWarnings.kt | 4 +- .../features/fishing/FishingHookDisplay.kt | 12 +- .../skyhanni/features/fishing/FishingTimer.kt | 4 +- .../features/fishing/SeaCreatureFeatures.kt | 4 +- .../fishing/SeaCreatureMessageShortener.kt | 4 +- .../skyhanni/features/fishing/SharkFishCounter.kt | 4 +- .../features/fishing/ShowFishingItemName.kt | 4 +- .../features/fishing/ThunderSparksHighlight.kt | 8 +- .../skyhanni/features/fishing/TotemOfCorruption.kt | 8 +- .../features/fishing/trophy/GeyserFishing.kt | 4 +- .../features/fishing/trophy/OdgerWaypoint.kt | 4 +- .../features/fishing/trophy/TrophyFishFillet.kt | 4 +- .../features/fishing/trophy/TrophyFishMessages.kt | 4 +- .../features/garden/AtmosphericFilterDisplay.kt | 4 +- .../features/garden/GardenCropMilestoneFix.kt | 4 +- .../skyhanni/features/garden/GardenLevelDisplay.kt | 4 +- .../skyhanni/features/garden/GardenOptimalSpeed.kt | 4 +- .../skyhanni/features/garden/GardenWarpCommands.kt | 4 +- .../skyhanni/features/garden/GardenYawAndPitch.kt | 4 +- .../skyhanni/features/garden/ToolTooltipTweaks.kt | 13 +- .../features/garden/composter/ComposterDisplay.kt | 6 +- .../garden/composter/ComposterInventoryNumbers.kt | 4 +- .../composter/GardenComposterInventoryFeatures.kt | 4 +- .../garden/contest/JacobContestFFNeededDisplay.kt | 4 +- .../garden/contest/JacobContestStatsSummary.kt | 4 +- .../garden/contest/JacobContestTimeNeeded.kt | 4 +- .../contest/JacobFarmingContestsInventory.kt | 4 +- .../farming/GardenBurrowingSporesNotifier.kt | 4 +- .../farming/WildStrawberryDyeNotification.kt | 4 +- .../garden/farming/WrongFungiCutterWarning.kt | 4 +- .../garden/inventory/AnitaExtraFarmingFortune.kt | 4 +- .../inventory/GardenCropMilestoneInventory.kt | 4 +- .../garden/inventory/GardenInventoryNumbers.kt | 4 +- .../inventory/GardenInventoryTooltipOverflow.kt | 4 +- .../features/garden/inventory/LogBookStats.kt | 4 +- .../garden/inventory/plots/GardenNextPlotPrice.kt | 4 +- .../inventory/plots/GardenPlotMenuHighlighting.kt | 4 +- .../features/garden/pests/PestParticleLine.kt | 4 +- .../features/garden/pests/PestParticleWaypoint.kt | 4 +- .../skyhanni/features/garden/pests/PestSpawn.kt | 4 +- .../skyhanni/features/garden/pests/SprayDisplay.kt | 4 +- .../features/garden/pests/SprayFeatures.kt | 6 +- .../features/garden/pests/StereoHarmonyDisplay.kt | 8 +- .../garden/visitor/GardenVisitorSupercraft.kt | 6 +- .../features/garden/visitor/GardenVisitorTimer.kt | 10 +- .../visitor/HighlightVisitorsOutsideOfGarden.kt | 4 +- .../features/garden/visitor/VisitorListener.kt | 10 +- .../garden/visitor/VisitorRewardWarning.kt | 4 +- .../skyhanni/features/gui/MovableHotBar.kt | 4 +- .../skyhanni/features/gui/quiver/QuiverDisplay.kt | 4 +- .../skyhanni/features/gui/quiver/QuiverWarning.kt | 4 +- .../skyhanni/features/inventory/ChestValue.kt | 4 +- .../skyhanni/features/inventory/DojoRankDisplay.kt | 4 +- .../features/inventory/HideNotClickableItems.kt | 4 +- .../skyhanni/features/inventory/ItemStars.kt | 4 +- .../skyhanni/features/inventory/MaxPurseItems.kt | 4 +- .../features/inventory/PowerStoneGuideFeatures.kt | 4 +- .../features/inventory/QuickCraftFeatures.kt | 4 +- .../features/inventory/RngMeterInventory.kt | 4 +- .../features/inventory/ShiftClickBrewing.kt | 4 +- .../features/inventory/ShiftClickEquipment.kt | 4 +- .../skyhanni/features/inventory/StatsTuning.kt | 6 +- .../features/inventory/SuperpairsClicksAlert.kt | 4 +- .../auctionhouse/AuctionHouseCopyUnderbidPrice.kt | 4 +- .../auctionhouse/AuctionHouseOpenPriceWebsite.kt | 4 +- .../inventory/bazaar/BazaarBestSellMethod.kt | 4 +- .../bazaar/BazaarCancelledBuyOrderClipboard.kt | 4 +- .../inventory/bazaar/BazaarOpenPriceWebsite.kt | 4 +- .../inventory/bazaar/CraftMaterialsFromBazaar.kt | 4 +- .../chocolatefactory/ChocolateFactoryShortcut.kt | 4 +- .../features/inventory/tiarelay/TiaRelayHelper.kt | 4 +- .../inventory/tiarelay/TiaRelayWaypoints.kt | 4 +- .../features/itemabilities/ChickenHeadTimer.kt | 4 +- .../itemabilities/FireVeilWandParticles.kt | 4 +- .../abilitycooldown/ItemAbilityCooldown.kt | 4 +- .../skyhanni/features/mining/ColdOverlay.kt | 4 +- .../skyhanni/features/mining/DeepCavernsGuide.kt | 4 +- .../features/mining/GoldenGoblinHighlight.kt | 4 +- .../mining/HighlightMiningCommissionMobs.kt | 9 +- .../skyhanni/features/mining/HotmFeatures.kt | 8 +- .../skyhanni/features/mining/TunnelsMaps.kt | 4 +- .../crystalhollows/CrystalHollowsNamesInCore.kt | 4 +- .../mining/crystalhollows/CrystalHollowsWalls.kt | 97 +++-- .../fossilexcavator/ExcavatorProfitTracker.kt | 4 +- .../fossilexcavator/GlacitePowderFeatures.kt | 4 +- .../mining/fossilexcavator/ProfitPerExcavation.kt | 4 +- .../features/mining/mineshaft/CorpseAPI.kt | 4 +- .../mining/mineshaft/MineshaftCorpseProfitPer.kt | 4 +- .../features/minion/InfernoMinionFeatures.kt | 4 +- .../skyhanni/features/minion/MinionCollectLogic.kt | 4 +- .../hannibal2/skyhanni/features/minion/MinionXp.kt | 4 +- .../features/misc/AuctionHousePriceComparison.kt | 4 +- .../skyhanni/features/misc/BetterSignEditing.kt | 4 +- .../skyhanni/features/misc/BetterWikiFromMenus.kt | 4 +- .../skyhanni/features/misc/BrewingStandOverlay.kt | 4 +- .../skyhanni/features/misc/ButtonOnPause.kt | 4 +- .../skyhanni/features/misc/CurrentPetDisplay.kt | 4 +- .../skyhanni/features/misc/CustomTextBox.kt | 4 +- .../skyhanni/features/misc/ExpOrbsOnGroundHider.kt | 6 +- .../skyhanni/features/misc/FixNEUHeavyPearls.kt | 6 +- .../hannibal2/skyhanni/features/misc/HideArmor.kt | 4 +- .../skyhanni/features/misc/HideFarEntities.kt | 4 +- .../skyhanni/features/misc/InGameDateDisplay.kt | 4 +- .../skyhanni/features/misc/JoinCrystalHollows.kt | 4 +- .../skyhanni/features/misc/LesserOrbHider.kt | 8 +- .../skyhanni/features/misc/MarkedPlayerManager.kt | 2 + .../features/misc/NonGodPotEffectDisplay.kt | 4 +- .../skyhanni/features/misc/ParticleHider.kt | 4 +- .../skyhanni/features/misc/PartyMemberOutlines.kt | 4 +- .../features/misc/PatcherSendCoordinates.kt | 4 +- .../skyhanni/features/misc/PetCandyUsedDisplay.kt | 4 +- .../skyhanni/features/misc/PetExpTooltip.kt | 20 +- .../skyhanni/features/misc/PetItemDisplay.kt | 4 +- .../features/misc/PocketSackInASackDisplay.kt | 10 +- .../features/misc/PrivateIslandNoPickaxeAbility.kt | 6 +- .../skyhanni/features/misc/ReplaceRomanNumerals.kt | 4 +- .../misc/RestorePieceOfWizardPortalLore.kt | 4 +- .../skyhanni/features/misc/SkyBlockKickDuration.kt | 4 +- .../skyhanni/features/misc/TabWidgetSettings.kt | 6 +- .../skyhanni/features/misc/TimeFeatures.kt | 4 +- .../hannibal2/skyhanni/features/misc/TpsCounter.kt | 21 +- .../features/misc/items/EstimatedWardrobePrice.kt | 4 +- .../features/misc/items/GlowingDroppedItems.kt | 4 +- .../misc/teleportpad/TeleportPadCompactName.kt | 4 +- .../misc/teleportpad/TeleportPadInventoryNumber.kt | 4 +- .../skyhanni/features/nether/MatriarchHelper.kt | 4 +- .../skyhanni/features/nether/PabloHelper.kt | 4 +- .../skyhanni/features/nether/SulphurSkitterBox.kt | 14 +- .../features/nether/VolcanoExplosivityDisplay.kt | 6 +- .../features/nether/ashfang/AshfangBlazes.kt | 4 +- .../features/nether/ashfang/AshfangBlazingSouls.kt | 8 +- .../features/nether/ashfang/AshfangGravityOrbs.kt | 8 +- .../nether/ashfang/AshfangHideDamageIndicator.kt | 4 +- .../nether/ashfang/AshfangHideParticles.kt | 4 +- .../nether/ashfang/AshfangNextResetCooldown.kt | 4 +- .../rift/area/colosseum/BlobbercystsHighlight.kt | 8 +- .../rift/area/dreadfarm/RiftAgaricusCap.kt | 4 +- .../area/dreadfarm/RiftWiltedBerberisHelper.kt | 4 +- .../rift/area/dreadfarm/VoltHighlighter.kt | 8 +- .../area/livingcave/LivingCaveDefenseBlocks.kt | 4 +- .../area/livingcave/LivingCaveLivingMetalHelper.kt | 4 +- .../area/livingcave/LivingMetalSuitProgress.kt | 4 +- .../rift/area/mirrorverse/RiftLavaMazeParkour.kt | 4 +- .../rift/area/mirrorverse/RiftUpsideDownParkour.kt | 4 +- .../rift/area/mirrorverse/TubulatorParkour.kt | 4 +- .../rift/area/westvillage/VerminHighlighter.kt | 10 +- .../rift/area/westvillage/kloon/KloonHacking.kt | 4 +- .../features/rift/area/wyldwoods/RiftLarva.kt | 8 +- .../features/rift/area/wyldwoods/RiftOdonata.kt | 8 +- .../rift/area/wyldwoods/ShyCruxWarnings.kt | 4 +- .../features/rift/everywhere/HighlightRiftGuide.kt | 4 +- .../rift/everywhere/RiftHorsezookaHider.kt | 4 +- .../skyhanni/features/rift/everywhere/RiftTimer.kt | 4 +- .../features/rift/everywhere/motes/RiftMotesOrb.kt | 4 +- .../rift/everywhere/motes/ShowMotesNpcSellPrice.kt | 4 +- .../features/skillprogress/SkillTooltip.kt | 4 +- .../skyhanni/features/slayer/HideMobNames.kt | 4 +- .../features/slayer/SlayerBossSpawnSoon.kt | 6 +- .../features/slayer/SlayerItemsOnGround.kt | 4 +- .../features/slayer/SlayerMiniBossFeatures.kt | 4 +- .../skyhanni/features/slayer/SlayerQuestWarning.kt | 4 +- .../features/slayer/SlayerRngMeterDisplay.kt | 4 +- .../features/slayer/blaze/BlazeSlayerClearView.kt | 4 +- .../slayer/blaze/BlazeSlayerDaggerHelper.kt | 4 +- .../slayer/blaze/BlazeSlayerFirePitsWarning.kt | 4 +- .../features/slayer/blaze/FirePillarDisplay.kt | 5 +- .../slayer/enderman/EndermanSlayerFeatures.kt | 8 +- .../slayer/enderman/EndermanSlayerHideParticles.kt | 4 +- .../features/stranded/HighlightPlaceableNpcs.kt | 4 +- .../features/summonings/SummoningMobManager.kt | 4 +- .../features/summonings/SummoningSoulsName.kt | 8 +- .../skyhanni/test/HighlightMissingRepoItems.kt | 4 +- .../skyhanni/test/ParkourWaypointSaver.kt | 4 +- .../at/hannibal2/skyhanni/test/ShowItemUuid.kt | 4 +- .../hannibal2/skyhanni/test/TestShowSlotNumber.kt | 4 +- 241 files changed, 864 insertions(+), 876 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 08cea8784..98fcc5626 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -1,295 +1,55 @@ package at.hannibal2.skyhanni -import at.hannibal2.skyhanni.api.DataWatcherAPI import at.hannibal2.skyhanni.config.ConfigFileType import at.hannibal2.skyhanni.config.ConfigManager import at.hannibal2.skyhanni.config.Features import at.hannibal2.skyhanni.config.SackData import at.hannibal2.skyhanni.config.commands.Commands import at.hannibal2.skyhanni.data.ActionBarStatsData -import at.hannibal2.skyhanni.data.BlockData -import at.hannibal2.skyhanni.data.FixedRateTimerManager -import at.hannibal2.skyhanni.data.GardenComposterUpgradesData import at.hannibal2.skyhanni.data.GuiEditManager import at.hannibal2.skyhanni.data.HotmData import at.hannibal2.skyhanni.data.HypixelData -import at.hannibal2.skyhanni.data.ItemAddManager -import at.hannibal2.skyhanni.data.ItemClickData -import at.hannibal2.skyhanni.data.ItemTipHelper import at.hannibal2.skyhanni.data.OtherInventoryData -import at.hannibal2.skyhanni.data.OwnInventoryData -import at.hannibal2.skyhanni.data.RenderData import at.hannibal2.skyhanni.data.ScoreboardData import at.hannibal2.skyhanni.data.SkillExperience -import at.hannibal2.skyhanni.data.TitleData import at.hannibal2.skyhanni.data.TitleManager -import at.hannibal2.skyhanni.data.hypixel.chat.PlayerChatManager -import at.hannibal2.skyhanni.data.hypixel.chat.PlayerNameFormatter import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson import at.hannibal2.skyhanni.data.jsonobjects.local.KnownFeaturesJson import at.hannibal2.skyhanni.data.jsonobjects.local.VisualWordsJson import at.hannibal2.skyhanni.data.mob.MobData -import at.hannibal2.skyhanni.data.mob.MobDebug -import at.hannibal2.skyhanni.data.mob.MobDetection import at.hannibal2.skyhanni.data.repo.RepoManager import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.PreInitFinishedEvent -import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper -import at.hannibal2.skyhanni.features.bingo.CompactBingoChat -import at.hannibal2.skyhanni.features.bingo.MinionCraftHelper import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay -import at.hannibal2.skyhanni.features.bingo.card.BingoCardReader -import at.hannibal2.skyhanni.features.bingo.card.BingoCardTips import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper -import at.hannibal2.skyhanni.features.chat.ArachneChatMessageHider -import at.hannibal2.skyhanni.features.chat.ChatFilter -import at.hannibal2.skyhanni.features.chat.CompactBestiaryChatMessage -import at.hannibal2.skyhanni.features.chat.CompactSplashPotionMessage -import at.hannibal2.skyhanni.features.chat.PlayerDeathMessages -import at.hannibal2.skyhanni.features.chat.RareDropMessages -import at.hannibal2.skyhanni.features.chat.SkyblockXPInChat import at.hannibal2.skyhanni.features.chat.Translator import at.hannibal2.skyhanni.features.chat.WatchdogHider import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFilter -import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatModifier -import at.hannibal2.skyhanni.features.combat.FerocityDisplay -import at.hannibal2.skyhanni.features.combat.HideDamageSplash import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager -import at.hannibal2.skyhanni.features.combat.mobs.AreaMiniBossFeatures -import at.hannibal2.skyhanni.features.combat.mobs.AshfangMinisNametagHider -import at.hannibal2.skyhanni.features.combat.mobs.MobHighlight -import at.hannibal2.skyhanni.features.combat.mobs.SpawnTimers -import at.hannibal2.skyhanni.features.commands.SendCoordinatedCommand -import at.hannibal2.skyhanni.features.commands.WarpIsCommand -import at.hannibal2.skyhanni.features.cosmetics.ArrowTrail -import at.hannibal2.skyhanni.features.cosmetics.CosmeticFollowingLine import at.hannibal2.skyhanni.features.dungeon.CroesusChestTracker -import at.hannibal2.skyhanni.features.dungeon.DungeonArchitectFeatures -import at.hannibal2.skyhanni.features.dungeon.DungeonBossHideDamageSplash -import at.hannibal2.skyhanni.features.dungeon.DungeonBossMessages -import at.hannibal2.skyhanni.features.dungeon.DungeonChatFilter -import at.hannibal2.skyhanni.features.dungeon.DungeonCleanEnd -import at.hannibal2.skyhanni.features.dungeon.DungeonCopilot -import at.hannibal2.skyhanni.features.dungeon.DungeonDeathCounter -import at.hannibal2.skyhanni.features.dungeon.DungeonFinderFeatures -import at.hannibal2.skyhanni.features.dungeon.DungeonHideItems -import at.hannibal2.skyhanni.features.dungeon.DungeonHighlightClickedBlocks -import at.hannibal2.skyhanni.features.dungeon.DungeonRankTabListColor -import at.hannibal2.skyhanni.features.dungeon.DungeonShadowAssassinNotification -import at.hannibal2.skyhanni.features.dungeon.DungeonTeammateOutlines -import at.hannibal2.skyhanni.features.dungeon.DungeonsRaceGuide -import at.hannibal2.skyhanni.features.dungeon.HighlightDungeonDeathmite -import at.hannibal2.skyhanni.features.dungeon.TerracottaPhase import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper -import at.hannibal2.skyhanni.features.event.diana.DianaFixChat -import at.hannibal2.skyhanni.features.event.diana.GriffinPetWarning -import at.hannibal2.skyhanni.features.event.diana.HighlightInquisitors -import at.hannibal2.skyhanni.features.event.diana.SoopyGuessBurrow -import at.hannibal2.skyhanni.features.event.jerry.HighlightJerries -import at.hannibal2.skyhanni.features.event.lobby.waypoints.christmas.PresentWaypoints -import at.hannibal2.skyhanni.features.event.lobby.waypoints.easter.EasterEggWaypoints -import at.hannibal2.skyhanni.features.event.lobby.waypoints.halloween.BasketWaypoints -import at.hannibal2.skyhanni.features.event.spook.TheGreatSpook -import at.hannibal2.skyhanni.features.event.winter.JyrreTimer -import at.hannibal2.skyhanni.features.event.winter.NewYearCakeReminder import at.hannibal2.skyhanni.features.fame.AccountUpgradeReminder import at.hannibal2.skyhanni.features.fame.CityProjectFeatures -import at.hannibal2.skyhanni.features.fishing.ChumBucketHider -import at.hannibal2.skyhanni.features.fishing.FishingBaitWarnings -import at.hannibal2.skyhanni.features.fishing.FishingHookDisplay -import at.hannibal2.skyhanni.features.fishing.FishingTimer -import at.hannibal2.skyhanni.features.fishing.SeaCreatureFeatures import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager -import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener -import at.hannibal2.skyhanni.features.fishing.SharkFishCounter -import at.hannibal2.skyhanni.features.fishing.ShowFishingItemName -import at.hannibal2.skyhanni.features.fishing.ThunderSparksHighlight -import at.hannibal2.skyhanni.features.fishing.TotemOfCorruption -import at.hannibal2.skyhanni.features.fishing.trophy.GeyserFishing -import at.hannibal2.skyhanni.features.fishing.trophy.OdgerWaypoint -import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishFillet -import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishMessages import at.hannibal2.skyhanni.features.garden.AnitaMedalProfit -import at.hannibal2.skyhanni.features.garden.AtmosphericFilterDisplay -import at.hannibal2.skyhanni.features.garden.GardenCropMilestoneFix -import at.hannibal2.skyhanni.features.garden.GardenLevelDisplay -import at.hannibal2.skyhanni.features.garden.GardenOptimalSpeed -import at.hannibal2.skyhanni.features.garden.GardenWarpCommands -import at.hannibal2.skyhanni.features.garden.GardenYawAndPitch -import at.hannibal2.skyhanni.features.garden.ToolTooltipTweaks -import at.hannibal2.skyhanni.features.garden.composter.ComposterDisplay -import at.hannibal2.skyhanni.features.garden.composter.ComposterInventoryNumbers -import at.hannibal2.skyhanni.features.garden.composter.GardenComposterInventoryFeatures -import at.hannibal2.skyhanni.features.garden.contest.JacobContestFFNeededDisplay -import at.hannibal2.skyhanni.features.garden.contest.JacobContestStatsSummary -import at.hannibal2.skyhanni.features.garden.contest.JacobContestTimeNeeded -import at.hannibal2.skyhanni.features.garden.contest.JacobFarmingContestsInventory import at.hannibal2.skyhanni.features.garden.farming.CropSpeedMeter import at.hannibal2.skyhanni.features.garden.farming.FarmingWeightDisplay import at.hannibal2.skyhanni.features.garden.farming.GardenBestCropTime -import at.hannibal2.skyhanni.features.garden.farming.GardenBurrowingSporesNotifier -import at.hannibal2.skyhanni.features.garden.farming.WildStrawberryDyeNotification -import at.hannibal2.skyhanni.features.garden.farming.WrongFungiCutterWarning -import at.hannibal2.skyhanni.features.garden.inventory.AnitaExtraFarmingFortune -import at.hannibal2.skyhanni.features.garden.inventory.GardenCropMilestoneInventory -import at.hannibal2.skyhanni.features.garden.inventory.GardenInventoryNumbers -import at.hannibal2.skyhanni.features.garden.inventory.GardenInventoryTooltipOverflow -import at.hannibal2.skyhanni.features.garden.inventory.LogBookStats import at.hannibal2.skyhanni.features.garden.inventory.SkyMartCopperPrice -import at.hannibal2.skyhanni.features.garden.inventory.plots.GardenNextPlotPrice -import at.hannibal2.skyhanni.features.garden.inventory.plots.GardenPlotMenuHighlighting -import at.hannibal2.skyhanni.features.garden.pests.PestParticleLine -import at.hannibal2.skyhanni.features.garden.pests.PestParticleWaypoint -import at.hannibal2.skyhanni.features.garden.pests.PestSpawn -import at.hannibal2.skyhanni.features.garden.pests.SprayDisplay -import at.hannibal2.skyhanni.features.garden.pests.SprayFeatures -import at.hannibal2.skyhanni.features.garden.pests.StereoHarmonyDisplay -import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorSupercraft -import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorTimer -import at.hannibal2.skyhanni.features.garden.visitor.HighlightVisitorsOutsideOfGarden -import at.hannibal2.skyhanni.features.garden.visitor.VisitorListener -import at.hannibal2.skyhanni.features.garden.visitor.VisitorRewardWarning -import at.hannibal2.skyhanni.features.gui.MovableHotBar import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard -import at.hannibal2.skyhanni.features.gui.quiver.QuiverDisplay -import at.hannibal2.skyhanni.features.gui.quiver.QuiverWarning -import at.hannibal2.skyhanni.features.inventory.ChestValue -import at.hannibal2.skyhanni.features.inventory.DojoRankDisplay -import at.hannibal2.skyhanni.features.inventory.HideNotClickableItems -import at.hannibal2.skyhanni.features.inventory.ItemStars -import at.hannibal2.skyhanni.features.inventory.MaxPurseItems -import at.hannibal2.skyhanni.features.inventory.PowerStoneGuideFeatures -import at.hannibal2.skyhanni.features.inventory.QuickCraftFeatures -import at.hannibal2.skyhanni.features.inventory.RngMeterInventory -import at.hannibal2.skyhanni.features.inventory.ShiftClickBrewing -import at.hannibal2.skyhanni.features.inventory.ShiftClickEquipment import at.hannibal2.skyhanni.features.inventory.SkyblockGuideHighlightFeature -import at.hannibal2.skyhanni.features.inventory.StatsTuning -import at.hannibal2.skyhanni.features.inventory.SuperpairsClicksAlert -import at.hannibal2.skyhanni.features.inventory.auctionhouse.AuctionHouseCopyUnderbidPrice -import at.hannibal2.skyhanni.features.inventory.auctionhouse.AuctionHouseOpenPriceWebsite import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi -import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarBestSellMethod -import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarCancelledBuyOrderClipboard -import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarOpenPriceWebsite import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarOrderHelper -import at.hannibal2.skyhanni.features.inventory.bazaar.CraftMaterialsFromBazaar -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryShortcut -import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayHelper -import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayWaypoints -import at.hannibal2.skyhanni.features.itemabilities.ChickenHeadTimer -import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles -import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown -import at.hannibal2.skyhanni.features.mining.ColdOverlay -import at.hannibal2.skyhanni.features.mining.DeepCavernsGuide -import at.hannibal2.skyhanni.features.mining.GoldenGoblinHighlight -import at.hannibal2.skyhanni.features.mining.HighlightMiningCommissionMobs -import at.hannibal2.skyhanni.features.mining.HotmFeatures import at.hannibal2.skyhanni.features.mining.KingTalismanHelper -import at.hannibal2.skyhanni.features.mining.TunnelsMaps -import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsNamesInCore -import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsWalls import at.hannibal2.skyhanni.features.mining.eventtracker.MiningEventTracker -import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker -import at.hannibal2.skyhanni.features.mining.fossilexcavator.GlacitePowderFeatures -import at.hannibal2.skyhanni.features.mining.fossilexcavator.ProfitPerExcavation -import at.hannibal2.skyhanni.features.mining.mineshaft.CorpseAPI -import at.hannibal2.skyhanni.features.mining.mineshaft.MineshaftCorpseProfitPer -import at.hannibal2.skyhanni.features.minion.InfernoMinionFeatures -import at.hannibal2.skyhanni.features.minion.MinionCollectLogic -import at.hannibal2.skyhanni.features.minion.MinionXp -import at.hannibal2.skyhanni.features.misc.AuctionHousePriceComparison -import at.hannibal2.skyhanni.features.misc.BetterSignEditing -import at.hannibal2.skyhanni.features.misc.BetterWikiFromMenus -import at.hannibal2.skyhanni.features.misc.BrewingStandOverlay -import at.hannibal2.skyhanni.features.misc.ButtonOnPause import at.hannibal2.skyhanni.features.misc.CollectionTracker -import at.hannibal2.skyhanni.features.misc.CurrentPetDisplay -import at.hannibal2.skyhanni.features.misc.CustomTextBox -import at.hannibal2.skyhanni.features.misc.ExpOrbsOnGroundHider -import at.hannibal2.skyhanni.features.misc.FixNEUHeavyPearls -import at.hannibal2.skyhanni.features.misc.HideArmor -import at.hannibal2.skyhanni.features.misc.HideFarEntities -import at.hannibal2.skyhanni.features.misc.InGameDateDisplay -import at.hannibal2.skyhanni.features.misc.JoinCrystalHollows -import at.hannibal2.skyhanni.features.misc.LesserOrbHider -import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager import at.hannibal2.skyhanni.features.misc.MovementSpeedDisplay -import at.hannibal2.skyhanni.features.misc.NonGodPotEffectDisplay -import at.hannibal2.skyhanni.features.misc.ParticleHider -import at.hannibal2.skyhanni.features.misc.PartyMemberOutlines -import at.hannibal2.skyhanni.features.misc.PatcherSendCoordinates -import at.hannibal2.skyhanni.features.misc.PetCandyUsedDisplay -import at.hannibal2.skyhanni.features.misc.PetExpTooltip -import at.hannibal2.skyhanni.features.misc.PetItemDisplay -import at.hannibal2.skyhanni.features.misc.PocketSackInASackDisplay -import at.hannibal2.skyhanni.features.misc.PrivateIslandNoPickaxeAbility -import at.hannibal2.skyhanni.features.misc.ReplaceRomanNumerals -import at.hannibal2.skyhanni.features.misc.RestorePieceOfWizardPortalLore -import at.hannibal2.skyhanni.features.misc.SkyBlockKickDuration -import at.hannibal2.skyhanni.features.misc.TabWidgetSettings -import at.hannibal2.skyhanni.features.misc.TimeFeatures -import at.hannibal2.skyhanni.features.misc.TpsCounter -import at.hannibal2.skyhanni.features.misc.items.EstimatedWardrobePrice -import at.hannibal2.skyhanni.features.misc.items.GlowingDroppedItems -import at.hannibal2.skyhanni.features.misc.teleportpad.TeleportPadCompactName -import at.hannibal2.skyhanni.features.misc.teleportpad.TeleportPadInventoryNumber -import at.hannibal2.skyhanni.features.nether.MatriarchHelper -import at.hannibal2.skyhanni.features.nether.PabloHelper -import at.hannibal2.skyhanni.features.nether.SulphurSkitterBox -import at.hannibal2.skyhanni.features.nether.VolcanoExplosivityDisplay -import at.hannibal2.skyhanni.features.nether.ashfang.AshfangBlazes -import at.hannibal2.skyhanni.features.nether.ashfang.AshfangBlazingSouls -import at.hannibal2.skyhanni.features.nether.ashfang.AshfangGravityOrbs -import at.hannibal2.skyhanni.features.nether.ashfang.AshfangHideDamageIndicator -import at.hannibal2.skyhanni.features.nether.ashfang.AshfangHideParticles -import at.hannibal2.skyhanni.features.nether.ashfang.AshfangNextResetCooldown import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputationHelper -import at.hannibal2.skyhanni.features.rift.area.colosseum.BlobbercystsHighlight -import at.hannibal2.skyhanni.features.rift.area.dreadfarm.RiftAgaricusCap -import at.hannibal2.skyhanni.features.rift.area.dreadfarm.RiftWiltedBerberisHelper -import at.hannibal2.skyhanni.features.rift.area.dreadfarm.VoltHighlighter -import at.hannibal2.skyhanni.features.rift.area.livingcave.LivingCaveDefenseBlocks -import at.hannibal2.skyhanni.features.rift.area.livingcave.LivingCaveLivingMetalHelper -import at.hannibal2.skyhanni.features.rift.area.livingcave.LivingMetalSuitProgress -import at.hannibal2.skyhanni.features.rift.area.mirrorverse.RiftLavaMazeParkour -import at.hannibal2.skyhanni.features.rift.area.mirrorverse.RiftUpsideDownParkour -import at.hannibal2.skyhanni.features.rift.area.mirrorverse.TubulatorParkour -import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminHighlighter -import at.hannibal2.skyhanni.features.rift.area.westvillage.kloon.KloonHacking -import at.hannibal2.skyhanni.features.rift.area.wyldwoods.RiftLarva -import at.hannibal2.skyhanni.features.rift.area.wyldwoods.RiftOdonata -import at.hannibal2.skyhanni.features.rift.area.wyldwoods.ShyCruxWarnings -import at.hannibal2.skyhanni.features.rift.everywhere.HighlightRiftGuide -import at.hannibal2.skyhanni.features.rift.everywhere.RiftHorsezookaHider -import at.hannibal2.skyhanni.features.rift.everywhere.RiftTimer -import at.hannibal2.skyhanni.features.rift.everywhere.motes.RiftMotesOrb -import at.hannibal2.skyhanni.features.rift.everywhere.motes.ShowMotesNpcSellPrice -import at.hannibal2.skyhanni.features.skillprogress.SkillTooltip -import at.hannibal2.skyhanni.features.slayer.HideMobNames -import at.hannibal2.skyhanni.features.slayer.SlayerBossSpawnSoon -import at.hannibal2.skyhanni.features.slayer.SlayerItemsOnGround -import at.hannibal2.skyhanni.features.slayer.SlayerMiniBossFeatures -import at.hannibal2.skyhanni.features.slayer.SlayerQuestWarning -import at.hannibal2.skyhanni.features.slayer.SlayerRngMeterDisplay -import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerClearView -import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerDaggerHelper -import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerFirePitsWarning -import at.hannibal2.skyhanni.features.slayer.blaze.FirePillarDisplay import at.hannibal2.skyhanni.features.slayer.blaze.HellionShieldHelper -import at.hannibal2.skyhanni.features.slayer.enderman.EndermanSlayerFeatures -import at.hannibal2.skyhanni.features.slayer.enderman.EndermanSlayerHideParticles -import at.hannibal2.skyhanni.features.stranded.HighlightPlaceableNpcs -import at.hannibal2.skyhanni.features.summonings.SummoningMobManager -import at.hannibal2.skyhanni.features.summonings.SummoningSoulsName import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper import at.hannibal2.skyhanni.skyhannimodule.LoadedModules -import at.hannibal2.skyhanni.test.HighlightMissingRepoItems -import at.hannibal2.skyhanni.test.ParkourWaypointSaver -import at.hannibal2.skyhanni.test.ShowItemUuid import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests -import at.hannibal2.skyhanni.test.TestShowSlotNumber import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.test.hotswap.HotswapSupport import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging @@ -316,7 +76,7 @@ import org.apache.logging.log4j.Logger clientSideOnly = true, useMetadata = true, guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop", - version = "0.26.Beta.7", + version = "0.26.Beta.6", ) class SkyHanniMod { @@ -330,289 +90,49 @@ class SkyHanniMod { LoadedModules.modules.forEach { loadModule(it) } // data - loadModule(PlayerChatManager()) - loadModule(PlayerNameFormatter()) loadModule(HypixelData()) loadModule(ScoreboardData()) - loadModule(SeaCreatureFeatures()) loadModule(SeaCreatureManager()) loadModule(MobData()) - loadModule(MobDetection()) - loadModule(ItemClickData()) // loadModule(Year300RaffleEvent) loadModule(TitleManager()) - loadModule(ItemTipHelper()) loadModule(RenderLivingEntityHelper()) loadModule(SkillExperience()) - loadModule(RenderData()) - loadModule(MovableHotBar()) - loadModule(VisitorListener()) - loadModule(VisitorRewardWarning()) - loadModule(OwnInventoryData()) - loadModule(HighlightVisitorsOutsideOfGarden()) loadModule(GuiEditManager()) - loadModule(GardenComposterUpgradesData()) loadModule(ActionBarStatsData) - loadModule(GardenCropMilestoneInventory()) - loadModule(GardenWarpCommands()) - loadModule(TitleData()) - loadModule(BlockData()) - loadModule(ItemAddManager()) - loadModule(BingoCardReader()) - loadModule(DeepCavernsGuide()) - loadModule(DungeonsRaceGuide()) loadModule(GardenBestCropTime()) - loadModule(FixedRateTimerManager()) loadModule(HotmData) // APIs loadModule(BazaarApi()) - loadModule(DataWatcherAPI()) // features loadModule(BazaarOrderHelper()) - loadModule(ChatFilter()) - loadModule(PlayerChatModifier()) - loadModule(DungeonChatFilter()) - loadModule(HideNotClickableItems()) - loadModule(CurrentPetDisplay()) - loadModule(HideFarEntities()) - loadModule(ExpOrbsOnGroundHider()) - loadModule(BetterWikiFromMenus()) loadModule(DamageIndicatorManager()) - loadModule(ItemAbilityCooldown()) - loadModule(DungeonHighlightClickedBlocks()) - loadModule(DungeonDeathCounter()) - loadModule(DungeonCleanEnd()) - loadModule(TunnelsMaps()) - loadModule(DungeonBossMessages()) - loadModule(DungeonBossHideDamageSplash()) - loadModule(TrophyFishFillet()) - loadModule(TrophyFishMessages()) - loadModule(GeyserFishing()) - loadModule(BazaarBestSellMethod()) - loadModule(ShiftClickBrewing()) - loadModule(BazaarOpenPriceWebsite()) - loadModule(AuctionHouseCopyUnderbidPrice()) - loadModule(AuctionHouseOpenPriceWebsite()) - loadModule(AnvilCombineHelper()) - loadModule(SeaCreatureMessageShortener()) - loadModule(AshfangNextResetCooldown()) - loadModule(CrystalHollowsWalls()) - loadModule(SummoningSoulsName()) - loadModule(AshfangGravityOrbs()) - loadModule(AshfangBlazingSouls()) - loadModule(AshfangBlazes()) - loadModule(AshfangHideParticles()) - loadModule(AshfangHideDamageIndicator()) - loadModule(ItemStars()) - loadModule(TimeFeatures()) - loadModule(RngMeterInventory()) - loadModule(SendCoordinatedCommand()) - loadModule(WarpIsCommand()) - loadModule(SummoningMobManager()) - loadModule(SkyblockXPInChat()) - loadModule(AreaMiniBossFeatures()) - loadModule(MobHighlight()) - loadModule(ChocolateFactoryShortcut()) - loadModule(SpawnTimers()) - loadModule(MarkedPlayerManager) - loadModule(SlayerMiniBossFeatures()) - loadModule(PlayerDeathMessages()) - loadModule(HighlightDungeonDeathmite()) - loadModule(DungeonHideItems()) - loadModule(DungeonCopilot()) - loadModule(DungeonArchitectFeatures()) - loadModule(EndermanSlayerFeatures()) - loadModule(FireVeilWandParticles()) - loadModule(HideMobNames()) - loadModule(HideDamageSplash()) - loadModule(FerocityDisplay()) - loadModule(InGameDateDisplay()) - loadModule(ThunderSparksHighlight()) - loadModule(BlazeSlayerDaggerHelper()) loadModule(HellionShieldHelper()) - loadModule(BlazeSlayerFirePitsWarning()) - loadModule(BlazeSlayerClearView()) - loadModule(FirePillarDisplay()) - loadModule(EndermanSlayerHideParticles()) loadModule(PlayerChatFilter()) - loadModule(HideArmor()) - loadModule(SlayerQuestWarning()) - loadModule(StatsTuning()) - loadModule(NonGodPotEffectDisplay()) - loadModule(SoopyGuessBurrow()) - loadModule(HotmFeatures()) - loadModule(DianaFixChat()) - loadModule(HighlightJerries()) - loadModule(TheGreatSpook()) loadModule(BurrowWarpHelper()) loadModule(CollectionTracker()) - loadModule(BazaarCancelledBuyOrderClipboard()) - loadModule(CompactSplashPotionMessage()) loadModule(CroesusChestTracker()) - loadModule(CompactBingoChat()) - loadModule(BrewingStandOverlay()) - loadModule(FishingTimer()) - loadModule(MatriarchHelper()) - loadModule(LesserOrbHider()) - loadModule(FishingHookDisplay()) loadModule(CrimsonIsleReputationHelper(this)) loadModule(SkyblockGuideHighlightFeature) - loadModule(SharkFishCounter()) - loadModule(PowerStoneGuideFeatures()) - loadModule(OdgerWaypoint()) - loadModule(TiaRelayHelper()) - loadModule(TiaRelayWaypoints()) - loadModule(BasketWaypoints()) - loadModule(EasterEggWaypoints()) loadModule(BingoCardDisplay()) loadModule(BingoNextStepHelper()) - loadModule(MinionCraftHelper()) - loadModule(TpsCounter()) - loadModule(ParticleHider()) - loadModule(ReplaceRomanNumerals()) - loadModule(GardenPlotMenuHighlighting()) loadModule(SkyMartCopperPrice()) - loadModule(GardenVisitorSupercraft()) - loadModule(GardenInventoryNumbers()) - loadModule(GardenVisitorTimer()) - loadModule(MinionXp()) - loadModule(GardenNextPlotPrice()) - loadModule(ChickenHeadTimer()) - loadModule(ExcavatorProfitTracker()) - loadModule(ProfitPerExcavation()) - loadModule(GlacitePowderFeatures()) - loadModule(MineshaftCorpseProfitPer()) - loadModule(CorpseAPI()) - loadModule(GardenOptimalSpeed()) - loadModule(GardenLevelDisplay()) loadModule(FarmingWeightDisplay()) - loadModule(PrivateIslandNoPickaxeAbility()) - loadModule(JacobFarmingContestsInventory()) - loadModule(WrongFungiCutterWarning()) - loadModule(JoinCrystalHollows()) - loadModule(CrystalHollowsNamesInCore()) - loadModule(TeleportPadCompactName()) loadModule(AnitaMedalProfit()) - loadModule(AtmosphericFilterDisplay()) - loadModule(AnitaExtraFarmingFortune()) - loadModule(ComposterDisplay()) - loadModule(GardenComposterInventoryFeatures()) - loadModule(MinionCollectLogic()) - loadModule(BetterSignEditing()) - loadModule(PatcherSendCoordinates()) - loadModule(PetItemDisplay()) - loadModule(EstimatedWardrobePrice()) - loadModule(ComposterInventoryNumbers()) - loadModule(ToolTooltipTweaks()) loadModule(CropSpeedMeter()) - loadModule(AshfangMinisNametagHider()) - loadModule(TeleportPadInventoryNumber()) - loadModule(GardenCropMilestoneFix()) - loadModule(GardenBurrowingSporesNotifier()) - loadModule(WildStrawberryDyeNotification()) - loadModule(JacobContestFFNeededDisplay()) - loadModule(JacobContestTimeNeeded()) - loadModule(JacobContestStatsSummary()) - loadModule(GardenYawAndPitch()) loadModule(MovementSpeedDisplay()) - loadModule(ChumBucketHider()) - loadModule(BingoCardTips()) - loadModule(PetCandyUsedDisplay()) loadModule(CityProjectFeatures()) - loadModule(LogBookStats()) - loadModule(PocketSackInASackDisplay()) - loadModule(ShowFishingItemName()) - loadModule(SlayerItemsOnGround()) - loadModule(RestorePieceOfWizardPortalLore()) - loadModule(ArachneChatMessageHider()) - loadModule(ShowItemUuid()) - loadModule(SlayerRngMeterDisplay()) - loadModule(RiftTimer()) - loadModule(HighlightRiftGuide()) - loadModule(ShyCruxWarnings()) - loadModule(RiftLarva()) - loadModule(VoltHighlighter()) - loadModule(RiftOdonata()) - loadModule(RiftAgaricusCap()) - loadModule(KloonHacking()) - loadModule(TubulatorParkour()) - loadModule(CustomTextBox()) - loadModule(RiftUpsideDownParkour()) - loadModule(RiftLavaMazeParkour()) - loadModule(HighlightMiningCommissionMobs()) - loadModule(ShowMotesNpcSellPrice()) - loadModule(LivingMetalSuitProgress()) - loadModule(BlobbercystsHighlight()) - loadModule(LivingCaveDefenseBlocks()) - loadModule(LivingCaveLivingMetalHelper()) - loadModule(RiftMotesOrb()) - loadModule(ChestValue()) - loadModule(SlayerBossSpawnSoon()) - loadModule(RiftWiltedBerberisHelper()) - loadModule(RiftHorsezookaHider()) - loadModule(GriffinPetWarning()) loadModule(KingTalismanHelper()) - loadModule(CompactBestiaryChatMessage()) loadModule(WatchdogHider()) - loadModule(AuctionHousePriceComparison()) loadModule(AccountUpgradeReminder()) - loadModule(PetExpTooltip()) loadModule(Translator()) - loadModule(CosmeticFollowingLine()) - loadModule(SuperpairsClicksAlert()) - loadModule(GlowingDroppedItems()) - loadModule(DungeonTeammateOutlines()) - loadModule(DungeonRankTabListColor()) - loadModule(TerracottaPhase()) - loadModule(VolcanoExplosivityDisplay()) - loadModule(FixNEUHeavyPearls()) - loadModule(QuickCraftFeatures()) - loadModule(SkyBlockKickDuration()) - loadModule(PartyMemberOutlines()) - loadModule(ArrowTrail()) - loadModule(ShiftClickEquipment()) - loadModule(DungeonFinderFeatures()) - loadModule(GoldenGoblinHighlight()) - loadModule(TabWidgetSettings()) - loadModule(PabloHelper()) - loadModule(FishingBaitWarnings()) loadModule(CustomScoreboard()) - loadModule(PestSpawn()) - loadModule(PestParticleWaypoint()) - loadModule(StereoHarmonyDisplay()) - loadModule(PestParticleLine()) - loadModule(SprayFeatures()) - loadModule(DojoRankDisplay()) - loadModule(SprayDisplay()) - loadModule(HighlightPlaceableNpcs()) - loadModule(PresentWaypoints()) loadModule(MiningEventTracker()) - loadModule(JyrreTimer()) - loadModule(TotemOfCorruption()) - loadModule(NewYearCakeReminder()) - loadModule(SulphurSkitterBox()) - loadModule(HighlightInquisitors()) - loadModule(VerminHighlighter()) - loadModule(GardenInventoryTooltipOverflow()) - loadModule(SkillTooltip()) - loadModule(MaxPurseItems()) - loadModule(InfernoMinionFeatures()) - loadModule(RareDropMessages()) - loadModule(CraftMaterialsFromBazaar()) - loadModule(DungeonShadowAssassinNotification()) - loadModule(ColdOverlay()) - loadModule(QuiverDisplay()) - loadModule(QuiverWarning()) // test stuff loadModule(SkyHanniDebugsAndTests()) - loadModule(ButtonOnPause()) - loadModule(HighlightMissingRepoItems()) - loadModule(ParkourWaypointSaver()) - loadModule(TestShowSlotNumber()) - loadModule(MobDebug()) Commands.init() diff --git a/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt index 4eb107554..94931dd8c 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt @@ -2,9 +2,11 @@ package at.hannibal2.skyhanni.api import at.hannibal2.skyhanni.events.DataWatcherUpdatedEvent import at.hannibal2.skyhanni.events.EntityCustomNameUpdateEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class DataWatcherAPI { +@SkyHanniModule +object DataWatcherAPI { private val DATA_VALUE_CUSTOM_NAME = 2 diff --git a/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt b/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt index 32a2ee17d..3d767b505 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt @@ -2,12 +2,14 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.ServerBlockChangeEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import net.minecraft.network.play.server.S22PacketMultiBlockChange import net.minecraft.network.play.server.S23PacketBlockChange import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class BlockData { +@SkyHanniModule +object BlockData { @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true) fun onBlockReceivePacket(event: PacketEvent.ReceiveEvent) { @@ -25,4 +27,4 @@ class BlockData { } } } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt b/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt index a0125d35e..4d825b2e9 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt @@ -1,11 +1,13 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.SecondPassedEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.client.Minecraft import kotlin.concurrent.fixedRateTimer -class FixedRateTimerManager { +@SkyHanniModule +object FixedRateTimerManager { private var totalSeconds = 0 init { diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt index 19943ad05..18093b880 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt @@ -4,12 +4,14 @@ import at.hannibal2.skyhanni.data.model.ComposterUpgrade import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.features.garden.composter.ComposterAPI +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class GardenComposterUpgradesData { +@SkyHanniModule +object GardenComposterUpgradesData { @SubscribeEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt index 7025e1710..fbac6d716 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt @@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.SackChangeEvent import at.hannibal2.skyhanni.events.entity.ItemAddInInventoryEvent import at.hannibal2.skyhanni.features.inventory.SuperCraftFeatures.craftedPattern +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName @@ -19,7 +20,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds -class ItemAddManager { +@SkyHanniModule +object ItemAddManager { enum class Source { ITEM_ADD, SACKS, diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt index acd331cc8..a5f8091e4 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.events.BlockClickEvent import at.hannibal2.skyhanni.events.EntityClickEvent import at.hannibal2.skyhanni.events.ItemClickEvent import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.toLorenzVec import net.minecraft.client.Minecraft @@ -13,7 +14,8 @@ import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement import net.minecraft.network.play.client.C0APacketAnimation import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class ItemClickData { +@SkyHanniModule +object ItemClickData { @SubscribeEvent fun onItemClickSend(event: PacketEvent.SendEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt index 22d299f17..fbbd78e13 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt @@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.events.GuiRenderItemEvent import at.hannibal2.skyhanni.events.RenderInventoryItemTipEvent import at.hannibal2.skyhanni.events.RenderItemTipEvent import at.hannibal2.skyhanni.mixins.transformers.gui.AccessorGuiContainer +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName import at.hannibal2.skyhanni.utils.LorenzUtils @@ -16,7 +17,8 @@ import net.minecraft.inventory.ContainerChest import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class ItemTipHelper { +@SkyHanniModule +object ItemTipHelper { @SubscribeEvent fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) { @@ -75,4 +77,4 @@ class ItemTipHelper { GlStateManager.enableLighting() GlStateManager.enableDepth() } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt index 2759f82b9..900f87550 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt @@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.entity.ItemAddInInventoryEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut import at.hannibal2.skyhanni.utils.DelayedRun import at.hannibal2.skyhanni.utils.InventoryUtils @@ -28,7 +29,8 @@ import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds -class OwnInventoryData { +@SkyHanniModule +object OwnInventoryData { private var itemAmounts = mapOf() private var dirty = false diff --git a/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt index f8e8f37da..0aae78357 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt @@ -5,6 +5,7 @@ import at.hannibal2.skyhanni.config.features.chroma.ChromaConfig import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests import at.hannibal2.skyhanni.utils.ConfigUtils import net.minecraft.client.Minecraft @@ -16,7 +17,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class RenderData { +@SkyHanniModule +object RenderData { @SubscribeEvent fun onRenderOverlay(event: RenderGameOverlayEvent.Pre) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt index fe776c8d0..91203cbca 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt @@ -2,10 +2,12 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.TitleReceivedEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import net.minecraft.network.play.server.S45PacketTitle import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class TitleData { +@SkyHanniModule +object TitleData { @SubscribeEvent fun onReceiveCurrentShield(event: PacketEvent.ReceiveEvent) { @@ -18,4 +20,4 @@ class TitleData { event.isCanceled = true } } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt index 023589e0f..f8f8b4523 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt @@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.data.hypixel.chat.event.PlayerShowItemChatEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.PrivateMessageChatEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.SystemMessageEvent import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ComponentMatcher import at.hannibal2.skyhanni.utils.ComponentMatcherUtils.intoSpan import at.hannibal2.skyhanni.utils.ComponentMatcherUtils.matchStyledMatcher @@ -23,7 +24,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent /** * Reading normal chat events, and splitting them up into many different player chat events, with all available extra information */ -class PlayerChatManager { +@SkyHanniModule +object PlayerChatManager { private val patternGroup = RepoPattern.group("data.chat.player") diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt index b617fd118..94bc665b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt @@ -13,6 +13,7 @@ import at.hannibal2.skyhanni.features.bingo.BingoAPI import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFilter import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager import at.hannibal2.skyhanni.features.misc.compacttablist.AdvancedPlayerList +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils.changeColor import at.hannibal2.skyhanni.utils.ComponentMatcherUtils.matchStyledMatcher import at.hannibal2.skyhanni.utils.ComponentSpan @@ -34,7 +35,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent * Listening to the player chat events, and applying custom chat options to them. * E.g. part order, rank hider, etc */ -class PlayerNameFormatter { +@SkyHanniModule +object PlayerNameFormatter { private val config get() = SkyHanniMod.feature.chat.playerMessage private val patternGroup = RepoPattern.group("data.chat.player.name") diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt index bb9eb7ac0..03f6d64b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.features.dev.DebugMobConfig.HowToShow import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.events.MobEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand.getMobInfo import at.hannibal2.skyhanni.utils.LocationUtils.getTopCenter import at.hannibal2.skyhanni.utils.LorenzColor @@ -16,7 +17,8 @@ import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityPlayerSP import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class MobDebug { +@SkyHanniModule +object MobDebug { private val config get() = SkyHanniMod.feature.dev.mobDebug.mobDetection diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt index f85e63420..9a1ec8672 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt @@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.MobEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.CollectionUtils.drainForEach import at.hannibal2.skyhanni.utils.CollectionUtils.drainTo import at.hannibal2.skyhanni.utils.CollectionUtils.put @@ -35,9 +36,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicBoolean -private const val MAX_RETRIES = 20 * 5 -class MobDetection { +@SkyHanniModule +object MobDetection { /* Unsupported "Mobs" Nicked Players @@ -53,6 +54,8 @@ class MobDetection { Zee */ + private const val MAX_RETRIES = 20 * 5 + private val forceReset get() = !SkyHanniMod.feature.dev.mobDebug.enable private var shouldClear: AtomicBoolean = AtomicBoolean(false) diff --git a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt index 9e9992ab1..625ded34f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.anvil import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName import at.hannibal2.skyhanni.utils.InventoryUtils.getLowerItems import at.hannibal2.skyhanni.utils.InventoryUtils.getUpperItems @@ -13,7 +14,8 @@ import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.inventory.ContainerChest import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class AnvilCombineHelper { +@SkyHanniModule +object AnvilCombineHelper { @SubscribeEvent fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { 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 a6a773bda..39f069771 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher @@ -9,7 +10,8 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -class CompactBingoChat { +@SkyHanniModule +object CompactBingoChat { private val config get() = SkyHanniMod.feature.event.bingo.compactChat diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/M