diff --git a/main/pom.xml b/main/pom.xml index a6a5f06e0..32bfdf5b1 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -122,12 +122,14 @@ 3.1.6 provided + com.github.PikaMug LocaleLib diff --git a/main/src/main/java/me/blackvein/quests/Dependencies.java b/main/src/main/java/me/blackvein/quests/Dependencies.java index 2a809a691..84a49322b 100644 --- a/main/src/main/java/me/blackvein/quests/Dependencies.java +++ b/main/src/main/java/me/blackvein/quests/Dependencies.java @@ -12,25 +12,15 @@ package me.blackvein.quests; -import java.util.UUID; - -import org.bukkit.Location; -import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; -import org.bukkit.plugin.RegisteredListener; -import org.bukkit.plugin.RegisteredServiceProvider; - import com.alessiodp.parties.api.Parties; import com.alessiodp.parties.api.interfaces.PartiesAPI; import com.codisimus.plugins.phatloots.PhatLoots; -import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.SkillType; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.player.UserManager; import com.herocraftonline.heroes.Heroes; import com.herocraftonline.heroes.characters.Hero; - -import de.erethon.dungeonsxl.DungeonsXL; import me.blackvein.quests.listeners.NpcListener; import me.blackvein.quests.reflect.denizen.DenizenAPI; import me.blackvein.quests.reflect.worldguard.WorldGuardAPI; @@ -39,9 +29,18 @@ import me.clip.placeholderapi.PlaceholderAPIPlugin; import net.citizensnpcs.api.CitizensPlugin; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.bukkit.plugin.RegisteredListener; +import org.bukkit.plugin.RegisteredServiceProvider; import ro.nicuch.citizensbooks.CitizensBooksAPI; import ro.nicuch.citizensbooks.CitizensBooksPlugin; +import java.util.UUID; + +//import de.erethon.dungeonsxl.DungeonsXL; + public class Dependencies { private final Quests plugin; @@ -55,7 +54,7 @@ public class Dependencies { private static CitizensPlugin citizens = null; private static DenizenAPI denizenApi = null; private static CitizensBooksAPI citizensBooks = null; - private static DungeonsXL dungeons = null; + //private static DungeonsXL dungeons = null; private static PartiesAPI parties = null; public Dependencies(final Quests plugin) { @@ -181,12 +180,12 @@ public class Dependencies { return citizensBooks; } - public DungeonsXL getDungeonsApi() { + /*public DungeonsXL getDungeonsApi() { if (dungeons == null && isPluginAvailable("DungeonsXL")) { dungeons = DungeonsXL.getInstance(); } return dungeons; - } + }*/ public PartiesAPI getPartiesApi() { if (parties == null && isPluginAvailable("Parties")) { @@ -226,7 +225,7 @@ public class Dependencies { getPhatLoots(); getPlaceholderApi(); getCitizensBooksApi(); - getDungeonsApi(); + //getDungeonsApi(); getPartiesApi(); getVaultEconomy(); getVaultPermission(); diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index 29ddb9cc1..ff4683a95 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -16,7 +16,7 @@ import com.alessiodp.parties.api.interfaces.Party; import com.alessiodp.parties.api.interfaces.PartyPlayer; import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.util.player.UserManager; -import de.erethon.dungeonsxl.player.DGroup; +//import de.erethon.dungeonsxl.player.DGroup; import me.blackvein.quests.conditions.Condition; import me.blackvein.quests.enums.ObjectiveType; import me.blackvein.quests.events.quest.QuestTakeEvent; @@ -4125,7 +4125,7 @@ public class Quester implements Comparable { } } } - if (plugin.getDependencies().getDungeonsApi() != null) { + /*if (plugin.getDependencies().getDungeonsApi() != null) { if (quest.getOptions().canUseDungeonsXLPlugin()) { final DGroup group = (DGroup) plugin.getDependencies().getDungeonsApi().getPlayerGroup(getPlayer()); if (group != null) { @@ -4156,7 +4156,7 @@ public class Quester implements Comparable { return mq; } } - } + }*/ return mq; } diff --git a/main/src/main/java/me/blackvein/quests/Quests.java b/main/src/main/java/me/blackvein/quests/Quests.java index e82683ca2..81fe5b73b 100644 --- a/main/src/main/java/me/blackvein/quests/Quests.java +++ b/main/src/main/java/me/blackvein/quests/Quests.java @@ -225,9 +225,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener final long ticks = settings.getStrictPlayerMovement() * 20L; getServer().getScheduler().scheduleSyncRepeatingTask(this, moveThread, ticks, ticks); } - if (depends.getDungeonsApi() != null) { + /*if (depends.getDungeonsApi() != null) { getServer().getPluginManager().registerEvents(dungeonsListener, this); - } + }*/ if (depends.getPartiesApi() != null) { getServer().getPluginManager().registerEvents(partiesListener, this); } diff --git a/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java b/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java index 8a47656ec..82761fe0e 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java @@ -12,20 +12,11 @@ package me.blackvein.quests.listeners; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import de.erethon.dungeonsxl.api.event.group.GroupCreateEvent; -import de.erethon.dungeonsxl.api.event.group.GroupDisbandEvent; -import de.erethon.dungeonsxl.api.event.group.GroupPlayerJoinEvent; -import de.erethon.dungeonsxl.api.event.group.GroupPlayerLeaveEvent; -import me.blackvein.quests.util.Lang; - public class DungeonsListener implements Listener { - @EventHandler + /*@EventHandler public void onGroupCreate(final GroupCreateEvent event) { if (Lang.get("questDungeonsCreate").length() > 0) { final Player p = event.getCreator().getPlayer(); @@ -72,5 +63,5 @@ public class DungeonsListener implements Listener { } } } - } + }*/ } diff --git a/pom.xml b/pom.xml index 516b5f902..22d0ba311 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,8 @@ - dre-repo - https://erethon.de/repo/ + elmakers-repo + http://maven.elmakers.com/repository/