From 7da2cd817f8f876100be1211990a4e80a066ac42 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Jun 2024 17:51:30 +0800 Subject: Improvement: Improve phrasing of config descriptions, enhance overall readability, fix typos, newlines, etc (#2067) --- .../hannibal2/skyhanni/config/features/About.java | 8 +-- .../skyhanni/config/features/chat/ChatConfig.java | 27 ++++---- .../config/features/chat/CompactPotionConfig.java | 2 +- .../config/features/chat/FilterTypesConfig.java | 29 ++++----- .../config/features/chat/PlayerMessagesConfig.java | 4 +- .../config/features/chroma/ChromaConfig.java | 12 ++-- .../config/features/combat/CombatConfig.java | 2 +- .../config/features/combat/EnderNodeConfig.java | 2 +- .../features/combat/FerocityDisplayConfig.java | 4 +- .../config/features/combat/FlareConfig.java | 4 +- .../config/features/combat/MobsConfig.java | 8 +-- .../config/features/combat/QuiverConfig.java | 6 +- .../features/combat/QuiverDisplayConfig.java | 4 +- .../config/features/combat/SummoningsConfig.java | 4 +- .../damageindicator/DamageIndicatorConfig.java | 10 +-- .../combat/damageindicator/EnderSlayerConfig.java | 2 +- .../damageindicator/VampireSlayerConfig.java | 4 +- .../combat/ghostcounter/GhostCounterConfig.java | 8 +-- .../textformatting/BestiaryFormattingConfig.java | 20 +++--- .../textformatting/ETAFormattingConfig.java | 11 ++-- .../textformatting/KillHourFormattingConfig.java | 8 +-- .../textformatting/TextFormattingConfig.java | 73 +++++++++++----------- .../textformatting/XPHourFormattingConfig.java | 8 +-- .../features/commands/BetterWikiCommandConfig.java | 8 +-- .../config/features/commands/CommandsConfig.java | 8 +-- .../features/commands/TabCompleteConfig.java | 18 +++--- .../features/crimsonisle/CrimsonIsleConfig.java | 8 +-- .../crimsonisle/MatriarchHelperConfig.java | 2 +- .../crimsonisle/ReputationHelperConfig.java | 2 +- .../crimsonisle/ashfang/BlazingSoulsColor.java | 2 +- .../crimsonisle/ashfang/GravityOrbsConfig.java | 2 +- .../crimsonisle/ashfang/HideAshfangConfig.java | 2 +- .../skyhanni/config/features/dev/DebugConfig.java | 8 +-- .../config/features/dev/DebugMobConfig.java | 4 +- .../skyhanni/config/features/dev/GraphConfig.java | 22 +++---- .../config/features/dev/WaypointsConfig.java | 2 +- .../config/features/dungeon/CleanEndConfig.java | 2 +- .../features/dungeon/DungeonChestConfig.java | 6 +- .../config/features/dungeon/DungeonConfig.java | 6 +- .../features/dungeon/DungeonCopilotConfig.java | 2 +- .../features/dungeon/DungeonsRaceGuideConfig.java | 2 +- .../config/features/dungeon/LividFinderConfig.java | 2 +- .../features/dungeon/MessageFilterConfig.java | 4 +- .../config/features/dungeon/ObjectHiderConfig.java | 2 +- .../config/features/event/GreatSpookConfig.java | 8 +-- .../config/features/event/HoppityEggsConfig.java | 17 ++--- .../config/features/event/MayorJerryConfig.java | 2 +- .../features/event/bingo/BingoCardConfig.java | 4 +- .../features/event/bingo/CompactChatConfig.java | 2 +- .../config/features/event/diana/DianaConfig.java | 7 ++- .../event/diana/DianaProfitTrackerConfig.java | 2 +- .../features/event/diana/IgnoredWarpsConfig.java | 4 +- .../event/diana/InquisitorSharingConfig.java | 2 +- .../event/diana/MythologicalMobTrackerConfig.java | 2 +- .../features/event/waypoints/EasterEggConfig.java | 6 +- .../event/waypoints/HalloweenBasketConfig.java | 6 +- .../event/winter/FrozenTreasureConfig.java | 8 +-- .../event/winter/GiftingOpportunitiesConfig.java | 6 +- .../features/event/winter/UniqueGiftConfig.java | 4 +- .../config/features/event/winter/WinterConfig.java | 4 +- .../config/features/fishing/BarnTimerConfig.java | 2 +- .../features/fishing/ChumBucketHiderConfig.java | 2 +- .../config/features/fishing/FishingConfig.java | 4 +- .../features/fishing/FishingHookDisplayConfig.java | 3 +- .../features/fishing/SeaCreatureTrackerConfig.java | 2 +- .../features/fishing/TotemOfCorruptionConfig.java | 2 +- .../fishing/trophyfishing/ChatMessagesConfig.java | 2 +- .../fishing/trophyfishing/GeyserFishingConfig.java | 4 +- .../trophyfishing/TrophyFishDisplayConfig.java | 6 +- .../fishing/trophyfishing/TrophyFishingConfig.java | 4 +- .../config/features/garden/AnitaShopConfig.java | 3 +- .../garden/AtmosphericFilterDisplayConfig.java | 8 +-- .../features/garden/EliteFarmingWeightConfig.java | 6 +- .../features/garden/FarmingFortuneConfig.java | 4 +- .../config/features/garden/MoneyPerHourConfig.java | 12 ++-- .../features/garden/NextJacobContestConfig.java | 2 +- .../garden/PlotMenuHighlightingConfig.java | 2 +- .../features/garden/SensitivityReducerConfig.java | 6 +- .../features/garden/TooltipTweaksConfig.java | 4 +- .../features/garden/YawPitchDisplayConfig.java | 2 +- .../features/garden/composter/ComposterConfig.java | 8 +-- .../cropmilestones/CropMilestonesConfig.java | 2 +- .../features/garden/cropmilestones/NextConfig.java | 4 +- .../garden/laneswitch/FarmingLaneConfig.java | 2 +- .../laneswitch/LaneSwitchNotificationConfig.java | 2 +- .../garden/optimalspeed/OptimalSpeedConfig.java | 4 +- .../garden/pests/PestProfitTrackerConfig.java | 2 +- .../features/garden/pests/StereoHarmonyConfig.java | 7 +-- .../garden/visitor/DropsStatisticsConfig.java | 8 +-- .../garden/visitor/RewardWarningConfig.java | 4 +- .../garden/visitor/ShoppingListConfig.java | 15 ++--- .../features/garden/visitor/TimerConfig.java | 13 ++-- .../features/garden/visitor/VisitorConfig.java | 6 +- .../skyhanni/config/features/gui/GUIConfig.java | 4 +- .../skyhanni/config/features/gui/HotbarConfig.java | 4 +- .../config/features/gui/ModifyWordsConfig.java | 4 +- .../config/features/gui/TextBoxConfig.java | 4 +- .../features/gui/customscoreboard/ArrowConfig.java | 2 +- .../customscoreboard/BackgroundOutlineConfig.java | 2 +- .../customscoreboard/CustomScoreboardConfig.java | 2 +- .../gui/customscoreboard/DisplayConfig.java | 6 +- .../InformationFilteringConfig.java | 4 +- .../gui/customscoreboard/MaxwellConfig.java | 3 +- .../features/gui/customscoreboard/MayorConfig.java | 4 +- .../features/gui/customscoreboard/PartyConfig.java | 5 +- .../features/inventory/AuctionHouseConfig.java | 6 +- .../AuctionHousePriceComparisonConfig.java | 4 +- .../config/features/inventory/BazaarConfig.java | 6 +- .../features/inventory/EnchantParsingConfig.java | 2 +- .../features/inventory/HideNotClickableConfig.java | 4 +- .../config/features/inventory/InventoryConfig.java | 16 ++--- .../inventory/JacobFarmingContestConfig.java | 8 +-- .../features/inventory/SackDisplayConfig.java | 2 +- .../features/inventory/SkyblockGuideConfig.java | 16 ++--- .../chocolatefactory/ChocolateFactoryConfig.java | 25 ++++---- .../ChocolateFactoryCustomReminderConfig.java | 4 +- .../ChocolateFactoryRabbitWarningConfig.java | 8 +-- .../ChocolateUpgradeWarningsConfig.java | 2 +- .../customwardrobe/CustomWardrobeConfig.java | 10 +-- .../inventory/customwardrobe/SpacingConfig.java | 2 +- .../inventory/helper/HarpConfigKeyBinds.java | 14 ++--- .../features/inventory/helper/HelperConfig.java | 6 +- .../features/inventory/helper/TiaRelayConfig.java | 4 +- .../features/itemability/FireVeilWandConfig.java | 4 +- .../features/itemability/ItemAbilityConfig.java | 2 +- .../config/features/mining/AreaWallsConfig.java | 2 +- .../features/mining/CorpseLocatorConfig.java | 2 +- .../features/mining/DeepCavernsGuideConfig.java | 2 +- .../features/mining/FossilExcavatorConfig.java | 2 +- .../mining/FossilExcavatorSolverConfig.java | 4 +- .../features/mining/GlaciteMineshaftConfig.java | 2 +- .../config/features/mining/HotmConfig.java | 12 ++-- .../features/mining/MineshaftWaypointsConfig.java | 4 +- .../config/features/mining/MiningConfig.java | 6 +- .../config/features/mining/MiningEventConfig.java | 19 +++--- .../config/features/mining/TunnelMapsConfig.java | 14 ++--- .../features/minion/LastClickedMinionConfig.java | 2 +- .../config/features/minion/MinionsConfig.java | 6 +- .../skyhanni/config/features/misc/BitsConfig.java | 4 +- .../config/features/misc/DiscordRPCConfig.java | 2 +- .../features/misc/EstimatedItemValueConfig.java | 2 +- .../features/misc/GlowingDroppedItemsConfig.java | 6 +- .../features/misc/HideFarEntitiesConfig.java | 2 +- .../features/misc/HighlightPartyMembersConfig.java | 2 +- .../config/features/misc/KickDurationConfig.java | 4 +- .../skyhanni/config/features/misc/MiscConfig.java | 24 +++---- .../config/features/misc/PartyCommandsConfig.java | 2 +- .../features/misc/PatcherCoordsWaypointConfig.java | 2 +- .../features/misc/PetCandyDisplayConfig.java | 2 +- .../features/misc/PocketSackInASackConfig.java | 4 +- .../features/misc/QuickModMenuSwitchConfig.java | 2 +- .../features/misc/TrevorTheTrapperConfig.java | 7 ++- .../misc/compacttablist/CompactTabListConfig.java | 6 +- .../features/misc/cosmetic/ArrowTrailConfig.java | 2 +- .../config/features/misc/pets/PetConfig.java | 6 +- .../rift/area/dreadfarm/DreadfarmConfig.java | 2 +- .../rift/area/dreadfarm/VoltCruxConfig.java | 4 +- .../rift/area/mirrorverse/LavaMazeConfig.java | 2 +- .../rift/area/mirrorverse/TubulatorConfig.java | 4 +- .../area/mirrorverse/UpsideDownParkourConfig.java | 4 +- .../danceroomhelper/DanceRoomHelperConfig.java | 2 +- .../rift/area/westvillage/KloonHackingConfig.java | 4 +- .../rift/area/westvillage/VerminTrackerConfig.java | 2 +- .../rift/area/wyldwoods/WyldWoodsConfig.java | 2 +- .../skillprogress/SkillETADisplayConfig.java | 12 ++-- .../skillprogress/SkillProgressBarConfig.java | 2 +- .../features/slayer/ItemProfitTrackerConfig.java | 2 +- .../config/features/slayer/SlayerConfig.java | 6 +- .../slayer/endermen/EndermanBeaconConfig.java | 4 +- .../features/slayer/endermen/EndermanConfig.java | 2 +- .../config/features/stranded/StrandedConfig.java | 2 +- 171 files changed, 510 insertions(+), 506 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/About.java b/src/main/java/at/hannibal2/skyhanni/config/features/About.java index 5e568747c..6ce4dd65f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/About.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/About.java @@ -13,22 +13,22 @@ import io.github.notenoughupdates.moulconfig.observer.Property; public class About { - @ConfigOption(name = "Current Version", desc = "This is the SkyHanni version you are running currently") + @ConfigOption(name = "Current Version", desc = "This is the SkyHanni version you are currently running") @ConfigVersionDisplay public transient Void currentVersion = null; - @ConfigOption(name = "Auto Updates", desc = "Automatically check for updates on each startup") + @ConfigOption(name = "Check for Updates", desc = "Automatically check for updates on each startup") @Expose @ConfigEditorBoolean public boolean autoUpdates = true; - @ConfigOption(name = "Full Auto Updates", desc = "Automatically downloads new version on each startup.") + @ConfigOption(name = "Auto Updates", desc = "Automatically download new version on each startup") @Expose @FeatureToggle @ConfigEditorBoolean public boolean fullAutoUpdates = false; - @ConfigOption(name = "Update Stream", desc = "How frequently do you want updates for SkyHanni") + @ConfigOption(name = "Update Stream", desc = "How frequently you want updates for SkyHanni") @Expose @ConfigEditorDropdown public Property updateStream = Property.of(UpdateStream.RELEASES); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java index 9369f2c6f..f9e64f1e0 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java @@ -33,7 +33,7 @@ public class ChatConfig { public PlayerMessagesConfig playerMessage = new PlayerMessagesConfig(); @Expose - @ConfigOption(name = "Dungeon Filter", desc = "Hide specific message types in Dungeons.") + @ConfigOption(name = "Dungeon Filters", desc = "Hide specific message types in Dungeons.") @ConfigEditorDraggableList public List dungeonFilteredMessageTypes = new ArrayList<>(); @@ -65,14 +65,13 @@ public class ChatConfig { } @Expose - @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from the Watcher and bosses in the Dungeon.") + @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from the Watcher and bosses in Dungeons.") @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.") + @ConfigOption(name = "Hide Far Deaths", desc = "Hide other players' death messages when they're not nearby (except during Dungeons/Kuudra fights)") @ConfigEditorBoolean @FeatureToggle public boolean hideFarDeathMessages = false; @@ -84,7 +83,7 @@ public class ChatConfig { public CompactPotionConfig compactPotionMessages = new CompactPotionConfig(); @Expose - @ConfigOption(name = "Compact Bestiary Message", desc = "Shorten the Bestiary level up message, showing additional information when hovering.") + @ConfigOption(name = "Compact Bestiary Messages", desc = "Compact the Bestiary level up message, only showing additional information when hovering.") @ConfigEditorBoolean @FeatureToggle public boolean compactBestiaryMessage = true; @@ -97,9 +96,9 @@ public class ChatConfig { @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." + name = "Sack Change Hider", + desc = "Hide the sack change message while allowing mods to continue accessing sack data.\n" + + "§eUse this instead of the toggle in Hypixel Settings." ) @ConfigEditorBoolean @FeatureToggle @@ -108,8 +107,8 @@ public class ChatConfig { @Expose @ConfigOption( name = "Translator", - desc = "Click on a message to translate it to English. " + - "Use §e/shcopytranslation§7 to translate from English. " + + desc = "Click on a message to translate it to English.\n" + + "Use §e/shcopytranslation§7 to translate from English.\n" + "§cTranslation is not guaranteed to be 100% accurate." ) @ConfigEditorBoolean @@ -117,19 +116,19 @@ public class ChatConfig { public boolean translator = false; @Expose - @ConfigOption(name = "Skyblock XP Chat", desc = "Sends the Skyblock XP message into the chat.") + @ConfigOption(name = "SkyBlock XP in Chat", desc = "Send the SkyBlock XP messages into the chat.") @ConfigEditorBoolean @FeatureToggle public boolean skyBlockXPInChat = true; @Expose - @ConfigOption(name = "Jacob's Event", desc = "Hide Anita Accessories' fortune bonus messages outside the Garden.") + @ConfigOption(name = "Anita's Accessories", desc = "Hide Anita's Accessories' fortune bonus messages outside the Garden.") @ConfigEditorBoolean @FeatureToggle public boolean hideJacob = true; @Expose - @ConfigOption(name = "Sky Mall", desc = "Hides the Sky Mall message outside Mining Islands.") + @ConfigOption(name = "Sky Mall Messages", desc = "Hide the Sky Mall messages outside of Mining Islands.") @ConfigEditorBoolean @FeatureToggle public boolean hideSkyMall = true; @@ -137,7 +136,7 @@ public class ChatConfig { @Expose @ConfigOption( name = "Pet Drop Rarity", - desc = "Shows what rarity the pet drop is in the pet drop message.\n" + + desc = "Show the rarity of the Pet Drop in the message.\n" + "§6§lPET DROP! §5§lEPIC §5Slug §6(§6+1300☘)" ) @ConfigEditorBoolean diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java index ef7b8abbf..c0786a52f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java @@ -14,7 +14,7 @@ public class CompactPotionConfig { public boolean enabled = true; @Expose - @ConfigOption(name = "Clickable Chat Message", desc = "Makes the Compact Potion message open the Potion effects menu on click.") + @ConfigOption(name = "Clickable Chat Message", desc = "Make the Compact Potion message open the Potion effects menu on click.") @ConfigEditorBoolean public boolean clickableChatMessage = true; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java index 76fb716da..ebab020bc 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java @@ -8,19 +8,20 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public 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.") + @ConfigOption(name = "Hypixel Lobbies", desc = "Hide announcements in Hypixel lobbies " + + "(player joins, loot boxes, prototype lobby messages, radiating generosity, Hypixel tournaments)") @ConfigEditorBoolean @FeatureToggle public boolean hypixelHub = false; @Expose - @ConfigOption(name = "Empty", desc = "Hide all the empty messages from the chat.") + @ConfigOption(name = "Empty", desc = "Hide all empty messages.") @ConfigEditorBoolean @FeatureToggle public boolean empty = false; @Expose - @ConfigOption(name = "Warping", desc = "Block 'Sending request to join...' and 'Warping...' messages.") + @ConfigOption(name = "Warping", desc = "Hide 'Sending request to join...' and 'Warping...' messages.") @ConfigEditorBoolean @FeatureToggle public boolean warping = false; @@ -32,38 +33,38 @@ public class FilterTypesConfig { public boolean welcome = false; @Expose - @ConfigOption(name = "Guild Exp", desc = "Hide Guild EXP messages.") + @ConfigOption(name = "Guild EXP", desc = "Hide Guild EXP messages.") @ConfigEditorBoolean @FeatureToggle public boolean guildExp = false; @Expose - @ConfigOption(name = "Friend Join Left", desc = "Hide friend join/left messages.") + @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.") + @ConfigOption(name = "Winter Gifts", desc = "Hide pointless 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)") + "(except powder numbers over 1k, essence numbers over 2, Prehistoric Eggs, and Automaton Parts)") @ConfigEditorBoolean @FeatureToggle public boolean powderMining = false; @Expose - @ConfigOption(name = "Kill Combo", desc = "Hide messages about the current Kill Combo from the Grandma Wolf Pet.") + @ConfigOption(name = "Kill Combo", desc = "Hide messages about your 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.") + @ConfigOption(name = "Watchdog", desc = "Hide the message where Hypixel flexes about how many players they have banned over the last week.") @ConfigEditorBoolean @FeatureToggle public boolean watchDog = false; @@ -81,26 +82,26 @@ public class FilterTypesConfig { public boolean fireSale = false; @Expose - @ConfigOption(name = "Event Level Up", desc = "Hide the message that shows on event level up.") + @ConfigOption(name = "Event Level Up", desc = "Hide event level up messages.") @ConfigEditorBoolean @FeatureToggle public boolean eventLevelUp = false; @Expose - @ConfigOption(name = "Diana", desc = "Hide chat messages around griffin burrow chains and griffin feather drops and coin drops.") + @ConfigOption(name = "Diana", desc = "Hide chat messages around griffin burrow chains, griffin feather drops, and coin drops.") @ConfigEditorBoolean @FeatureToggle public boolean diana = false; @Expose - @ConfigOption(name = "Factory Upgrade", desc = "Hide §nHypixel's§r chocolate factory upgrade and employee promotion messages. " + - "§eTo turn off Skyhanni upgrade messages search §lUpgrade Warning") + @ConfigOption(name = "Factory Upgrade", desc = "Hide §nHypixel's§r Chocolate Factory upgrade and employee promotion messages.\n" + + "§eTo turn off SkyHanni's upgrade messages, search §lUpgrade Warning") @ConfigEditorBoolean @FeatureToggle public boolean factoryUpgrade = false; @Expose - @ConfigOption(name = "Sacrifice", desc = "Hide sacrifice messages of other players.") + @ConfigOption(name = "Sacrifice", desc = "Hide other players' sacrifice messages.") @ConfigEditorBoolean @FeatureToggle public boolean sacrifice = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java index dc072e8ab..a3463476b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java @@ -74,7 +74,7 @@ public class PlayerMessagesConfig { public boolean playerRankHider = false; @Expose - @ConfigOption(name = "Ignore YouTube", desc = "Do not remove the rank for YouTubers in chat.") + @ConfigOption(name = "Ignore YouTube Rank", desc = "Do not remove the YouTube rank from chat.") @ConfigEditorBoolean public boolean ignoreYouTube = false; @@ -85,7 +85,7 @@ public class PlayerMessagesConfig { public boolean chatFilter = false; @Expose - @ConfigOption(name = "Same Chat Color", desc = "All players, also those with ranks, write with the same, white chat color.") + @ConfigOption(name = "Same Chat Color", desc = "Make all chat messages white regardless of rank.") @ConfigEditorBoolean @FeatureToggle public boolean sameChatColor = true; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java index 83a45c584..6a02e2ed3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java @@ -15,12 +15,12 @@ import io.github.notenoughupdates.moulconfig.observer.Property; public class ChromaConfig { @Expose - @ConfigOption(name = "Chroma Preview", desc = "§fPlease star the mod on GitHub!") - @ConfigEditorInfoText(infoTitle = "Only In SkyBlock") + @ConfigOption(name = "Chroma Preview", desc = "§fPlease star SkyHanni 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)") + @ConfigOption(name = "Enabled", desc = "Toggle SkyHanni's chroma. §e(Disables Patcher's Optimized Font Renderer while enabled)") @ConfigEditorBoolean @FeatureToggle public Property enabled = Property.of(false); @@ -75,17 +75,17 @@ public class ChromaConfig { } } - @ConfigOption(name = "Reset to Default", desc = "Resets all chroma settings to the default.") + @ConfigOption(name = "Reset to Default", desc = "Reset all chroma settings to the default.") @ConfigEditorButton(buttonText = "Reset") public Runnable resetSettings = ChromaManager::resetChromaSettings; @Expose - @ConfigOption(name = "Everything Chroma", desc = "Renders §4§l§oALL §r§7text in chroma. (Some enchants may appear white with SBA enchant parsing)") + @ConfigOption(name = "Everything Chroma", desc = "Render §4§l§oALL §r§7text in chroma. §e(Some enchants may appear white with SBA enchant parsing)") @ConfigEditorBoolean public boolean allChroma = false; @Expose - @ConfigOption(name = "Ignore Chat", desc = "Prevents Everything Chroma from applying to the chat if you unironically use that feature...") + @ConfigOption(name = "Ignore Chat", desc = "Prevent Everything Chroma from applying to the chat (if you unironically use that feature...)") @ConfigEditorBoolean public boolean ignoreChat = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java index 1c1ae14ae..456c3451f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java @@ -16,7 +16,7 @@ public class CombatConfig { public DamageIndicatorConfig damageIndicator = new DamageIndicatorConfig(); @Expose - @Category(name = "Ghost Counter", desc = "Ghost counter settings") + @Category(name = "Ghost Counter", desc = "Ghost Counter settings") public GhostCounterConfig ghostCounter = new GhostCounterConfig(); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java index 914fb7222..550f562e3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java @@ -45,7 +45,7 @@ public class EnderNodeConfig { @Expose @ConfigOption( name = "Only While Holding Tool", - desc = "Only shows the tracker if holding a pickaxe, drill or gauntlet in hand." + desc = "Only show the tracker if holding a pickaxe, drill or gauntlet in hand." ) @ConfigEditorBoolean public boolean onlyPickaxe = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java index 42c8bb9a6..d212a4a07 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/FerocityDisplayConfig.java @@ -12,8 +12,8 @@ public class FerocityDisplayConfig { @Expose @ConfigOption( name = "Enabled", - desc = "Show ferocity stat as single gui element. " + - "Requires tab list widget enabled and ferocity selected to work." + desc = "Show ferocity stat as single GUI element.\n" + + "§eRequires tab list widget enabled and ferocity selected to work." ) @ConfigEditorBoolean @FeatureToggle diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/FlareConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/FlareConfig.java index b685f2942..1ebe07b6c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/FlareConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/FlareConfig.java @@ -42,7 +42,7 @@ public class FlareConfig { } @Expose - @ConfigOption(name = "Display Type", desc = "Where to show the timer, as GUI element or in the world") + @ConfigOption(name = "Display Type", desc = "Where to show the timer.") @ConfigEditorDropdown public DisplayType displayType = DisplayType.GUI; @@ -65,7 +65,7 @@ public class FlareConfig { } @Expose - @ConfigOption(name = "Show Effective Area", desc = "Show the effective area of the Flare.") + @ConfigOption(name = "Show Effective Area", desc = "Show the effective area of the flare.") @ConfigEditorDropdown public OutlineType outlineType = OutlineType.NONE; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java index 9d26facfa..0d9c2f694 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java @@ -66,8 +66,8 @@ public class MobsConfig { @Expose @ConfigOption( name = "Area Boss Timer", - desc = "Show a timer when Area Bosses respawn. " + - "§cMay take 20-30 seconds to calibrate correctly." + desc = "Show a timer when Area Bosses respawn.\n" + + "§eMay take 20 - 30 seconds to calibrate correctly." ) @ConfigEditorBoolean @FeatureToggle @@ -76,8 +76,8 @@ public class MobsConfig { @Expose @ConfigOption( name = "Arachne Spawn Timer", - desc = "Show a timer when Arachne fragments or crystals are placed to indicate how long " + - "until the boss will spawn. §cTimer may be 1-2 seconds off." + desc = "Show a timer when Arachne fragments or crystals are placed to indicate how long until the boss will spawn. " + + "§eTimer may be 1 - 2 seconds off." ) @ConfigEditorBoolean @FeatureToggle diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverConfig.java index 174af713b..6002d55a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverConfig.java @@ -16,8 +16,7 @@ public class QuiverConfig { @Expose @ConfigOption( name = "Low Quiver Alert", - desc = "Notifies you when your quiver\n" + - "reaches an amount of arrows." + desc = "Notifies you when your quiver reaches a set amount of arrows." ) @ConfigEditorBoolean @FeatureToggle @@ -26,8 +25,7 @@ public class QuiverConfig { @Expose @ConfigOption( name = "Reminder After Run", - desc = "Reminds you to buy arrows after\n" + - "a Dungeons/Kuudra run if you're low." + desc = "Reminds you to buy arrows after a Dungeons/Kuudra run if you're low." ) @ConfigEditorBoolean @FeatureToggle diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java index b7151fc12..ebf6b5eed 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/QuiverDisplayConfig.java @@ -21,14 +21,14 @@ public class QuiverDisplayConfig { public Position quiverDisplayPos = new Position(260, -15); @Expose - @ConfigOption(name = "Show arrow icon", desc = "Displays an icon next to the Quiver Display.") + @ConfigOption(name = "Show arrow icon", desc = "Display an icon next to the Quiver Display.") @ConfigEditorBoolean public Property showIcon = Property.of(true); @Expose @ConfigOption( name = "When to show", - desc = "Decides in what conditions to show the display." + desc = "Decide in what conditions to show the display." ) @ConfigEditorDropdown public Property whenToShow = Property.of(ShowWhen.ONLY_BOW_HAND); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java index 2bcaa3e41..cfa899b8f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java @@ -10,7 +10,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class SummoningsConfig { @Expose - @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped Summoning Souls laying on the ground. " + + @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped Summoning Souls laying on the ground.\n" + "§cNot working in Dungeons if Skytils' 'Hide Non-Starred Mobs Nametags' feature is enabled!") @ConfigEditorBoolean @FeatureToggle @@ -33,7 +33,7 @@ public class SummoningsConfig { public boolean summoningMobHideNametag = false; @Expose - @ConfigOption(name = "Summoning Mob Color", desc = "Marks own summons green.") + @ConfigOption(name = "Summoning Mob Color", desc = "Mark own summons green.") @ConfigEditorBoolean @FeatureToggle public boolean summoningMobColored = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java index 28a1fee53..7e44df7f9 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java @@ -37,14 +37,14 @@ public class DamageIndicatorConfig { public boolean enabled = false; @Expose - @ConfigOption(name = "Healing Chat Message", desc = "Sends a chat message when a boss heals themself.") + @ConfigOption(name = "Healing Chat Message", desc = "Send 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.") + desc = "Change how boss names are displayed.") @ConfigEditorDropdown public NameVisibility bossName = NameVisibility.FULL_NAME; @@ -81,7 +81,7 @@ public class DamageIndicatorConfig { @Expose @ConfigOption( name = "Select Boss", - desc = "Change what type of boss you want the damage indicator be enabled for." + desc = "Change what bosses the damage indicator should be enabled for." ) @ConfigEditorDraggableList //TODO only show currently working and tested features @@ -156,7 +156,7 @@ public class DamageIndicatorConfig { } @Expose - @ConfigOption(name = "Hide Damage Splash", desc = "Hiding damage splashes near the damage indicator.") + @ConfigOption(name = "Hide Damage Splash", desc = "Hide damage splashes near the damage indicator.") @ConfigEditorBoolean public boolean hideDamageSplash = false; @@ -166,7 +166,7 @@ public class DamageIndicatorConfig { public boolean showDamageOverTime = false; @Expose - @ConfigOption(name = "Hide Nametag", desc = "Hide the vanilla nametag of damage indicator bosses.") + @ConfigOption(name = "Hide Nametag", desc = "Hide the vanilla nametag of bosses with damage indicator enabled.") @ConfigEditorBoolean public boolean hideVanillaNametag = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java index 5f0de9f4b..f43174841 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java @@ -7,7 +7,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class EnderSlayerConfig { @Expose - @ConfigOption(name = "Laser Phase Timer", desc = "Show a timer when the laser phase will end.") + @ConfigOption(name = "Laser Phase Timer", desc = "Show a timer for when the laser phase will end.") @ConfigEditorBoolean public boolean laserPhaseTimer = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java index 50121d3ed..114b64572 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java @@ -7,7 +7,7 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public 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.") + @ConfigOption(name = "HP Until Steak", desc = "Show the amount of HP left until the Steak can be used on the Vampire Slayer on top of the boss.") @ConfigEditorBoolean public boolean hpTillSteak = false; @@ -17,7 +17,7 @@ public class VampireSlayerConfig { public boolean maniaCircles = false; @Expose - @ConfigOption(name = "Percentage HP", desc = "Show the percentage of HP next to the HP.") + @ConfigOption(name = "Percentage HP", desc = "Show a percentage next to the HP.") @ConfigEditorBoolean public boolean percentage = false; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java index 613b1d120..2ebeb2517 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java @@ -31,7 +31,7 @@ import static at.hannibal2.skyhanni.config.features.combat.ghostcounter.GhostCou public class GhostCounterConfig { @Expose - @ConfigOption(name = "Enabled", desc = "Enable the ghost counter (invisible creepers in the Dwarven Mines The Mist area).") + @ConfigOption(name = "Enabled", desc = "Enable the ghost counter (invisible creepers within The Mist in the Dwarven Mines)") @ConfigEditorBoolean @FeatureToggle public boolean enabled = true; @@ -107,7 +107,7 @@ public class GhostCounterConfig { public TextFormattingConfig textFormatting = new TextFormattingConfig(); @Expose - @ConfigOption(name = "Extra space", desc = "Space between each line of text.") + @ConfigOption(name = "Extra Spaces", desc = "Spaces between each line of text.") @ConfigEditorSlider( minValue = -5, maxValue = 10, @@ -115,7 +115,7 @@ public class GhostCounterConfig { public int extraSpace = 1; @Expose - @ConfigOption(name = "Pause Timer", desc = "How many seconds does it wait before pausing.") + @ConfigOption(name = "Pause Timer", desc = "How many seconds to wait before pausing.") @ConfigEditorSlider( minValue = 1, maxValue = 20, @@ -129,7 +129,7 @@ public class GhostCounterConfig { public boolean onlyOnMist = true; @Expose - @ConfigOption(name = "Maxed Bestiary", desc = "Show progress to max bestiary instead of next level.") + @ConfigOption(name = "Max Bestiary", desc = "Show progress to max bestiary instead of next level.") @ConfigEditorBoolean public boolean showMax = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java index 5b3a3f001..46a02e9b2 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java @@ -7,21 +7,21 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class BestiaryFormattingConfig { @Expose - @ConfigOption(name = "Bestiary", desc = "Bestiary Progress line.\n§e%value% §7is replaced with\n" + - "Your current progress to next level.\n" + - "§e%currentLevel% &7is replaced with your current bestiary level\n" + - "§e%nextLevel% §7is replaced with your current bestiary level +1.\n" + + @ConfigOption(name = "Bestiary", desc = "Bestiary Progress line.\n" + + "§e%value% §7is replaced with your current progress to next level.\n" + + "§e%currentLevel% §7is replaced with your current bestiary level.\n" + + "§e%nextLevel% §7is replaced with your next bestiary level.\n" + "§e%value% §7is replaced with one of the text below.") @ConfigEditorText public String base = " &6Bestiary %display%: &b%value%"; @Expose - @ConfigOption(name = "No Data", desc = "Text to show when you need to open the\nBestiary Menu to gather data.") + @ConfigOption(name = "No Data", desc = "Text to show when you need to open the Bestiary Menu to gather data.") @ConfigEditorText - public String openMenu = "§cOpen Bestiary Menu !"; + public String openMenu = "§cOpen Bestiary Menu!"; @Expose - @ConfigOption(name = "Maxed", desc = "Text to show when your bestiary for ghost is at max level.\n" + + @ConfigOption(name = "Maxed", desc = "Text to show when your bestiary is at max level.\n" + "§e%currentKill% §7is replaced with your current total kill.") @ConfigEditorText public String maxed = "%currentKill% (&c&lMaxed!)"; @@ -33,9 +33,9 @@ public class BestiaryFormattingConfig { public String showMax_progress = "%currentKill%/250k (%percentNumber%%)"; @Expose - @ConfigOption(name = "Progress", desc = "Text to show progress when the §eMaxed Bestiary§7 option is §cOFF\n" + - "§e%currentKill% §7is replaced with how many kill you have to the next level.\n" + - "§e%killNeeded% §7is replaced with how many kill you need to reach the next level.") + @ConfigOption(name = "Progress", desc = "Text to show progress when the §eMaxed Bestiary §7option is §cOFF\n" + + "§e%currentKill% §7is replaced with how many kills you have to the next level.\n" + + "§e%killNeeded% §7is replaced with how many kills you need to reach the next level.") @ConfigEditorText public String progress = "%currentKill%/%killNeeded%"; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java index 59ceb25ac..6e7d4766c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java @@ -6,29 +6,28 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class ETAFormattingConfig { @Expose - @ConfigOption(name = "ETA to next level", desc = "ETA To Next Level Line.\n" + + @ConfigOption(name = "ETA to Next Level", desc = "ETA To Next Level line.\n" + "§e%value% §7is replaced with one of the text below.") @ConfigEditorText public String base = " &6ETA: &b%value%"; @Expose - @ConfigOption(name = "Maxed!", desc = "So you really maxed ghost bestiary ?") + @ConfigOption(name = "Maxed!", desc = "Text to show when ghost bestiary is maxed.") @ConfigEditorText public String maxed = "&c&lMAXED!"; @Expose - @ConfigOption(name = "No Data", desc = "Start killing some ghosts !") + @ConfigOption(name = "No Data", desc = "Text to show when there is no ETA.") @ConfigEditorText public String noData = "&bN/A"; @Expose - @ConfigOption(name = "Progress", desc = "Text to show progress to next level.") + @ConfigOption(name = "Progress", desc = "Text to show progress to the next level.") @ConfigEditorText public String progress = "&b%value%"; @Expose - @ConfigOption(name = "Paused", desc = "Text displayed next to the time \n" + - "when you are doing nothing for a given amount of seconds") + @ConfigOption(name = "Paused", desc = "Text displayed next to the time when paused.") @ConfigEditorText public String paused = "&c(PAUSED)"; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java index 89deac4c5..b942278d3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java @@ -6,18 +6,18 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class KillHourFormattingConfig { @Expose - @ConfigOption(name = "Kill/h", desc = "Kill Per Hour line.\n§e%value% §7is replaced with\nEstimated kills per hour you get.") + @ConfigOption(name = "Kills/h", desc = "Kills per Hour line.\n" + + "§e%value% §7is replaced with the estimated kills per hour.") @ConfigEditorText public String base = " &6Kill/h: &b%value%"; @Expose - @ConfigOption(name = "No Data", desc = "Start killing some ghosts !") + @ConfigOption(name = "No Data", desc = "Text to show when there is no Kills per Hour data.") @ConfigEditorText public String noData = "&bN/A"; @Expose - @ConfigOption(name = "Paused", desc = "Text displayed next to the time \n" + - "when you are doing nothing for a given amount of seconds") + @ConfigOption(name = "Paused", desc = "Text displayed next to the time when paused.") @ConfigEditorText public String paused = "&c(PAUSED)"; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java index ed1864c78..f33f4c7e8 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java @@ -10,9 +10,8 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public 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" + + @ConfigOption(name = "§eText Formatting Info", desc = "§e%session% §7is §e§lalways §7replaced with the count for your current session.\n" + + "§7It is reset when the game is restarted.\n" + "§7You can use §e&Z §7color code to use SBA chroma.") @ConfigEditorInfoText public boolean formatInfo = false; @@ -30,86 +29,87 @@ public class TextFormattingConfig { public Runnable importFormatting = GhostFormatting.INSTANCE::importFormat; @Expose - @ConfigOption(name = "Title", desc = "Title Line.") + @ConfigOption(name = "Title", desc = "Title line.") @ConfigEditorText public String titleFormat = "&6Ghost Counter"; @Expose - @ConfigOption(name = "Ghosts Killed", desc = "Ghosts Killed line.\n§e%value% §ris replaced with\n" + - "Ghosts Killed.\n" + - "§e%session% §7is replaced with Ghosts killed") + @ConfigOption(name = "Ghosts killed", desc = "Ghosts killed line.\n" + + "§e%value% §7is replaced with Ghosts killed.\n" + + "§e%session% §7is replaced with Ghosts killed in this session.") @ConfigEditorText - public String ghostKilledFormat = " &6Ghosts Killed: &b%value% &7(%session%)"; + public String ghostKilledFormat = " &6Ghosts killed: &b%value% &7(%session%)"; @Expose - @ConfigOption(name = "Sorrows", desc = "Sorrows drop line.\n" + - "§e%value% §7is replaced with\nsorrows dropped.") + @ConfigOption(name = "Sorrows dropped", desc = "Sorrows dropped line.\n" + + "§e%value% §7is replaced with Sorrows dropped.") @ConfigEditorText - public String sorrowsFormat = " &6Sorrow: &b%value% &7(%session%)"; + public String sorrowsFormat = " &6Sorrows: &b%value% &7(%session%)"; @Expose - @ConfigOption(name = "Ghost Since Sorrow", desc = "Ghost Since Sorrow line.\n" + - "§e%value% §7is replaced with\nGhost since last sorrow drop.") + @ConfigOption(name = "Ghosts since Sorrow", desc = "Ghosts since Sorrow line.\n" + + "§e%value% §7is replaced with Ghosts since last Sorrow drop.") @ConfigEditorText - public String ghostSinceSorrowFormat = " &6Ghost since Sorrow: &b%value%"; + public String ghostSinceSorrowFormat = " &6Ghosts since Sorrow: &b%value%"; @Expose - @ConfigOption(name = "Ghost Kill Per Sorrow", desc = "Ghost Kill Per Sorrow line.\n" + - "§e%value% §7is replaced with\naverage ghost kill per sorrow drop.") + @ConfigOption(name = "Ghost kills per Sorrow", desc = "Ghost kills per Sorrow line.\n" + + "§e%value% §7is replaced with average Ghost kills per Sorrow drop.") @ConfigEditorText public String ghostKillPerSorrowFormat = " &6Ghosts/Sorrow: &b%value%"; @Expose - @ConfigOption(name = "Voltas", desc = "Voltas drop line.\n" + - "§e%value% §7is replaced with\nvoltas dropped.") + @ConfigOption(name = "Voltas dropped", desc = "Voltas dropped line.\n" + + "§e%value% §7is replaced with Voltas dropped.") @ConfigEditorText public String voltasFormat = " &6Voltas: &b%value% &7(%session%)"; @Expose - @ConfigOption(name = "Plasmas", desc = "Plasmas drop line.\n" + - "§e%value% §7is replaced with\nplasmas dropped.") + @ConfigOption(name = "Plasmas dropped", desc = "Plasmas dropped line.\n" + + "§e%value% §7is replaced with Plasmas dropped.") @ConfigEditorText public String plasmasFormat = " &6Plasmas: &b%value% &7(%session%)"; @Expose - @ConfigOption(name = "Ghostly Boots", desc = "Ghostly Boots drop line.\n" + - "§e%value% §7is replaced with\nGhostly Boots dropped.") + @ConfigOption(name = "Ghostly Boots", desc = "Ghostly Boots dropped line.\n" + + "§e%value% §7is replaced with Ghostly Boots dropped.") @ConfigEditorText public String ghostlyBootsFormat = " &6Ghostly Boots: &b%value% &7(%session%)"; @Expose - @ConfigOption(name = "Bag Of Cash", desc = "Bag Of Cash drop line.\n" + - "§e%value% §7is replaced with\nBag Of Cash dropped.") + @ConfigOption(name = "Bag Of Cash", desc = "Bag Of Cash dropped line.\n" + + "§e%value% §7is replaced with Bag Of Cash dropped.") @ConfigEditorText public String bagOfCashFormat = " &6Bag Of Cash: &b%value% &7(%session%)"; @Expose @ConfigOption(name = "Average Magic Find", desc = "Average Magic Find line.\n" + - "§e%value% §7is replaced with\nAverage Magic Find.") + "§e%value% §7is replaced with Average Magic Find.") @ConfigEditorText public String avgMagicFindFormat = " &6Avg Magic Find: &b%value%"; @Expose @ConfigOption(name = "Scavenger Coins", desc = "Scavenger Coins line.\n" + - "§e%value% §7is replaced with\nCoins earned from kill ghosts.\nInclude: Scavenger Enchant, Scavenger Talismans, Kill Combo.") + "§e%value% §7is replaced with Coins earned from kill ghosts.\n" + + "Includes: Scavenger Enchant, Scavenger Talismans, Kill Combo") @ConfigEditorText public String scavengerCoinsFormat = " &6Scavenger Coins: &b%value% &7(%session%)"; @Expose @ConfigOption(name = "Kill Combo", desc = "Kill Combo line.\n" + - "§e%value% §7is replaced with\nYour current kill combo.") + "§e%value% §7is replaced with your current kill combo.") @ConfigEditorText public String killComboFormat = " &6Kill Combo: &b%value%"; @Expose @ConfigOption(name = "Highest Kill Combo", desc = "Highest Kill Combo line.\n" + - "§e%value% §7is replaced with\nYour current highest kill combo.") + "§e%value% §7is replaced with your highest kill combo.") @ConfigEditorText public String highestKillComboFormat = " &6Highest Kill Combo: &b%value% &7(%session%)"; @Expose @ConfigOption(name = "Skill XP Gained", desc = "Skill XP Gained line.\n" + - "§e%value% §7is replaced with\nSkill XP Gained from killing Ghosts.") + "§e%value% §7is replaced with Skill XP Gained from killing Ghosts.") @ConfigEditorText public String skillXPGainFormat = " &6Skill XP Gained: &b%value% &7(%session%)"; @@ -118,7 +118,7 @@ public class TextFormattingConfig { @Expose public BestiaryFormattingConfig bestiaryFormatting = new BestiaryFormattingConfig(); - @ConfigOption(name = "XP Per Hour Formatting", desc = "") + @ConfigOption(name = "XP per Hour Formatting", desc = "") @Accordion @Expose public XPHourFormattingConfig xpHourFormatting = new XPHourFormattingConfig(); @@ -128,21 +128,22 @@ public class TextFormattingConfig { @Expose public ETAFormattingConfig etaFormatting = new ETAFormattingConfig(); - @ConfigOption(name = "Kill Per Hour Formatting", desc = "") + @ConfigOption(name = "Kills per Hour Formatting", desc = "") @Expose @Accordion public KillHourFormattingConfig killHourFormatting = new KillHourFormattingConfig(); @Expose - @ConfigOption(name = "Money Per Hour", desc = "Money Per Hour.\n§e%value% §7is replaced with\nEstimated money you get per hour\n" + - "Calculated with your kill per hour and your average magic find.") + @ConfigOption(name = "Money per Hour", desc = "Money per Hour.\n" + + "§e%value% §7is replaced with estimated money earned per hour.\n" + + "Calculated with your kills per hour and your average magic find.") @ConfigEditorText public String moneyHourFormat = " &6$/h: &b%value%"; @Expose - @ConfigOption(name = "Money made", desc = "Calculate the money you made.\nInclude §eSorrow§7, §ePlasma§7, §eVolta§7, §e1M coins drop\n" + - "§eGhostly Boots§7, §eScavenger coins.\n" + - "§cUsing current Sell Offer value.") + @ConfigOption(name = "Money made", desc = "Calculate the money you made.\n" + + "Includes §eSorrow§7, §ePlasma§7, §eVolta§7, §e1m coins drops§7, §eGhostly Boots§7, §eScavenger coins§7.\n" + + "§eUses current Sell Offer value.") @ConfigEditorText public String moneyMadeFormat = " &6Money made: &b%value%"; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java index 5c9441532..aac56f591 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java @@ -7,19 +7,19 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class XPHourFormattingConfig { @Expose - @ConfigOption(name = "XP/h", desc = "XP Per Hour line.\n" + + @ConfigOption(name = "XP/h", desc = "XP per Hour line.\n" + "§e%value% §7is replaced with one of the text below.") @ConfigEditorText public String base = " &6XP/h: &b%value%"; @Expose - @ConfigOption(name = "No Data", desc = "XP Per Hour line.\n§e%value% §7is replaced with\nEstimated amount of combat xp you gain per hour.") + @ConfigOption(name = "No Data", desc = "XP per Hour line.\n" + + "§e%value% §7is replaced with estimated amount of Combat XP you gain per hour.") @ConfigEditorText public String noData = "&bN/A"; @Expose - @ConfigOption(name = "Paused", desc = "Text displayed next to the time \n" + - "when you are doing nothing for a given amount of seconds") + @ConfigOption(name = "Paused", desc = "Text displayed next to the time when paused.") @ConfigEditorText public String paused = "&c(PAUSED)"; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java index 4f79f9076..fc6d0be06 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java @@ -30,7 +30,7 @@ public class BetterWikiCommandConfig { @ConfigOption( name = "Use Fandom Wiki", desc = "Use Fandom Wiki (§ehypixel-skyblock.fandom.com§7) instead of " + - "the Hypixel wiki (§ewiki.hypixel.net§7) in most wiki-related chat messages." + "the Hypixel Wiki (§ewiki.hypixel.net§7) in most wiki-related chat messages." ) @ConfigEditorBoolean @FeatureToggle @@ -39,7 +39,7 @@ public class BetterWikiCommandConfig { @Expose @ConfigOption( name = "Auto Open", - desc = "Directly opens the Wiki when running the command instead of having to click a message in chat." + desc = "Directly open the Wiki when running the command instead of having to click a message in chat." ) @ConfigEditorBoolean public boolean autoOpenWiki = false; @@ -47,14 +47,14 @@ public class BetterWikiCommandConfig { @Expose @ConfigOption( name = "Open from Menus", - desc = "Directly opens the Wiki from menus instead of having to click a message in chat." + desc = "Directly open the Wiki from menus instead of having to click a message in chat." ) @ConfigEditorBoolean public boolean menuOpenWiki = false; @Expose @ConfigOption(name = "Fandom Wiki Key", desc = "Search for an item on Wiki with this keybind.\n" + - "§4For optimal experiences, do §lNOT§r §4bind this to a mouse button.") + "§cFor an optimal experience, do §lNOT §cbind this to a mouse button.") @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) public int wikiKeybind = Keyboard.KEY_NONE; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java index 45f41fdcf..783d43d74 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java @@ -19,26 +19,26 @@ public class CommandsConfig { public BetterWikiCommandConfig betterWiki = new BetterWikiCommandConfig(); @ConfigOption(name = "Party Commands", desc = "Shortens party commands and allows tab-completing for them. " + - "\n§eCommands: /pt /pp /pko /pk /pd §7SkyBlock command §e/pt §7to check the play time still works.") + "\n§eCommands: /pt, /pp, /pko, /pk, /pd §7(SkyBlock command §e/pt §7to check your play time will still work)") @Expose @ConfigEditorBoolean @FeatureToggle public boolean shortCommands = true; - @ConfigOption(name = "Party Kick Reason", desc = "Kick people while sending a reason when using §e/pk lrg89 Dupe Archer§7 or §e/party kick nea89o Low Cata Level§7.") + @ConfigOption(name = "Party Kick Reason", desc = "Send a reason when kicking people using §e/pk lrg89 Dupe Archer §7or §e/party kick nea89o Low Cata Level§7.") @Expose @ConfigEditorBoolean @FeatureToggle public boolean partyKickReason = true; @Expose - @ConfigOption(name = "Replace Warp Is", desc = "Adds §e/warp is §7alongside §e/is§7. Idk why. Ask §cKaeso") + @ConfigOption(name = "Replace §e/warp is", desc = "Add §e/warp is §7alongside §e/is§7. Idk why. Ask §cKaeso") @ConfigEditorBoolean @FeatureToggle public boolean replaceWarpIs = false; @Expose - @ConfigOption(name = "/viewrecipe Lower Case", desc = "Adds support for lower case item IDs to the Hypixel command §e/viewrecipe§7.") + @ConfigOption(name = "Lower Case §e/viewrecipe", desc = "Add support for lower case item IDs to the Hypixel command §e/viewrecipe§7.") @ConfigEditorBoolean @FeatureToggle public boolean viewRecipeLowerCase = true; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java index fcb4a4501..790224761 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java @@ -8,53 +8,53 @@ import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class TabCompleteConfig { @Expose - @ConfigOption(name = "Warps", desc = "Tab complete the warp-point names when typing §e/warp §7.") + @ConfigOption(name = "Warps", desc = "Tab-complete §e/warp §7warp points.") @ConfigEditorBoolean @FeatureToggle public boolean warps = true; @Expose - @ConfigOption(name = "Island Players", desc = "Tab complete other players on the same island.") + @ConfigOption(name = "Island Players", desc = "Tab-complete other players on the same island.") @ConfigEditorBoolean public boolean islandPlayers = true; @Expose - @ConfigOption(name = "Friends", desc = "Tab complete friends from your friends list.") + @ConfigOption(name = "Friends", desc = "Tab-complete friends from your friends list.") @ConfigEditorBoolean @FeatureToggle public boolean friends = true; @Expose - @ConfigOption(name = "Only Best Friends", desc = "Only Tab Complete best friends.") + @ConfigOption(name = "Only Best Friends", desc = "Only tab-complete best friends.") @ConfigEditorBoolean public boolean onlyBestFriends = false; @Expose - @ConfigOption(name = "Party", desc = "Tab complete Party Members.") + @ConfigOption(name = "Party", desc = "Tab-complete Party Members.") @ConfigEditorBoolean @FeatureToggle public boolean party = true; @Expose - @ConfigOption(name = "VIP Visits", desc = "Tab complete the visit to special users with cake souls on it.") + @ConfigOption(name = "VIP Visits", desc = "Tab-complete the visit to special users with cake souls on it.") @ConfigEditorBoolean @FeatureToggle public boolean vipVisits = tr