diff --git a/core/src/main/java/me/pikamug/quests/convo/quests/requirements/QuestRequirementsPrompt.java b/core/src/main/java/me/pikamug/quests/convo/quests/requirements/QuestRequirementsPrompt.java index a54e526bc..bd305bab0 100644 --- a/core/src/main/java/me/pikamug/quests/convo/quests/requirements/QuestRequirementsPrompt.java +++ b/core/src/main/java/me/pikamug/quests/convo/quests/requirements/QuestRequirementsPrompt.java @@ -461,11 +461,7 @@ public class QuestRequirementsPrompt extends QuestsEditorNumericPrompt { String text = getQueryText(context); if (plugin.getDependencies().getVaultEconomy() != null) { - text = text.replace("", ((plugin.getDependencies().getVaultEconomy() - .currencyNamePlural().isEmpty() ? BukkitLang.get("money") - : plugin.getDependencies().getVaultEconomy().currencyNamePlural()))); - } else { - text = text.replace("", BukkitLang.get("money")); + text = text.replace("", plugin.getDependencies().getVaultEconomy().currencyNamePlural()); } return ChatColor.YELLOW + text; } diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml index 430e517e3..6f4ae53f9 100644 --- a/core/src/main/resources/strings.yml +++ b/core/src/main/resources/strings.yml @@ -1,52 +1,52 @@ COMMAND_LIST: "list" -COMMAND_LIST_HELP: " [page] - List available quests" +COMMAND_LIST_HELP: "%gold% %yellow%[page] - List available quests" COMMAND_TAKE: "take" -COMMAND_TAKE_HELP: " [quest] - Accept a quest via command" +COMMAND_TAKE_HELP: "%gold% %yellow%[quest] - Accept a quest via command" COMMAND_QUIT: "quit" -COMMAND_QUIT_HELP: " [quest] - Quit a current quest" +COMMAND_QUIT_HELP: "%gold% %yellow%[quest] - Quit a current quest" COMMAND_JOURNAL: "journal" -COMMAND_JOURNAL_HELP: " - View or hide your " +COMMAND_JOURNAL_HELP: "%gold% %yellow%- View or hide your " COMMAND_EDITOR: "editor" -COMMAND_EDITOR_HELP: " - Create, edit or delete quests" +COMMAND_EDITOR_HELP: "%gold% %yellow%- Create, edit or delete quests" COMMAND_EVENTS_EDITOR: "actions" -COMMAND_EVENTS_EDITOR_HELP: " - Create, edit or delete actions" +COMMAND_EVENTS_EDITOR_HELP: "%gold% %yellow%- Create, edit or delete actions" COMMAND_CONDITIONS_EDITOR: "conditions" -COMMAND_CONDITIONS_EDITOR_HELP: " - Create, edit or delete conditions" +COMMAND_CONDITIONS_EDITOR_HELP: "%gold% %yellow%- Create, edit or delete conditions" COMMAND_STATS: "stats" -COMMAND_STATS_HELP: " - View quest statistics" +COMMAND_STATS_HELP: "%gold% %yellow%- View quest statistics" COMMAND_TOP: "top" -COMMAND_TOP_HELP: " [number] - View plugin leaderboards" +COMMAND_TOP_HELP: "%gold% %yellow%[number] - View plugin leaderboards" COMMAND_INFO: "info" -COMMAND_INFO_HELP: " - View plugin information" +COMMAND_INFO_HELP: "%gold% %yellow%- View plugin information" COMMAND_CHOICE: "choice" -COMMAND_CHOICE_HELP: " [choice] - Make a menu selection" +COMMAND_CHOICE_HELP: "%gold% %yellow%[choice] - Make a menu selection" COMMAND_QUEST_HELP: "- View current quest objectives" -COMMAND_QUESTINFO_HELP: "[quest] - View information about a quest" +COMMAND_QUESTINFO_HELP: "%yellow%[quest] - View information about a quest" COMMAND_QUESTADMIN_HELP: "- Display administrator help" COMMAND_QUESTADMIN_STATS: "stats" -COMMAND_QUESTADMIN_STATS_HELP: " [player] - View quest statistics of a player" +COMMAND_QUESTADMIN_STATS_HELP: "%gold% %red%[player] - View quest statistics of a player" COMMAND_QUESTADMIN_GIVE: "give" -COMMAND_QUESTADMIN_GIVE_HELP: " [player] [quest] - Force a player to take a quest" +COMMAND_QUESTADMIN_GIVE_HELP: "%gold% %red%[player] [quest] - Force a player to take a quest" COMMAND_QUESTADMIN_QUIT: "quit" -COMMAND_QUESTADMIN_QUIT_HELP: " [player] [quest] - Force a player to quit a quest" +COMMAND_QUESTADMIN_QUIT_HELP: "%gold% %red%[player] [quest] - Force a player to quit a quest" COMMAND_QUESTADMIN_POINTS: "points" -COMMAND_QUESTADMIN_POINTS_HELP: " [player] [amount] - Set a player's " +COMMAND_QUESTADMIN_POINTS_HELP: "%gold% %red%[player] [amount] - Set a player's " COMMAND_QUESTADMIN_TAKEPOINTS: "takepoints" -COMMAND_QUESTADMIN_TAKEPOINTS_HELP: " [player] [amount] - Take away a player's " +COMMAND_QUESTADMIN_TAKEPOINTS_HELP: "%gold% %red%[player] [amount] - Take away a player's " COMMAND_QUESTADMIN_GIVEPOINTS: "givepoints" -COMMAND_QUESTADMIN_GIVEPOINTS_HELP: " [player] [amount] - Add to a player's " +COMMAND_QUESTADMIN_GIVEPOINTS_HELP: "%gold% %red%[player] [amount] - Add to a player's " COMMAND_QUESTADMIN_FINISH: "finish" -COMMAND_QUESTADMIN_FINISH_HELP: " [player] [quest] - Force a player to complete a quest" +COMMAND_QUESTADMIN_FINISH_HELP: "%gold% %red%[player] [quest] - Force a player to complete a quest" COMMAND_QUESTADMIN_NEXTSTAGE: "nextstage" -COMMAND_QUESTADMIN_NEXTSTAGE_HELP: " [player] [quest] - Force a player to complete current stage" +COMMAND_QUESTADMIN_NEXTSTAGE_HELP: "%gold% %red%[player] [quest] - Force a player to complete current stage" COMMAND_QUESTADMIN_SETSTAGE: "setstage" -COMMAND_QUESTADMIN_SETSTAGE_HELP: " [player] [quest] [stage] - Set the current stage for a player" +COMMAND_QUESTADMIN_SETSTAGE_HELP: "%gold% %red%[player] [quest] [stage] - Set the current stage for a player" COMMAND_QUESTADMIN_RESET: "reset" -COMMAND_QUESTADMIN_RESET_HELP: " [player] - Clear all questing data of a player" +COMMAND_QUESTADMIN_RESET_HELP: "%gold% %red%[player] - Clear all questing data of a player" COMMAND_QUESTADMIN_REMOVE: "remove" -COMMAND_QUESTADMIN_REMOVE_HELP: " [player] [quest] - Remove a completed quest from a player" +COMMAND_QUESTADMIN_REMOVE_HELP: "%gold% %red%[player] [quest] - Remove a completed quest from a player" COMMAND_QUESTADMIN_RELOAD: "reload" -COMMAND_QUESTADMIN_RELOAD_HELP: " - Safely reload the plugin" +COMMAND_QUESTADMIN_RELOAD_HELP: "%gold% %red%- Safely reload the plugin" questEditorCreate: "Create new quest" questEditorEdit: "Edit a quest" questEditorDelete: "Delete a quest" @@ -178,7 +178,7 @@ stageEditorModulePrompt: "Enter the name of a module, , " stageEditorCustomPrompt: "Enter the name of a custom objective to add, , " stageEditorCustomAlreadyAdded: "That custom objective has already been added!" stageEditorCustomCleared: "Custom objectives cleared." -stageEditorCustomDataPrompt: "Enter value for :" +stageEditorCustomDataPrompt: "Enter value for %gold%%yellow%:" stageEditorEnterBlockNames: "Enter block names, , " stageEditorEnterBlockAmounts: "Enter block amounts, , " stageEditorEnterBlockDurability: "Enter block durabilities (numbers), , " @@ -216,21 +216,21 @@ stageEditorPasswordPhrasePrompt: "Enter password phrases, , " stageEditorDeliveryAddItem: "Add item" stageEditorNPCUniqueIds: "Add NPC UUIDs" stageEditorDeliveryMessages: "Set partial delivery messages" -stageEditorNotSolid: " is not a solid block!" -stageEditorInvalidBlockName: " is not a valid block name!" -stageEditorInvalidNPC: " is not a valid NPC UUID!" -stageEditorInvalidMob: " is not a valid mob name!" -stageEditorInvalidItemName: " is not a valid item name!" -stageEditorInvalidDye: " is not a valid dye color!" -stageEditorInvalidCondition: " is not a valid condition name!" -stageEditorInvalidEvent: " is not a valid action name!" +stageEditorNotSolid: "%red% %yellow%is not a solid block!" +stageEditorInvalidBlockName: "%red% %yellow%is not a valid block name!" +stageEditorInvalidNPC: "%red% %yellow%is not a valid NPC UUID!" +stageEditorInvalidMob: "%red% %yellow%is not a valid mob name!" +stageEditorInvalidItemName: "%red% %yellow%is not a valid item name!" +stageEditorInvalidDye: "%red% %yellow%is not a valid dye color!" +stageEditorInvalidCondition: "%red% %yellow%is not a valid condition name!" +stageEditorInvalidEvent: "%red% %yellow%is not a valid action name!" stageEditorDuplicateEvent: "Action is already in the list!" stageEditorInvalidScript: "Denizen script not found!" stageEditorNoCitizens: "Citizens is not installed!" stageEditorNoDenizen: "Denizen is not installed!" stageEditorPositiveAmount: "You must enter a positive number!" -stageEditorNotListOfNumbers: " is not a list of numbers!" -stageEditorNotListOfUniqueIds: " is not a list of valid UUIDs!" +stageEditorNotListOfNumbers: "%gold% %red%is not a list of numbers!" +stageEditorNotListOfUniqueIds: "%gold% %red%is not a list of valid UUIDs!" stageEditorNoDelaySet: "You must set a delay first!" stageEditorNoItems: "You must add items first!" stageEditorNoDeliveryMessage: "You must set at least one delivery message!" @@ -245,7 +245,7 @@ stageEditorMessageCleared: "Message cleared." stageEditorConfirmStageNote: "Any stages after will be shifted back one spot" stageEditorDeleteSucces: "Stage deleted successfully." stageEditorEnchantments: "Enchantments" -stageEditorNPCNote: 'Note: You may specify the name of the NPC with ' +stageEditorNPCNote: "Note: You may specify the name of the NPC with " stageEditorOptional: "Optional" stageEditorColors: "Sheep Colors" eventEditorCreate: "Create new action" @@ -258,7 +258,7 @@ eventEditorExists: "Action already exists!" eventEditorDeleted: "Action deleted. Quest and action data reloaded." eventEditorSaved: "Action saved. Quest and action data reloaded." eventEditorEnterEventName: "Enter action name, " -eventEditorModifiedNote: 'You have modified an action that the following quests use:' +eventEditorModifiedNote: "You have modified an action that the following quests use:" eventEditorForcedToQuit: "If you save the action, anyone who is actively doing any of these quests will be forced to quit them." eventEditorEventInUse: "The following quests use the action" eventEditorMustModifyQuests: "You must modify these quests first!" @@ -303,7 +303,7 @@ eventEditorItemsCleared: "Action items cleared." eventEditorSetWorld: "Set world" eventEditorSetDuration: "Set duration" eventEditorSetWorldFirst: "You must set a world first!" -eventEditorInvalidWorld: " is not a valid world name!" +eventEditorInvalidWorld: "%red% %yellow%is not a valid world name!" eventEditorMustSetStormDuration: "You must set a storm duration!" eventEditorStormCleared: "Storm data cleared." eventEditorEnterStormWorld: "Enter a world name for the storm to occur in, " @@ -314,7 +314,7 @@ eventEditorEnterThunderWorld: "Enter a world name for the thunder to occur in, < eventEditorAddEffect: "Add sound effect" eventEditorAddEffectLocation: "Add sound effect location" eventEditorMustAddEffects: "You must add sound effects first!" -eventEditorInvalidEffect: " is not a valid sound effect name!" +eventEditorInvalidEffect: "%red% %yellow%is not a valid sound effect name!" eventEditorEffectsCleared: "Action sound effects cleared." eventEditorEffectLocationPrompt: "Right-click on a block to play a sound effect at, , " eventEditorAddMobTypes: "Add mob" @@ -346,7 +346,7 @@ eventEditorMustSetPotionDurationsFirst: "You must set potion effect durations fi eventEditorMustSetPotionTypesAndDurationsFirst: "You must set potion effect types and durations first!" eventEditorSetPotionMagnitudes: "Set potion effect magnitudes" eventEditorPotionsCleared: "Potion effects cleared." -eventEditorInvalidPotionType: " is not a valid potion effect type!" +eventEditorInvalidPotionType: "%red% %yellow%is not a valid potion effect type!" eventEditorLightningPrompt: "Right-click on a block to spawn a lightning strike at, , , " eventEditorExplosionPrompt: "Right-click on a block to spawn an explosion at, , , " eventEditorSelectBlockFirst: "You must select a block first." @@ -374,7 +374,7 @@ conditionEditorInUse: "The following quests use the condition" conditionEditorEnterName: "Enter condition name, " conditionEditorSaved: "Condition saved. Quest and condition data reloaded." conditionEditorDeleted: "Condition deleted. Quest and condition data reloaded." -conditionEditorModifiedNote: 'You have modified a condition that the following quests use:' +conditionEditorModifiedNote: "You have modified a condition that the following quests use:" conditionEditorForcedToQuit: "If you save the condition, anyone who is actively doing any of these quests will be forced to quit them." conditionEditorSetName: "Set name" conditionEditorEntity: "Entity" @@ -393,11 +393,11 @@ conditionEditorItemsWear: "Wear as armor" conditionEditorWorldsTitle: "- Worlds -" conditionEditorWorldsPrompt: "Enter world names, , " conditionEditorStayWithinWorld: "Stay within world" -conditionEditorInvalidWorld: " is not a valid world name!" +conditionEditorInvalidWorld: "%red% %yellow%is not a valid world name!" conditionEditorBiomesTitle: "- Biomes -" conditionEditorBiomesPrompt: "Enter biome names, , " conditionEditorStayWithinBiome: "Stay within biome" -conditionEditorInvalidBiome: " is not a valid biome name!" +conditionEditorInvalidBiome: "%red% %yellow%is not a valid biome name!" conditionEditorRegionsTitle: "- Regions -" conditionEditorRegionsPrompt: "Enter region names, , " conditionEditorStayWithinRegion: "Stay within region" @@ -406,7 +406,7 @@ conditionEditorSetStartTick: "Set start tick" conditionEditorSetEndTick: "Set end tick" conditionEditorTicksPrompt: "Enter tick value, , " conditionEditorStayWithinTicks: "Stay within ticks" -conditionEditorInvalidTicks: " is not a valid tick value!" +conditionEditorInvalidTicks: "%red% %yellow%is not a valid tick value!" conditionEditorPlaceholderTitle: "- PlaceholderAPI -" conditionEditorSetPlaceholderId: "Set placeholder identifiers" conditionEditorSetPlaceholderVal: "Set placeholder values" @@ -440,12 +440,12 @@ reqAddItem: "Add item" reqSetRemoveItems: "Set remove items" reqHeroesPrimaryDisplay: "Primary Class:" reqHeroesSecondaryDisplay: "Secondary Class:" -reqNotAQuestName: " is not a quest name!" +reqNotAQuestName: "%purple% %red%is not a quest name!" reqItemCleared: "Item requirements cleared." reqCustomAlreadyAdded: "That custom requirement has already been added!" reqCustomNotFound: "Custom requirement module not found." reqCustomCleared: "Custom requirements cleared." -reqMcMMOError: " is not an mcMMO Classic skill name!" +reqMcMMOError: "%red% %yellow%is not an mcMMO Classic skill name!" reqMcMMOCleared: "mcMMO Classic skill requirements cleared." reqMcMMOAmountsCleared: "mcMMO Classic skill amount requirements cleared." reqHeroesNotPrimary: "The class is not primary!" @@ -453,8 +453,8 @@ reqHeroesPrimaryCleared: "Heroes Primary Class requirement cleared." reqHeroesNotSecondary: "The class is not secondary!" reqHeroesSecondaryCleared: "Heroes Secondary Class requirement cleared." reqHeroesClassNotFound: "Class not found!" -reqNotANumber: " is not a number!" -reqNotAUniqueId: " is not a valid UUID!" +reqNotANumber: "%red% %yellow%is not a number!" +reqNotAUniqueId: "%red% %yellow%is not a valid UUID!" reqMustAddItem: "You must add at least one item first!" reqNoMessage: "You must set a fail requirements message!" plnStart: "Set start date" @@ -462,8 +462,8 @@ plnEnd: "Set end date" plnRepeat: "Set repeat cycle" plnCooldown: "Set player cooldown" plnOverride: "Ignore cooldown after repeat" -plnTooEarly: " will be active in