From 39adca7678bb675e6917b35c1de699c6a0bd55dc Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:03:34 +0200 Subject: removed wildcards from imports --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 199 +++++++++++++++++++-- .../at/hannibal2/skyhanni/config/ConfigManager.kt | 11 +- .../hannibal2/skyhanni/config/commands/Commands.kt | 8 +- .../hannibal2/skyhanni/data/CropAccessoryData.kt | 2 +- .../java/at/hannibal2/skyhanni/data/EntityData.kt | 6 +- .../java/at/hannibal2/skyhanni/data/FriendAPI.kt | 2 +- .../at/hannibal2/skyhanni/data/GuiEditManager.kt | 2 +- .../java/at/hannibal2/skyhanni/data/HypixelData.kt | 8 +- .../at/hannibal2/skyhanni/data/MinecraftData.kt | 7 +- .../hannibal2/skyhanni/data/OtherInventoryData.kt | 7 +- .../hannibal2/skyhanni/data/ProfileStorageData.kt | 9 +- .../java/at/hannibal2/skyhanni/data/SlayerAPI.kt | 6 +- .../at/hannibal2/skyhanni/data/repo/RepoManager.kt | 9 +- .../skyhanni/features/bazaar/BazaarApi.kt | 13 +- .../skyhanni/features/bingo/BingoNextStepHelper.kt | 11 +- .../skyhanni/features/bingo/MinionCraftHelper.kt | 6 +- .../hannibal2/skyhanni/features/chat/Translator.kt | 6 +- .../features/damageindicator/DamageCounter.kt | 2 +- .../damageindicator/DamageIndicatorManager.kt | 18 +- .../skyhanni/features/damageindicator/MobFinder.kt | 15 +- .../skyhanni/features/dungeon/DungeonAPI.kt | 8 +- .../skyhanni/features/dungeon/DungeonCleanEnd.kt | 8 +- .../skyhanni/features/dungeon/DungeonCopilot.kt | 8 +- .../skyhanni/features/dungeon/DungeonHideItems.kt | 8 +- .../features/event/diana/GriffinBurrowHelper.kt | 13 +- .../event/diana/GriffinBurrowParticleFinder.kt | 7 +- .../event/diana/InquisitorWaypointShare.kt | 15 +- .../features/event/diana/SoopyGuessBurrow.kt | 8 +- .../features/fame/AccountUpgradeReminder.kt | 6 +- .../skyhanni/features/fame/CityProjectFeatures.kt | 13 +- .../skyhanni/features/fishing/FishingTimer.kt | 9 +- .../features/fishing/ShowFishingItemName.kt | 6 +- .../skyhanni/features/garden/AnitaMedalProfit.kt | 6 +- .../features/garden/FarmingFortuneDisplay.kt | 8 +- .../skyhanni/features/garden/GardenAPI.kt | 11 +- .../features/garden/GardenNextJacobContest.kt | 7 +- .../features/garden/composter/ComposterDisplay.kt | 4 +- .../features/garden/composter/ComposterOverlay.kt | 9 +- .../composter/GardenComposterInventoryFeatures.kt | 7 +- .../features/garden/contest/FarmingContestAPI.kt | 6 +- .../contest/JacobFarmingContestsInventory.kt | 8 +- .../features/garden/farming/CropMoneyDisplay.kt | 6 +- .../features/garden/farming/DicerRngDropCounter.kt | 6 +- .../features/garden/farming/FarmingArmorDrops.kt | 6 +- .../garden/farming/FarmingWeightDisplay.kt | 14 +- .../garden/farming/GardenCropMilestoneDisplay.kt | 8 +- .../garden/farming/GardenCustomKeybinds.kt | 2 +- .../garden/inventory/GardenNextPlotPrice.kt | 6 +- .../garden/visitor/GardenVisitorFeatures.kt | 28 ++- .../features/garden/visitor/GardenVisitorTimer.kt | 6 +- .../features/inventory/HideNotClickableItems.kt | 6 +- .../features/inventory/HighlightBonzoMasks.kt | 6 +- .../inventory/ItemDisplayOverlayFeatures.kt | 1 - .../abilitycooldown/ItemAbilityCooldown.kt | 9 +- .../skyhanni/features/mining/KingTalismanHelper.kt | 2 +- .../skyhanni/features/minion/MinionFeatures.kt | 16 +- .../hannibal2/skyhanni/features/misc/ChestValue.kt | 14 +- .../skyhanni/features/misc/CollectionTracker.kt | 2 +- .../skyhanni/features/misc/EnderNodeTracker.kt | 7 +- .../skyhanni/features/misc/MarkedPlayerManager.kt | 7 +- .../features/misc/NonGodPotEffectDisplay.kt | 7 +- .../features/misc/ThunderSparksHighlight.kt | 6 +- .../features/misc/discordrpc/DiscordRPCManager.kt | 3 +- .../features/misc/discordrpc/DiscordStatus.kt | 6 +- .../features/misc/ghostcounter/GhostCounter.kt | 12 +- .../features/misc/ghostcounter/GhostFormatting.kt | 2 +- .../features/misc/items/EstimatedItemValue.kt | 8 +- .../massconfiguration/FeatureToggleProcessor.kt | 2 +- .../features/misc/powdertracker/PowderTracker.kt | 6 +- .../features/misc/trevor/TrevorFeatures.kt | 15 +- .../skyhanni/features/misc/update/UpdateManager.kt | 6 +- .../skyhanni/features/mobs/AreaMiniBossFeatures.kt | 6 +- .../features/nether/ashfang/AshfangBlazes.kt | 7 +- .../features/nether/ashfang/AshfangBlazingSouls.kt | 6 +- .../features/nether/ashfang/AshfangGravityOrbs.kt | 7 +- .../dailyquest/DailyQuestHelper.kt | 24 ++- .../reputationhelper/dailyquest/QuestLoader.kt | 11 +- .../rift/area/dreadfarm/RiftAgaricusCap.kt | 6 +- .../rift/area/mirrorverse/DanceRoomHelper.kt | 15 +- .../area/stillgorechateau/RiftBloodEffigies.kt | 8 +- .../features/rift/area/westvillage/KloonHacking.kt | 7 +- .../rift/everywhere/EnigmaSoulWaypoints.kt | 6 +- .../rift/everywhere/motes/ShowMotesNpcSellPrice.kt | 13 +- .../features/slayer/SlayerItemProfitTracker.kt | 13 +- .../features/slayer/SlayerRngMeterDisplay.kt | 6 +- .../features/slayer/VampireSlayerFeatures.kt | 21 ++- .../slayer/blaze/BlazeSlayerDaggerHelper.kt | 6 +- .../slayer/enderman/EndermanSlayerFeatures.kt | 14 +- .../features/summonings/SummoningMobManager.kt | 15 +- .../mixins/transformers/MixinRenderGlobal.java | 2 - .../transformers/MixinRendererLivingEntity.java | 4 +- .../java/at/hannibal2/skyhanni/test/PacketTest.kt | 17 +- .../skyhanni/test/ParkourWaypointSaver.kt | 7 +- .../skyhanni/test/SkyHanniDebugsAndTests.kt | 10 +- .../at/hannibal2/skyhanni/test/TestExportTools.kt | 8 +- .../skyhanni/test/command/CopyErrorCommand.kt | 2 +- .../test/command/CopyNearbyEntitiesCommand.kt | 6 +- .../test/command/CopyNearbyParticlesCommand.kt | 6 +- .../java/at/hannibal2/skyhanni/utils/ItemUtils.kt | 2 +- .../at/hannibal2/skyhanni/utils/KSerializable.kt | 6 +- .../at/hannibal2/skyhanni/utils/LorenzUtils.kt | 3 +- .../java/at/hannibal2/skyhanni/utils/LorenzVec.kt | 6 +- .../at/hannibal2/skyhanni/utils/NBTTypeAdapter.kt | 2 +- .../java/at/hannibal2/skyhanni/utils/NumberUtil.kt | 3 +- .../skyhanni/utils/SkyBlockItemModifierUtils.kt | 2 +- .../at/hannibal2/skyhanni/utils/StringUtils.kt | 4 +- 106 files changed, 872 insertions(+), 156 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 45ef19f80..7bcf1d253 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -5,13 +5,55 @@ 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.init -import at.hannibal2.skyhanni.data.* +import at.hannibal2.skyhanni.data.ActionBarStatsData +import at.hannibal2.skyhanni.data.BlockData +import at.hannibal2.skyhanni.data.ChatManager +import at.hannibal2.skyhanni.data.CropAccessoryData +import at.hannibal2.skyhanni.data.EntityData +import at.hannibal2.skyhanni.data.EntityMovementData +import at.hannibal2.skyhanni.data.FriendAPI +import at.hannibal2.skyhanni.data.GardenComposterUpgradesData +import at.hannibal2.skyhanni.data.GardenCropMilestones +import at.hannibal2.skyhanni.data.GardenCropUpgrades +import at.hannibal2.skyhanni.data.GuiEditManager +import at.hannibal2.skyhanni.data.HypixelData +import at.hannibal2.skyhanni.data.ItemClickData +import at.hannibal2.skyhanni.data.ItemRenderBackground +import at.hannibal2.skyhanni.data.ItemTipHelper +import at.hannibal2.skyhanni.data.MayorElection +import at.hannibal2.skyhanni.data.MinecraftData +import at.hannibal2.skyhanni.data.OtherInventoryData +import at.hannibal2.skyhanni.data.OwnInventoryData +import at.hannibal2.skyhanni.data.PartyAPI +import at.hannibal2.skyhanni.data.ProfileStorageData +import at.hannibal2.skyhanni.data.PurseAPI +import at.hannibal2.skyhanni.data.RenderGuiData +import at.hannibal2.skyhanni.data.SackAPI +import at.hannibal2.skyhanni.data.ScoreboardData +import at.hannibal2.skyhanni.data.SkillExperience +import at.hannibal2.skyhanni.data.SlayerAPI +import at.hannibal2.skyhanni.data.TitleData +import at.hannibal2.skyhanni.data.TitleUtils +import at.hannibal2.skyhanni.data.ToolTipData import at.hannibal2.skyhanni.data.repo.RepoManager import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper -import at.hannibal2.skyhanni.features.bazaar.* -import at.hannibal2.skyhanni.features.bingo.* -import at.hannibal2.skyhanni.features.chat.* +import at.hannibal2.skyhanni.features.bazaar.BazaarApi +import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod +import at.hannibal2.skyhanni.features.bazaar.BazaarCancelledBuyOrderClipboard +import at.hannibal2.skyhanni.features.bazaar.BazaarOpenPriceWebsite +import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper +import at.hannibal2.skyhanni.features.bingo.BingoCardDisplay +import at.hannibal2.skyhanni.features.bingo.BingoCardTips +import at.hannibal2.skyhanni.features.bingo.BingoNextStepHelper +import at.hannibal2.skyhanni.features.bingo.CompactBingoChat +import at.hannibal2.skyhanni.features.bingo.MinionCraftHelper +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.PlayerDeathMessages +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.commands.PartyTransferCommand @@ -20,29 +62,93 @@ import at.hannibal2.skyhanni.features.commands.WarpIsCommand import at.hannibal2.skyhanni.features.commands.WikiCommand import at.hannibal2.skyhanni.features.cosmetics.CosmeticFollowingLine import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager -import at.hannibal2.skyhanni.features.dungeon.* -import at.hannibal2.skyhanni.features.event.diana.* +import at.hannibal2.skyhanni.features.dungeon.CroesusUnopenedChestTracker +import at.hannibal2.skyhanni.features.dungeon.DungeonAPI +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.DungeonHideItems +import at.hannibal2.skyhanni.features.dungeon.DungeonHighlightClickedBlocks +import at.hannibal2.skyhanni.features.dungeon.DungeonLevelColor +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.DungeonTeammateOutlines +import at.hannibal2.skyhanni.features.dungeon.HighlightDungeonDeathmite +import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper +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.InquisitorWaypointShare +import at.hannibal2.skyhanni.features.event.diana.SoopyGuessBurrow import at.hannibal2.skyhanni.features.fame.AccountUpgradeReminder import at.hannibal2.skyhanni.features.fame.CityProjectFeatures -import at.hannibal2.skyhanni.features.fishing.* +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.trophy.OdgerWaypoint 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.* +import at.hannibal2.skyhanni.features.garden.AnitaMedalProfit +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.GardenPlotBorders +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.ComposterOverlay import at.hannibal2.skyhanni.features.garden.composter.GardenComposterInventoryFeatures -import at.hannibal2.skyhanni.features.garden.contest.* -import at.hannibal2.skyhanni.features.garden.farming.* +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.CropMoneyDisplay +import at.hannibal2.skyhanni.features.garden.farming.CropSpeedMeter +import at.hannibal2.skyhanni.features.garden.farming.DicerRngDropCounter +import at.hannibal2.skyhanni.features.garden.farming.FarmingArmorDrops +import at.hannibal2.skyhanni.features.garden.farming.FarmingWeightDisplay +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.fortuneguide.CaptureFarmingGear -import at.hannibal2.skyhanni.features.garden.inventory.* +import at.hannibal2.skyhanni.features.garden.inventory.AnitaExtraFarmingFortune +import at.hannibal2.skyhanni.features.garden.inventory.GardenCropMilestoneInventory +import at.hannibal2.skyhanni.features.garden.inventory.GardenDeskInSBMenu +import at.hannibal2.skyhanni.features.garden.inventory.GardenInventoryNumbers +import at.hannibal2.skyhanni.features.garden.inventory.GardenNextPlotPrice +import at.hannibal2.skyhanni.features.garden.inventory.GardenPlotIcon +import at.hannibal2.skyhanni.features.garden.inventory.SkyMartCopperPrice 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.GardenVisitorTimer -import at.hannibal2.skyhanni.features.inventory.* +import at.hannibal2.skyhanni.features.inventory.AuctionsHighlighter +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.RngMeterInventory +import at.hannibal2.skyhanni.features.inventory.SackDisplay +import at.hannibal2.skyhanni.features.inventory.SkyBlockLevelGuideHelper +import at.hannibal2.skyhanni.features.inventory.StatsTuning import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown import at.hannibal2.skyhanni.features.mining.HighlightMiningCommissionMobs @@ -50,7 +156,40 @@ import at.hannibal2.skyhanni.features.mining.KingTalismanHelper import at.hannibal2.skyhanni.features.mining.crystalhollows.CrystalHollowsNamesInCore import at.hannibal2.skyhanni.features.minion.MinionCollectLogic import at.hannibal2.skyhanni.features.minion.MinionFeatures -import at.hannibal2.skyhanni.features.misc.* +import at.hannibal2.skyhanni.features.misc.BestiaryData +import at.hannibal2.skyhanni.features.misc.BrewingStandOverlay +import at.hannibal2.skyhanni.features.misc.ButtonOnPause +import at.hannibal2.skyhanni.features.misc.ChestValue +import at.hannibal2.skyhanni.features.misc.ChickenHeadTimer +import at.hannibal2.skyhanni.features.misc.ChumBucketHider +import at.hannibal2.skyhanni.features.misc.CollectionTracker +import at.hannibal2.skyhanni.features.misc.CompactSplashPotionMessage +import at.hannibal2.skyhanni.features.misc.CurrentPetDisplay +import at.hannibal2.skyhanni.features.misc.CustomTextBox +import at.hannibal2.skyhanni.features.misc.EnderNodeTracker +import at.hannibal2.skyhanni.features.misc.ExpOrbsOnGroundHider +import at.hannibal2.skyhanni.features.misc.FrozenTreasureTracker +import at.hannibal2.skyhanni.features.misc.HarpFeatures +import at.hannibal2.skyhanni.features.misc.HideArmor +import at.hannibal2.skyhanni.features.misc.HideDamageSplash +import at.hannibal2.skyhanni.features.misc.JoinCrystalHollows +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.NonGodPotEffectDisplay +import at.hannibal2.skyhanni.features.misc.ParticleHider +import at.hannibal2.skyhanni.features.misc.PasteIntoSigns +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.PocketSackInASackDisplay +import at.hannibal2.skyhanni.features.misc.QuickModMenuSwitch +import at.hannibal2.skyhanni.features.misc.RestorePieceOfWizardPortalLore +import at.hannibal2.skyhanni.features.misc.ServerRestartTitle +import at.hannibal2.skyhanni.features.misc.SuperpairsClicksAlert +import at.hannibal2.skyhanni.features.misc.ThunderSparksHighlight +import at.hannibal2.skyhanni.features.misc.TimeFeatures +import at.hannibal2.skyhanni.features.misc.TpsCounter import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostCounter import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue @@ -73,7 +212,13 @@ import at.hannibal2.skyhanni.features.mobs.AreaMiniBossFeatures import at.hannibal2.skyhanni.features.mobs.AshfangMinisNametagHider import at.hannibal2.skyhanni.features.mobs.MobHighlight import at.hannibal2.skyhanni.features.mobs.SpawnTimers -import at.hannibal2.skyhanni.features.nether.ashfang.* +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.reputationhelper.CrimsonIsleReputationHelper import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.features.rift.area.RiftLarva @@ -92,10 +237,21 @@ import at.hannibal2.skyhanni.features.rift.area.stillgorechateau.RiftBloodEffigi import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonHacking 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.* +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.slayer.* +import at.hannibal2.skyhanni.features.slayer.HideMobNames +import at.hannibal2.skyhanni.features.slayer.SlayerBossSpawnSoon +import at.hannibal2.skyhanni.features.slayer.SlayerItemProfitTracker +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.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 @@ -105,7 +261,16 @@ import at.hannibal2.skyhanni.features.slayer.enderman.EndermanSlayerHideParticle 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.test.* +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.command.CopyNearbyParticlesCommand import at.hannibal2.skyhanni.utils.EntityOutlineRenderer import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index a1586bc91..661728742 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -19,11 +19,18 @@ import io.github.moulberry.moulconfig.processor.BuiltinMoulConfigGuis import io.github.moulberry.moulconfig.processor.ConfigProcessorDriver import io.github.moulberry.moulconfig.processor.MoulConfigProcessor import net.minecraft.item.ItemStack -import java.io.* +import java.io.BufferedReader +import java.io.BufferedWriter +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.IOException +import java.io.InputStreamReader +import java.io.OutputStreamWriter import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.StandardCopyOption -import java.util.* +import java.util.UUID import kotlin.concurrent.fixedRateTimer class ConfigManager { diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index 625bc7f83..e93a42228 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -34,7 +34,13 @@ import at.hannibal2.skyhanni.test.PacketTest import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests import at.hannibal2.skyhanni.test.TestBingo -import at.hannibal2.skyhanni.test.command.* +import at.hannibal2.skyhanni.test.command.CopyErrorCommand +import at.hannibal2.skyhanni.test.command.CopyItemCommand +import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand +import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand +import at.hannibal2.skyhanni.test.command.CopyScoreboardCommand +import at.hannibal2.skyhanni.test.command.CopyTabListCommand +import at.hannibal2.skyhanni.test.command.TestChatCommand import at.hannibal2.skyhanni.utils.APIUtil import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.client.Minecraft diff --git a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt index 93a590016..83853ef59 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt @@ -16,7 +16,7 @@ import net.minecraft.nbt.CompressedStreamTools import net.minecraftforge.client.event.GuiScreenEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.io.ByteArrayInputStream -import java.util.* +import java.util.Base64 class CropAccessoryData { private val accessoryBagNamePattern = "Accessory Bag \\((\\d)/(\\d)\\)".toRegex() diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt index 40cada194..c76bcadab 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt @@ -1,6 +1,10 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent +import at.hannibal2.skyhanni.events.EntityMaxHealthUpdateEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.utils.EntityUtils import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth import at.hannibal2.skyhanni.utils.LorenzUtils.derpy diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt index d8c44b834..1614e51f1 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt @@ -13,7 +13,7 @@ import net.minecraft.util.ChatStyle import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.io.File import java.io.FileReader -import java.util.* +import java.util.UUID class FriendAPI { private val file = File("config/skyhanni/friends.json") diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt index d778be299..82b94189c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt @@ -16,7 +16,7 @@ import net.minecraft.client.renderer.GlStateManager import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.lwjgl.input.Keyboard -import java.util.* +import java.util.UUID class GuiEditManager { diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index abd5615ea..9bb35c602 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -1,7 +1,11 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.HypixelJoinEvent +import at.hannibal2.skyhanni.events.IslandChangeEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside import at.hannibal2.skyhanni.utils.LorenzLogger import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt index bc626a156..a09380357 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt @@ -1,6 +1,11 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.ItemInHandChangeEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.events.PlaySoundEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt index b6dab180a..5950d5fb8 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt @@ -1,6 +1,11 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.InventoryUpdatedEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.PacketEvent import net.minecraft.item.ItemStack import net.minecraft.network.play.server.S2DPacketOpenWindow import net.minecraft.network.play.server.S2EPacketCloseWindow diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt index e80675c43..2b4fcd7a8 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt @@ -3,7 +3,14 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.SackData import at.hannibal2.skyhanni.config.Storage -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.ConfigLoadEvent +import at.hannibal2.skyhanni.events.HypixelJoinEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PreProfileSwitchEvent +import at.hannibal2.skyhanni.events.ProfileJoinEvent +import at.hannibal2.skyhanni.events.TabListUpdateEvent import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt index 2675c27c3..eb351d7d4 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt @@ -1,6 +1,10 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.SlayerChangeEvent +import at.hannibal2.skyhanni.events.SlayerProgressChangeEvent +import at.hannibal2.skyhanni.events.SlayerQuestCompleteEvent import at.hannibal2.skyhanni.features.slayer.SlayerType import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt index 712f3b9fd..d6302fa6e 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt @@ -8,7 +8,14 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import com.google.gson.JsonObject import net.minecraft.client.Minecraft import org.apache.commons.io.FileUtils -import java.io.* +import java.io.BufferedReader +import java.io.BufferedWriter +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.IOException +import java.io.InputStreamReader +import java.io.OutputStreamWriter import java.net.URL import java.nio.charset.StandardCharsets import java.util.concurrent.CompletableFuture diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt index dfc69dee8..57e674976 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt @@ -1,11 +1,20 @@ package at.hannibal2.skyhanni.features.bazaar import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.events.* -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.events.BazaarOpenedProductEvent +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.NEUInternalName +import at.hannibal2.skyhanni.utils.NEUItems +import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.RenderUtils.highlight import at.hannibal2.skyhanni.utils.StringUtils.removeColor import net.minecraft.client.gui.inventory.GuiChest diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt index 357763e2c..7f4b5cf46 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt @@ -6,7 +6,16 @@ import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.SkillExperience import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.features.bingo.nextstep.* +import at.hannibal2.skyhanni.features.bingo.nextstep.ChatMessageStep +import at.hannibal2.skyhanni.features.bingo.nextstep.CollectionStep +import at.hannibal2.skyhanni.features.bingo.nextstep.CraftStep +import at.hannibal2.skyhanni.features.bingo.nextstep.IslandVisitStep +import at.hannibal2.skyhanni.features.bingo.nextstep.ItemsStep +import at.hannibal2.skyhanni.features.bingo.nextstep.NextStep +import at.hannibal2.skyhanni.features.bingo.nextstep.ObtainCrystalStep +import at.hannibal2.skyhanni.features.bingo.nextstep.PartialProgressItemsStep +import at.hannibal2.skyhanni.features.bingo.nextstep.ProgressionStep +import at.hannibal2.skyhanni.features.bingo.nextstep.SkillLevelStep import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt index bb324a984..e3b784c90 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -2,7 +2,11 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.TitleUtils -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt index e7f3ea46f..3f7a213c7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt @@ -7,7 +7,11 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.StringUtils.getPlayerName import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import com.google.gson.* +import com.google.gson.JsonArray +import com.google.gson.JsonElement +import com.google.gson.JsonObject +import com.google.gson.JsonParser +import com.google.gson.JsonSyntaxException import net.minecraft.event.ClickEvent import net.minecraft.event.HoverEvent import net.minecraft.util.ChatComponentText diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt index 711523175..bf6bb581b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.features.damageindicator -import java.util.* +import java.util.LinkedList class DamageCounter { diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt index 78fcec31e..d1b8425e0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt @@ -3,22 +3,34 @@ package at.hannibal2.skyhanni.features.damageindicator import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.BossHealthChangeEvent +import at.hannibal2.skyhanni.events.DamageIndicatorDetectedEvent +import at.hannibal2.skyhanni.events.DamageIndicatorFinalBossEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.features.slayer.blaze.HellionShield import at.hannibal2.skyhanni.features.slayer.blaze.setHellionShield -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.utils.EntityUtils import at.hannibal2.skyhanni.utils.EntityUtils.getNameTagWith import at.hannibal2.skyhanni.utils.EntityUtils.hasNameTagWith +import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth import at.hannibal2.skyhanni.utils.LorenzUtils.between import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy import at.hannibal2.skyhanni.utils.LorenzUtils.put import at.hannibal2.skyhanni.utils.LorenzUtils.round +import at.hannibal2.skyhanni.utils.LorenzVec +import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.StringUtils.removeColor +import at.hannibal2.skyhanni.utils.TimeUtils +import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.client.renderer.GlStateManager @@ -34,7 +46,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent import net.minecraftforge.event.entity.EntityJoinWorldEvent import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import java.util.* +import java.util.UUID import kotlin.math.max class DamageIndicatorManager { diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt index 0d9792265..9f0bf542e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt @@ -22,10 +22,21 @@ import net.minecraft.entity.EntityLiving import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.boss.EntityDragon import net.minecraft.entity.boss.EntityWither -import net.minecraft.entity.monster.* +import net.minecraft.entity.monster.EntityBlaze +import net.minecraft.entity.monster.EntityEnderman +import net.minecraft.entity.monster.EntityGhast +import net.minecraft.entity.monster.EntityGiantZombie +import net.minecraft.entity.monster.EntityGuardian +import net.minecraft.entity.monster.EntityIronGolem +import net.minecraft.entity.monster.EntityMagmaCube +import net.minecraft.entity.monster.EntityPigZombie +import net.minecraft.entity.monster.EntitySkeleton +import net.minecraft.entity.monster.EntitySlime +import net.minecraft.entity.monster.EntitySpider +import net.minecraft.entity.monster.EntityZombie import net.minecraft.entity.passive.EntityHorse import net.minecraft.entity.passive.EntityWolf -import java.util.* +import java.util.UUID class MobFinder { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt index fa627eec0..739dbe17b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt @@ -2,7 +2,13 @@ package at.hannibal2.skyhanni.features.dungeon import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.DungeonBossRoomEnterEvent +import at.hannibal2.skyhanni.events.DungeonEnterEvent +import at.hannibal2.skyhanni.events.DungeonStartEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt index d3be56797..ff29e4774 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt @@ -1,7 +1,13 @@ package at.hannibal2.skyhanni.features.dungeon import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.CheckRenderEntityEvent +import at.hannibal2.skyhanni.events.DamageIndicatorFinalBossEvent +import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PlaySoundEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.StringUtils.matchRegex import net.minecraft.client.Minecraft diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt index 48664b835..ce83263ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt @@ -1,7 +1,13 @@ package at.hannibal2.skyhanni.features.dungeon import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.CheckRenderEntityEvent +import at.hannibal2.skyhanni.events.DungeonBossRoomEnterEvent +import at.hannibal2.skyhanni.events.DungeonEnterEvent +import at.hannibal2.skyhanni.events.DungeonStartEvent +import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.StringUtils.matchRegex diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt index 5f82207bb..e91c40ef8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt @@ -2,7 +2,13 @@ package at.hannibal2.skyhanni.features.dungeon import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.EntityMovementData -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.CheckRenderEntityEvent +import at.hannibal2.skyhanni.events.EntityMoveEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.ReceiveParticleEvent +import at.hannibal2.skyhanni.events.RenderMobColoredEvent +import at.hannibal2.skyhanni.events.ResetEntityHurtEvent +import at.hannibal2.skyhanni.events.withAlpha import at.hannibal2.skyhanni.utils.ItemUtils.cleanName import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture import at.hannibal2.skyhanni.utils.LorenzColor diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt index 1a6750d85..4e18251b5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt @@ -3,15 +3,24 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.EntityMovementData -import at.hannibal2.skyhanni.events.* -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.events.BurrowDetectEvent +import at.hannibal2.skyhanni.events.BurrowDugEvent +import at.hannibal2.skyhanni.events.EntityMoveEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.SoopyGuessBurrowEvent import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt +import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy +import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine import at.hannibal2.skyhanni.utils.RenderUtils.drawColor import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.RenderUtils.drawString +import at.hannibal2.skyhanni.utils.TimeUtils import net.minecraft.client.Minecraft import net.minecraft.init.Blocks import net.minecraftforge.client.event.RenderWorldLastEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt index b16df2c70..a4ca74ff4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt @@ -2,7 +2,12 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.BlockClickEvent +import at.hannibal2.skyhanni.events.BurrowDetectEvent +import at.hannibal2.skyhanni.events.BurrowDugEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt index 14f4305ab..18f8c6f7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt @@ -4,11 +4,22 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.TitleUtils -import at.hannibal2.skyhanni.events.* -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.utils.LocationUtils +import at.hannibal2.skyhanni.utils.LorenzLogger +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy +import at.hannibal2.skyhanni.utils.LorenzVec +import at.hannibal2.skyhanni.utils.OSUtils +import at.hannibal2.skyhanni.utils.SimpleTimeMark +import at.hannibal2.skyhanni.utils.SoundUtils import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher +import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.network.play.server.S02PacketChat diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt index 0ca67ad8e..7bb4a8f87 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt @@ -11,7 +11,13 @@ import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.toLorenzVec import net.minecraft.util.EnumParticleTypes import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import kotlin.math.* +import kotlin.math.abs +import kotlin.math.atan +import kotlin.math.cos +import kotlin.math.floor +import kotlin.math.hypot +import kotlin.math.pow +import kotlin.math.sin /** * Taken and ported from Soopyboo32's javascript module SoopyV2 diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt index 3690d8ea3..436cf7b8f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/AccountUpgradeReminder.kt @@ -2,7 +2,11 @@ package at.hannibal2.skyhanni.features.fame import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ProfileStorageData -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.SimpleTimeMark diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt index 2e8154d6a..db7e2f57a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt @@ -3,16 +3,25 @@ package at.hannibal2.skyhanni.features.fame import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.ProfileStorageData -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.features.bazaar.BazaarApi -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.utils.ItemUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name +import at.hannibal2.skyhanni.utils.LorenzColor +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList +import at.hannibal2.skyhanni.utils.NEUItems +import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.RenderUtils.highlight import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher +import at.hannibal2.skyhanni.utils.TimeUtils import at.hannibal2.skyhanni.utils.renderables.Renderable import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt index fce359672..266325e3d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt @@ -4,9 +4,16 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.utils.EntityUtils +import at.hannibal2.skyhanni.utils.LocationUtils +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland +import at.hannibal2.skyhanni.utils.LorenzVec +import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.RenderUtils.renderString +import at.hannibal2.skyhanni.utils.SoundUtils +import at.hannibal2.skyhanni.utils.TimeUnit +import at.hannibal2.skyhanni.utils.TimeUtils import net.minecraft.entity.item.EntityArmorStand import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt index addb6368c..6b245df73 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ShowFishingItemName.kt @@ -2,8 +2,12 @@ package at.hannibal2.skyhanni.features.fishing import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.utils.EntityUtils +import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.name +import at.hannibal2.skyhanni.utils.LocationUtils +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.RenderUtils.drawString import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation import at.hannibal2.skyhanni.utils.StringUtils.removeColor diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt index dcc645f5e..ca4bd5097 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt @@ -5,13 +5,17 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorFeatures -import at.hannibal2.skyhanni.utils.* +import at.hannibal2.skyhanni.utils.ItemUtils import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList +import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName +import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NEUItems.getPrice +import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt index 4776ff9c9..db14edcc9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt @@ -5,7 +5,13 @@ import at.hannibal2.skyhanni.data.CropAccessoryData import at.hannibal2.skyhanni.data.GardenCropMilestones import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter import at.hannibal2.skyhanni.data.GardenCropUpgrades.Companion.getUpgradeLevel -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.CropClickEvent +import at.hannibal2.skyhanni.events.GardenToolChangeEvent +import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent +import at.hannibal2.skyhanni.events.PreProfileSwitchEvent +import at.hannibal2.skyhanni.events.TabListUpdateEvent import at.hannibal2.skyhanni.features.garden.CropType.Companion.getTurboCrop import at.hannibal2.skyhanni.features.garden.GardenAPI.addCropIcon import at.hannibal2.skyhanni.features.garden.GardenAPI.getCropType diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index d7469416f..76c5666c9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -3,7 +3,16 @@ package at.hannibal2.skyhanni.features.garden import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.ProfileStorageData -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.BlockClickEvent +import at.hannibal2.skyhanni.events.ConfigLoadEvent +import at.hannibal2.skyhanni.events.CropClickEvent +import at.hannibal2.skyhanni.events.GardenToolChangeEvent +import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.PacketEvent +import at.hannibal2.skyhanni.events.RepositoryReloadEvent +import at.hannibal2.skyhanni.events.TabListUpdateEvent import at.hannibal2.skyhanni.features.garden.CropType.Companion.getCropType import at.hannibal2.skyhanni.features.garden.composter.ComposterOverlay import at.hannibal2.skyhanni.features.garden.contest.FarmingContestAPI diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt index 1c02e4cc8..768bf8bc8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -2,7 +2,12 @@ package at.hannibal2.skyhanni.features.garden import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.TitleUtils -import at.hannibal2.skyhanni.events.* +import at.hannibal2.skyhanni.events.ConfigLoadEvent +import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent +import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.TabListUpdateEvent import at.hannibal2.skyhanni.features.garden.GardenAPI.addCropIcon import at.hannibal2.skyhanni.utils.APIUtil import at.hannibal2.skyhanni.utils.ItemUtils.getLore diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt index aab3b082b..6cd1b5658 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt @@ -12,11 +12,11 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.TimeUtils import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import java.util.* +import java.util.Collections +import kotlin.math.floor import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds import kotlin.time.DurationUnit -import kotlin.math.floor class ComposterDisplay { private val config get() = SkyHanniMod.feature.garden diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index e86d4124a..0e30451f0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -2,7 +2