Skip to content

Commit

Permalink
NPCSelector API
Browse files Browse the repository at this point in the history
  • Loading branch information
fullwall committed Feb 20, 2013
1 parent 0bdfe75 commit 2cd75a9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
6 changes: 6 additions & 0 deletions src/main/java/net/citizensnpcs/api/CitizensAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import java.io.File;

import net.citizensnpcs.api.ai.speech.SpeechFactory;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.npc.NPCDataStore;
import net.citizensnpcs.api.npc.NPCRegistry;
import net.citizensnpcs.api.npc.NPCSelector;
import net.citizensnpcs.api.scripting.ScriptCompiler;
import net.citizensnpcs.api.trait.TraitFactory;

Expand Down Expand Up @@ -62,6 +64,10 @@ public static File getDataFolder() {
return getImplementation().getDataFolder();
}

public static NPCSelector getDefaultNPCSelector() {
return getImplementation().getDefaultNPCSelector();
}

private static CitizensPlugin getImplementation() {
if (instance.implementation == null)
throw new IllegalStateException("no implementation set");
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/citizensnpcs/api/CitizensPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.citizensnpcs.api.ai.speech.SpeechFactory;
import net.citizensnpcs.api.npc.NPCDataStore;
import net.citizensnpcs.api.npc.NPCRegistry;
import net.citizensnpcs.api.npc.NPCSelector;
import net.citizensnpcs.api.trait.TraitFactory;

import org.bukkit.plugin.Plugin;
Expand All @@ -28,6 +29,8 @@ public interface CitizensPlugin extends Plugin {
*/
public NPCRegistry createNamedNPCRegistry(String name, NPCDataStore store);

public NPCSelector getDefaultNPCSelector();

/**
*
* @param pluginName
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/citizensnpcs/api/npc/NPCSelector.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package net.citizensnpcs.api.npc;

import org.bukkit.command.CommandSender;

public interface NPCSelector {
NPC getSelected(CommandSender sender);
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* to compile.
*/
public class ScriptCompiler implements Runnable {
private final WeakReference<ClassLoader> classLoader;
private final ScriptEngineManager engineManager;
private final Map<String, ScriptEngine> engines = Maps.newHashMap();
private final Function<File, FileEngine> fileEngineConverter = new Function<File, FileEngine>() {
Expand All @@ -53,7 +54,6 @@ public FileEngine apply(File file) {
private final List<ContextProvider> globalContextProviders = Lists.newArrayList();
private final Thread runningThread;
private final BlockingQueue<CompileTask> toCompile = new ArrayBlockingQueue<CompileTask>(50);
private final WeakReference<ClassLoader> classLoader;

public ScriptCompiler(ClassLoader classLoader) {
engineManager = new ScriptEngineManager(classLoader);
Expand Down

0 comments on commit 2cd75a9

Please sign in to comment.