Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-14 03:21:20 +01:00
Code Issues Projects Releases Wiki Activity

NPC API getters

Browse Source
This commit is contained in:
PikaMug 2025-02-08 10:50:50 -05:00
parent 5e13d1914f
commit e9bfb46ff4
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/me/pikamug/quests/dependencies/BukkitDenizenTrigger.java
View File

@ -34,7 +34,7 @@ public class BukkitDenizenTrigger {
plugin.getLogger().severe("NPC UUID was null for Denizen script named " + scriptName); plugin.getLogger().severe("NPC UUID was null for Denizen script named " + scriptName);
return false; return false;
} }
final NPC npc = ((BukkitCitizensDependency) plugin.getDependencies().getNpcDependency("Citizens")).getCitizens().getNPCRegistry().getByUniqueId(uuid); final NPC npc = ((BukkitCitizensDependency) plugin.getDependencies().getNpcDependency("Citizens")).getApi().getNPCRegistry().getByUniqueId(uuid);
plugin.getDependencies().getDenizenApi().runTaskScript(scriptName, quester.getPlayer(), npc); plugin.getDependencies().getDenizenApi().runTaskScript(scriptName, quester.getPlayer(), npc);
} else { } else {
plugin.getDependencies().getDenizenApi().runTaskScript(scriptName, quester.getPlayer(), null); plugin.getDependencies().getDenizenApi().runTaskScript(scriptName, quester.getPlayer(), null);

8
core/src/main/java/me/pikamug/quests/dependencies/npc/citizens/BukkitCitizensDependency.java
View File

@ -70,10 +70,6 @@ public class BukkitCitizensDependency implements BukkitNpcDependency, BukkitEnti
return npcs; return npcs;
} }
public CitizensPlugin getCitizens() {
return citizens;
}
@Override @Override
public boolean isNpc(final Entity entity) { public boolean isNpc(final Entity entity) {
return citizens.getNPCRegistry().isNPC(entity); return citizens.getNPCRegistry().isNPC(entity);
@ -90,4 +86,8 @@ public class BukkitCitizensDependency implements BukkitNpcDependency, BukkitEnti
final NPC npc = citizens.getNPCRegistry().getNPC(entity); final NPC npc = citizens.getNPCRegistry().getNPC(entity);
return npc != null ? npc.getUniqueId() : null; return npc != null ? npc.getUniqueId() : null;
} }
public CitizensPlugin getApi() {
return citizens;
}
} }

4
core/src/main/java/me/pikamug/quests/dependencies/npc/znpcsplus/BukkitZnpcsPlusDependency.java
View File

@ -84,4 +84,8 @@ public class BukkitZnpcsPlusDependency implements BukkitNpcDependency {
} }
return npcs; return npcs;
} }
public NpcApi getApi() {
return api;
}
} }

7
core/src/main/java/me/pikamug/quests/dependencies/npc/znpcsplus/legacy/BukkitZnpcsPlusLegacyDependency.java
View File

@ -1,6 +1,7 @@
package me.pikamug.quests.dependencies.npc.znpcsplus.legacy; package me.pikamug.quests.dependencies.npc.znpcsplus.legacy;
import io.github.znetworkw.znpcservers.npc.NPC; import io.github.znetworkw.znpcservers.npc.NPC;
import lol.pyr.znpcsplus.ZNPCsPlus;
import me.pikamug.quests.BukkitQuestsPlugin; import me.pikamug.quests.BukkitQuestsPlugin;
import me.pikamug.quests.dependencies.npc.BukkitEntityNpcDependency; import me.pikamug.quests.dependencies.npc.BukkitEntityNpcDependency;
import me.pikamug.quests.dependencies.npc.BukkitNpcDependency; import me.pikamug.quests.dependencies.npc.BukkitNpcDependency;
@ -17,8 +18,10 @@ import java.util.function.BiPredicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class BukkitZnpcsPlusLegacyDependency implements BukkitNpcDependency, BukkitEntityNpcDependency { public class BukkitZnpcsPlusLegacyDependency implements BukkitNpcDependency, BukkitEntityNpcDependency {
private final ZNPCsPlus znpcsPlusLegacy;
public BukkitZnpcsPlusLegacyDependency(final BukkitQuestsPlugin plugin) { public BukkitZnpcsPlusLegacyDependency(final BukkitQuestsPlugin plugin) {
znpcsPlusLegacy = (ZNPCsPlus) plugin.getServer().getPluginManager().getPlugin("ZNPCsPlus");
plugin.getServer().getPluginManager().registerEvents(new BukkitZnpcsPlusLegacyListener(plugin, this), plugin); plugin.getServer().getPluginManager().registerEvents(new BukkitZnpcsPlusLegacyListener(plugin, this), plugin);
} }
@ -88,4 +91,8 @@ public class BukkitZnpcsPlusLegacyDependency implements BukkitNpcDependency, Buk
final NPC npc = getNpc(entity); final NPC npc = getNpc(entity);
return npc != null ? npc.getUUID() : null; return npc != null ? npc.getUUID() : null;
} }
public ZNPCsPlus getApi() {
return znpcsPlusLegacy;
}
} }