Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable DungeonsXL integration

This commit is contained in:
PikaMug 2021-08-04 03:39:01 -04:00
parent 0481067dd0
commit 1f0404dcca
6 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/pom.xml
View File

@ -122,12 +122,14 @@
<version>3.1.6</version>
<scope>provided</scope>
</dependency>
<!-- repo offline
<dependency>
<groupId>com.github.DRE2N</groupId>
<artifactId>DungeonsXL</artifactId>
<version>5e7b28ea55</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>com.github.PikaMug</groupId>
<artifactId>LocaleLib</artifactId>

29
main/src/main/java/me/blackvein/quests/Dependencies.java
View File

@ -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();

6
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -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<Quester> {
}
}
}
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<Quester> {
return mq;
}
}
}
}*/
return mq;
}

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

@ -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);
}

13
main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java
View File

@ -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 {
}
}
}
}
}*/
}

4
pom.xml
View File

@ -30,8 +30,8 @@
<repositories>
<repository>
<id>dre-repo</id>
<url>https://erethon.de/repo/</url>
<id>elmakers-repo</id>
<url>http://maven.elmakers.com/repository/</url>
</repository>
</repositories>
</project>