diff --git a/pom.xml b/pom.xml index 2b3152fb1..3d64b7847 100644 --- a/pom.xml +++ b/pom.xml @@ -14,17 +14,17 @@ - + bukkit-repo http://repo.bukkit.org/content/groups/public - citizensapi-repo - http://ci.citizensnpcs.com/plugin/repository/everything + citizens-repo + http://repo.citizensnpcs.com denizens-repo - http://ci.citizensnpcs.com/view/Characters/job/Denizen/592/maven-repository/repository/ + http://repo.citizensnpcs.com vault-repo @@ -39,18 +39,23 @@ org.bukkit - bukkit + craftbukkit LATEST + + org.bukkit + bukkit + LATEST + net.citizensnpcs - citizensapi - 2.0.4-SNAPSHOT + citizens + 2.0.9-SNAPSHOT net.aufdemrand denizen - 0.76-SNAPSHOT + 0.8-PRERELEASE net.milkbowl.vault diff --git a/src/me/blackvein/quests/EventFactory.java b/src/me/blackvein/quests/EventFactory.java index ba0fb33a1..c9b568bec 100644 --- a/src/me/blackvein/quests/EventFactory.java +++ b/src/me/blackvein/quests/EventFactory.java @@ -10,6 +10,8 @@ import java.util.Map.Entry; import me.blackvein.quests.prompts.ItemStackPrompt; import me.blackvein.quests.util.ItemUtil; import me.blackvein.quests.util.Lang; +import net.citizensnpcs.api.CitizensAPI; + import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Effect; @@ -1156,8 +1158,8 @@ public class EventFactory implements ConversationAbandonedListener, ColorUtil{ protected Prompt acceptValidatedInput(ConversationContext context, Number input) { if (input.intValue() != -1) { - - if (quests.citizens.getNPCRegistry().getById(input.intValue()) == null) { + + if (CitizensAPI.getNPCRegistry().getById(input.intValue()) == null) { context.getForWhom().sendRawMessage(RED + Lang.get("eventEditorNoNPCExists")); return new SetNpcStartPrompt(); } diff --git a/src/me/blackvein/quests/ItemData.java b/src/me/blackvein/quests/ItemData.java index 1c74f042b..a165cacaa 100644 --- a/src/me/blackvein/quests/ItemData.java +++ b/src/me/blackvein/quests/ItemData.java @@ -3,8 +3,6 @@ package me.blackvein.quests; import java.util.HashMap; import java.util.Scanner; -import me.blackvein.quests.ItemData.Data; - public class ItemData { public HashMap map = new HashMap(); diff --git a/src/me/blackvein/quests/NpcListener.java b/src/me/blackvein/quests/NpcListener.java index 1d3b93946..9ffc93b39 100644 --- a/src/me/blackvein/quests/NpcListener.java +++ b/src/me/blackvein/quests/NpcListener.java @@ -3,6 +3,7 @@ package me.blackvein.quests; import java.text.MessageFormat; import java.util.LinkedList; import me.blackvein.quests.util.ItemUtil; +import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.event.NPCDeathEvent; import net.citizensnpcs.api.event.NPCRightClickEvent; import net.citizensnpcs.api.npc.NPC; @@ -171,7 +172,7 @@ public class NpcListener implements Listener { boolean okay = true; if (plugin.citizens != null) { - if (plugin.citizens.getNPCRegistry().isNPC(player)) { + if (CitizensAPI.getNPCRegistry().isNPC(player)) { okay = false; } } diff --git a/src/me/blackvein/quests/PlayerListener.java b/src/me/blackvein/quests/PlayerListener.java index 7322db18b..a0eef6797 100644 --- a/src/me/blackvein/quests/PlayerListener.java +++ b/src/me/blackvein/quests/PlayerListener.java @@ -1,6 +1,9 @@ package me.blackvein.quests; import java.io.File; + +import net.citizensnpcs.api.CitizensAPI; + import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; @@ -390,7 +393,7 @@ public class PlayerListener implements Listener { boolean okay = true; if (plugin.citizens != null) { - if (plugin.citizens.getNPCRegistry().isNPC(player)) { + if (CitizensAPI.getNPCRegistry().isNPC(player)) { okay = false; } } @@ -410,7 +413,7 @@ public class PlayerListener implements Listener { boolean okay = true; if (plugin.citizens != null) { - if (plugin.citizens.getNPCRegistry().isNPC(damager)) { + if (CitizensAPI.getNPCRegistry().isNPC(damager)) { okay = false; } } @@ -456,7 +459,7 @@ public class PlayerListener implements Listener { boolean okay = true; if (plugin.citizens != null) { - if (plugin.citizens.getNPCRegistry().isNPC(player) || plugin.citizens.getNPCRegistry().isNPC(evt.getEntity())) { + if (CitizensAPI.getNPCRegistry().isNPC(player) || CitizensAPI.getNPCRegistry().isNPC(evt.getEntity())) { okay = false; } } @@ -484,7 +487,7 @@ public class PlayerListener implements Listener { if (plugin.citizens != null) { - if (plugin.citizens.getNPCRegistry().isNPC(player) || plugin.citizens.getNPCRegistry().isNPC(evt.getEntity())) { + if (CitizensAPI.getNPCRegistry().isNPC(player) || CitizensAPI.getNPCRegistry().isNPC(evt.getEntity())) { okay = false; } @@ -591,7 +594,7 @@ public class PlayerListener implements Listener { boolean isPlayer = true; if (plugin.citizens != null) { - if (plugin.citizens.getNPCRegistry().isNPC(evt.getPlayer())) { + if (CitizensAPI.getNPCRegistry().isNPC(evt.getPlayer())) { isPlayer = false; } } diff --git a/src/me/blackvein/quests/QuestFactory.java b/src/me/blackvein/quests/QuestFactory.java index b26273da0..e7e9662cb 100644 --- a/src/me/blackvein/quests/QuestFactory.java +++ b/src/me/blackvein/quests/QuestFactory.java @@ -11,6 +11,7 @@ import me.blackvein.quests.prompts.RewardsPrompt; import me.blackvein.quests.prompts.StagesPrompt; import me.blackvein.quests.util.ItemUtil; import me.blackvein.quests.util.Lang; +import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.bukkit.ChatColor; import org.bukkit.DyeColor; @@ -186,7 +187,7 @@ public class QuestFactory implements ConversationAbandonedListener, ColorUtil { if (context.getSessionData("npcStart") == null && quests.citizens != null) { text += BLUE + "" + BOLD + "5" + RESET + YELLOW + " - Set NPC start (None set)\n"; } else if (quests.citizens != null) { - text += BLUE + "" + BOLD + "5" + RESET + YELLOW + " - Set NPC start (" + quests.citizens.getNPCRegistry().getById((Integer) context.getSessionData("npcStart")).getName() + ")\n"; + text += BLUE + "" + BOLD + "5" + RESET + YELLOW + " - Set NPC start (" + CitizensAPI.getNPCRegistry().getById((Integer) context.getSessionData("npcStart")).getName() + ")\n"; } if (context.getSessionData("blockStart") == null) { @@ -474,7 +475,7 @@ public class QuestFactory implements ConversationAbandonedListener, ColorUtil { if (input.intValue() > -1) { - if (quests.citizens.getNPCRegistry().getById(input.intValue()) == null) { + if (CitizensAPI.getNPCRegistry().getById(input.intValue()) == null) { context.getForWhom().sendRawMessage(ChatColor.RED + "No NPC exists with that id!"); return new SetNpcStartPrompt(); } diff --git a/src/me/blackvein/quests/Quester.java b/src/me/blackvein/quests/Quester.java index 0dc0136ce..7ab7b1d06 100644 --- a/src/me/blackvein/quests/Quester.java +++ b/src/me/blackvein/quests/Quester.java @@ -5,6 +5,7 @@ import java.util.*; import java.util.Map.Entry; import me.ThaH3lper.com.LoadBosses.LoadBoss; import me.blackvein.quests.util.ItemUtil; +import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; import org.bukkit.ChatColor; import org.bukkit.DyeColor; @@ -2349,7 +2350,7 @@ public class Quester { for (int i : ids) { - citizensInteracted.put(plugin.citizens.getNPCRegistry().getById(i), has.get(ids.indexOf(i))); + citizensInteracted.put(CitizensAPI.getNPCRegistry().getById(i), has.get(ids.indexOf(i))); } @@ -2362,7 +2363,7 @@ public class Quester { for (int i : ids) { - citizensKilled.add(plugin.citizens.getNPCRegistry().getById(i)); + citizensKilled.add(CitizensAPI.getNPCRegistry().getById(i)); citizenNumKilled.add(num.get(ids.indexOf(i))); } @@ -2556,7 +2557,7 @@ public class Quester { if (delayTimeLeft > -1) { plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this), delayTimeLeft * 50); } else { - plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this), currentStage.delay); + plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this), currentStage.delay / 50); plugin.getServer().getPlayer(name).sendMessage(currentStage.delayMessage); } diff --git a/src/me/blackvein/quests/Quests.java b/src/me/blackvein/quests/Quests.java index be5908386..25f6fd38e 100644 --- a/src/me/blackvein/quests/Quests.java +++ b/src/me/blackvein/quests/Quests.java @@ -6,6 +6,7 @@ import java.sql.DriverManager; import java.sql.Statement; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Calendar; import java.util.Collections; import java.util.Comparator; import java.util.EnumMap; @@ -26,6 +27,7 @@ import me.blackvein.quests.util.ItemUtil; import me.blackvein.quests.util.Lang; import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.scripts.ScriptRegistry; +import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensPlugin; import net.citizensnpcs.api.npc.NPC; import net.milkbowl.vault.Vault; @@ -43,7 +45,6 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.conversations.Conversable; -import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; import org.bukkit.conversations.ConversationAbandonedListener; import org.bukkit.conversations.ConversationContext; @@ -1879,10 +1880,10 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener, if (config.contains("quests." + s + ".npc-giver-id")) { - if (citizens.getNPCRegistry().getById(config.getInt("quests." + s + ".npc-giver-id")) != null) { + if (CitizensAPI.getNPCRegistry().getById(config.getInt("quests." + s + ".npc-giver-id")) != null) { - quest.npcStart = citizens.getNPCRegistry().getById(config.getInt("quests." + s + ".npc-giver-id")); - questNPCs.add(citizens.getNPCRegistry().getById(config.getInt("quests." + s + ".npc-giver-id"))); + quest.npcStart = CitizensAPI.getNPCRegistry().getById(config.getInt("quests." + s + ".npc-giver-id")); + questNPCs.add(CitizensAPI.getNPCRegistry().getById(config.getInt("quests." + s + ".npc-giver-id"))); } else { printSevere(GOLD + "[Quests] " + RED + "npc-giver-id: " + GOLD + "for Quest " + PURPLE + quest.name + GOLD + " is not a valid NPC id!"); @@ -2429,10 +2430,10 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener, npcsToTalkTo = new LinkedList(); for (int i : npcIdsToTalkTo) { - if (citizens.getNPCRegistry().getById(i) != null) { + if (CitizensAPI.getNPCRegistry().getById(i) != null) { - npcsToTalkTo.add(citizens.getNPCRegistry().getById(i)); - questNPCs.add(citizens.getNPCRegistry().getById(i)); + npcsToTalkTo.add(CitizensAPI.getNPCRegistry().getById(i)); + questNPCs.add(CitizensAPI.getNPCRegistry().getById(i)); } else { printSevere(GOLD + "[Quests] " + RED + i + GOLD + " inside " + GREEN + "npc-ids-to-talk-to: " + GOLD + "inside " + PINK + "Stage " + s2 + GOLD + " of Quest " + PURPLE + quest.name + GOLD + " is not a valid NPC id!"); @@ -2475,7 +2476,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener, if (is != null) { int npcId = itemDeliveryTargetIds.get(itemsToDeliver.indexOf(item)); - NPC npc = citizens.getNPCRegistry().getById(npcId); + NPC npc = CitizensAPI.getNPCRegistry().getById(npcId); if (npc != null) { @@ -2538,12 +2539,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener, npcAmounts = config.getIntegerList("quests." + s + ".stages.ordered." + s2 + ".npc-kill-amounts"); for (int i : npcIds) { - if (citizens.getNPCRegistry().getById(i) != null) { + if (CitizensAPI.getNPCRegistry().getById(i) != null) { if (npcAmounts.get(npcIds.indexOf(i)) > 0) { - stage.citizensToKill.add(citizens.getNPCRegistry().getById(i)); + stage.citizensToKill.add(CitizensAPI.getNPCRegistry().getById(i)); stage.citizenNumToKill.add(npcAmounts.get(npcIds.indexOf(i))); - questNPCs.add(citizens.getNPCRegistry().getById(i)); + questNPCs.add(CitizensAPI.getNPCRegistry().getById(i)); } else { printSevere(GOLD + "[Quests] " + RED + npcAmounts.get(npcIds.indexOf(i)) + GOLD + " inside " + GREEN + "npc-kill-amounts: " + GOLD + "inside " + PINK + "Stage " + s2 + GOLD + " of Quest " + PURPLE + quest.name + GOLD + " is not a positive number!"); stageFailed = true; @@ -3743,32 +3744,17 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener, public static String getTime(long milliseconds) { String message = ""; - long days = 0; - long hours = 0; - long minutes = 0; - long seconds = 0; - if (((Long) milliseconds).compareTo(Long.parseLong("86400000")) > -1) { - days = (Long) milliseconds / Long.parseLong("86400000"); - milliseconds -= ((Long) milliseconds / Long.parseLong("86400000")) * Long.parseLong("86400000"); - } - - if (((Long) milliseconds).compareTo(Long.parseLong("3600000")) > -1) { - hours = (Long) milliseconds / Long.parseLong("3600000"); - milliseconds -= ((Long) milliseconds / Long.parseLong("3600000")) * Long.parseLong("3600000"); - } - - if (((Long) milliseconds).compareTo(Long.parseLong("60000")) > -1) { - minutes = (Long) milliseconds / Long.parseLong("60000"); - milliseconds -= ((Long) milliseconds / Long.parseLong("60000")) * Long.parseLong("60000"); - } - - if (((Long) milliseconds).compareTo(Long.parseLong("1000")) > -1) { - seconds = (Long) milliseconds / Long.parseLong("1000"); - } - - + + Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(milliseconds); + + long days = calendar.get(Calendar.DAY_OF_YEAR) - 1; + long hours = calendar.get(Calendar.HOUR_OF_DAY) - 1; + long minutes = calendar.get(Calendar.MINUTE); + long seconds = calendar.get(Calendar.SECOND); + if (days > 0) { - + if (days == 1) { message += " 1 Day,"; } else {