From 024cd40a3a3e98da87a1ce6eaaebd379f312cc72 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Thu, 16 Nov 2023 10:40:55 +0000 Subject: Config Updates - Subcategories and Reformatting (#709) Added new sub category stuff from moul config #709 --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 2 +- .../skyhanni/config/ConfigUpdaterMigrator.kt | 2 +- .../at/hannibal2/skyhanni/config/Features.java | 40 +- .../skyhanni/config/features/BazaarConfig.java | 43 - .../skyhanni/config/features/ChatConfig.java | 212 --- .../skyhanni/config/features/ChromaConfig.java | 62 - .../skyhanni/config/features/CombatConfig.java | 721 ---------- .../skyhanni/config/features/CommandsConfig.java | 115 -- .../config/features/CrimsonIsleConfig.java | 157 --- .../skyhanni/config/features/DevConfig.java | 225 --- .../skyhanni/config/features/DungeonConfig.java | 256 ---- .../skyhanni/config/features/EventConfig.java | 421 ------ .../skyhanni/config/features/FishingConfig.java | 309 ---- .../skyhanni/config/features/GUIConfig.java | 174 --- .../skyhanni/config/features/GardenConfig.java | 1488 -------------------- .../skyhanni/config/features/InventoryConfig.java | 480 ------- .../config/features/ItemAbilityConfig.java | 74 - .../config/features/MarkedPlayerConfig.java | 24 - .../skyhanni/config/features/MiningConfig.java | 128 -- .../skyhanni/config/features/MinionsConfig.java | 96 -- .../skyhanni/config/features/MiscConfig.java | 834 ----------- .../skyhanni/config/features/RiftConfig.java | 720 ---------- .../skyhanni/config/features/SlayerConfig.java | 529 ------- .../config/features/bazaar/BazaarConfig.java | 43 + .../skyhanni/config/features/chat/ChatConfig.java | 91 ++ .../skyhanni/config/features/chat/ChatSymbols.java | 24 + .../config/features/chat/CompactPotionConfig.java | 20 + .../config/features/chat/FilterTypesConfig.java | 83 ++ .../config/features/chat/PlayerMessagesConfig.java | 21 + .../config/features/chroma/ChromaConfig.java | 62 + .../config/features/combat/BestiaryConfig.java | 48 + .../config/features/combat/CombatConfig.java | 47 + .../config/features/combat/EnderNodeConfig.java | 64 + .../config/features/combat/MobsConfig.java | 94 ++ .../config/features/combat/SummoningsConfig.java | 38 + .../damageindicator/DamageIndicatorConfig.java | 102 ++ .../combat/damageindicator/EnderSlayerConfig.java | 18 + .../damageindicator/VampireSlayerConfig.java | 23 + .../combat/ghostcounter/GhostCounterConfig.java | 96 ++ .../textformatting/BestiaryFormattingConfig.java | 41 + .../textformatting/ETAFormattingConfig.java | 42 + .../textformatting/KillHourFormattingConfig.java | 24 + .../textformatting/TextFormattingConfig.java | 148 ++ .../textformatting/XPHourFormattingConfig.java | 26 + .../config/features/commands/CommandsConfig.java | 39 + .../features/commands/FandomWikiCommandConfig.java | 27 + .../features/commands/TabCompleteConfig.java | 61 + .../features/crimsonisle/CrimsonIsleConfig.java | 34 + .../crimsonisle/ReputationHelperConfig.java | 38 + .../crimsonisle/ashfang/AshfangConfig.java | 50 + .../crimsonisle/ashfang/BlazingSoulsColor.java | 21 + .../crimsonisle/ashfang/GravityOrbsConfig.java | 21 + .../crimsonisle/ashfang/HideAshfangConfig.java | 27 + .../skyhanni/config/features/dev/DebugConfig.java | 88 ++ .../skyhanni/config/features/dev/DevConfig.java | 46 + .../config/features/dev/WaypointsConfig.java | 26 + .../dev/minecraftconsole/ConsoleFiltersConfig.java | 53 + .../minecraftconsole/MinecraftConsoleConfig.java | 40 + .../config/features/dungeon/CleanEndConfig.java | 21 + .../config/features/dungeon/DungeonConfig.java | 102 ++ .../features/dungeon/DungeonCopilotConfig.java | 18 + .../config/features/dungeon/LividFinderConfig.java | 20 + .../features/dungeon/MessageFilterConfig.java | 14 + .../config/features/dungeon/ObjectHiderConfig.java | 65 + .../config/features/dungeon/PartyFinderConfig.java | 44 + .../config/features/dungeon/TabListConfig.java | 15 + .../config/features/event/CenturyConfig.java | 24 + .../config/features/event/CityProjectConfig.java | 31 + .../config/features/event/EventConfig.java | 51 + .../config/features/event/GreatSpookConfig.java | 44 + .../features/event/HalloweenBasketConfig.java | 25 + .../config/features/event/MayorJerryConfig.java | 16 + .../features/event/bingo/BingoCardConfig.java | 45 + .../config/features/event/bingo/BingoConfig.java | 30 + .../features/event/bingo/CompactChatConfig.java | 27 + .../config/features/event/diana/DianaConfig.java | 60 + .../features/event/diana/IgnoredWarpsConfig.java | 19 + .../event/diana/InquisitorSharingConfig.java | 37 + .../event/winter/FrozenTreasureConfig.java | 72 + .../config/features/event/winter/WinterConfig.java | 26 + .../config/features/fishing/BarnTimerConfig.java | 62 + .../features/fishing/ChumBucketHiderConfig.java | 26 + .../features/fishing/FishedItemNameConfig.java | 21 + .../fishing/FishingBaitWarningsConfig.java | 20 + .../config/features/fishing/FishingConfig.java | 76 + .../features/fishing/FishingHookDisplayConfig.java | 27 + .../config/features/fishing/RareCatchesConfig.java | 32 + .../features/fishing/ThunderSparkConfig.java | 20 + .../fishing/trophyfishing/ChatMessagesConfig.java | 56 + .../fishing/trophyfishing/TrophyFishingConfig.java | 27 + .../config/features/garden/AnitaShopConfig.java | 30 + .../features/garden/CropStartLocationConfig.java | 16 + .../config/features/garden/DicerCounterConfig.java | 24 + .../features/garden/EliteFarmingWeightConfig.java | 53 + .../features/garden/FarmingArmorDropsConfig.java | 24 + .../features/garden/FarmingFortuneConfig.java | 36 + .../config/features/garden/GardenConfig.java | 205 +++ .../config/features/garden/GardenLevelConfig.java | 18 + .../config/features/garden/KeyBindConfig.java | 87 ++ .../config/features/garden/MoneyPerHourConfig.java | 126 ++ .../features/garden/NextJacobContestConfig.java | 59 + .../config/features/garden/NumbersConfig.java | 32 + .../config/features/garden/PlotIconConfig.java | 24 + .../config/features/garden/SkyMartConfig.java | 23 + .../features/garden/TooltipTweaksConfig.java | 47 + .../features/garden/YawPitchDisplayConfig.java | 64 + .../features/garden/composter/ComposterConfig.java | 108 ++ .../features/garden/composter/NotifyLowConfig.java | 38 + .../cropmilestones/CropMilestonesConfig.java | 101 ++ .../cropmilestones/MushroomPetPerkConfig.java | 43 + .../features/garden/cropmilestones/NextConfig.java | 66 + .../garden/optimalspeed/CustomSpeedConfig.java | 79 ++ .../garden/optimalspeed/OptimalSpeedConfig.java | 39 + .../garden/visitor/DropsStatisticsConfig.java | 78 + .../features/garden/visitor/InventoryConfig.java | 37 + .../features/garden/visitor/NeedsConfig.java | 40 + .../garden/visitor/RewardWarningConfig.java | 62 + .../features/garden/visitor/TimerConfig.java | 37 + .../features/garden/visitor/VisitorConfig.java | 118 ++ .../skyhanni/config/features/gui/GUIConfig.java | 74 + .../config/features/gui/InGameDateConfig.java | 63 + .../config/features/gui/ModifyWordsConfig.java | 28 + .../config/features/gui/TextBoxConfig.java | 26 + .../features/inventory/ChestValueConfig.java | 88 ++ .../features/inventory/HideNotClickableConfig.java | 43 + .../config/features/inventory/InventoryConfig.java | 127 ++ .../inventory/JacobFarmingContestConfig.java | 32 + .../config/features/inventory/RngMeterConfig.java | 26 + .../features/inventory/SackDisplayConfig.java | 84 ++ .../features/inventory/StatsTuningConfig.java | 32 + .../inventory/helper/HarpConfigKeyBinds.java | 37 + .../features/inventory/helper/HelperConfig.java | 37 + .../features/inventory/helper/TiaRelayConfig.java | 32 + .../features/itemability/ChickenHeadConfig.java | 25 + .../features/itemability/FireVeilWandConfig.java | 21 + .../features/itemability/ItemAbilityConfig.java | 38 + .../features/markedplayer/MarkedPlayerConfig.java | 24 + .../config/features/mining/KingTalismanConfig.java | 25 + .../config/features/mining/MiningConfig.java | 32 + .../features/mining/PowderTrackerConfig.java | 84 ++ .../config/features/minion/EmptiedTimeConfig.java | 27 + .../features/minion/LastClickedMinionConfig.java | 36 + .../config/features/minion/MinionsConfig.java | 46 + .../config/features/misc/DiscordRPCConfig.java | 97 ++ .../features/misc/EstimatedItemValueConfig.java | 52 + .../features/misc/GlowingDroppedItemsConfig.java | 26 + .../config/features/misc/HideArmorConfig.java | 20 + .../features/misc/HighlightPartyMembersConfig.java | 25 + .../config/features/misc/KickDurationConfig.java | 34 + .../skyhanni/config/features/misc/MiscConfig.java | 209 +++ .../config/features/misc/ParticleHiderConfig.java | 50 + .../features/misc/PocketSackInASackConfig.java | 21 + .../config/features/misc/PotionEffectsConfig.java | 24 + .../features/misc/QuickModMenuSwitchConfig.java | 29 + .../config/features/misc/TeleportPadConfig.java | 21 + .../features/misc/TrevorTheTrapperConfig.java | 110 ++ .../compacttablist/AdvancedPlayerListConfig.java | 73 + .../misc/compacttablist/CompactTabListConfig.java | 27 + .../features/misc/cosmetic/ArrowTrailConfig.java | 46 + .../features/misc/cosmetic/CosmeticConfig.java | 18 + .../misc/cosmetic/FollowingLineConfig.java | 37 + .../config/features/misc/pets/PetConfig.java | 24 + .../misc/pets/PetExperienceToolTipConfig.java | 27 + .../features/rift/CruxTalismanDisplayConfig.java | 30 + .../config/features/rift/EnigmaSoulConfig.java | 22 + .../config/features/rift/MotesOrbsConfig.java | 28 + .../skyhanni/config/features/rift/RiftConfig.java | 53 + .../config/features/rift/RiftTimerConfig.java | 30 + .../config/features/rift/area/RiftAreasConfig.java | 60 + .../rift/area/colosseum/ColosseumConfig.java | 15 + .../rift/area/dreadfarm/DreadfarmConfig.java | 26 + .../rift/area/dreadfarm/VoltCruxConfig.java | 33 + .../rift/area/dreadfarm/WiltedBerberisConfig.java | 26 + .../rift/area/livingcave/DefenseBlockConfig.java | 29 + .../rift/area/livingcave/LivingCaveConfig.java | 23 + .../livingcave/LivingCaveLivingMetalConfig.java | 22 + .../livingcave/LivingMetalSuitProgressConfig.java | 24 + .../rift/area/mirrorverse/LavaMazeConfig.java | 39 + .../rift/area/mirrorverse/MirrorVerseConfig.java | 29 + .../rift/area/mirrorverse/TubulatorConfig.java | 44 + .../area/mirrorverse/UpsideDownParkourConfig.java | 44 + .../danceroomhelper/DanceRoomHelperConfig.java | 48 + .../danceroomformatting/ColorConfig.java | 42 + .../DanceRoomFormattingConfig.java | 29 + .../rift/area/stillgorechateau/EffigiesConfig.java | 37 + .../stillgorechateau/StillgoreChateauConfig.java | 14 + .../rift/area/westvillage/KloonHackingConfig.java | 27 + .../rift/area/westvillage/WestVillageConfig.java | 13 + .../features/rift/area/wyldwoods/LarvasConfig.java | 22 + .../rift/area/wyldwoods/OdonataConfig.java | 23 + .../rift/area/wyldwoods/WyldWoodsConfig.java | 27 + .../features/rift/motes/InventoryValueConfig.java | 25 + .../config/features/rift/motes/MotesConfig.java | 27 + .../features/slayer/ItemProfitTrackerConfig.java | 50 + .../features/slayer/ItemsOnGroundConfig.java | 21 + .../features/slayer/RngMeterDisplayConfig.java | 30 + .../features/slayer/SlayerBossWarningConfig.java | 26 + .../config/features/slayer/SlayerConfig.java | 77 + .../config/features/slayer/blaze/BlazeConfig.java | 32 + .../features/slayer/blaze/BlazeHellionConfig.java | 45 + .../slayer/endermen/EndermanBeaconConfig.java | 46 + .../features/slayer/endermen/EndermanConfig.java | 31 + .../features/slayer/vampire/BloodIchorConfig.java | 38 + .../slayer/vampire/CoopBossHighlightConfig.java | 44 + .../slayer/vampire/KillerSpringConfig.java | 31 + .../features/slayer/vampire/OthersBossConfig.java | 39 + .../features/slayer/vampire/OwnBossConfig.java | 39 + .../features/slayer/vampire/VampireConfig.java | 80 ++ .../skyhanni/features/cosmetics/ArrowTrail.kt | 2 +- .../features/cosmetics/CosmeticFollowingLine.kt | 10 +- .../visitor/HighlightVisitorsOutsideOfGarden.kt | 2 +- .../garden/visitor/VisitorTooltipParser.kt | 10 +- .../skyhanni/features/misc/CurrentPetDisplay.kt | 3 +- .../at/hannibal2/skyhanni/features/rift/RiftAPI.kt | 2 +- .../skyhanni/features/rift/area/RiftLarva.kt | 49 - .../rift/area/colosseum/BlobbercystsHighlight.kt | 10 +- .../rift/area/dreadfarm/RiftAgaricusCap.kt | 8 +- .../area/dreadfarm/RiftWiltedBerberisHelper.kt | 2 +- .../rift/area/dreadfarm/VoltHighlighter.kt | 4 +- .../area/livingcave/LivingCaveDefenseBlocks.kt | 8 +- .../area/livingcave/LivingCaveLivingMetalHelper.kt | 2 +- .../area/livingcave/LivingMetalSuitProgress.kt | 4 +- .../rift/area/mirrorverse/DanceRoomHelper.kt | 8 +- .../rift/area/mirrorverse/RiftLavaMazeParkour.kt | 2 +- .../rift/area/mirrorverse/RiftUpsideDownParkour.kt | 2 +- .../rift/area/mirrorverse/TubulatorParkour.kt | 2 +- .../area/stillgorechateau/RiftBloodEffigies.kt | 8 +- .../features/rift/area/westvillage/KloonHacking.kt | 8 +- .../features/rift/area/wyldwoods/RiftLarva.kt | 49 + .../features/rift/area/wyldwoods/RiftOdonata.kt | 2 +- .../rift/area/wyldwoods/ShyCruxWarnings.kt | 10 +- .../features/rift/everywhere/motes/RiftMotesOrb.kt | 8 +- .../features/slayer/VampireSlayerFeatures.kt | 8 +- .../slayer/enderman/EndermanSlayerFeatures.kt | 3 +- .../test/garden/VisitorToolTipParserTest.kt | 16 +- 235 files changed, 8388 insertions(+), 7176 deletions(-) delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/ChromaConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/CommandsConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/EventConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/GUIConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/GardenConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/InventoryConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilityConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayerConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MiningConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MinionsConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/bazaar/BazaarConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatSymbols.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/BestiaryConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/commands/FandomWikiCommandConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/AshfangConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/BlazingSoulsColor.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/GravityOrbsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/HideAshfangConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dev/WaypointsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dev/minecraftconsole/ConsoleFiltersConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dev/minecraftconsole/MinecraftConsoleConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/CleanEndConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/DungeonCopilotConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/LividFinderConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/MessageFilterConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/ObjectHiderConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/PartyFinderConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/dungeon/TabListConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/CenturyConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/CityProjectConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/EventConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/GreatSpookConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/HalloweenBasketConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/MayorJerryConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoCardConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/BingoConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/bingo/CompactChatConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/diana/IgnoredWarpsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/diana/InquisitorSharingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/winter/FrozenTreasureConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/event/winter/WinterConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/ChumBucketHiderConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishedItemNameConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingBaitWarningsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/FishingHookDisplayConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/RareCatchesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/ThunderSparkConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/ChatMessagesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/fishing/trophyfishing/TrophyFishingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/AnitaShopConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/CropStartLocationConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerCounterConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/EliteFarmingWeightConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingArmorDropsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/KeyBindConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/NextJacobContestConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/NumbersConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotIconConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/SkyMartConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/TooltipTweaksConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/YawPitchDisplayConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/NotifyLowConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/MushroomPetPerkConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/CustomSpeedConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/DropsStatisticsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/InventoryConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/NeedsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/TimerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/gui/GUIConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/gui/InGameDateConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/gui/ModifyWordsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/gui/TextBoxConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/ChestValueConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/HideNotClickableConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/JacobFarmingContestConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/RngMeterConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/SackDisplayConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/StatsTuningConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HarpConfigKeyBinds.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/HelperConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/TiaRelayConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/itemability/ChickenHeadConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/itemability/FireVeilWandConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/markedplayer/MarkedPlayerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/KingTalismanConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/mining/PowderTrackerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/minion/EmptiedTimeConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/minion/LastClickedMinionConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/minion/MinionsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/DiscordRPCConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/EstimatedItemValueConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/GlowingDroppedItemsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/HideArmorConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/HighlightPartyMembersConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/KickDurationConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/ParticleHiderConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/PocketSackInASackConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/PotionEffectsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/QuickModMenuSwitchConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/TeleportPadConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/TrevorTheTrapperConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/AdvancedPlayerListConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/ArrowTrailConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/CosmeticConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/cosmetic/FollowingLineConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/pets/PetExperienceToolTipConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/CruxTalismanDisplayConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/EnigmaSoulConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/MotesOrbsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftTimerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/RiftAreasConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/colosseum/ColosseumConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/DreadfarmConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/VoltCruxConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/dreadfarm/WiltedBerberisConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/DefenseBlockConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingCaveConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingCaveLivingMetalConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/livingcave/LivingMetalSuitProgressConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/LavaMazeConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/MirrorVerseConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/TubulatorConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/UpsideDownParkourConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/danceroomhelper/DanceRoomHelperConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/danceroomhelper/danceroomformatting/ColorConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/mirrorverse/danceroomhelper/danceroomformatting/DanceRoomFormattingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/StillgoreChateauConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/KloonHackingConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/westvillage/WestVillageConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/wyldwoods/LarvasConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/wyldwoods/OdonataConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/area/wyldwoods/WyldWoodsConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/motes/InventoryValueConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/rift/motes/MotesConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemProfitTrackerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/ItemsOnGroundConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/RngMeterDisplayConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerBossWarningConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/SlayerConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/blaze/BlazeConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/blaze/BlazeHellionConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/endermen/EndermanBeaconConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/endermen/EndermanConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/BloodIchorConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/CoopBossHighlightConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/KillerSpringConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OthersBossConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/OwnBossConfig.java create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/slayer/vampire/VampireConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt create mode 100644 src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftLarva.kt (limited to 'src') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 84bbb2e26..5309a4e2e 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -249,7 +249,7 @@ 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 +import at.hannibal2.skyhanni.features.rift.area.wyldwoods.RiftLarva import at.hannibal2.skyhanni.features.rift.area.colosseum.BlobbercystsHighlight import at.hannibal2.skyhanni.features.rift.area.dreadfarm.RiftAgaricusCap import at.hannibal2.skyhanni.features.rift.area.dreadfarm.RiftWiltedBerberisHelper diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt index 19b77abf3..6227b0ea9 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt @@ -9,7 +9,7 @@ import com.google.gson.JsonPrimitive object ConfigUpdaterMigrator { val logger = LorenzLogger("ConfigMigration") - const val CONFIG_VERSION = 8 + const val CONFIG_VERSION = 9 fun JsonElement.at(chain: List, init: Boolean): JsonElement? { if (chain.isEmpty()) return this if (this !is JsonObject) return null diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 33d766fdf..4085eb069 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -2,26 +2,26 @@ package at.hannibal2.skyhanni.config; import at.hannibal2.skyhanni.SkyHanniMod; import at.hannibal2.skyhanni.config.features.About; -import at.hannibal2.skyhanni.config.features.BazaarConfig; -import at.hannibal2.skyhanni.config.features.ChatConfig; -import at.hannibal2.skyhanni.config.features.ChromaConfig; -import at.hannibal2.skyhanni.config.features.CombatConfig; -import at.hannibal2.skyhanni.config.features.CommandsConfig; -import at.hannibal2.skyhanni.config.features.CrimsonIsleConfig; -import at.hannibal2.skyhanni.config.features.DevConfig; -import at.hannibal2.skyhanni.config.features.DungeonConfig; -import at.hannibal2.skyhanni.config.features.EventConfig; -import at.hannibal2.skyhanni.config.features.FishingConfig; -import at.hannibal2.skyhanni.config.features.GUIConfig; -import at.hannibal2.skyhanni.config.features.GardenConfig; -import at.hannibal2.skyhanni.config.features.InventoryConfig; -import at.hannibal2.skyhanni.config.features.ItemAbilityConfig; -import at.hannibal2.skyhanni.config.features.MarkedPlayerConfig; -import at.hannibal2.skyhanni.config.features.MiningConfig; -import at.hannibal2.skyhanni.config.features.MinionsConfig; -import at.hannibal2.skyhanni.config.features.MiscConfig; -import at.hannibal2.skyhanni.config.features.RiftConfig; -import at.hannibal2.skyhanni.config.features.SlayerConfig; +import at.hannibal2.skyhanni.config.features.bazaar.BazaarConfig; +import at.hannibal2.skyhanni.config.features.chat.ChatConfig; +import at.hannibal2.skyhanni.config.features.chroma.ChromaConfig; +import at.hannibal2.skyhanni.config.features.combat.CombatConfig; +import at.hannibal2.skyhanni.config.features.commands.CommandsConfig; +import at.hannibal2.skyhanni.config.features.crimsonisle.CrimsonIsleConfig; +import at.hannibal2.skyhanni.config.features.dev.DevConfig; +import at.hannibal2.skyhanni.config.features.dungeon.DungeonConfig; +import at.hannibal2.skyhanni.config.features.event.EventConfig; +import at.hannibal2.skyhanni.config.features.fishing.FishingConfig; +import at.hannibal2.skyhanni.config.features.gui.GUIConfig; +import at.hannibal2.skyhanni.config.features.garden.GardenConfig; +import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig; +import at.hannibal2.skyhanni.config.features.itemability.ItemAbilityConfig; +import at.hannibal2.skyhanni.config.features.markedplayer.MarkedPlayerConfig; +import at.hannibal2.skyhanni.config.features.mining.MiningConfig; +import at.hannibal2.skyhanni.config.features.minion.MinionsConfig; +import at.hannibal2.skyhanni.config.features.misc.MiscConfig; +import at.hannibal2.skyhanni.config.features.rift.RiftConfig; +import at.hannibal2.skyhanni.config.features.slayer.SlayerConfig; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.Config; import io.github.moulberry.moulconfig.Social; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java deleted file mode 100644 index b02c0ef40..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/BazaarConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.FeatureToggle; -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class BazaarConfig { - - @Expose - @ConfigOption(name = "Purchase Helper", desc = "Highlights the item you are trying to buy in the Bazaar.") - @ConfigEditorBoolean - @FeatureToggle - public boolean purchaseHelper = true; - - @Expose - @ConfigOption(name = "Order Helper", desc = "Show visual hints inside the Bazaar Manage Order view when items are ready to pickup or outbid.") - @ConfigEditorBoolean - @FeatureToggle - public boolean orderHelper = false; - - @Expose - @ConfigOption(name = "Best Sell Method", desc = "Show the price difference between sell instantly and sell offer.") - @ConfigEditorBoolean - @FeatureToggle - public boolean bestSellMethod = false; - - @Expose - public Position bestSellMethodPos = new Position(394, 142, false, true); - - @Expose - @ConfigOption(name = "Cancelled Buy Order Clipboard", desc = "Saves missing items from cancelled buy orders to clipboard for faster re-entry.") - @ConfigEditorBoolean - @FeatureToggle - public boolean cancelledBuyOrderClipboard = false; - - @Expose - @ConfigOption(name = "Price Website", desc = "Adds a button to the Bazaar product inventory that will open the item page in §cskyblock.bz§7.") - @ConfigEditorBoolean - @FeatureToggle - public boolean openPriceWebsite = false; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java deleted file mode 100644 index 9ce9cc5a3..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/ChatConfig.java +++ /dev/null @@ -1,212 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.FeatureToggle; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import org.lwjgl.input.Keyboard; - -public class ChatConfig { - - @Expose - @ConfigOption(name = "Peek Chat", desc = "Hold this key to keep the chat open.") - @ConfigEditorKeybind(defaultKey = Keyboard.KEY_Z) - public int peekChat = Keyboard.KEY_Z; - - @Expose - @ConfigOption(name = "Chat Filter Types", desc = "") - @Accordion - public FilterTypesConfig filterType = new FilterTypesConfig(); - - public static class FilterTypesConfig { - @Expose - @ConfigOption(name = "Hypixel Hub", desc = "Block messages outside SkyBlock in the Hypixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and Hypixel tournaments.") - @ConfigEditorBoolean - @FeatureToggle - public boolean hypixelHub = true; - - @Expose - @ConfigOption(name = "Empty", desc = "Hide all the empty messages from the chat.") - @ConfigEditorBoolean - @FeatureToggle - public boolean empty = true; - - @Expose - @ConfigOption(name = "Warping", desc = "Block 'Sending request to join...' and 'Warping...' messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean warping = true; - - @Expose - @ConfigOption(name = "Welcome", desc = "Hide the 'Welcome to SkyBlock' message.") - @ConfigEditorBoolean - @FeatureToggle - public boolean welcome = true; - - @Expose - @ConfigOption(name = "Guild Exp", desc = "Hide Guild EXP messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean guildExp = true; - - @Expose - @ConfigOption(name = "Friend Join Left", desc = "Hide friend join/left messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean friendJoinLeft = false; - - @Expose - @ConfigOption(name = "Winter Gifts", desc = "Hide useless Winter Gift messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean winterGift = false; - - @Expose - @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in the Crystal Hollows. " + - "(Except powder numbers over 1k, essence numbers over 2, Prehistoric Eggs, and Automaton Parts)") - @ConfigEditorBoolean - @FeatureToggle - public boolean powderMining = true; - - @Expose - @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current Kill Combo from the Grandma Wolf Pet.") - @ConfigEditorBoolean - @FeatureToggle - public boolean killCombo = false; - - @Expose - @ConfigOption(name = "Watchdog", desc = "Hide the message where Hypixel is flexing how many players they have banned over the last week.") - @ConfigEditorBoolean - @FeatureToggle - public boolean watchDog = true; - - @Expose - @ConfigOption(name = "Profile Join", desc = "Hide 'You are playing on profile' and 'Profile ID' chat messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean profileJoin = true; - - //TODO remove - @Expose - @ConfigOption(name = "Others", desc = "Hide other annoying messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean others = false; - } - - @Expose - @ConfigOption(name = "Player Messages", desc = "") - @Accordion - public PlayerMessagesConfig playerMessage = new PlayerMessagesConfig(); - - public static class PlayerMessagesConfig { - @Expose - @ConfigOption(name = "Player Rank Hider", desc = "Hide player ranks in all chat messages.") - @ConfigEditorBoolean - @FeatureToggle - public boolean playerRankHider = false; - - @Expose - @ConfigOption(name = "Chat Filter", desc = "Scan messages sent by players for blacklisted words and gray out the message if any are found.") - @ConfigEditorBoolean - @FeatureToggle - public boolean chatFilter = false; - } - - @Expose - @ConfigOption(name = "Player Chat Symbols", desc = "") - @Accordion - public ChatSymbols chatSymbols = new ChatSymbols(); - - public static class ChatSymbols { - - @Expose - @ConfigOption(name = "Enabled", desc = "Adds extra symbols to the chat such as those from ironman, " + - "stranded, bingo or nether factions and places them next to your regular player emblems. " + - "§cDoes not work with hide rank hider!") - @ConfigEditorBoolean - @FeatureToggle - public boolean enabled = true; - - @Expose - @ConfigOption(name = "Chat Symbol Location", desc = "Determines where the symbols should go in chat in relation to the " + - "player's name. Hidden will hide all emblems from the chat. §eRequires above setting to be on to hide the symbols.") - @ConfigEditorDropdown(values = {"Left", "Right", "Hidden"}) - public int symbolLocation = 0; - } - - @Expose - @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in Dungeons.") - @ConfigEditorBoolean - @FeatureToggle - public boolean dungeonMessages = true; - - @Expose - @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from the Watcher and bosses in the Dungeon.") - @ConfigEditorBoolean - @FeatureToggle - public boolean dungeonBossMessages = false; - - @Expose - @ConfigOption(name = "Hide Far Deaths", desc = "Hide other players' death messages, " + - "except for players who are nearby or during Dungeons/a Kuudra fight.") - @ConfigEditorBoolean - @FeatureToggle - public boolean hideFarDeathMessages = false; - //TODO jawbus + thunder - - @Expose - @ConfigOption(name = "Compact Potion Messages", desc = "") - @Accordion - public CompactPotionConfig compactPotionMessages = new CompactPotionConfig(); - - public static class CompactPotionConfig { - - @Expose - @ConfigOption(name = "Enabled", desc = "Shorten chat messages about player potion effects.") - @ConfigEditorBoolean - @FeatureToggle - public boolean enabled = true; - - @Expose - @ConfigOption(name = "Clickable Chat Message", desc = "Makes the Compact Potion message open the Potion effects menu on click.") - @ConfigEditorBoolean - public boolean clickableChatMessage = true; - } - - @Expose - @ConfigOption(name = "Compact Bestiary Message", desc = "Shorten the Bestiary level up message, showing additional information when hovering.") - @ConfigEditorBoolean - @FeatureToggle - public boolean compactBestiaryMessage = true; - - @Expose - @ConfigOption(name = "Arachne Hider", desc = "Hide chat messages about the Arachne Fight while outside of §eArachne's Sanctuary§7.") - @ConfigEditorBoolean - @FeatureToggle - public boolean hideArachneMessages = false; - - @Expose - @ConfigOption( - name = "Sacks Hider", - desc = "Hide the chat's sack change message with this, " + - "not in Hypixel settings, for mods to access sack data in new features." - ) - @ConfigEditorBoolean - @FeatureToggle - public boolean hideSacksChange = false; - - @Expose - @ConfigOption( - name = "Translator", - desc = "Click on a message to translate it into English. " + - "Use §e/shcopytranslation§7 to get the translation from English. " + - "§cTranslation is not guaranteed to be 100% accurate." - ) - @ConfigEditorBoolean - @FeatureToggle - public boolean translator = false; -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ChromaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/ChromaConfig.java deleted file mode 100644 index 80c40cd98..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/ChromaConfig.java +++ /dev/null @@ -1,62 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.SkyHanniMod; -import at.hannibal2.skyhanni.config.FeatureToggle; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorInfoText; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; - -public class ChromaConfig { - - @Expose - @ConfigOption(name = "Chroma Preview", desc = "§fPlease star the mod on GitHub!") - @ConfigEditorInfoText(infoTitle = "Only In SkyBlock") - public boolean chromaPreview = false; - - @Expose - @ConfigOption(name = "Enabled", desc = "Toggle for SkyHanni's chroma. (Disables Patcher's Optimized Font Renderer while enabled)") - @ConfigEditorBoolean - @FeatureToggle - public boolean enabled = false; - - @Expose - @ConfigOption(name = "Chroma Size", desc = "Change the size of each color in the chroma.") - @ConfigEditorSlider(minValue = 1f, maxValue = 100f, minStep = 1f) - public float chromaSize = 30f; - - @Expose - @ConfigOption(name = "Chroma Speed", desc = "Change how fast the chroma animation moves.") - @ConfigEditorSlider(minValue = 0.5f, maxValue = 20f, minStep = 0.5f) - public float chromaSpeed = 6f; - - @Expose - @ConfigOption(name = "Chroma Saturation", desc = "Change the saturation of the chroma.") - @ConfigEditorSlider(minValue = 0f, maxValue = 1f, minStep = 0.01f) - public float chromaSaturation = 0.75f; - - @Expose - @ConfigOption(name = "Chroma Direction", desc = "Change the slant and direction of the chroma.") - @ConfigEditorDropdown(values = {"Forward + Right", "Forward + Left", "Backward + Right", "Backward + Left"}) - public int chromaDirection = 0; - - @ConfigOption(name = "Reset to Default", desc = "Resets all chroma settings to the default.") - @ConfigEditorButton(buttonText = "Reset") - public Runnable resetSettings = this::resetChromaSettings; - - @Expose - @ConfigOption(name = "Everything Chroma", desc = "Renders §4§l§oALL §r§7text in chroma. (Some enchants may appear white with SBA enchant parsing)") - @ConfigEditorBoolean - public boolean allChroma = false; - - private void resetChromaSettings() { - SkyHanniMod.getFeature().chroma.chromaSize = 30f; - SkyHanniMod.getFeature().chroma.chromaSpeed = 6f; - SkyHanniMod.getFeature().chroma.chromaSaturation = 0.75f; - SkyHanniMod.getFeature().chroma.allChroma = false; - SkyHanniMod.getFeature().chroma.chromaDirection = 0; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java deleted file mode 100644 index d0d69afba..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java +++ /dev/null @@ -1,721 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.FeatureToggle; -import at.hannibal2.skyhanni.config.core.config.Position; -import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostFormatting; -import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorInfoText; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class CombatConfig { - - @Expose - @ConfigOption(name = "Damage Indicator", desc = "") - @Accordion - public DamageIndicatorConfig damageIndicator = new DamageIndicatorConfig(); - - public static class DamageIndicatorConfig { - - @Expose - @ConfigOption(name = "Damage Indicator Enabled", desc = "Show the boss' remaining health.") - @ConfigEditorBoolean - @FeatureToggle - public boolean enabled = false; - - @Expose - @ConfigOption(name = "Healing Chat Message", desc = "Sends a chat message when a boss heals themself.") - @ConfigEditorBoolean - public boolean healingMessage = false; - - @Expose - @ConfigOption( - name = "Boss Name", - desc = "Change how the boss name should be displayed.") - @ConfigEditorDropdown(values = {"Hidden", "Full Name", "Short Name"}) - public int bossName = 1; - - @Expose - @ConfigOption( - name = "Select Boss", - desc = "Change what type of boss you want the damage indicator be enabled for." - ) - @ConfigEditorDraggableList( - exampleText = { - "§bDungeon All", - "§bNether Mini Bosses", - "§bVanquisher", - "§bEndstone Protector (not tested)", - "§bEnder Dragon (not finished)", - "§bRevenant Horror", - "§bTarantula Broodfather", - "§bSven Packmaster", - "§bVoidgloom Seraph", - "§bInferno Demonlord", - "§bHeadless Horseman (bugged)", - "§bDungeon Floor 1", - "§bDungeon Floor 2", - "§bDungeon Floor 3", - "§bDungeon Floor 4", - "§bDungeon Floor 5", - "§bDungeon Floor 6", - "§bDungeon Floor 7", - "§bDiana Mobs", - "§bSea Creatures", - "Dummy", - "§bArachne", - "§bThe Rift Bosses", - "§bRiftstalker Bloodfiend", - "§6Reindrake" - } - ) - //TODO only show currently working and tested features - public List bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21, 22, 23, 24)); - - @Expose - @ConfigOption(name = "Hide Damage Splash", desc = "Hiding damage splashes near the damage indicator.") - @ConfigEditorBoolean - public boolean hideDamageSplash = false; - - @Expose - @ConfigOption(name = "Damage Over Time", desc = "Show damage and health over time below the damage indicator.") - @ConfigEditorBoolean - public boolean showDamageOverTime = false; - - @Expose - @ConfigOption(name = "Hide Nametag", desc = "Hide the vanilla nametag of damage indicator bosses.") - @ConfigEditorBoolean - public boolean hideVanillaNametag = false; - - @Expose - @ConfigOption(name = "Time to Kill", desc = "Show the time it takes to kill the slayer boss.") - @ConfigEditorBoolean - public boolean timeToKillSlayer = true; - - - @Expose - @ConfigOption(name = "Ender Slayer", desc = "") - @Accordion - public EnderSlayerConfig enderSlayer = new EnderSlayerConfig(); - - public static class EnderSlayerConfig { - - @Expose - @ConfigOption(name = "Laser Phase Timer", desc = "Show a timer when the laser phase will end.") - @ConfigEditorBoolean - public boolean laserPhaseTimer = false; - - @Expose - @ConfigOption(name = "Health During Laser", desc = "Show the health of Voidgloom Seraph 4 during the laser phase.") - @ConfigEditorBoolean - public boolean showHealthDuringLaser = false; - } - - @Expose - @ConfigOption(name = "Vampire Slayer", desc = "") - @Accordion - public VampireSlayerConfig vampireSlayer = new VampireSlayerConfig(); - - public static class VampireSlayerConfig { - @Expose - @ConfigOption(name = "HP Until Steak", desc = "Show the amount of HP missing until the Steak can be used on the Vampire Slayer on top of the boss.") - @ConfigEditorBoolean - public boolean hpTillSteak = false; - - @Expose - @ConfigOption(name = "Mania Circles", desc = "Show a timer until the boss leaves the invincible Mania Circles state.") - @ConfigEditorBoolean - public boolean maniaCircles = false; - - @Expose - @ConfigOption(name = "Percentage HP", desc = "Show the percentage of HP next to the HP.") - @ConfigEditorBoolean - public boolean percentage = false; - } - } - - @Expose - @ConfigOption(name = "Ghost Counter", desc = "") - @Accordion - public GhostCounterConfig ghostCounter = new GhostCounterConfig(); - - public static class GhostCounterConfig { - - @Expose - @ConfigOption(name = "Enabled", desc = "Enable the ghost counter (invisible creepers in the Dwarven Mines The Mist area).") - @ConfigEditorBoolean - @FeatureToggle - public boolean enabled = true; - - @Expose - @ConfigOption( - name = "Display Text", - desc = "Drag text to change the appearance of the overlay." - ) - @ConfigEditorDraggableList( - exampleText = { - "§6Ghosts Counter", - " §bGhost Killed: 42", - " §bSorrow: 6", - " §bGhost since Sorrow: 1", - " §bGhosts/Sorrow: 5", - " §bVolta: 6", - " §bPlasma: 8", - " §bGhostly Boots: 1", - " §bBag Of Cash: 4", - " §bAvg Magic Find: 271", - " §bScavenger Coins: 15,000", - " §bKill Combo: 14", - " §bHighest Kill Combo: 96", - " §bSkill XP Gained: 145,648", - " §bBestiary 1: 0/10", - " §bXP/h: 810,410", - " §bKills/h: 420", - " §bETA: 14d", - " §bMoney/h: 13,420,069", - " §bMoney made: 14B" - } - ) - public List ghostDisplayText = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 9, 10, 11, 12)); - - @ConfigOption(name = "Text Formatting", desc = "") - @Accordion - @Expose - public TextFormattingConfig textFormatting = new TextFormattingConfig(); - - public static class TextFormattingConfig { - - @ConfigOption(name = "§eText Formatting Info", desc = "§e%session% §ris §e§lalways §rreplaced with\n" + - "§7the count for your current session.\n" + - "§7Reset when restarting the game.\n" + - "§7You can use §e&Z §7color code to use SBA chroma.") - @ConfigEditorInfoText - public boolean formatInfo = false; - - @ConfigOption(name = "Reset Formatting", desc = "Reset formatting to default text.") - @ConfigEditorButton(buttonText = "Reset") - public Runnable resetFormatting = GhostFormatting.INSTANCE::reset; - - @ConfigOption(name = "Export Formatting", desc = "Export current formatting to clipboard.") - @ConfigEditorButton(buttonText = "Export") - public Runnable exportFormatting = GhostFormatting.INSTANCE::export; - - @ConfigOption(name = "Import Formatting", desc = "Import formatting from clipboard.") - @ConfigEditorButton(buttonText = "Import") - public Runnable importFormatting = GhostFormatting.INSTANCE::importFormat; - - @Expose - @ConfigOption(name = "Title", desc = "Title Line.") - @ConfigEditorText - public String titleFormat = "&6Ghost Counter"; - - @Expose -