From 4ef946f824817e91bdf9c2e0ae4f201e5c669f63 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:16:51 +1000 Subject: Backend: Convert existing objects to use the annotation and add the plugin (#1974) Co-authored-by: ThatGravyBoat --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 376 +-------------------- .../at/hannibal2/skyhanni/api/CollectionAPI.kt | 2 + .../at/hannibal2/skyhanni/api/GetFromSackAPI.kt | 2 + .../java/at/hannibal2/skyhanni/api/SkillAPI.kt | 2 + .../at/hannibal2/skyhanni/data/ActionBarData.kt | 2 + .../java/at/hannibal2/skyhanni/data/BitsAPI.kt | 2 + .../java/at/hannibal2/skyhanni/data/BossbarData.kt | 2 + .../hannibal2/skyhanni/data/CropAccessoryData.kt | 2 + .../hannibal2/skyhanni/data/EntityMovementData.kt | 2 + .../at/hannibal2/skyhanni/data/EventCounter.kt | 2 + .../java/at/hannibal2/skyhanni/data/FameRanks.kt | 2 + .../java/at/hannibal2/skyhanni/data/FriendAPI.kt | 2 + .../skyhanni/data/GardenCropMilestones.kt | 2 + .../data/GardenCropMilestonesCommunityFix.kt | 2 + .../hannibal2/skyhanni/data/GardenCropUpgrades.kt | 2 + .../java/at/hannibal2/skyhanni/data/GuiData.kt | 2 + .../java/at/hannibal2/skyhanni/data/GuildAPI.kt | 2 + .../skyhanni/data/HighlightOnHoverSlot.kt | 2 + .../at/hannibal2/skyhanni/data/LocationFixData.kt | 2 + .../java/at/hannibal2/skyhanni/data/MaxwellAPI.kt | 2 + .../java/at/hannibal2/skyhanni/data/MayorAPI.kt | 2 + .../at/hannibal2/skyhanni/data/MinecraftData.kt | 2 + .../java/at/hannibal2/skyhanni/data/MiningAPI.kt | 2 + .../hannibal2/skyhanni/data/OtherInventoryData.kt | 2 + .../java/at/hannibal2/skyhanni/data/PartyAPI.kt | 2 + src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt | 2 + .../hannibal2/skyhanni/data/ProfileStorageData.kt | 2 + .../java/at/hannibal2/skyhanni/data/PurseAPI.kt | 2 + .../java/at/hannibal2/skyhanni/data/QuiverAPI.kt | 3 +- .../java/at/hannibal2/skyhanni/data/SackAPI.kt | 2 + .../java/at/hannibal2/skyhanni/data/ScreenData.kt | 2 + .../java/at/hannibal2/skyhanni/data/SlayerAPI.kt | 2 + .../at/hannibal2/skyhanni/data/TrackerManager.kt | 2 + .../skyhanni/data/bazaar/HypixelBazaarFetcher.kt | 2 + .../at/hannibal2/skyhanni/data/model/TabWidget.kt | 2 + .../hannibal2/skyhanni/features/bingo/BingoAPI.kt | 2 + .../skyhanni/features/chroma/ChromaManager.kt | 2 + .../skyhanni/features/combat/BestiaryData.kt | 2 + .../skyhanni/features/combat/FlareDisplay.kt | 2 + .../combat/endernodetracker/EnderNodeTracker.kt | 2 + .../features/combat/ghostcounter/GhostCounter.kt | 2 + .../features/commands/PartyChatCommands.kt | 2 + .../skyhanni/features/commands/PartyCommands.kt | 2 + .../features/commands/ViewRecipeCommand.kt | 2 + .../skyhanni/features/commands/WikiManager.kt | 2 + .../commands/tabcomplete/PlayerTabComplete.kt | 2 + .../features/commands/tabcomplete/TabComplete.kt | 2 + .../commands/tabcomplete/WarpTabComplete.kt | 2 + .../skyhanni/features/dungeon/DungeonAPI.kt | 2 + .../features/dungeon/DungeonLividFinder.kt | 2 + .../features/dungeon/DungeonMilestonesDisplay.kt | 2 + .../event/UniqueGiftingOpportunitiesFeatures.kt | 2 + .../features/event/diana/AllBurrowsList.kt | 2 + .../skyhanni/features/event/diana/DianaAPI.kt | 2 + .../features/event/diana/DianaProfitTracker.kt | 2 + .../features/event/diana/GriffinBurrowHelper.kt | 2 + .../event/diana/GriffinBurrowParticleFinder.kt | 2 + .../event/diana/InquisitorWaypointShare.kt | 2 + .../event/diana/MythologicalCreatureTracker.kt | 2 + .../event/hoppity/HoppityCollectionData.kt | 4 +- .../event/hoppity/HoppityCollectionStats.kt | 2 + .../event/hoppity/HoppityEggDisplayManager.kt | 2 + .../features/event/hoppity/HoppityEggLocator.kt | 2 + .../features/event/hoppity/HoppityEggsManager.kt | 2 + .../features/event/hoppity/HoppityEggsShared.kt | 2 + .../skyhanni/features/event/hoppity/HoppityNpc.kt | 2 + .../jerry/frozentreasure/FrozenTreasureTracker.kt | 2 + .../features/event/winter/UniqueGiftCounter.kt | 4 +- .../skyhanni/features/fishing/FishingAPI.kt | 2 + .../features/fishing/IsFishingDetection.kt | 2 + .../fishing/tracker/FishingProfitTracker.kt | 2 + .../features/fishing/tracker/SeaCreatureTracker.kt | 5 +- .../features/fishing/trophy/TrophyFishDisplay.kt | 2 + .../features/fishing/trophy/TrophyFishManager.kt | 2 + .../features/garden/FarmingFortuneDisplay.kt | 2 + .../skyhanni/features/garden/GardenAPI.kt | 2 + .../features/garden/GardenNextJacobContest.kt | 3 +- .../skyhanni/features/garden/GardenPlotAPI.kt | 2 + .../skyhanni/features/garden/GardenPlotBorders.kt | 2 + .../skyhanni/features/garden/SensitivityReducer.kt | 2 + .../features/garden/composter/ComposterOverlay.kt | 2 + .../features/garden/contest/FarmingContestAPI.kt | 2 + .../features/garden/farming/ArmorDropTracker.kt | 2 + .../features/garden/farming/CropMoneyDisplay.kt | 2 + .../features/garden/farming/DicerRngDropTracker.kt | 2 + .../garden/farming/GardenCropMilestoneDisplay.kt | 2 + .../features/garden/farming/GardenCropSpeed.kt | 2 + .../garden/farming/GardenCustomKeybinds.kt | 2 + .../features/garden/farming/GardenStartLocation.kt | 2 + .../features/garden/farming/lane/FarmingLaneAPI.kt | 2 + .../garden/farming/lane/FarmingLaneCreator.kt | 2 + .../garden/farming/lane/FarmingLaneFeatures.kt | 2 + .../garden/fortuneguide/CaptureFarmingGear.kt | 2 + .../garden/inventory/plots/GardenPlotIcon.kt | 2 + .../skyhanni/features/garden/pests/PestAPI.kt | 2 + .../skyhanni/features/garden/pests/PestFinder.kt | 2 + .../features/garden/pests/PestProfitTracker.kt | 2 + .../features/garden/pests/PestSpawnTimer.kt | 2 + .../garden/visitor/GardenVisitorColorNames.kt | 2 + .../garden/visitor/GardenVisitorDropStatistics.kt | 2 + .../garden/visitor/GardenVisitorFeatures.kt | 4 +- .../features/garden/visitor/NPCVisitorFix.kt | 2 + .../skyhanni/features/garden/visitor/VisitorAPI.kt | 2 + .../gui/customscoreboard/ScoreboardPattern.kt | 2 + .../features/inventory/AuctionOutbidWarning.kt | 2 + .../features/inventory/AuctionsHighlighter.kt | 2 + .../skyhanni/features/inventory/HarpFeatures.kt | 2 + .../skyhanni/features/inventory/HeldTimeInLore.kt | 2 + .../features/inventory/HighlightBonzoMasks.kt | 2 + .../inventory/ItemDisplayOverlayFeatures.kt | 2 + .../skyhanni/features/inventory/SackDisplay.kt | 2 + .../features/inventory/ShiftClickNPCSell.kt | 2 + .../features/inventory/SuperCraftFeatures.kt | 2 + .../features/inventory/UltraRareBookAlert.kt | 2 + .../chocolatefactory/ChocolateFactoryAPI.kt | 2 + .../ChocolateFactoryBarnManager.kt | 2 + .../ChocolateFactoryCustomReminder.kt | 2 + .../chocolatefactory/ChocolateFactoryDataLoader.kt | 2 + .../chocolatefactory/ChocolateFactoryInventory.kt | 2 + .../chocolatefactory/ChocolateFactoryKeybinds.kt | 2 + .../chocolatefactory/ChocolateFactoryStats.kt | 2 + .../ChocolateFactoryTimeTowerManager.kt | 2 + .../chocolatefactory/ChocolateFactoryTooltip.kt | 2 + .../ChocolateFactoryTooltipCompact.kt | 2 + .../ChocolateFactoryUpgradeWarning.kt | 2 + .../chocolatefactory/ChocolateShopPrice.kt | 2 + .../mining/MiningCommissionsBlocksColor.kt | 2 + .../features/mining/MiningNotifications.kt | 2 + .../mining/eventtracker/MiningEventDisplay.kt | 2 + .../mining/fossilexcavator/FossilExcavatorAPI.kt | 2 + .../fossilexcavator/solver/FossilSolverDisplay.kt | 2 + .../mining/glacitemineshaft/CorpseLocator.kt | 2 + .../mining/glacitemineshaft/MineshaftWaypoints.kt | 2 + .../features/mining/powdertracker/PowderTracker.kt | 2 + .../skyhanni/features/minion/MinionFeatures.kt | 2 + .../skyhanni/features/misc/ContributorManager.kt | 2 + .../skyhanni/features/misc/CopyPlaytime.kt | 2 + .../skyhanni/features/misc/FixGhostEntities.kt | 2 + .../skyhanni/features/misc/InWaterDisplay.kt | 2 + .../skyhanni/features/misc/LockMouseLook.kt | 2 + .../skyhanni/features/misc/MiscFeatures.kt | 2 + .../skyhanni/features/misc/NoBitsWarning.kt | 2 + .../skyhanni/features/misc/QuickModMenuSwitch.kt | 2 + .../skyhanni/features/misc/ServerRestartTitle.kt | 2 + .../misc/compacttablist/AdvancedPlayerList.kt | 2 + .../features/misc/compacttablist/TabListReader.kt | 2 + .../misc/compacttablist/TabListRenderer.kt | 2 + .../features/misc/discordrpc/DiscordRPCManager.kt | 2 + .../features/misc/items/EstimatedItemValue.kt | 2 + .../features/misc/items/enchants/EnchantParser.kt | 2 + .../skyhanni/features/misc/limbo/LimboPlaytime.kt | 2 + .../features/misc/limbo/LimboTimeTracker.kt | 2 + .../massconfiguration/DefaultConfigFeatures.kt | 2 + .../features/misc/trevor/TrevorFeatures.kt | 8 +- .../skyhanni/features/misc/trevor/TrevorTracker.kt | 4 +- .../skyhanni/features/misc/update/UpdateManager.kt | 2 + .../features/misc/visualwords/ModifyVisualWords.kt | 2 + .../nether/ashfang/AshfangFreezeCooldown.kt | 2 + .../skyhanni/features/nether/kuudra/KuudraAPI.kt | 2 + .../rift/area/mirrorverse/DanceRoomHelper.kt | 2 + .../area/stillgorechateau/RiftBloodEffigies.kt | 2 + .../rift/area/westvillage/VerminTracker.kt | 2 + .../rift/everywhere/CruxTalismanDisplay.kt | 2 + .../rift/everywhere/EnigmaSoulWaypoints.kt | 2 + .../features/skillprogress/SkillProgress.kt | 2 + .../features/slayer/SlayerProfitTracker.kt | 2 + .../features/slayer/VampireSlayerFeatures.kt | 2 + .../java/at/hannibal2/skyhanni/test/PacketTest.kt | 2 + .../skyhanni/test/TestCopyBestiaryValues.kt | 2 + .../skyhanni/test/TestCopyRngMeterValues.kt | 2 + .../at/hannibal2/skyhanni/test/TestExportTools.kt | 2 + .../java/at/hannibal2/skyhanni/test/WorldEdit.kt | 2 + .../skyhanni/test/command/TrackParticlesCommand.kt | 2 + .../skyhanni/test/command/TrackSoundsCommand.kt | 2 + .../java/at/hannibal2/skyhanni/utils/ChatUtils.kt | 2 + .../skyhanni/utils/EntityOutlineRenderer.kt | 2 + .../at/hannibal2/skyhanni/utils/EntityUtils.kt | 2 + .../at/hannibal2/skyhanni/utils/KeyboardManager.kt | 2 + .../java/at/hannibal2/skyhanni/utils/NEUItems.kt | 2 + .../at/hannibal2/skyhanni/utils/TabListData.kt | 2 + .../at/hannibal2/skyhanni/utils/UtilsPatterns.kt | 2 + .../utils/renderables/RenderableTooltips.kt | 2 + .../utils/repopatterns/RepoPatternManager.kt | 4 +- 183 files changed, 373 insertions(+), 388 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 561d34710..08cea8784 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -1,60 +1,28 @@ package at.hannibal2.skyhanni -import at.hannibal2.skyhanni.api.CollectionAPI import at.hannibal2.skyhanni.api.DataWatcherAPI -import at.hannibal2.skyhanni.api.GetFromSackAPI -import at.hannibal2.skyhanni.api.SkillAPI 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.ActionBarData import at.hannibal2.skyhanni.data.ActionBarStatsData -import at.hannibal2.skyhanni.data.BitsAPI import at.hannibal2.skyhanni.data.BlockData -import at.hannibal2.skyhanni.data.BossbarData -import at.hannibal2.skyhanni.data.CropAccessoryData -import at.hannibal2.skyhanni.data.EntityMovementData -import at.hannibal2.skyhanni.data.EventCounter -import at.hannibal2.skyhanni.data.FameRanks import at.hannibal2.skyhanni.data.FixedRateTimerManager -import at.hannibal2.skyhanni.data.FriendAPI import at.hannibal2.skyhanni.data.GardenComposterUpgradesData -import at.hannibal2.skyhanni.data.GardenCropMilestones -import at.hannibal2.skyhanni.data.GardenCropMilestonesCommunityFix -import at.hannibal2.skyhanni.data.GardenCropUpgrades -import at.hannibal2.skyhanni.data.GuiData import at.hannibal2.skyhanni.data.GuiEditManager -import at.hannibal2.skyhanni.data.GuildAPI -import at.hannibal2.skyhanni.data.HighlightOnHoverSlot 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.LocationFixData -import at.hannibal2.skyhanni.data.MaxwellAPI -import at.hannibal2.skyhanni.data.MayorAPI -import at.hannibal2.skyhanni.data.MinecraftData -import at.hannibal2.skyhanni.data.MiningAPI import at.hannibal2.skyhanni.data.OtherInventoryData import at.hannibal2.skyhanni.data.OwnInventoryData -import at.hannibal2.skyhanni.data.PartyAPI -import at.hannibal2.skyhanni.data.PetAPI -import at.hannibal2.skyhanni.data.ProfileStorageData -import at.hannibal2.skyhanni.data.PurseAPI -import at.hannibal2.skyhanni.data.QuiverAPI import at.hannibal2.skyhanni.data.RenderData -import at.hannibal2.skyhanni.data.SackAPI import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.data.ScreenData import at.hannibal2.skyhanni.data.SkillExperience -import at.hannibal2.skyhanni.data.SlayerAPI import at.hannibal2.skyhanni.data.TitleData import at.hannibal2.skyhanni.data.TitleManager -import at.hannibal2.skyhanni.data.TrackerManager -import at.hannibal2.skyhanni.data.bazaar.HypixelBazaarFetcher import at.hannibal2.skyhanni.data.hypixel.chat.PlayerChatManager import at.hannibal2.skyhanni.data.hypixel.chat.PlayerNameFormatter import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson @@ -64,12 +32,10 @@ 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.model.TabWidget 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.BingoAPI import at.hannibal2.skyhanni.features.bingo.CompactBingoChat import at.hannibal2.skyhanni.features.bingo.MinionCraftHelper import at.hannibal2.skyhanni.features.bingo.card.BingoCardDisplay @@ -87,32 +53,18 @@ 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.chroma.ChromaManager -import at.hannibal2.skyhanni.features.combat.BestiaryData import at.hannibal2.skyhanni.features.combat.FerocityDisplay -import at.hannibal2.skyhanni.features.combat.FlareDisplay import at.hannibal2.skyhanni.features.combat.HideDamageSplash import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager -import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker -import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostCounter 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.PartyChatCommands -import at.hannibal2.skyhanni.features.commands.PartyCommands import at.hannibal2.skyhanni.features.commands.SendCoordinatedCommand -import at.hannibal2.skyhanni.features.commands.ViewRecipeCommand import at.hannibal2.skyhanni.features.commands.WarpIsCommand -import at.hannibal2.skyhanni.features.commands.WikiManager -import at.hannibal2.skyhanni.features.commands.tabcomplete.GetFromSacksTabComplete -import at.hannibal2.skyhanni.features.commands.tabcomplete.PlayerTabComplete -import at.hannibal2.skyhanni.features.commands.tabcomplete.TabComplete -import at.hannibal2.skyhanni.features.commands.tabcomplete.WarpTabComplete 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.DungeonAPI import at.hannibal2.skyhanni.features.dungeon.DungeonArchitectFeatures import at.hannibal2.skyhanni.features.dungeon.DungeonBossHideDamageSplash import at.hannibal2.skyhanni.features.dungeon.DungeonBossMessages @@ -123,51 +75,30 @@ 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.DungeonLividFinder -import at.hannibal2.skyhanni.features.dungeon.DungeonMilestonesDisplay 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.UniqueGiftingOpportunitiesFeatures -import at.hannibal2.skyhanni.features.event.diana.AllBurrowsList import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper -import at.hannibal2.skyhanni.features.event.diana.DianaAPI import at.hannibal2.skyhanni.features.event.diana.DianaFixChat -import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker -import at.hannibal2.skyhanni.features.event.diana.GriffinBurrowHelper -import at.hannibal2.skyhanni.features.event.diana.GriffinBurrowParticleFinder import at.hannibal2.skyhanni.features.event.diana.GriffinPetWarning import at.hannibal2.skyhanni.features.event.diana.HighlightInquisitors -import at.hannibal2.skyhanni.features.event.diana.InquisitorWaypointShare -import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker import at.hannibal2.skyhanni.features.event.diana.SoopyGuessBurrow -import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionData -import at.hannibal2.skyhanni.features.event.hoppity.HoppityCollectionStats -import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggDisplayManager -import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggLocator -import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager -import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsShared -import at.hannibal2.skyhanni.features.event.hoppity.HoppityNpc import at.hannibal2.skyhanni.features.event.jerry.HighlightJerries -import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker 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.event.winter.UniqueGiftCounter 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.FishingAPI 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.IsFishingDetection import at.hannibal2.skyhanni.features.fishing.SeaCreatureFeatures import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener @@ -175,54 +106,31 @@ 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.tracker.FishingProfitTracker -import at.hannibal2.skyhanni.features.fishing.tracker.SeaCreatureTracker import at.hannibal2.skyhanni.features.fishing.trophy.GeyserFishing import at.hannibal2.skyhanni.features.fishing.trophy.OdgerWaypoint -import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishDisplay import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishFillet -import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager 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.FarmingFortuneDisplay -import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.features.garden.GardenCropMilestoneFix import at.hannibal2.skyhanni.features.garden.GardenLevelDisplay -import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest import at.hannibal2.skyhanni.features.garden.GardenOptimalSpeed -import at.hannibal2.skyhanni.features.garden.GardenPlotAPI -import at.hannibal2.skyhanni.features.garden.GardenPlotBorders import at.hannibal2.skyhanni.features.garden.GardenWarpCommands import at.hannibal2.skyhanni.features.garden.GardenYawAndPitch -import at.hannibal2.skyhanni.features.garden.SensitivityReducer 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.ComposterOverlay import at.hannibal2.skyhanni.features.garden.composter.GardenComposterInventoryFeatures -import at.hannibal2.skyhanni.features.garden.contest.FarmingContestAPI 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.ArmorDropTracker -import at.hannibal2.skyhanni.features.garden.farming.CropMoneyDisplay import at.hannibal2.skyhanni.features.garden.farming.CropSpeedMeter -import at.hannibal2.skyhanni.features.garden.farming.DicerRngDropTracker 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.GardenCropMilestoneDisplay -import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed -import at.hannibal2.skyhanni.features.garden.farming.GardenCustomKeybinds -import at.hannibal2.skyhanni.features.garden.farming.GardenStartLocation import at.hannibal2.skyhanni.features.garden.farming.WildStrawberryDyeNotification import at.hannibal2.skyhanni.features.garden.farming.WrongFungiCutterWarning -import at.hannibal2.skyhanni.features.garden.farming.lane.FarmingLaneAPI -import at.hannibal2.skyhanni.features.garden.farming.lane.FarmingLaneCreator -import at.hannibal2.skyhanni.features.garden.farming.lane.FarmingLaneFeatures -import at.hannibal2.skyhanni.features.garden.fortuneguide.CaptureFarmingGear import at.hannibal2.skyhanni.features.garden.inventory.AnitaExtraFarmingFortune import at.hannibal2.skyhanni.features.garden.inventory.GardenCropMilestoneInventory import at.hannibal2.skyhanni.features.garden.inventory.GardenInventoryNumbers @@ -230,56 +138,35 @@ import at.hannibal2.skyhanni.features.garden.inventory.GardenInventoryTooltipOve 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.GardenPlotIcon import at.hannibal2.skyhanni.features.garden.inventory.plots.GardenPlotMenuHighlighting -import at.hannibal2.skyhanni.features.garden.pests.PestAPI -import at.hannibal2.skyhanni.features.garden.pests.PestFinder import at.hannibal2.skyhanni.features.garden.pests.PestParticleLine import at.hannibal2.skyhanni.features.garden.pests.PestParticleWaypoint -import at.hannibal2.skyhanni.features.garden.pests.PestProfitTracker import at.hannibal2.skyhanni.features.garden.pests.PestSpawn -import at.hannibal2.skyhanni.features.garden.pests.PestSpawnTimer 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.GardenVisitorColorNames -import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorDropStatistics -import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorFeatures 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.NPCVisitorFix -import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI 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.customscoreboard.ScoreboardPattern import at.hannibal2.skyhanni.features.gui.quiver.QuiverDisplay import at.hannibal2.skyhanni.features.gui.quiver.QuiverWarning -import at.hannibal2.skyhanni.features.inventory.AuctionOutbidWarning -import at.hannibal2.skyhanni.features.inventory.AuctionsHighlighter import at.hannibal2.skyhanni.features.inventory.ChestValue import at.hannibal2.skyhanni.features.inventory.DojoRankDisplay -import at.hannibal2.skyhanni.features.inventory.HarpFeatures -import at.hannibal2.skyhanni.features.inventory.HeldTimeInLore import at.hannibal2.skyhanni.features.inventory.HideNotClickableItems -import at.hannibal2.skyhanni.features.inventory.HighlightBonzoMasks -import at.hannibal2.skyhanni.features.inventory.ItemDisplayOverlayFeatures 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.SackDisplay import at.hannibal2.skyhanni.features.inventory.ShiftClickBrewing import at.hannibal2.skyhanni.features.inventory.ShiftClickEquipment -import at.hannibal2.skyhanni.features.inventory.ShiftClickNPCSell import at.hannibal2.skyhanni.features.inventory.SkyblockGuideHighlightFeature import at.hannibal2.skyhanni.features.inventory.StatsTuning -import at.hannibal2.skyhanni.features.inventory.SuperCraftFeatures import at.hannibal2.skyhanni.features.inventory.SuperpairsClicksAlert -import at.hannibal2.skyhanni.features.inventory.UltraRareBookAlert import at.hannibal2.skyhanni.features.inventory.auctionhouse.AuctionHouseCopyUnderbidPrice import at.hannibal2.skyhanni.features.inventory.auctionhouse.AuctionHouseOpenPriceWebsite import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi @@ -288,19 +175,7 @@ import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarCancelledBuyOrderCl 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.ChocolateFactoryAPI -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryBarnManager -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryCustomReminder -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryDataLoader -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryInventory -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryKeybinds import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryShortcut -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStats -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryTimeTowerManager -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryTooltip -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryTooltipCompact -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryUpgradeWarning -import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateShopPrice import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayHelper import at.hannibal2.skyhanni.features.inventory.tiarelay.TiaRelayWaypoints import at.hannibal2.skyhanni.features.itemabilities.ChickenHeadTimer @@ -312,26 +187,17 @@ 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.MiningCommissionsBlocksColor -import at.hannibal2.skyhanni.features.mining.MiningNotifications 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.MiningEventDisplay import at.hannibal2.skyhanni.features.mining.eventtracker.MiningEventTracker import at.hannibal2.skyhanni.features.mining.fossilexcavator.ExcavatorProfitTracker -import at.hannibal2.skyhanni.features.mining.fossilexcavator.FossilExcavatorAPI import at.hannibal2.skyhanni.features.mining.fossilexcavator.GlacitePowderFeatures import at.hannibal2.skyhanni.features.mining.fossilexcavator.ProfitPerExcavation -import at.hannibal2.skyhanni.features.mining.fossilexcavator.solver.FossilSolverDisplay -import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseLocator -import at.hannibal2.skyhanni.features.mining.glacitemineshaft.MineshaftWaypoints import at.hannibal2.skyhanni.features.mining.mineshaft.CorpseAPI import at.hannibal2.skyhanni.features.mining.mineshaft.MineshaftCorpseProfitPer -import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker import at.hannibal2.skyhanni.features.minion.InfernoMinionFeatures import at.hannibal2.skyhanni.features.minion.MinionCollectLogic -import at.hannibal2.skyhanni.features.minion.MinionFeatures import at.hannibal2.skyhanni.features.minion.MinionXp import at.hannibal2.skyhanni.features.misc.AuctionHousePriceComparison import at.hannibal2.skyhanni.features.misc.BetterSignEditing @@ -339,24 +205,17 @@ 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.ContributorManager -import at.hannibal2.skyhanni.features.misc.CopyPlaytime 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.FixGhostEntities 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.InWaterDisplay import at.hannibal2.skyhanni.features.misc.JoinCrystalHollows import at.hannibal2.skyhanni.features.misc.LesserOrbHider -import at.hannibal2.skyhanni.features.misc.LockMouseLook import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager -import at.hannibal2.skyhanni.features.misc.MiscFeatures import at.hannibal2.skyhanni.features.misc.MovementSpeedDisplay -import at.hannibal2.skyhanni.features.misc.NoBitsWarning import at.hannibal2.skyhanni.features.misc.NonGodPotEffectDisplay import at.hannibal2.skyhanni.features.misc.ParticleHider import at.hannibal2.skyhanni.features.misc.PartyMemberOutlines @@ -366,46 +225,27 @@ 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.QuickModMenuSwitch import at.hannibal2.skyhanni.features.misc.ReplaceRomanNumerals import at.hannibal2.skyhanni.features.misc.RestorePieceOfWizardPortalLore -import at.hannibal2.skyhanni.features.misc.ServerRestartTitle 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.compacttablist.AdvancedPlayerList -import at.hannibal2.skyhanni.features.misc.compacttablist.TabListReader -import at.hannibal2.skyhanni.features.misc.compacttablist.TabListRenderer -import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager -import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue import at.hannibal2.skyhanni.features.misc.items.EstimatedWardrobePrice import at.hannibal2.skyhanni.features.misc.items.GlowingDroppedItems -import at.hannibal2.skyhanni.features.misc.items.enchants.EnchantParser -import at.hannibal2.skyhanni.features.misc.limbo.LimboPlaytime -import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker -import at.hannibal2.skyhanni.features.misc.massconfiguration.DefaultConfigFeatures import at.hannibal2.skyhanni.features.misc.teleportpad.TeleportPadCompactName import at.hannibal2.skyhanni.features.misc.teleportpad.TeleportPadInventoryNumber -import at.hannibal2.skyhanni.features.misc.trevor.TrevorFeatures -import at.hannibal2.skyhanni.features.misc.trevor.TrevorSolver -import at.hannibal2.skyhanni.features.misc.trevor.TrevorTracker -import at.hannibal2.skyhanni.features.misc.update.UpdateManager -import at.hannibal2.skyhanni.features.misc.visualwords.ModifyVisualWords 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.AshfangFreezeCooldown 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.kuudra.KuudraAPI import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputationHelper -import at.hannibal2.skyhanni.features.rift.RiftAPI 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 @@ -413,34 +253,26 @@ 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.DanceRoomHelper 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.stillgorechateau.RiftBloodEffigies import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminHighlighter -import at.hannibal2.skyhanni.features.rift.area.westvillage.VerminTracker 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.CruxTalismanDisplay -import at.hannibal2.skyhanni.features.rift.everywhere.EnigmaSoulWaypoints 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.SkillProgress 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.SlayerProfitTracker import at.hannibal2.skyhanni.features.slayer.SlayerQuestWarning import at.hannibal2.skyhanni.features.slayer.SlayerRngMeterDisplay -import at.hannibal2.skyhanni.features.slayer.VampireSlayerFeatures import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerClearView import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerDaggerHelper import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerFirePitsWarning @@ -454,32 +286,14 @@ 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.PacketTest import at.hannibal2.skyhanni.test.ParkourWaypointSaver import at.hannibal2.skyhanni.test.ShowItemUuid import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests -import at.hannibal2.skyhanni.test.TestBingo -import at.hannibal2.skyhanni.test.TestCopyBestiaryValues -import at.hannibal2.skyhanni.test.TestCopyRngMeterValues -import at.hannibal2.skyhanni.test.TestExportTools import at.hannibal2.skyhanni.test.TestShowSlotNumber -import at.hannibal2.skyhanni.test.WorldEdit import at.hannibal2.skyhanni.test.command.ErrorManager -import at.hannibal2.skyhanni.test.command.TrackParticlesCommand -import at.hannibal2.skyhanni.test.command.TrackSoundsCommand import at.hannibal2.skyhanni.test.hotswap.HotswapSupport -import at.hannibal2.skyhanni.utils.ChatUtils -import at.hannibal2.skyhanni.utils.EntityOutlineRenderer -import at.hannibal2.skyhanni.utils.EntityUtils -import at.hannibal2.skyhanni.utils.KeyboardManager -import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging -import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded -import at.hannibal2.skyhanni.utils.TabListData -import at.hannibal2.skyhanni.utils.UtilsPatterns -import at.hannibal2.skyhanni.utils.renderables.RenderableTooltips -import at.hannibal2.skyhanni.utils.repopatterns.RepoPatternManager import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job @@ -519,116 +333,48 @@ class SkyHanniMod { loadModule(PlayerChatManager()) loadModule(PlayerNameFormatter()) loadModule(HypixelData()) - loadModule(LocationFixData) - loadModule(DungeonAPI) loadModule(ScoreboardData()) loadModule(SeaCreatureFeatures()) loadModule(SeaCreatureManager()) loadModule(MobData()) loadModule(MobDetection()) - loadModule(EntityMovementData) - loadModule(TestExportTools) loadModule(ItemClickData()) // loadModule(Year300RaffleEvent) - loadModule(MinecraftData) loadModule(TitleManager()) loadModule(ItemTipHelper()) loadModule(RenderLivingEntityHelper()) loadModule(SkillExperience()) - loadModule(OtherInventoryData) - loadModule(TabListData) loadModule(RenderData()) - loadModule(GardenCropMilestones) - loadModule(GardenCropMilestonesCommunityFix) loadModule(MovableHotBar()) - loadModule(GardenCropUpgrades) loadModule(VisitorListener()) loadModule(VisitorRewardWarning()) loadModule(OwnInventoryData()) - loadModule(ScreenData) loadModule(HighlightVisitorsOutsideOfGarden()) loadModule(GuiEditManager()) - loadModule(GetFromSackAPI) - loadModule(UpdateManager) - loadModule(CropAccessoryData) loadModule(GardenComposterUpgradesData()) loadModule(ActionBarStatsData) loadModule(GardenCropMilestoneInventory()) - loadModule(GardenCropSpeed) loadModule(GardenWarpCommands()) - loadModule(ProfileStorageData) loadModule(TitleData()) loadModule(BlockData()) - loadModule(DefaultConfigFeatures) - loadModule(EntityOutlineRenderer) - loadModule(KeyboardManager) - loadModule(AdvancedPlayerList) loadModule(ItemAddManager()) loadModule(BingoCardReader()) loadModule(DeepCavernsGuide()) loadModule(DungeonsRaceGuide()) loadModule(GardenBestCropTime()) - loadModule(ActionBarData) - loadModule(TrackerManager) - loadModule(ScoreboardPattern) - loadModule(UtilsPatterns) - loadModule(GuiData) - loadModule(BossbarData) - loadModule(EntityUtils) - loadModule(ChatUtils) loadModule(FixedRateTimerManager()) - loadModule(ChromaManager) - loadModule(TabWidget) loadModule(HotmData) - loadModule(ContributorManager) - loadModule(TabComplete) - loadModule(HypixelBazaarFetcher) - loadModule(EventCounter) // APIs loadModule(BazaarApi()) - loadModule(GardenAPI) - loadModule(GardenPlotAPI) loadModule(DataWatcherAPI()) - loadModule(CollectionAPI) - loadModule(FarmingContestAPI) - loadModule(HighlightOnHoverSlot) - loadModule(FriendAPI) - loadModule(PartyAPI) - loadModule(GuildAPI) - loadModule(SlayerAPI) - loadModule(PurseAPI) - loadModule(RiftAPI) - loadModule(SackAPI) - loadModule(BingoAPI) - loadModule(FameRanks) - loadModule(FishingAPI) - loadModule(MaxwellAPI) - loadModule(QuiverAPI) - loadModule(BitsAPI) - loadModule(MayorAPI) - loadModule(SkillAPI) - loadModule(VisitorAPI) - loadModule(KuudraAPI) - loadModule(PetAPI) - loadModule(IsFishingDetection) - loadModule(LorenzUtils) - loadModule(NEUItems) - loadModule(PestAPI) - loadModule(MiningAPI) - loadModule(FossilExcavatorAPI) - loadModule(ChocolateFactoryAPI) - loadModule(RenderableTooltips) - loadModule(DianaAPI) // features loadModule(BazaarOrderHelper()) - loadModule(AuctionsHighlighter) loadModule(ChatFilter()) loadModule(PlayerChatModifier()) loadModule(DungeonChatFilter()) loadModule(HideNotClickableItems()) - loadModule(ItemDisplayOverlayFeatures) loadModule(CurrentPetDisplay()) loadModule(HideFarEntities()) loadModule(ExpOrbsOnGroundHider()) @@ -636,15 +382,11 @@ class SkyHanniMod { loadModule(DamageIndicatorManager()) loadModule(ItemAbilityCooldown()) loadModule(DungeonHighlightClickedBlocks()) - loadModule(DungeonMilestonesDisplay) loadModule(DungeonDeathCounter()) loadModule(DungeonCleanEnd()) loadModule(TunnelsMaps()) loadModule(DungeonBossMessages()) loadModule(DungeonBossHideDamageSplash()) - loadModule(UniqueGiftingOpportunitiesFeatures) - loadModule(UniqueGiftCounter) - loadModule(TrophyFishManager) loadModule(TrophyFishFillet()) loadModule(TrophyFishMessages()) loadModule(GeyserFishing()) @@ -655,7 +397,6 @@ class SkyHanniMod { loadModule(AuctionHouseOpenPriceWebsite()) loadModule(AnvilCombineHelper()) loadModule(SeaCreatureMessageShortener()) - loadModule(AshfangFreezeCooldown) loadModule(AshfangNextResetCooldown()) loadModule(CrystalHollowsWalls()) loadModule(SummoningSoulsName()) @@ -665,38 +406,15 @@ class SkyHanniMod { loadModule(AshfangHideParticles()) loadModule(AshfangHideDamageIndicator()) loadModule(ItemStars()) - loadModule(MinionFeatures) loadModule(TimeFeatures()) loadModule(RngMeterInventory()) - loadModule(WikiManager) loadModule(SendCoordinatedCommand()) loadModule(WarpIsCommand()) - loadModule(ViewRecipeCommand) - loadModule(PartyCommands) - loadModule(PartyChatCommands) loadModule(SummoningMobManager()) loadModule(SkyblockXPInChat()) loadModule(AreaMiniBossFeatures()) loadModule(MobHighlight()) - loadModule(ChocolateFactoryDataLoader) - loadModule(ChocolateFactoryBarnManager) loadModule(ChocolateFactoryShortcut()) - loadModule(ChocolateFactoryInventory) - loadModule(ChocolateFactoryStats) - loadModule(ChocolateFactoryTooltipCompact) - loadModule(ChocolateFactoryTimeTowerManager) - loadModule(ChocolateFactoryTooltip) - loadModule(ChocolateFactoryKeybinds) - loadModule(ChocolateShopPrice) - loadModule(ChocolateFactoryUpgradeWarning) - loadModule(ChocolateFactoryCustomReminder) - loadModule(HoppityNpc) - loadModule(HoppityEggsManager) - loadModule(HoppityEggLocator) - loadModule(HoppityEggsShared) - loadModule(HoppityEggDisplayManager) - loadModule(HoppityCollectionData) - loadModule(HoppityCollectionStats) loadModule(SpawnTimers()) loadModule(MarkedPlayerManager) loadModule(SlayerMiniBossFeatures()) @@ -710,7 +428,6 @@ class SkyHanniMod { loadModule(HideMobNames()) loadModule(HideDamageSplash()) loadModule(FerocityDisplay()) - loadModule(FlareDisplay) loadModule(InGameDateDisplay()) loadModule(ThunderSparksHighlight()) loadModule(BlazeSlayerDaggerHelper()) @@ -726,18 +443,11 @@ class SkyHanniMod { loadModule(NonGodPotEffectDisplay()) loadModule(SoopyGuessBurrow()) loadModule(HotmFeatures()) - loadModule(DianaProfitTracker) loadModule(DianaFixChat()) - loadModule(MythologicalCreatureTracker) - loadModule(ShiftClickNPCSell) loadModule(HighlightJerries()) loadModule(TheGreatSpook()) - loadModule(GriffinBurrowHelper) - loadModule(AllBurrowsList) - loadModule(GriffinBurrowParticleFinder) loadModule(BurrowWarpHelper()) loadModule(CollectionTracker()) - loadModule(HighlightBonzoMasks) loadModule(BazaarCancelledBuyOrderClipboard()) loadModule(CompactSplashPotionMessage()) loadModule(CroesusChestTracker()) @@ -752,7 +462,6 @@ class SkyHanniMod { loadModule(SharkFishCounter()) loadModule(PowerStoneGuideFeatures()) loadModule(OdgerWaypoint()) - loadModule(TrophyFishDisplay) loadModule(TiaRelayHelper()) loadModule(TiaRelayWaypoints()) loadModule(BasketWaypoints()) @@ -762,44 +471,28 @@ class SkyHanniMod { loadModule(MinionCraftHelper()) loadModule(TpsCounter()) loadModule(ParticleHider()) - loadModule(MiscFeatures) loadModule(ReplaceRomanNumerals()) loadModule(GardenPlotMenuHighlighting()) loadModule(SkyMartCopperPrice()) - loadModule(GardenVisitorFeatures) loadModule(GardenVisitorSupercraft()) - loadModule(NPCVisitorFix) loadModule(GardenInventoryNumbers()) loadModule(GardenVisitorTimer()) loadModule(MinionXp()) loadModule(GardenNextPlotPrice()) - loadModule(GardenCropMilestoneDisplay) - loadModule(GardenCustomKeybinds) loadModule(ChickenHeadTimer()) - loadModule(FossilSolverDisplay) loadModule(ExcavatorProfitTracker()) loadModule(ProfitPerExcavation()) loadModule(GlacitePowderFeatures()) loadModule(MineshaftCorpseProfitPer()) - loadModule(MineshaftWaypoints) - loadModule(CorpseLocator) loadModule(CorpseAPI()) loadModule(GardenOptimalSpeed()) loadModule(GardenLevelDisplay()) loadModule(FarmingWeightDisplay()) - loadModule(DicerRngDropTracker) loadModule(PrivateIslandNoPickaxeAbility()) - loadModule(CropMoneyDisplay) loadModule(JacobFarmingContestsInventory()) - loadModule(GardenNextJacobContest) loadModule(WrongFungiCutterWarning()) - loadModule(ArmorDropTracker) - loadModule(FarmingLaneAPI) - loadModule(FarmingLaneFeatures) - loadModule(FarmingLaneCreator) loadModule(JoinCrystalHollows()) loadModule(CrystalHollowsNamesInCore()) - loadModule(GardenVisitorColorNames) loadModule(TeleportPadCompactName()) loadModule(AnitaMedalProfit()) loadModule(AtmosphericFilterDisplay()) @@ -810,16 +503,12 @@ class SkyHanniMod { loadModule(BetterSignEditing()) loadModule(PatcherSendCoordinates()) loadModule(PetItemDisplay()) - loadModule(EstimatedItemValue) loadModule(EstimatedWardrobePrice()) loadModule(ComposterInventoryNumbers()) - loadModule(FarmingFortuneDisplay) loadModule(ToolTooltipTweaks()) loadModule(CropSpeedMeter()) loadModule(AshfangMinisNametagHider()) loadModule(TeleportPadInventoryNumber()) - loadModule(ComposterOverlay) - loadModule(DiscordRPCManager) loadModule(GardenCropMilestoneFix()) loadModule(GardenBurrowingSporesNotifier()) loadModule(WildStrawberryDyeNotification()) @@ -829,39 +518,17 @@ class SkyHanniMod { loadModule(GardenYawAndPitch()) loadModule(MovementSpeedDisplay()) loadModule(ChumBucketHider()) - loadModule(InquisitorWaypointShare) - loadModule(TrevorFeatures) - loadModule(TrevorSolver) - loadModule(TrevorTracker) loadModule(BingoCardTips()) - loadModule(GardenVisitorDropStatistics) - loadModule(CaptureFarmingGear) - loadModule(SackDisplay) - loadModule(GardenStartLocation) loadModule(PetCandyUsedDisplay()) - loadModule(ServerRestartTitle) loadModule(CityProjectFeatures()) - loadModule(GardenPlotIcon) - loadModule(GardenPlotBorders) loadModule(LogBookStats()) loadModule(PocketSackInASackDisplay()) loadModule(ShowFishingItemName()) - loadModule(WarpTabComplete) - loadModule(PlayerTabComplete) - loadModule(GetFromSacksTabComplete) - loadModule(SlayerProfitTracker) - loadModule(FishingProfitTracker) - loadModule(SeaCreatureTracker) loadModule(SlayerItemsOnGround()) loadModule(RestorePieceOfWizardPortalLore()) - loadModule(QuickModMenuSwitch) loadModule(ArachneChatMessageHider()) loadModule(ShowItemUuid()) - loadModule(FrozenTreasureTracker) - loadModule(MiningEventDisplay) - loadModule(MiningCommissionsBlocksColor) loadModule(SlayerRngMeterDisplay()) - loadModule(GhostCounter) loadModule(RiftTimer()) loadModule(HighlightRiftGuide()) loadModule(ShyCruxWarnings()) @@ -870,10 +537,6 @@ class SkyHanniMod { loadModule(RiftOdonata()) loadModule(RiftAgaricusCap()) loadModule(KloonHacking()) - loadModule(EnigmaSoulWaypoints) - loadModule(DungeonLividFinder) - loadModule(CruxTalismanDisplay) - loadModule(DanceRoomHelper) loadModule(TubulatorParkour()) loadModule(CustomTextBox()) loadModule(RiftUpsideDownParkour()) @@ -881,21 +544,16 @@ class SkyHanniMod { loadModule(HighlightMiningCommissionMobs()) loadModule(ShowMotesNpcSellPrice()) loadModule(LivingMetalSuitProgress()) - loadModule(VampireSlayerFeatures) loadModule(BlobbercystsHighlight()) loadModule(LivingCaveDefenseBlocks()) loadModule(LivingCaveLivingMetalHelper()) loadModule(RiftMotesOrb()) loadModule(ChestValue()) loadModule(SlayerBossSpawnSoon()) - loadModule(RiftBloodEffigies) loadModule(RiftWiltedBerberisHelper()) loadModule(RiftHorsezookaHider()) loadModule(GriffinPetWarning()) - loadModule(BestiaryData) loadModule(KingTalismanHelper()) - loadModule(HarpFeatures) - loadModule(EnderNodeTracker) loadModule(CompactBestiaryChatMessage()) loadModule(WatchdogHider()) loadModule(AuctionHousePriceComparison()) @@ -904,11 +562,6 @@ class SkyHanniMod { loadModule(Translator()) loadModule(CosmeticFollowingLine()) loadModule(SuperpairsClicksAlert()) - loadModule(UltraRareBookAlert) - loadModule(PowderTracker) - loadModule(ModifyVisualWords) - loadModule(TabListReader) - loadModule(TabListRenderer) loadModule(GlowingDroppedItems()) loadModule(DungeonTeammateOutlines()) loadModule(DungeonRankTabListColor()) @@ -917,23 +570,16 @@ class SkyHanniMod { loadModule(FixNEUHeavyPearls()) loadModule(QuickCraftFeatures()) loadModule(SkyBlockKickDuration()) - loadModule(LimboTimeTracker) loadModule(PartyMemberOutlines()) loadModule(ArrowTrail()) loadModule(ShiftClickEquipment()) - loadModule(LockMouseLook) - loadModule(SensitivityReducer) loadModule(DungeonFinderFeatures()) loadModule(GoldenGoblinHighlight()) loadModule(TabWidgetSettings()) - loadModule(EnchantParser) loadModule(PabloHelper()) loadModule(FishingBaitWarnings()) loadModule(CustomScoreboard()) - loadModule(RepoPatternManager) loadModule(PestSpawn()) - loadModule(PestSpawnTimer) - loadModule(PestFinder) loadModule(PestParticleWaypoint()) loadModule(StereoHarmonyDisplay()) loadModule(PestParticleLine()) @@ -943,49 +589,29 @@ class SkyHanniMod { loadModule(HighlightPlaceableNpcs()) loadModule(PresentWaypoints()) loadModule(MiningEventTracker()) - loadModule(InWaterDisplay) - loadModule(MiningNotifications) loadModule(JyrreTimer()) loadModule(TotemOfCorruption()) loadModule(NewYearCakeReminder()) loadModule(SulphurSkitterBox()) loadModule(HighlightInquisitors()) - loadModule(VerminTracker) loadModule(VerminHighlighter()) - loadModule(SkillProgress) loadModule(GardenInventoryTooltipOverflow()) loadModule(SkillTooltip()) loadModule(MaxPurseItems()) - loadModule(SuperCraftFeatures) - loadModule(HeldTimeInLore) loadModule(InfernoMinionFeatures()) - loadModule(LimboPlaytime) - loadModule(CopyPlaytime) loadModule(RareDropMessages()) loadModule(CraftMaterialsFromBazaar()) loadModule(DungeonShadowAssassinNotification()) - loadModule(PestProfitTracker) - loadModule(NoBitsWarning) loadModule(ColdOverlay()) loadModule(QuiverDisplay()) loadModule(QuiverWarning()) - loadModule(AuctionOutbidWarning) // test stuff loadModule(SkyHanniDebugsAndTests()) - loadModule(FixGhostEntities) - loadModule(TrackSoundsCommand) - loadModule(TrackParticlesCommand) loadModule(ButtonOnPause()) - loadModule(PacketTest) - loadModule(TestBingo) - loadModule(TestCopyRngMeterValues) - loadModule(TestCopyBestiaryValues) loadModule(HighlightMissingRepoItems()) loadModule(ParkourWaypointSaver()) loadModule(TestShowSlotNumber()) - loadModule(SkyHanniDebugsAndTests) - loadModule(WorldEdit) loadModule(MobDebug()) Commands.init() @@ -1011,7 +637,7 @@ class SkyHanniMod { loadedClasses.clear() } - private val loadedClasses = mutableSetOf() + private val loadedClasses = mutableSetOf() fun loadModule(obj: Any) { if (!loadedClasses.add(obj.javaClass.name)) throw IllegalStateException("Module ${obj.javaClass.name} is already loaded") diff --git a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt index 22e22c423..e179b682e 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.events.CollectionUpdateEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.ItemAddEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut import at.hannibal2.skyhanni.utils.ItemUtils.getLore @@ -19,6 +20,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +@SkyHanniModule object CollectionAPI { private val patternGroup = RepoPattern.group("data.collection.api") private val counterPattern by patternGroup.pattern( diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt index 98160a372..359d23f75 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt @@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.events.MessageSendToServerEvent import at.hannibal2.skyhanni.features.commands.tabcomplete.GetFromSacksTabComplete +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ChatUtils.isCommand @@ -31,6 +32,7 @@ import java.util.Deque import java.util.LinkedList import kotlin.time.Duration.Companion.seconds +@SkyHanniModule object GetFromSackAPI { private val config get() = SkyHanniMod.feature.inventory.gfs diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt index 842b9ec84..5c9c3017a 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt @@ -19,6 +19,7 @@ import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.getLevel import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.getLevelExact import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.getSkillInfo import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.xpRequiredForLevel +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ItemUtils.cleanName import at.hannibal2.skyhanni.utils.ItemUtils.getLore @@ -39,6 +40,7 @@ import java.util.LinkedList import java.util.regex.Matcher import kotlin.time.Duration.Companion.seconds +@SkyHanniModule object SkillAPI { private val patternGroup = RepoPattern.group("api.skilldisplay") private val skillPercentPattern by patternGroup.pattern( diff --git a/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt b/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt index 74617e9b3..1cef0be01 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt @@ -2,10 +2,12 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.ActionBarUpdateEvent import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraftforge.client.event.ClientChatReceivedEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +@SkyHanniModule object ActionBarData { private var actionBar = "" diff --git a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt index 18d3ee1f9..53b80ec25 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt @@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.events.BitsUpdateEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.ScoreboardChangeEvent +import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter import at.hannibal2.skyhanni.utils.ItemUtils.getLore @@ -24,6 +25,7 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.days +@SkyHanniModule object Bit