Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-10-06 02:47:31 +02:00
Code Issues Projects Releases Wiki Activity

Accept seconds for delays/durations, adds #23

Browse Source
This commit is contained in:
HappyPikachu 2015-03-18 13:16:05 -04:00
parent 3670e4eb89
commit dfcc339e1d
6 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/blackvein/quests/Event.java
View File

@ -467,7 +467,7 @@ public class Event {
if (data.contains(eventKey + "storm-duration")) {
if (data.getInt(eventKey + "storm-duration", -999) != -999) {
event.stormDuration = data.getInt(eventKey + "storm-duration");
event.stormDuration = data.getInt(eventKey + "storm-duration") * 1000;
} else {
plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "storm-duration: " + ChatColor.GOLD + "inside Event " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!");
return null;

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

@ -2625,8 +2625,9 @@ public class EventFactory implements ConversationAbandonedListener, ColorUtil {
for (String s : input.split(" ")) {
try {
long l = Long.parseLong(s);
int i = Integer.parseInt(s);
long l = i * 1000;
if (l < 1000) {
player.sendMessage(PINK + s + " " + RED + Lang.get("eventEditorNotGreaterThanOneSecond"));

12
src/main/java/me/blackvein/quests/QuestFactory.java
View File

@ -968,9 +968,11 @@ public class QuestFactory implements ConversationAbandonedListener, ColorUtil {
if (input.equalsIgnoreCase(Lang.get("cmdClear"))) {
context.setSessionData(CK.Q_REDO_DELAY, null);
}
long delay;
try {
delay = Long.parseLong(input);
int i = Integer.parseInt(input);
delay = i * 1000;
} catch (NumberFormatException e) {
context.getForWhom().sendRawMessage(ITALIC + "" + RED + input + RESET + RED + " " + Lang.get("stageEditorInvalidNumber"));
//delay = MiscUtil.getTimeFromString(input);
@ -1279,7 +1281,9 @@ public class QuestFactory implements ConversationAbandonedListener, ColorUtil {
cs.set("name", name);
cs.set("npc-giver-id", npcStart);
cs.set("block-start", blockStart);
cs.set("redo-delay", redo);
if (redo != null) {
cs.set("redo-delay", redo.intValue() / 1000);
}
cs.set("ask-message", desc);
cs.set("finish-message", finish);
cs.set("initial-event", initialEvent);
@ -1700,7 +1704,9 @@ public class QuestFactory implements ConversationAbandonedListener, ColorUtil {
stage.set("chat-events", chatEvents);
stage.set("chat-event-triggers", chatEventTriggers);
}
stage.set("delay", delay);
if (delay != null) {
stage.set("delay", delay.intValue() / 1000);
}
stage.set("delay-message", delayMessage);
stage.set("objective-override", overrideDisplay);
stage.set("start-message", startMessage);

38
src/main/java/me/blackvein/quests/Quests.java
View File

@ -434,8 +434,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
vault = (Vault) getServer().getPluginManager().getPlugin("Vault");
}
@SuppressWarnings("deprecation")
@Override
@Override
public void onDisable() {
getLogger().info("Saving Quester data.");
@ -886,8 +885,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminGivePoints(final CommandSender cs, String[] args) {
private void adminGivePoints(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.givepoints")) {
Player target = null;
@ -942,8 +940,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminTakePoints(final CommandSender cs, String[] args) {
private void adminTakePoints(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.takepoints")) {
@ -1000,8 +997,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminPoints(final CommandSender cs, String[] args) {
private void adminPoints(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.points")) {
Player target = null;
@ -1057,8 +1053,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminGive(final CommandSender cs, String[] args) {
private void adminGive(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.give")) {
@ -1263,8 +1258,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminFinish(final CommandSender cs, String[] args) {
private void adminFinish(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.finish")) {
@ -1324,8 +1318,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminSetStage(final CommandSender cs, String[] args) {
private void adminSetStage(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.setstage")) {
Player target = null;
@ -1405,8 +1398,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminNextStage(final CommandSender cs, String[] args) {
private void adminNextStage(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.nextstage")) {
@ -1466,8 +1458,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
}
@SuppressWarnings("deprecation")
private void adminQuit(final CommandSender cs, String[] args) {
private void adminQuit(final CommandSender cs, String[] args) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.quit")) {
@ -2505,8 +2496,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
}
@SuppressWarnings("deprecation")
public Map<UUID, Quester> getOnlineQuesters() {
public Map<UUID, Quester> getOnlineQuesters() {
Map<UUID, Quester> qs = new HashMap<UUID, Quester>();
@ -2624,8 +2614,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
if (config.contains("quests." + questName + ".redo-delay")) {
if (config.getLong("quests." + questName + ".redo-delay", -999) != -999) {
quest.redoDelay = config.getLong("quests." + questName + ".redo-delay");
if (config.getInt("quests." + questName + ".redo-delay", -999) != -999) {
quest.redoDelay = config.getInt("quests." + questName + ".redo-delay") * 1000;
} else {
skipQuestProcess("redo-delay: for Quest " + quest.name + " is not a number!");
}
@ -4179,7 +4169,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
if (config.contains("quests." + questName + ".stages.ordered." + s2 + ".delay")) {
if (config.getLong("quests." + questName + ".stages.ordered." + s2 + ".delay", -999) != -999) {
oStage.delay = config.getLong("quests." + questName + ".stages.ordered." + s2 + ".delay");
oStage.delay = config.getInt("quests." + questName + ".stages.ordered." + s2 + ".delay") * 1000;
} else {
stageFailed("delay: in Stage " + s2 + " of Quest " + quest.name + " is not a number!");
}
@ -4522,7 +4512,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
public static String getTime(long milliseconds) {
String message = "";
long days = milliseconds / 86400000;
long hours = (milliseconds % 86400000) / 3600000;
long minutes = ((milliseconds % 86400000) % 3600000) / 60000;

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

@ -186,7 +186,7 @@ public class Lang {
langMap.put("questEditorEditEnterQuestName", "Enter Quest name to edit, or 'cancel' to return");
langMap.put("questEditorEnterAskMessage", "Enter ask message (or 'cancel' to return)");
langMap.put("questEditorEnterFinishMessage", "Enter finish message (or 'cancel' to return)");
langMap.put("questEditorEnterRedoDelay", "Enter amount of time (in milliseconds), 0 to clear the redo delay or -1 to cancel ");
langMap.put("questEditorEnterRedoDelay", "Enter amount of time (in seconds), 0 to clear the redo delay or -1 to cancel ");
langMap.put("questEditorEnterNPCStart", "Enter NPC ID, -1 to clear the NPC start or -2 to cancel");
langMap.put("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, or 'cancel' to return");
langMap.put("questEditorEnterInitialEvent", "Enter an Event name, or enter 'clear' to clear the initial Event, or 'cancel' to return");
@ -349,7 +349,7 @@ public class Lang {
langMap.put("stageEditorChatEventsPrompt", "Enter an event name to add, or enter 'clear' to clear all chat events, or 'cancel' to return");
langMap.put("stageEditorChatEventsTriggerPromptA", "Enter a chat trigger for");
langMap.put("stageEditorChatEventsTriggerPromptB", "or enter 'cancel' to return.");
langMap.put("stageEditorDelayPrompt", "Enter time (in milliseconds), or enter 'clear' to clear the delay, or 'cancel' to return");
langMap.put("stageEditorDelayPrompt", "Enter time (in seconds), or enter 'clear' to clear the delay, or 'cancel' to return");
langMap.put("stageEditorDelayMessagePrompt", "Enter delay message, or enter 'clear' to clear the message, or 'cancel' to return");
langMap.put("stageEditorScriptPrompt", "Enter script name, or enter 'clear' to clear the script, or 'cancel' to return");
langMap.put("stageEditorStartMessagePrompt", "Enter start message, or enter 'clear' to clear the message, or 'cancel' to return");
@ -524,9 +524,9 @@ public class Lang {
langMap.put("eventEditorMustSetStormDuration", "You must set a storm duration!");
langMap.put("eventEditorStormCleared", "Storm data cleared.");
langMap.put("eventEditorEnterStormWorld", "Enter a world name for the storm to occur in, or enter 'cancel' to return");
langMap.put("eventEditorEnterDuration", "Enter duration (in milliseconds)");
langMap.put("eventEditorAtLeastOneSecond", "Amount must be at least 1 second! (1000 milliseconds)");
langMap.put("eventEditorNotGreaterThanOneSecond", "is not greater than 1 second! (1000 milliseconds)");
langMap.put("eventEditorEnterDuration", "Enter duration (in seconds)");
langMap.put("eventEditorAtLeastOneSecond", "Amount must be at least 1 second!");
langMap.put("eventEditorNotGreaterThanOneSecond", "is not greater than 1 second!");
langMap.put("eventEditorThunder", "Event Thunder");
langMap.put("eventEditorMustSetThunderDuration", "You must set a thunder duration!");

4
src/main/resources/quests.yml
View File

@ -1,9 +1,9 @@
quests:
Miner:
name: 'Stone Miner'
ask-message: '<yellow>Could you mine <purple>10<yellow> blocks of <purple>Stone<yellow>, and deliver the <purple>10<yellow> pieces <yellow>of <purple>Cobblestone<yellow> to me?.'
ask-message: '<yellow>Could you mine <purple>10<yellow> blocks of <purple>Stone<yellow>, and deliver the <purple>10<yellow> pieces <yellow>of <purple>Cobblestone<yellow> to me?'
finish-message: '<yellow>Well done. Here is your reward.'
redo-delay: 1800000
redo-delay: 1800
requirements:
items:
- name-wood_pickaxe:amount-1