Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-25 21:52:36 +02:00
Code Issues Projects Releases Wiki Activity

(UNSTABLE) Lang corrections, reduce duplicate strings - part 3

Browse Source
This commit is contained in:
HappyPikachu 2018-01-31 03:03:23 -05:00
parent 03701fc230
commit 623d349c61
3 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/blackvein/quests/EventFactory.java
View File

@ -1039,9 +1039,9 @@ public class EventFactory implements ConversationAbandonedListener {
@Override
public Prompt acceptInput(ConversationContext context, String input) {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdNone")) == false) {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) {
context.setSessionData(CK.E_MESSAGE, input);
} else if (input.equalsIgnoreCase(Lang.get("cmdNone"))) {
} else if (input.equalsIgnoreCase(Lang.get("cmdClear"))) {
context.setSessionData(CK.E_MESSAGE, null);
}
return new CreateMenuPrompt();

22
src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -123,12 +123,24 @@ public class Lang {
}
private void finishLang() {
// or 'cancel' to return
if (get("strCancel") != null) {
langMap.put("strAdd", get("strAdd").replaceAll("<command>", get("cmdAdd")));
langMap.put("strClear", get("strClear").replaceAll("<command>", get("cmdClear")));
langMap.put("strCancel", get("strCancel").replaceAll("<command>", get("cmdCancel")));
}
for (String s : langMap.keySet()) {
langMap.put(s, get(s).replaceAll("<cancel>", get("strCancel")));
langMap.put("strDone", get("strDone").replaceAll("<command>", get("cmdDone")));
for (String key : langMap.keySet()) {
String value = get(key);
// then enter 'add' to include it
value.replaceAll("<add>", get("strAdd"));
// or 'clear' to erase all data
value.replaceAll("<clear>", get("strClear"));
// or 'cancel' to return
value.replaceAll("<cancel>", get("strCancel"));
// then enter '<command>' to save
value.replaceAll("<done>", get("strDone"));
langMap.put(key, value);
}
}

84
src/main/resources/strings.yml
View File

@ -73,12 +73,12 @@ questEditorEnterAskMessage: "Enter ask message (<cancel>)"
questEditorEnterFinishMessage: "Enter finish message (<cancel>)"
questEditorEnterRedoDelay: "Enter amount of time (in seconds), 0 to clear the redo delay or -1 to cancel"
questEditorEnterNPCStart: "Enter NPC ID, -1 to clear the NPC start or -2 to cancel"
questEditorEnterBlockStart: "Right-click on a block to use as a start point, then enter 'done' to save, or enter 'clear' to clear the block start, <cancel>"
questEditorEnterInitialEvent: "Enter an Event name, or enter 'clear' to clear the initial Event, <cancel>"
questEditorEnterBlockStart: "Right-click on a block to use as a start point, <done>, <clear>, <cancel>"
questEditorEnterInitialEvent: "Enter an Event name, <clear>, <cancel>"
questRequiredNoneSet: "Required, none set"
questWGSetRegion: "Set Region"
questWGNotInstalled: "WorldGuard not installed"
questWGPrompt: "Enter WorldGuard region, or enter 'clear' to clear the region, <cancel>"
questWGPrompt: "Enter WorldGuard region, <clear>, <cancel>"
questWGInvalidRegion: "<region> is not a valid WorldGuard region!"
questWGRegionCleared: "Quest region cleared."
questCitNotInstalled: "Citizens not installed"
@ -187,7 +187,7 @@ stageEditorObjectiveOverride: "Objective display override"
stageEditorCustom: "Custom objectives"
stageEditorNoModules: "No modules loaded"
stageEditorModuleNotFound: "Custom objective module not found."
stageEditorCustomPrompt: "Enter the name of a custom objective to add, or enter 'clear' to clear all custom objectives, <cancel>"
stageEditorCustomPrompt: "Enter the name of a custom objective to add, <clear>, <cancel>"
stageEditorCustomAlreadyAdded: "That custom objective has already been added!"
stageEditorCustomCleared: "Custom objectives cleared."
stageEditorCustomDataPrompt: "Enter value for <data>:"
@ -204,36 +204,36 @@ stageEditorEnchantTypePrompt: "Enter enchantment names, separating each one by a
stageEditorEnchantAmountsPrompt: "Enter enchant amounts (numbers), separating each one by a space, <cancel>"
stageEditorItemNamesPrompt: "Enter item names, separating each one by a space, <cancel>"
stageEditorNPCPrompt: "Enter NPC IDs, separating each one by a space, <cancel>"
stageEditorNPCToTalkToPrompt: "Enter NPC IDs, separating each one by a space, or enter 'clear' to clear the NPC ID list, <cancel>"
stageEditorNPCToTalkToPrompt: "Enter NPC IDs, separating each one by a space, <clear>, <cancel>"
stageEditorDeliveryMessagesPrompt: "Enter delivery messages, separating each one by a semi-colon, <cancel>"
stageEditorKillNPCsPrompt: "Enter kill amounts (numbers), separating each one by a space, <cancel>"
stageEditorMobsPrompt: "Enter mob names separating each one by a space, <cancel>"
stageEditorMobAmountsPrompt: "Enter mob amounts separating each one by a space, <cancel>"
stageEditorMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the kill location list, <cancel>"
stageEditorMobLocationPrompt: "Right-click on a block to select it, <add>, <cancel>"
stageEditorMobLocationRadiiPrompt: "Enter kill location radii (number of blocks) separating each one by a space, <cancel>"
stageEditorMobLocationNamesPrompt: "Enter location names separating each one by a comma, <cancel>"
stageEditorReachLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the reach location list, <cancel>"
stageEditorReachLocationPrompt: "Right-click on a block to select it, <add>, <cancel>"
stageEditorReachLocationRadiiPrompt: "Enter reach location radii (number of blocks) separating each one by a space, <cancel>"
stageEditorReachLocationNamesPrompt: "Enter location names separating each one by a comma, <cancel>"
stageEditorTameAmountsPrompt: "Enter tame amounts separating each one by a space, <cancel>"
stageEditorShearColorsPrompt: "Enter sheep colors separating each one by a space, <cancel>"
stageEditorShearAmountsPrompt: "Enter shear amounts separating each one by a space, <cancel>"
stageEditorEventsPrompt: "Enter an event name, or enter 'clear' to clear the event, <cancel>"
stageEditorChatEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all chat events, <cancel>"
stageEditorEventsPrompt: "Enter an event name, <clear>, <cancel>"
stageEditorChatEventsPrompt: "Enter an event name to add, <clear>, <cancel>"
stageEditorChatEventsTriggerPrompt: "%yellow%Enter a chat trigger for%aqua% <event>%yellow% <cancel>"
stageEditorCommandEventsPrompt: "Enter an event name to add, or enter 'clear' to clear all command events, <cancel>"
stageEditorCommandEventsPrompt: "Enter an event name to add, <clear>, <cancel>"
stageEditorCommandEventsTriggerPrompt: "%yellow%Enter a command trigger for%aqua% <event>%yellow% <cancel>"
stageEditorDelayPrompt: "Enter time (in seconds), or enter 'clear' to clear the delay, <cancel>"
stageEditorDelayMessagePrompt: "Enter delay message, or enter 'clear' to clear the message, <cancel>"
stageEditorScriptPrompt: "Enter script name, or enter 'clear' to clear the script, <cancel>"
stageEditorStartMessagePrompt: "Enter start message, or enter 'clear' to clear the message, <cancel>"
stageEditorCompleteMessagePrompt: "Enter complete message, or enter 'clear' to clear the message, <cancel>"
stageEditorDelayPrompt: "Enter time (in seconds), <clear>, <cancel>"
stageEditorDelayMessagePrompt: "Enter delay message, <clear>, <cancel>"
stageEditorScriptPrompt: "Enter script name, <clear>, <cancel>"
stageEditorStartMessagePrompt: "Enter start message, <clear>, <cancel>"
stageEditorCompleteMessagePrompt: "Enter complete message, <clear>, <cancel>"
stageEditorPasswordDisplayPrompt: "Enter a password display, <cancel>"
stageEditorPasswordDisplayHint: "(This is the text that will be displayed to the player as their objective)"
stageEditorPasswordPhrasePrompt: "Enter a password phrase, <cancel>"
stageEditorPasswordPhraseHint1: "(This is the text that a player has to say to complete the objective)"
stageEditorPasswordPhraseHint2: "If you want multiple password phrases, separate them by a | (pipe)"
stageEditorObjectiveOverridePrompt: "Enter objective display override, or 'clear' to clear the override, <cancel>"
stageEditorObjectiveOverridePrompt: "Enter objective display override, <clear>, <cancel>"
stageEditorObjectiveOverrideHint: "(This override will display your own text as the objective)"
stageEditorObjectiveOverrideCleared: "Objective display override cleared."
stageEditorDeliveryAddItem: "Add item"
@ -401,7 +401,7 @@ eventEditorNoEffects: "No effects set"
eventEditorMustAddEffects: "You must add effects first!"
eventEditorInvalidEffect: "is not a valid effect name!"
eventEditorEffectsCleared: "Event effects cleared."
eventEditorEffectLocationPrompt: "Right-click on a block to play an effect at, then enter 'add' to add it to the list, <cancel>"
eventEditorEffectLocationPrompt: "Right-click on a block to play an effect at, <add>, <cancel>"
eventEditorMobSpawns: "Event Mob Spawns"
eventEditorAddMobTypes: "Add mob"
eventEditorNoTypesSet: "(No type set)"
@ -440,14 +440,14 @@ eventEditorPotionsCleared: "Potion effects cleared."
eventEditorInvalidPotionType: "is not a valid potion effect type!"
eventEditorEnterNPCId: "Enter NPC ID (or -1 to cancel)"
eventEditorNoNPCExists: "No NPC exists with that id!"
eventEditorLightningPrompt: "Right-click on a block to spawn a lightning strike at, then enter 'add' to add it to the list, or enter 'clear' to clear the locations list, <cancel>"
eventEditorExplosionPrompt: "Right-click on a block to spawn an explosion at, then enter 'add' to add it to the list, or enter 'clear' to clear the explosions list, <cancel>"
eventEditorLightningPrompt: "Right-click on a block to spawn a lightning strike at, <add>, <clear>, <cancel>"
eventEditorExplosionPrompt: "Right-click on a block to spawn an explosion at, <add>, <clear>, <cancel>"
eventEditorSelectBlockFirst: "You must select a block first."
eventEditorSetMessagePrompt: "Enter message, or enter 'none' to delete, (<cancel>)"
eventEditorSetMobTypesPrompt: "Enter mob name, <cancel>"
eventEditorSetMobAmountsPrompt: "Enter mob amount, <cancel>"
eventEditorSetMobNamePrompt: "Enter the name for this mob, <cancel>"
eventEditorSetMobLocationPrompt: "Right-click on a block to select it, then enter 'add' to add it to the mob spawn location list, <cancel>"
eventEditorSetMobLocationPrompt: "Right-click on a block to select it, <add>, <cancel>"
eventEditorSetPotionEffectsPrompt: "Enter potion effect types separating each one by a space, <cancel>"
eventEditorSetPotionDurationsPrompt: "Enter effect durations (in milliseconds) separating each one by a space, <cancel>"
eventEditorSetPotionMagnitudesPrompt: "Enter potion effect magnitudes separating each one by a space, <cancel>"
@ -457,9 +457,9 @@ eventEditorSetSaturationPrompt: "Enter saturation level, or -1 to clear"
eventEditorSaturationLevelAtLeastZero: "Saturation level must be at least 0!"
eventEditorSetHealthPrompt: "Enter health level, or -1 to clear"
eventEditorHealthLevelAtLeastZero: "Health level must be at least 0!"
eventEditorSetTeleportPrompt: "Right-click on a block to teleport the player to, then enter 'done' to finish, or enter 'clear' to clear the teleport location, <cancel>"
eventEditorSetTeleportPrompt: "Right-click on a block to teleport the player to, <done>, <clear>, <cancel>"
eventEditorCommandsNote: "Note: You may use <player> to refer to the player's name."
eventEditorSetCommandsPrompt: "Enter commands separating each one by a comma, or enter 'clear' to clear the list, <cancel>"
eventEditorSetCommandsPrompt: "Enter commands separating each one by a comma, <clear>, <cancel>"
reqSetMoney: "Set money requirement"
reqSetQuestPoints: "Set Quest Points requirement"
reqSetItem: "Set item requirements"
@ -477,14 +477,14 @@ reqHeroesSetSecondary: "Set Secondary Class"
reqMoneyPrompt: "Enter amount of <money>, or 0 to clear the money requirement, or -1 to cancel"
reqQuestPointsPrompt: "Enter amount of Quest Points, or 0 to clear the Quest Point requirement, or -1 to cancel"
reqQuestListTitle: "- Quests Available -"
reqQuestPrompt: "Enter a list of Quest names separating each one by a <comma>, or enter 'clear' to clear the list, <cancel>"
reqQuestPrompt: "Enter a list of Quest names separating each one by a <comma>, <clear>, <cancel>"
reqRemoveItemsPrompt: "Enter a list of true/false values, separating each one by a space, <cancel>"
reqPermissionsPrompt: "Enter permission requirements separating each one by a space, or enter 'clear' to clear the list, <cancel>"
reqCustomPrompt: "Enter the name of a custom requirement to add, or enter 'clear' to clear all custom requirements, <cancel>"
reqMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, or enter 'clear' to clear the list, <cancel>"
reqMcMMOAmountsPrompt: "Enter mcMMO skill amounts, separating each one by a space, or enter 'clear' to clear the list, <cancel>"
reqHeroesPrimaryPrompt: "Enter a Heroes Primary Class name, or enter 'clear' to clear the requirement, <cancel>"
reqHeroesSecondaryPrompt: "Enter a Heroes Secondary Class name, or enter 'clear' to clear the requirement, <cancel>"
reqPermissionsPrompt: "Enter permission requirements separating each one by a space, <clear>, <cancel>"
reqCustomPrompt: "Enter the name of a custom requirement to add, <clear>, <cancel>"
reqMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, <clear>, <cancel>"
reqMcMMOAmountsPrompt: "Enter mcMMO skill amounts, separating each one by a space, <clear>, <cancel>"
reqHeroesPrimaryPrompt: "Enter a Heroes Primary Class name, <clear>, <cancel>"
reqHeroesSecondaryPrompt: "Enter a Heroes Secondary Class name, <clear>, <cancel>"
reqFailMessagePrompt: "Enter fail requirements message, <cancel>"
reqAddItem: "Add item"
reqSetRemoveItems: "Set remove items"
@ -528,16 +528,16 @@ rewSetHeroesClasses: "Set classes"
rewSetHeroesAmounts: "Set experience amounts"
rewMoneyPrompt: "Enter amount of <money>, or 0 to clear the money reward, or -1 to cancel"
rewExperiencePrompt: "Enter amount of experience, or 0 to clear the experience reward, or -1 to cancel"
rewCommandPrompt: "Enter command rewards separating each one by a <comma>, or enter 'clear' to clear the list, <cancel>"
rewCommandPrompt: "Enter command rewards separating each one by a <comma>, <clear>, <cancel>"
rewCommandPromptHint: 'Note: You may put <player> to specify the player who completed the Quest. e.g. smite <player>'
rewPermissionsPrompt: "Enter permission rewards separating each one by a space, or enter 'clear' to clear the list, <cancel>"
rewPermissionsPrompt: "Enter permission rewards separating each one by a space, <clear>, <cancel>"
rewQuestPointsPrompt: "Enter amount of Quest Points, or 0 to clear the Quest Point reward, or -1 to cancel"
rewMcMMOPrompt: "Enter mcMMO skills, separating each one by a space, <cancel>"
rewMcMMOPromptHint: "Note: Typing 'All' will give levels to all skills."
rewHeroesClassesPrompt: "Enter Heroes classes separating each one by a space, <cancel>"
rewHeroesExperiencePrompt: "Enter experience amounts (numbers, decimals are allowed) separating each one by a space, <cancel>"
rewPhatLootsPrompt: "Enter PhatLoots separating each one by a space, or enter 'clear' to clear the list, <cancel>"
rewCustomRewardPrompt: "Enter the name of a custom reward to add, or enter 'clear' to clear all custom rewards, <cancel>"
rewPhatLootsPrompt: "Enter PhatLoots separating each one by a space, <clear>, <cancel>"
rewCustomRewardPrompt: "Enter the name of a custom reward to add, <clear>, <cancel>"
rewItemsCleared: "Item rewards cleared."
rewNoMcMMOSkills: "No skills set"
rewNoHeroesClasses: "No classes set"
@ -563,11 +563,11 @@ itemCreateSetDisplay: "Set display name"
itemCreateSetLore: "Set lore"
itemCreateEnterName: "Enter an item name, <cancel>"
itemCreateEnterAmount: "Enter item amount (max. 64), <cancel>"
itemCreateEnterDurab: "Enter item durability, or 'clear' to clear the data, <cancel>"
itemCreateEnterEnch: "Enter an enchantment name, or 'clear' to clear the enchantments, <cancel>"
itemCreateEnterDurab: "Enter item durability, <clear>, <cancel>"
itemCreateEnterEnch: "Enter an enchantment name, <clear>, <cancel>"
itemCreateEnterLevel: "Enter a level (number) for <enchantment>"
itemCreateEnterDisplay: "Enter item display name, or 'clear' to clear the display name, <cancel>"
itemCreateEnterLore: "Enter item lore, separating each line by a semi-colon ; or 'clear' to clear the lore, <cancel>"
itemCreateEnterDisplay: "Enter item display name, <clear>, <cancel>"
itemCreateEnterLore: "Enter item lore, separating each line by a semi-colon, <clear>, <cancel>"
itemCreateLoaded: "Item loaded."
itemCreateNoItem: "No item in hand!"
itemCreateNoName: "You must set a name first!"
@ -636,19 +636,21 @@ effGhastShriek: "Sound of a Ghast shrieking"
effZombieWood: "Sound of a Zombie chewing an iron door"
effZombieIron: "Sound of a Zombie chewing a wooden door"
effEnterName: "Enter an effect name to add it to the list, <cancel>"
cmdAdd: "add"
strAdd: "then enter '<command>' to include it"
cmdClear: "clear"
strClear: "or '<command>' to erase all data"
cmdCancel: "cancel"
strCancel: "or '<command>' to return"
cmdAdd: "add"
cmdClear: "clear"
cmdNone: "none"
cmdDone: "done"
strDone: "then enter '<command>' to save"
acceptQuest: "Accept Quest?"
enterAnOption: "Enter an option"
questAccepted: 'Quest accepted: <quest>'
currentQuest: "Current Quests:"
noMoreQuest: "No more quests available."
damage: "Damage"
break: "Break"
damage: "Damage"
place: "Place"
use: "Use"
cut: "Cut"