From 4559e5ff05e19817a21ae49f1c0d8a97d273f6a1 Mon Sep 17 00:00:00 2001 From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> Date: Sat, 10 Feb 2024 00:24:52 +0100 Subject: Splitting many utils functions from LorenzUtils up into other classes: ChatUtils, CollectionUtils, ConditionalUtils. And code cleanup #978 --- .../skyhanni/features/bazaar/BazaarApi.kt | 2 ++ .../features/bazaar/BazaarBestSellMethod.kt | 1 + .../bazaar/BazaarCancelledBuyOrderClipboard.kt | 3 +- .../skyhanni/features/bazaar/BazaarDataHolder.kt | 7 ++-- .../features/bazaar/BazaarOpenPriceWebsite.kt | 1 + .../skyhanni/features/bazaar/BazaarOrderHelper.kt | 5 ++- .../hannibal2/skyhanni/features/bingo/BingoAPI.kt | 1 + .../skyhanni/features/bingo/CompactBingoChat.kt | 6 ++-- .../skyhanni/features/bingo/FirstMinionTier.kt | 8 ++--- .../skyhanni/features/bingo/MinionCraftHelper.kt | 2 +- .../features/bingo/card/BingoCardDisplay.kt | 8 +++-- .../features/bingo/card/BingoCardReader.kt | 4 ++- .../skyhanni/features/bingo/card/BingoCardTips.kt | 1 + .../features/bingo/card/goals/BingoGoal.kt | 1 + .../card/nextstephelper/BingoNextStepHelper.kt | 9 +++-- .../card/nextstephelper/steps/CollectionStep.kt | 1 + .../bingo/card/nextstephelper/steps/ItemsStep.kt | 1 + .../bingo/card/nextstephelper/steps/NextStep.kt | 2 +- .../card/nextstephelper/steps/SkillLevelStep.kt | 2 +- .../features/chat/ArachneChatMessageHider.kt | 1 + .../hannibal2/skyhanni/features/chat/ChatFilter.kt | 19 +++++----- .../skyhanni/features/chat/ChatFilterGui.kt | 8 ++--- .../hannibal2/skyhanni/features/chat/ChatPeek.kt | 6 ++-- .../features/chat/CompactBestiaryChatMessage.kt | 6 ++-- .../features/chat/CompactSplashPotionMessage.kt | 6 ++-- .../skyhanni/features/chat/PlayerDeathMessages.kt | 3 +- .../skyhanni/features/chat/SkyblockXPInChat.kt | 4 +-- .../hannibal2/skyhanni/features/chat/Translator.kt | 15 ++++---- .../skyhanni/features/chat/WatchdogHider.kt | 1 + .../features/chat/playerchat/PlayerChatFilter.kt | 2 +- .../features/chat/playerchat/PlayerChatModifier.kt | 4 +-- .../skyhanni/features/chroma/ChromaShader.kt | 1 + .../skyhanni/features/combat/BestiaryData.kt | 10 +++--- .../features/combat/damageindicator/BossType.kt | 19 +++++----- .../combat/damageindicator/DamageCounter.kt | 3 +- .../damageindicator/DamageIndicatorManager.kt | 34 +++++++++--------- .../features/combat/damageindicator/EntityData.kt | 1 + .../features/combat/damageindicator/MobFinder.kt | 35 +++++++++---------- .../combat/endernodetracker/EnderNodeTracker.kt | 10 +++--- .../features/combat/ghostcounter/GhostCounter.kt | 13 ++++--- .../features/combat/ghostcounter/GhostUtil.kt | 8 ++--- .../features/combat/mobs/AreaMiniBossFeatures.kt | 4 ++- .../combat/mobs/AshfangMinisNametagHider.kt | 3 +- .../skyhanni/features/combat/mobs/MobHighlight.kt | 1 + .../skyhanni/features/combat/mobs/SpawnTimers.kt | 12 ++++--- .../skyhanni/features/commands/PartyCommands.kt | 4 ++- .../features/commands/SendCoordinatedCommand.kt | 5 ++- .../features/commands/ViewRecipeCommand.kt | 3 +- .../skyhanni/features/commands/WarpIsCommand.kt | 2 +- .../skyhanni/features/commands/WikiManager.kt | 11 +++--- .../tabcomplete/GetFromSacksTabComplete.kt | 3 +- .../commands/tabcomplete/PlayerTabComplete.kt | 3 +- .../commands/tabcomplete/WarpTabComplete.kt | 3 +- .../skyhanni/features/cosmetics/ArrowTrail.kt | 2 +- .../features/cosmetics/CosmeticFollowingLine.kt | 7 ++-- .../skyhanni/features/dungeon/DungeonAPI.kt | 10 +++--- .../features/dungeon/DungeonBossMessages.kt | 2 +- .../skyhanni/features/dungeon/DungeonChatFilter.kt | 2 +- .../skyhanni/features/dungeon/DungeonCleanEnd.kt | 4 +-- .../features/dungeon/DungeonDeathCounter.kt | 3 +- .../features/dungeon/DungeonFinderFeatures.kt | 2 +- .../features/dungeon/DungeonLividFinder.kt | 1 + .../features/dungeon/DungeonMilestonesDisplay.kt | 1 + .../features/dungeon/DungeonRankTabListColor.kt | 1 + .../features/dungeon/DungeonTeammateOutlines.kt | 2 +- .../skyhanni/features/dungeon/TerracottaPhase.kt | 1 + .../event/UniqueGiftingOpportunitiesFeatures.kt | 2 +- .../event/anniversary/Year300RaffleEvent.kt | 1 + .../skyhanni/features/event/diana/BurrowAPI.kt | 1 - .../features/event/diana/BurrowWarpHelper.kt | 11 +++--- .../features/event/diana/DianaProfitTracker.kt | 7 ++-- .../features/event/diana/GriffinBurrowHelper.kt | 17 ++++----- .../event/diana/GriffinBurrowParticleFinder.kt | 2 +- .../features/event/diana/GriffinPetWarning.kt | 4 ++- .../features/event/diana/HighlightInquisitors.kt | 1 + .../event/diana/InquisitorWaypointShare.kt | 20 ++++++----- .../event/diana/MythologicalCreatureTracker.kt | 15 ++++---- .../features/event/diana/SoopyGuessBurrow.kt | 6 ++-- .../features/event/jerry/HighlightJerries.kt | 5 +-- .../event/jerry/frozentreasure/FrozenTreasure.kt | 1 + .../jerry/frozentreasure/FrozenTreasureTracker.kt | 5 +-- .../event/lobby/waypoints/EventWaypoint.kt | 2 +- .../lobby/waypoints/christmas/PresentWaypoints.kt | 6 ++-- .../lobby/waypoints/halloween/BasketEntrances.kt | 3 +- .../lobby/waypoints/halloween/BasketWaypoints.kt | 1 + .../skyhanni/features/event/spook/TheGreatSpook.kt | 4 ++- .../skyhanni/features/event/winter/JyrreTimer.kt | 1 + .../features/event/winter/NewYearCakeReminder.kt | 4 ++- .../features/fame/AccountUpgradeReminder.kt | 6 ++-- .../skyhanni/features/fame/CityProjectFeatures.kt | 9 +++-- .../skyhanni/features/fame/ReminderUtils.kt | 1 + .../skyhanni/features/fishing/ChumBucketHider.kt | 5 +-- .../skyhanni/features/fishing/FishingAPI.kt | 2 +- .../features/fishing/FishingBaitWarnings.kt | 6 ++-- .../skyhanni/features/fishing/FishingDetection.kt | 1 + .../features/fishing/FishingHookDisplay.kt | 1 + .../skyhanni/features/fishing/FishingTimer.kt | 4 ++- .../features/fishing/SeaCreatureFeatures.kt | 9 +++-- .../features/fishing/SeaCreatureManager.kt | 1 + .../fishing/SeaCreatureMessageShortener.kt | 1 + .../skyhanni/features/fishing/SharkFishCounter.kt | 4 ++- .../features/fishing/ShowFishingItemName.kt | 2 +- .../fishing/tracker/FishingProfitTracker.kt | 7 ++-- .../features/fishing/tracker/SeaCreatureTracker.kt | 17 +++++---- .../features/fishing/trophy/OdgerWaypoint.kt | 1 + .../features/fishing/trophy/TrophyFishFillet.kt | 1 + .../features/fishing/trophy/TrophyFishManager.kt | 4 +-- .../features/fishing/trophy/TrophyFishMessages.kt | 22 +++++++----- .../features/fishing/trophy/TrophyRarity.kt | 3 +- .../skyhanni/features/garden/AnitaMedalProfit.kt | 7 ++-- .../features/garden/AtmosphericFilterDisplay.kt | 1 - .../skyhanni/features/garden/CropAccessory.kt | 6 ++-- .../hannibal2/skyhanni/features/garden/CropType.kt | 32 +++++++++++------ .../features/garden/FarmingFortuneDisplay.kt | 6 ++-- .../features/garden/FarmingMilestoneCommand.kt | 14 ++++---- .../skyhanni/features/garden/GardenAPI.kt | 5 +-- .../features/garden/GardenCropMilestoneFix.kt | 9 ++--- .../features/garden/GardenCropTimeCommand.kt | 17 ++++----- .../features/garden/GardenCropsInCommand.kt | 19 +++++----- .../skyhanni/features/garden/GardenLevelDisplay.kt | 19 +++++++--- .../features/garden/GardenNextJacobContest.kt | 24 +++++++------ .../skyhanni/features/garden/GardenOptimalSpeed.kt | 7 ++-- .../skyhanni/features/garden/GardenPlotAPI.kt | 9 +++-- .../skyhanni/features/garden/GardenWarpCommands.kt | 4 ++- .../skyhanni/features/garden/GardenYawAndPitch.kt | 1 + .../skyhanni/features/garden/SensitivityReducer.kt | 5 ++- .../skyhanni/features/garden/ToolTooltipTweaks.kt | 2 +- .../features/garden/composter/ComposterAPI.kt | 5 +-- .../features/garden/composter/ComposterDisplay.kt | 10 +++--- .../garden/composter/ComposterInventoryNumbers.kt | 2 +- .../features/garden/composter/ComposterOverlay.kt | 40 +++++++++++++--------- .../composter/GardenComposterInventoryFeatures.kt | 6 ++-- .../features/garden/contest/FarmingContestAPI.kt | 7 ++-- .../garden/contest/JacobContestFFNeededDisplay.kt | 6 ++-- .../garden/contest/JacobContestStatsSummary.kt | 15 ++++---- .../garden/contest/JacobContestTimeNeeded.kt | 11 +++--- .../contest/JacobFarmingContestsInventory.kt | 1 + .../features/garden/farming/ArmorDropTracker.kt | 7 ++-- .../features/garden/farming/CropMoneyDisplay.kt | 13 +++---- .../features/garden/farming/CropSpeedMeter.kt | 7 ++-- .../features/garden/farming/DicerRngDropTracker.kt | 8 +++-- .../garden/farming/FarmingWeightDisplay.kt | 20 ++++++----- .../features/garden/farming/GardenBestCropTime.kt | 7 ++-- .../garden/farming/GardenCropMilestoneDisplay.kt | 6 ++-- .../features/garden/farming/GardenCropSpeed.kt | 7 ++-- .../garden/farming/GardenCustomKeybinds.kt | 1 + .../features/garden/farming/GardenStartLocation.kt | 15 ++++---- .../farming/WildStrawberryDyeNotification.kt | 4 ++- .../garden/farming/WrongFungiCutterWarning.kt | 2 ++ .../garden/fortuneguide/CaptureFarmingGear.kt | 25 ++++++++------ .../features/garden/fortuneguide/FFGuideGUI.kt | 4 ++- .../features/garden/fortuneguide/FFStats.kt | 1 + .../garden/fortuneguide/FarmingReforges.kt | 4 +-- .../features/garden/fortuneguide/FarmingSets.kt | 5 +-- .../features/garden/fortuneguide/FortuneStats.kt | 2 +- .../features/garden/fortuneguide/FortuneUpgrade.kt | 4 +-- .../garden/fortuneguide/FortuneUpgrades.kt | 17 ++++----- .../garden/fortuneguide/pages/OverviewPage.kt | 4 ++- .../garden/fortuneguide/pages/UpgradePage.kt | 1 + .../garden/inventory/AnitaExtraFarmingFortune.kt | 3 +- .../inventory/GardenCropMilestoneInventory.kt | 3 +- .../garden/inventory/GardenInventoryNumbers.kt | 2 +- .../garden/inventory/GardenNextPlotPrice.kt | 4 +-- .../features/garden/inventory/GardenPlotIcon.kt | 4 +-- .../garden/inventory/SkyMartCopperPrice.kt | 4 ++- .../skyhanni/features/garden/pests/PestAPI.kt | 1 + .../skyhanni/features/garden/pests/PestFinder.kt | 14 ++++---- .../skyhanni/features/garden/pests/PestSpawn.kt | 4 ++- .../features/garden/pests/PestSpawnTimer.kt | 1 + .../skyhanni/features/garden/pests/SprayDisplay.kt | 5 +-- .../features/garden/pests/SprayFeatures.kt | 2 +- .../skyhanni/features/garden/pests/SprayType.kt | 3 +- .../garden/visitor/GardenVisitorColorNames.kt | 1 + .../garden/visitor/GardenVisitorDropStatistics.kt | 7 ++-- .../garden/visitor/GardenVisitorFeatures.kt | 15 ++++---- .../features/garden/visitor/GardenVisitorTimer.kt | 4 ++- .../visitor/HighlightVisitorsOutsideOfGarden.kt | 4 ++- .../features/garden/visitor/NPCVisitorFix.kt | 5 +-- .../skyhanni/features/garden/visitor/VisitorAPI.kt | 11 +++--- .../features/garden/visitor/VisitorListener.kt | 9 +++-- .../features/garden/visitor/VisitorReward.kt | 8 ++++- .../garden/visitor/VisitorTooltipParser.kt | 2 +- .../features/inventory/AuctionsHighlighter.kt | 6 +++- .../skyhanni/features/inventory/ChestValue.kt | 4 +-- .../skyhanni/features/inventory/DojoRankDisplay.kt | 7 ++-- .../features/inventory/HideNotClickableItems.kt | 7 ++-- .../features/inventory/HighlightBonzoMasks.kt | 3 +- .../inventory/ItemDisplayOverlayFeatures.kt | 1 + .../skyhanni/features/inventory/ItemStars.kt | 1 - .../features/inventory/PowerStoneGuideFeatures.kt | 3 +- .../features/inventory/QuickCraftFeatures.kt | 2 +- .../features/inventory/RngMeterInventory.kt | 3 +- .../skyhanni/features/inventory/SackDisplay.kt | 5 +-- .../skyhanni/features/inventory/StatsTuning.kt | 2 +- .../skyhanni/features/inventory/tiarelay/Relay.kt | 1 + .../features/inventory/tiarelay/TiaRelayHelper.kt | 8 +++-- .../inventory/tiarelay/TiaRelayWaypoints.kt | 1 + .../features/itemabilities/ChickenHeadTimer.kt | 1 + .../itemabilities/FireVeilWandParticles.kt | 3 +- .../itemabilities/abilitycooldown/ItemAbility.kt | 4 +-- .../abilitycooldown/ItemAbilityCooldown.kt | 7 ++-- .../skyhanni/features/mining/DeepCavernsParkour.kt | 13 ++++--- .../mining/HighlightMiningCommissionMobs.kt | 1 + .../skyhanni/features/mining/KingTalismanHelper.kt | 11 +++--- .../crystalhollows/CrystalHollowsNamesInCore.kt | 1 + .../mining/eventtracker/MiningEventTracker.kt | 4 +-- .../features/mining/powdertracker/PowderTracker.kt | 9 ++--- .../skyhanni/features/minion/MinionCollectLogic.kt | 1 + .../skyhanni/features/minion/MinionFeatures.kt | 10 ++++-- .../hannibal2/skyhanni/features/minion/MinionXp.kt | 3 +- .../skyhanni/features/misc/BetterSignEditing.kt | 1 + .../skyhanni/features/misc/ButtonOnPause.kt | 3 +- .../skyhanni/features/misc/CollectionTracker.kt | 17 ++++----- .../skyhanni/features/misc/CurrentPetDisplay.kt | 1 + .../skyhanni/features/misc/CustomTextBox.kt | 5 +-- .../skyhanni/features/misc/FandomWikiFromMenus.kt | 0 .../skyhanni/features/misc/FixNEUHeavyPearls.kt | 5 +-- .../hannibal2/skyhanni/features/misc/HideArmor.kt | 1 + .../skyhanni/features/misc/InGameDateDisplay.kt | 5 +-- .../skyhanni/features/misc/JoinCrystalHollows.kt | 9 ++--- .../skyhanni/features/misc/LesserOrbHider.kt | 4 ++- .../skyhanni/features/misc/LimboTimeTracker.kt | 14 ++++---- .../skyhanni/features/misc/LockMouseLook.kt | 9 ++--- .../skyhanni/features/misc/MarkedPlayerManager.kt | 12 +++---- .../skyhanni/features/misc/MovementSpeedDisplay.kt | 1 + .../features/misc/NonGodPotEffectDisplay.kt | 11 +++--- .../skyhanni/features/misc/ParticleHider.kt | 4 +-- .../skyhanni/features/misc/PartyMemberOutlines.kt | 3 +- .../skyhanni/features/misc/PetExpTooltip.kt | 3 +- .../skyhanni/features/misc/PlayerChatSymbols.kt | 1 + .../skyhanni/features/misc/QuickModMenuSwitch.kt | 12 ++++--- .../skyhanni/features/misc/ServerRestartTitle.kt | 1 + .../skyhanni/features/misc/SkyBlockKickDuration.kt | 1 + .../features/misc/SuperpairsClicksAlert.kt | 5 +-- .../skyhanni/features/misc/TimeFeatures.kt | 1 + .../hannibal2/skyhanni/features/misc/TpsCounter.kt | 2 ++ .../misc/compacttablist/AdvancedPlayerList.kt | 6 ++-- .../features/misc/compacttablist/TabColumn.kt | 4 +-- .../features/misc/compacttablist/TabListReader.kt | 1 + .../misc/compacttablist/TabListRenderer.kt | 4 +-- .../features/misc/compacttablist/TabSection.kt | 3 +- .../features/misc/compacttablist/TabStringType.kt | 3 +- .../features/misc/discordrpc/DiscordRPCManager.kt | 28 ++++++++++----- .../features/misc/discordrpc/DiscordStatus.kt | 1 - .../misc/items/AuctionHouseCopyUnderbidPrice.kt | 4 ++- .../features/misc/items/EstimatedItemValue.kt | 12 ++++--- .../misc/items/EstimatedItemValueCalculator.kt | 8 ++--- .../features/misc/items/EstimatedWardrobePrice.kt | 1 + .../massconfiguration/DefaultConfigFeatures.kt | 19 +++++----- .../massconfiguration/DefaultConfigOptionGui.kt | 6 ++-- .../massconfiguration/FeatureToggleableOption.kt | 4 +-- .../misc/teleportpad/TeleportPadCompactName.kt | 3 +- .../misc/teleportpad/TeleportPadInventoryNumber.kt | 1 + .../features/misc/trevor/TrevorFeatures.kt | 1 + .../skyhanni/features/misc/trevor/TrevorSolver.kt | 1 + .../skyhanni/features/misc/trevor/TrevorTracker.kt | 5 +-- .../misc/update/GuiOptionEditorUpdateCheck.kt | 1 + .../skyhanni/features/misc/update/UpdateManager.kt | 8 ++--- .../features/misc/visualwords/ModifyVisualWords.kt | 1 + .../features/misc/visualwords/VisualWord.kt | 5 +-- .../features/misc/visualwords/VisualWordGui.kt | 5 +-- .../skyhanni/features/nether/PabloHelper.kt | 5 +-- .../skyhanni/features/nether/SulphurSkitterBox.kt | 6 ++-- .../features/nether/VolcanoExplosivityDisplay.kt | 3 +- .../features/nether/ashfang/AshfangBlazes.kt | 3 +- .../features/nether/ashfang/AshfangBlazingSouls.kt | 3 +- .../nether/ashfang/AshfangFreezeCooldown.kt | 1 + .../features/nether/ashfang/AshfangGravityOrbs.kt | 3 +- .../nether/ashfang/AshfangHideParticles.kt | 3 +- .../nether/ashfang/AshfangNextResetCooldown.kt | 1 + .../CrimsonIsleReputationHelper.kt | 9 ++--- .../dailykuudra/DailyKuudraBossHelper.kt | 6 ++-- .../reputationhelper/dailykuudra/KuudraTier.kt | 3 +- .../dailyquest/DailyQuestHelper.kt | 8 ++--- .../reputationhelper/dailyquest/QuestLoader.kt | 4 ++- .../reputationhelper/dailyquest/quest/DojoQuest.kt | 2 +- .../dailyquest/quest/FetchQuest.kt | 8 ++++- .../dailyquest/quest/ProgressQuest.kt | 2 +- .../reputationhelper/dailyquest/quest/Quest.kt | 2 +- .../dailyquest/quest/TrophyFishQuest.kt | 2 +- .../reputationhelper/miniboss/CrimsonMiniBoss.kt | 2 +- .../miniboss/DailyMiniBossHelper.kt | 2 +- .../at/hannibal2/skyhanni/features/rift/RiftAPI.kt | 1 + .../rift/area/dreadfarm/RiftAgaricusCap.kt | 1 + .../area/dreadfarm/RiftWiltedBerberisHelper.kt | 5 +-- .../rift/area/dreadfarm/VoltHighlighter.kt | 3 +- .../area/livingcave/LivingCaveDefenseBlocks.kt | 6 ++-- .../area/livingcave/LivingCaveLivingMetalHelper.kt | 1 + .../area/livingcave/LivingMetalSuitProgress.kt | 2 +- .../rift/area/mirrorverse/RiftLavaMazeParkour.kt | 6 ++-- .../rift/area/mirrorverse/RiftUpsideDownParkour.kt | 6 ++-- .../rift/area/mirrorverse/TubulatorParkour.kt | 8 +++-- .../area/stillgorechateau/RiftBloodEffigies.kt | 11 +++--- .../rift/area/westvillage/VerminTracker.kt | 10 +++--- .../rift/area/westvillage/kloon/KloonHacking.kt | 1 + .../features/rift/area/wyldwoods/RiftLarva.kt | 3 +- .../features/rift/area/wyldwoods/RiftOdonata.kt | 3 +- .../rift/area/wyldwoods/ShyCruxWarnings.kt | 1 + .../rift/everywhere/CruxTalismanDisplay.kt | 7 ++-- .../rift/everywhere/EnigmaSoulWaypoints.kt | 9 ++--- .../features/rift/everywhere/HighlightRiftGuide.kt | 3 +- .../skyhanni/features/rift/everywhere/RiftTimer.kt | 4 ++- .../features/rift/everywhere/motes/RiftMotesOrb.kt | 3 +- .../rift/everywhere/motes/ShowMotesNpcSellPrice.kt | 5 +-- .../features/slayer/SlayerItemsOnGround.kt | 1 + .../features/slayer/SlayerMiniBossFeatures.kt | 3 +- .../features/slayer/SlayerProfitTracker.kt | 10 +++--- .../skyhanni/features/slayer/SlayerQuestWarning.kt | 13 +++---- .../features/slayer/SlayerRngMeterDisplay.kt | 6 ++-- .../features/slayer/VampireSlayerFeatures.kt | 4 +-- .../features/slayer/blaze/BlazeSlayerClearView.kt | 3 +- .../slayer/blaze/BlazeSlayerDaggerHelper.kt | 3 +- .../slayer/blaze/BlazeSlayerFirePitsWarning.kt | 2 ++ .../features/slayer/blaze/HellionShield.kt | 3 +- .../features/slayer/blaze/HellionShieldHelper.kt | 3 +- .../slayer/enderman/EndermanSlayerFeatures.kt | 11 ++++-- .../features/stranded/HighlightPlaceableNpcs.kt | 1 + .../features/summonings/SummoningMobManager.kt | 5 +-- .../features/summonings/SummoningSoulsName.kt | 6 ++-- 319 files changed, 1091 insertions(+), 710 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/features/misc/FandomWikiFromMenus.kt (limited to 'src/main/java/at/hannibal2/skyhanni/features') 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 840253166..6a9c65b8a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt @@ -25,9 +25,11 @@ import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BazaarApi { + private var loadedNpcPriceData = false companion object { + val holder = BazaarDataHolder() var inBazaarInventory = false private var currentSearchedItem = "" diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt index f78b682d7..de37b8b9b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt @@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BazaarBestSellMethod { + private var display = "" // Working with the last clicked item manually because diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt index 5df99f31e..b0e96ca1f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.bazaar import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzToolTipEvent +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils @@ -42,7 +43,7 @@ class BazaarCancelledBuyOrderClipboard { patternCancelledMessage.matchMatcher(event.message) { event.blockedReason = "bazaar cancelled buy order clipbaord" val coins = group("coins") - LorenzUtils.chat("Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)") + ChatUtils.chat("Bazaar buy order cancelled. $latestAmount saved to clipboard. ($coins coins)") latestAmount?.let { OSUtils.copyToClipboard(it.replace(",", "")) } latestAmount = null diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt index 452003c1e..5a4f956a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt @@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.features.bazaar import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.APIUtil +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ItemUtils.name -import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.NEUItems.getItemStackOrNull @@ -16,6 +16,7 @@ import kotlin.concurrent.fixedRateTimer class BazaarDataHolder { companion object { + private val bazaarData = mutableMapOf() private var npcPrices = mapOf() @@ -42,7 +43,7 @@ class BazaarDataHolder { RiftAPI.motesPrice = motesPrice } catch (e: Throwable) { e.printStackTrace() - LorenzUtils.error("Error while trying to read bazaar item list from api: " + e.message) + ChatUtils.error("Error while trying to read bazaar item list from api: " + e.message) } return list } @@ -62,7 +63,7 @@ class BazaarDataHolder { private fun createNewData(internalName: NEUInternalName): BazaarData? { val stack = internalName.getItemStackOrNull() if (stack == null) { - LorenzUtils.debug("Bazaar data is null: '$internalName'") + ChatUtils.debug("Bazaar data is null: '$internalName'") return null } val displayName = stack.name!!.removeColor() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt index 74922ebe4..0f03c9b0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOpenPriceWebsite.kt @@ -14,6 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds class BazaarOpenPriceWebsite { + private val config get() = SkyHanniMod.feature.bazaar private var lastClick = SimpleTimeMark.farPast() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt index fa0dd8187..da828ef31 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.bazaar import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiContainerEvent +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name @@ -15,11 +16,13 @@ import net.minecraft.inventory.Slot import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BazaarOrderHelper { + private val bazaarItemNamePattern = "§.§l(?BUY|SELL) (?.*)".toPattern() private val filledPattern = "§7Filled: §[a6].*§7/.* §a§l100%!".toPattern() private val pricePattern = "§7Price per unit: §6(?.*) coins".toPattern() companion object { + fun isBazaarOrderInventory(inventoryName: String): Boolean = when (inventoryName) { "Your Bazaar Orders" -> true "Co-op Bazaar Orders" -> true @@ -56,7 +59,7 @@ class BazaarOrderHelper { private fun highlightItem(itemName: String, slot: Slot, buyOrSell: Pair) { val data = BazaarApi.getBazaarDataByName(itemName) if (data == null) { - LorenzUtils.debug("Bazaar data is null for bazaarItemName '$itemName'") + ChatUtils.debug("Bazaar data is null for bazaarItemName '$itemName'") return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt index 282791154..a86a05c60 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt @@ -18,6 +18,7 @@ import java.time.OffsetDateTime import java.time.ZoneOffset object BingoAPI { + private var ranks = mapOf() private var data: Map = emptyMap() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt index eb130b06b..7c0e74cae 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt @@ -2,19 +2,21 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class CompactBingoChat { + private val config get() = SkyHanniMod.feature.event.bingo.compactChat private var inSkillLevelUp = false private var inSkyBlockLevelUp = false private var inCollectionLevelUp = false private var collectionLevelUpLastLine: String? = null - private var newArea = 0//0 = nothing, 1 = after first message, 2 = after second message + private var newArea = 0// 0 = nothing, 1 = after first message, 2 = after second message private val healthPattern = " {3}§r§7§8\\+§a.* §c❤ Health".toPattern() private val strengthPattern = " {3}§r§7§8\\+§a. §c❁ Strength".toPattern() @@ -93,7 +95,7 @@ class CompactBingoChat { if (message.contains("Trade") || message.contains("Recipe")) { val text = message.removeColor().replace(" ", "") if (text == "Trade" || text == "Recipe") { - collectionLevelUpLastLine?.let { LorenzUtils.chat(it, false) } + collectionLevelUpLastLine?.let { ChatUtils.chat(it, false) } } } else { collectionLevelUpLastLine = message diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt index f7366235c..ab5e2f3bf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/FirstMinionTier.kt @@ -25,7 +25,7 @@ object FirstMinionTier { private fun addMoreMinions( tierOneMinionsFiltered: List, help: Map, - minions: MutableMap + minions: MutableMap, ) { for (minionId in tierOneMinionsFiltered) { for (recipe in NEUItems.getRecipes(minionId)) { @@ -39,7 +39,7 @@ object FirstMinionTier { recipe: CraftingRecipe, help: Map, minions: MutableMap, - minionId: NEUInternalName + minionId: NEUInternalName, ) { if (recipe.getCachedIngredients().any { help.contains(it.internalItemId.asInternalName()) }) { val name = recipe.output.itemStack.name!!.removeColor() @@ -51,7 +51,7 @@ object FirstMinionTier { private fun addMinion( tierOneMinionsFiltered: List, minions: MutableMap, - tierOneMinionsDone: MutableList + tierOneMinionsDone: MutableList, ) { for (minionId in tierOneMinionsFiltered) { val prefix = minionId.asString().dropLast(1) @@ -63,7 +63,7 @@ object FirstMinionTier { private fun getTierOneMinionsFiltered( tierOneMinions: MutableList, - tierOneMinionsDone: MutableList + tierOneMinionsDone: MutableList, ) = tierOneMinions.filter { it !in tierOneMinionsDone } private fun helpMap(otherItems: Map) = 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 dd060aa9b..930ea6883 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds class MinionCraftHelper { + private val config get() = SkyHanniMod.feature.event.bingo // TODO USE SH-REPO @@ -296,5 +297,4 @@ class MinionCraftHelper { } data.add("tierOneMinionsDone", newList) } - } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt index 94490b1d8..f7c166d37 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt @@ -9,10 +9,11 @@ import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent import at.hannibal2.skyhanni.features.bingo.BingoAPI import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.BingoNextStepHelper +import at.hannibal2.skyhanni.utils.ChatUtils +import at.hannibal2.skyhanni.utils.ConditionalUtils.onToggle import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.LorenzUtils.onToggle import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.SimpleTimeMark @@ -34,6 +35,7 @@ class BingoCardDisplay { private var hasHiddenPersonalGoals = false companion object { + private const val MAX_PERSONAL_GOALS = 20 private const val MAX_COMMUNITY_GOALS = 5 @@ -50,11 +52,11 @@ class BingoCardDisplay { fun toggleCommand() { if (!LorenzUtils.isBingoProfile) { - LorenzUtils.userError("This command only works on a bingo profile!") + ChatUtils.userError("This command only works on a bingo profile!") return } if (!config.enabled) { - LorenzUtils.userError("Bingo Card is disabled in the config!") + ChatUtils.userError("Bingo Card is disabled in the config!") return } toggleMode() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index 9dc7ee907..be27e25a2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.features.bingo.BingoAPI import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal import at.hannibal2.skyhanni.features.bingo.card.goals.GoalType import at.hannibal2.skyhanni.features.bingo.card.goals.HiddenGoalData +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils @@ -22,6 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration class BingoCardReader { + private val config get() = SkyHanniMod.feature.event.bingo.bingoCard private val percentagePattern by RepoPattern.pattern("bingo.card.percentage", " {2}§8Top §.(?.*)%") @@ -97,7 +99,7 @@ class BingoCardReader { val oldFormat = BingoAPI.getCommunityPercentageColor(old) val newFormat = BingoAPI.getCommunityPercentageColor(new) val color = if (new > old) "§c" else "§a" - LorenzUtils.chat("$color${bingoGoal.displayName}: $oldFormat §b->" + " $newFormat") + ChatUtils.chat("$color${bingoGoal.displayName}: $oldFormat §b->" + " $newFormat") } private fun readCommuntyGoalPercentage(lore: List): Double? { diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt index b219f7d44..6148848b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardTips.kt @@ -16,6 +16,7 @@ import net.minecraft.inventory.ContainerChest import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BingoCardTips { + private val config get() = SkyHanniMod.feature.event.bingo.bingoCard @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt index f6758360b..120e66112 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.bingo.card.goals import com.google.gson.annotations.Expose class BingoGoal { + @Expose lateinit var type: GoalType diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt index 0cd5df65a..6987edb82 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/BingoNextStepHelper.kt @@ -17,15 +17,17 @@ import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.ObtainCrys import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.PartialProgressItemsStep import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.ProgressionStep import at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps.SkillLevelStep +import at.hannibal2.skyhanni.utils.ChatUtils +import at.hannibal2.skyhanni.utils.CollectionUtils.editCopy import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BingoNextStepHelper { + private val config get() = SkyHanniMod.feature.event.bingo.bingoCard private var dirty = true @@ -41,6 +43,7 @@ class BingoNextStepHelper { private val rhysTaskName = "30x Enchanted Minerals (Redstone, Lapis Lazuli, Coal) (for Rhys)" companion object { + private val finalSteps = mutableListOf() private var currentSteps = emptyList() var currentHelp = emptyList() @@ -152,7 +155,7 @@ class BingoNextStepHelper { currentStep.amountHavingHidden -= 10 } } - //TODO add thys message + // TODO add thys message // if (event.message == "thys message") { // thys.done() // } @@ -202,7 +205,7 @@ class BingoNextStepHelper { done = true updateResult() if (!silent && config.stepHelper) { - LorenzUtils.chat("A bingo goal step is done! ($displayName)") + ChatUtils.chat("A bingo goal step is done! ($displayName)") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt index e6bb7075b..d3f33a27d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/CollectionStep.kt @@ -5,5 +5,6 @@ import at.hannibal2.skyhanni.utils.NumberUtil class CollectionStep(collectionName: String, amountNeeded: Int) : ProgressionStep(NumberUtil.format(amountNeeded) + " $collectionName Collection", amountNeeded.toLong()) { + val internalName by lazy { NEUInternalName.fromItemName(if (collectionName == "Mushroom") "Red Mushroom" else collectionName) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ItemsStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ItemsStep.kt index 548318a20..cf856f001 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ItemsStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/ItemsStep.kt @@ -5,6 +5,7 @@ open class ItemsStep(displayName: String, val itemName: String, amountNeeded: Lo class PartialProgressItemsStep(displayName: String, itemName: String, amountNeeded: Long, variants: Map) : ItemsStep(displayName, itemName, amountNeeded, variants) { + var amountHavingHidden: Int = 0 override val amountNeeded: Long get() = super.amountNeeded - amountHavingHidden diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/NextStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/NextStep.kt index d0a73926a..b9e9b574e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/NextStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/NextStep.kt @@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.features.bingo.card.nextstephelper.steps abstract class NextStep( val displayName: String, var done: Boolean = false, - val requirements: MutableList = mutableListOf() + val requirements: MutableList = mutableListOf(), ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/SkillLevelStep.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/SkillLevelStep.kt index e93aa24b0..c87a8683c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/SkillLevelStep.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/nextstephelper/steps/SkillLevelStep.kt @@ -5,6 +5,6 @@ import at.hannibal2.skyhanni.data.SkillExperience class SkillLevelStep( val skillName: String, private val skillLevelNeeded: Int, - skillExpNeeded: Long = SkillExperience.getExpForLevel(skillLevelNeeded) + skillExpNeeded: Long = SkillExperience.getExpForLevel(skillLevelNeeded), ) : ProgressionStep("$skillName $skillLevelNeeded", skillExpNeeded) diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt index 72b28d013..54dc6bed0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ArachneChatMessageHider.kt @@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class ArachneChatMessageHider { + private val config get() = SkyHanniMod.feature.chat private var hideArachneDeadMessage = false diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt index 2c0437e01..fdeeb25e9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt @@ -10,6 +10,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.regex.Pattern class ChatFilter { + private val config get() = SkyHanniMod.feature.chat.filterType /// @@ -97,13 +98,13 @@ class ChatFilter { "§7Putting item in escrow...", "§7Putting coins in escrow...", - //Auction House + // Auction House "§7Setting up the auction...", "§7Processing purchase...", "§7Processing bid...", "§7Claiming BIN auction...", - //Bazaar + // Bazaar "§6[Bazaar] §r§7Submitting sell offer...", "§6[Bazaar] §r§7Submitting buy order...", "§6[Bazaar] §r§7Executing instant sell...", @@ -112,18 +113,18 @@ class ChatFilter { "§6[Bazaar] §r§7Claiming order...", "§6[Bazaar] §r§7Putting goods in escrow...", - //Bank + // Bank "§8Depositing coins...", "§8Withdrawing coins..." ) // Slayer private val slayerPatterns = listOf( - //start + // start " {2}§r§5§lSLAYER QUEST STARTED!".toPattern(), " {3}§5§l» §7Slay §c(.*) Combat XP §7worth of (.*)§7.".toPattern(), - //end + // end " {2}§r§a§lSLAYER QUEST COMPLETE!".toPattern(), " {3}§r§e(.*)Slayer LVL 9 §r§5- §r§a§lLVL MAXED OUT!".toPattern(), " {3}§r§5§l» §r§7Talk to Maddox to claim your (.*) Slayer XP!".toPattern() @@ -137,7 +138,7 @@ class ChatFilter { // Slayer Drop private val slayerDropPatterns = listOf( - //Zombie + // Zombie "§b§lRARE DROP! §r§7\\(§r§f§r§9Revenant Viscera§r§7\\) (.*)".toPattern(), "§b§lRARE DROP! §r§7\\(§r§f§r§7(.*)x §r§f§r§9Foul Flesh§r§7\\) (.*)".toPattern(), "§b§lRARE DROP! §r§7\\(§r§f§r§9Foul Flesh§r§7\\) (.*)".toPattern(), @@ -147,7 +148,7 @@ class ChatFilter { "§5§lVERY RARE DROP! {2}§r§7\\(§r§f§r§9Undead Catalyst§r§7\\) (.*)".toPattern(), "§5§lVERY RARE DROP! {2}§r§7\\(§r§f§r§2◆ Pestilence Rune I§r§7\\) §r§b(.*)".toPattern(), - //Tarantula + // Tarantula "§6§lRARE DROP! §r§9Arachne's Keeper Fragment (.+)".toPattern(), "§6§lRARE DROP! §r§5Travel Scroll to Spider's Den Top of Nest (.+)".toPattern(), "§9§lVERY RARE DROP! {2}§r§7\\(§r§f§r§a◆ Bite Rune I§r§7\\) (.+)".toPattern(), @@ -155,7 +156,7 @@ class ChatFilter { "§b§lRARE DROP! §r§7\\(§r§f§r§aToxic Arrow Poison§r§7\\) (.+)".toPattern(), "§5§lVERY RARE DROP! {2}§r§7\\(§r§9Bane of Arthropods VI§r§7\\) (.+)".toPattern(), - //Enderman + // Enderman "§b§lRARE DROP! §r§7\\(§r§f§r§7(.*)x §r§f§r§aTwilight Arrow Poison§r§7\\) (.*)".toPattern(), "§5§lVERY RARE DROP! {2}§r§7\\(§r§fMana Steal I§r§7\\) (.*)".toPattern(), "§5§lVERY RARE DROP! {2}§r§7\\(§r§f§r§5Sinful Dice§r§7\\) (.*)".toPattern(), @@ -167,7 +168,7 @@ class ChatFilter { "§5§lVERY RARE DROP! {2}§r§7\\(§r§f§r§5◆ End Rune I§r§7\\) (.*)".toPattern(), "§5§lVERY RARE DROP! {2}§r§7\\(§r§f§r§6Hazmat Enderman§r§7\\) .*".toPattern(), - //Blaze + // Blaze "§9§lVERY RARE DROP! {2}§r§7\\(§r§f§r§fWisp's Ice-Flavored Water I Splash Potion§r§7\\) (.*)".toPattern(), "§b§lRARE DROP! §r§7\\(§r§f§r§5Bundle of Magma Arrows§r§7\\) (.*)".toPattern(), "§9§lVERY RARE DROP! {2}§r§7\\(§r§f§r§7\\d+x §r§f§r§9(Glowstone|Blaze Rod|Magma Cream|Nether Wart) Distillate§r§7\\) (.*)".toPattern() diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt index b9a9a6e0b..e40854c9d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.chat import at.hannibal2.skyhanni.data.ChatManager +import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.KeyboardManager import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.OSUtils @@ -15,6 +16,7 @@ import net.minecraft.util.IChatComponent import org.lwjgl.input.Mouse class ChatFilterGui(private val history: List) : GuiScreen() { + private var scroll = -1.0 private val w = 500 private var wasMouseButtonDown = false @@ -61,11 +63,11 @@ class ChatFilterGui(private val history: List) { if (!isEnabled()) return if (args.size < 2 || args[0].length != 2) { // args[0] is the language code - LorenzUtils.userError("Usage: /shcopytranslation ") + ChatUtils.userError("Usage: /shcopytranslation ") return } val language = args[0] @@ -163,7 +164,7 @@ class Translator { coroutineScope.launch { val translation = getTranslationFromEnglish(message, language) - LorenzUtils.chat("Copied translation to clipboard: $translation") + ChatUtils.chat("Copied translation to clipboard: $translation") OSUtils.copyToClipboard(translation) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt index f70c10ea0..11e51e686 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt @@ -47,6 +47,7 @@ class WatchdogHider { } companion object { + private const val watchdogStartLine = "§f" private const val watchdogAnnouncementLine = "§4[WATCHDOG ANNOUNCEMENT]" private const val watchdogEndLine = "§c" diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt index 4a80f8084..024835aeb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.features.chat.playerchat +import at.hannibal2.skyhanni.data.jsonobjects.repo.PlayerChatFilterJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.MultiFilter -import at.hannibal2.skyhanni.data.jsonobjects.repo.PlayerChatFilterJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class PlayerChatFilter { diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt index c95763adf..a9c302021 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt @@ -69,7 +69,7 @@ class PlayerChatModifier { // TODO remove workaround if (!DungeonMilestonesDisplay.isMilestoneMessage(input)) { - //all players same color in chat + // all players same color in chat string = string.replace("§r§7: ", "§r§f: ") } } @@ -93,6 +93,4 @@ class PlayerChatModifier { event.move(3, "chat.playerRankHider", "chat.playerMessage.playerRankHider") event.move(3, "chat.chatFilter", "chat.playerMessage.chatFilter") } - - } diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt index 902caadf0..61e69a67b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft */ object ChromaShader : Shader("chroma", "chroma") { + val config get() = SkyHanniMod.feature.chroma val INSTANCE: ChromaShader get() = this diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt index 49526c6f8..a5b0cd386 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt @@ -9,12 +9,12 @@ 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.utils.CollectionUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.LorenzUtils.addButton import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators @@ -168,7 +168,8 @@ object BestiaryData { for ((lineIndex, line) in stack.getLore().withIndex()) { val loreLine = line.removeColor() if (loreLine.startsWith("Kills: ")) { - actualRealTotalKill = "([0-9,.]+)".toRegex().find(loreLine)?.groupValues?.get(1)?.formatNumber() ?: 0 + actualRealTotalKill = "([0-9,.]+)".toRegex().find(loreLine)?.groupValues?.get(1)?.formatNumber() + ?: 0 } if (!loreLine.startsWith(" ")) continue val previousLine = stack.getLore()[lineIndex - 1] @@ -437,7 +438,7 @@ object BestiaryData { val name: String, val familiesFound: Long, val totalFamilies: Long, - val familiesCompleted: Long + val familiesCompleted: Long, ) data class BestiaryMob( @@ -447,7 +448,7 @@ object BestiaryData { var totalKills: Long, var killNeededForNextLevel: Long, var currentKillToNextLevel: Long, - var actualRealTotalKill: Long + var actualRealTotalKill: Long, ) { fun killNeededToMax(): Long { @@ -482,5 +483,4 @@ object BestiaryData { } private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled - } diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt index 8f419f803..5562a4bf4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt @@ -8,9 +8,10 @@ enum class BossType( val fullName: String, val bossTypeToggle: Type, val shortName: String = fullName, - val showDeathTime: Boolean = false + val showDeathTime: B