Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-27 21:26:29 +01:00
Code Issues Projects Releases Wiki Activity

Save proper Action effect name, fixes #1199

Browse Source
This commit is contained in:
PikaMug 2020-04-15 03:40:24 -04:00
parent 6e5ebdba93
commit 0d7e282807
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/me/blackvein/quests/actions/Action.java
View File

@ -493,15 +493,17 @@ public class Action {
List<String> effectList = data.getStringList(actionKey + "effects"); List<String> effectList = data.getStringList(actionKey + "effects");
List<String> effectLocs = data.getStringList(actionKey + "effect-locations"); List<String> effectLocs = data.getStringList(actionKey + "effect-locations");
for (String s : effectList) { for (String s : effectList) {
Effect effect = Effect.valueOf(s.toUpperCase()); Effect effect = null;
Location l = ConfigUtil.getLocation(effectLocs.get(effectList.indexOf(s))); try {
if (effect == null) { effect = Effect.valueOf(s.toUpperCase());
} catch (IllegalArgumentException e) {
plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s
+ ChatColor.GOLD + " inside " + ChatColor.GREEN + "effects: " + ChatColor.GOLD + ChatColor.GOLD + " inside " + ChatColor.GREEN + "effects: " + ChatColor.GOLD
+ "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD
+ " is not a valid effect name!"); + " is not a valid effect name!");
return null; return null;
} }
Location l = ConfigUtil.getLocation(effectLocs.get(effectList.indexOf(s)));
if (l == null) { if (l == null) {
plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED
+ effectLocs.get(effectList.indexOf(s)) + ChatColor.GOLD + " inside " + effectLocs.get(effectList.indexOf(s)) + ChatColor.GOLD + " inside "

92
main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
View File

@ -1599,6 +1599,52 @@ public class ActionFactory implements ConversationAbandonedListener {
} }
} }
private class SoundEffectPrompt extends StringPrompt {
@Override
public String getPromptText(ConversationContext context) {
String effects = ChatColor.LIGHT_PURPLE + Lang.get("eventEditorEffectsTitle") + "\n";
Effect[] vals = Effect.values();
for (int i = 0; i < vals.length; i++) {
Effect eff = vals[i];
if (i < (vals.length - 1)) {
effects += MiscUtil.snakeCaseToUpperCamelCase(eff.name()) + ", ";
} else {
effects += MiscUtil.snakeCaseToUpperCamelCase(eff.name()) + "\n";
}
}
return effects + ChatColor.YELLOW + Lang.get("effEnterName");
}
@SuppressWarnings("unchecked")
@Override
public Prompt acceptInput(ConversationContext context, String input) {
Player player = (Player) context.getForWhom();
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
if (getProperEffect(input) != null) {
LinkedList<String> effects;
if (context.getSessionData(CK.E_EFFECTS) != null) {
effects = (LinkedList<String>) context.getSessionData(CK.E_EFFECTS);
} else {
effects = new LinkedList<String>();
}
effects.add(getProperEffect(input).name());
context.setSessionData(CK.E_EFFECTS, effects);
selectedEffectLocations.remove(player.getUniqueId());
return new SoundEffectListPrompt();
} else {
player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED
+ Lang.get("eventEditorInvalidEffect"));
return new SoundEffectPrompt();
}
} else {
selectedEffectLocations.remove(player.getUniqueId());
return new SoundEffectListPrompt();
}
}
}
private class SoundEffectLocationPrompt extends StringPrompt { private class SoundEffectLocationPrompt extends StringPrompt {
@Override @Override
@ -1637,52 +1683,6 @@ public class ActionFactory implements ConversationAbandonedListener {
} }
} }
private class SoundEffectPrompt extends StringPrompt {
@Override
public String getPromptText(ConversationContext context) {
String effects = ChatColor.LIGHT_PURPLE + Lang.get("eventEditorEffectsTitle") + "\n";
Effect[] vals = Effect.values();
for (int i = 0; i < vals.length; i++) {
Effect eff = vals[i];
if (i < (vals.length - 1)) {
effects += MiscUtil.snakeCaseToUpperCamelCase(eff.name()) + ", ";
} else {
effects += MiscUtil.snakeCaseToUpperCamelCase(eff.name()) + "\n";
}
}
return effects + ChatColor.YELLOW + Lang.get("effEnterName");
}
@SuppressWarnings("unchecked")
@Override
public Prompt acceptInput(ConversationContext context, String input) {
Player player = (Player) context.getForWhom();
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
if (getProperEffect(input) != null) {
LinkedList<String> effects;
if (context.getSessionData(CK.E_EFFECTS) != null) {
effects = (LinkedList<String>) context.getSessionData(CK.E_EFFECTS);
} else {
effects = new LinkedList<String>();
}
effects.add(input.toUpperCase());
context.setSessionData(CK.E_EFFECTS, effects);
selectedEffectLocations.remove(player.getUniqueId());
return new SoundEffectListPrompt();
} else {
player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED
+ Lang.get("eventEditorInvalidEffect"));
return new SoundEffectPrompt();
}
} else {
selectedEffectLocations.remove(player.getUniqueId());
return new SoundEffectListPrompt();
}
}
}
private class StormPrompt extends FixedSetPrompt { private class StormPrompt extends FixedSetPrompt {
public StormPrompt() { public StormPrompt() {