Abstract Queues

DenizenScript · Jul 20, 2013 · 1d0c94c · 1d0c94c
1 parent 8bbe362
commit 1d0c94c
Show file tree

Hide file tree

Showing 25 changed files with 765 additions and 421 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/exceptions/ScriptEntryCreationException.java b/src/main/java/net/aufdemrand/denizen/exceptions/ScriptEntryCreationException.java
@@ -4,7 +4,7 @@
 
 public class ScriptEntryCreationException extends Exception {
 
-	private static final long serialVersionUID = 3159123423457792068L;
+	private static final long serialVersionUID = 315955523457792068L;
 
 	public ScriptEntryCreationException(String msg) {
 		super(msg);

diff --git a/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java b/src/main/java/net/aufdemrand/denizen/npc/actions/ActionHandler.java
@@ -4,9 +4,10 @@
 import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
-import net.aufdemrand.denizen.scripts.ScriptQueue;
+import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizen.scripts.containers.core.AssignmentScriptContainer;
 import net.aufdemrand.denizen.objects.aH;
+import net.aufdemrand.denizen.scripts.queues.core.InstantQueue;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.DebugElement;
 
@@ -41,7 +42,7 @@ public boolean doAction(String actionName, dNPC npc, dPlayer player, AssignmentS
 
         dB.echoDebug(DebugElement.Header, "Building action 'On " + actionName.toUpperCase() + "' for " + npc.toString());
 
-        ScriptQueue queue = ScriptQueue._getInstantQueue(ScriptQueue._getNextId()).addEntries(script);
+        ScriptQueue queue = InstantQueue.getQueue(null).addEntries(script);
         queue.start();
 
         // TODO: Read queue context to see if the event behind action should be cancelled.

diff --git a/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java b/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java
@@ -7,8 +7,8 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface ObjectFetcher {
 
+public @interface ObjectFetcher {
     String value();
 
 }
diff --git a/src/main/java/net/aufdemrand/denizen/objects/aH.java b/src/main/java/net/aufdemrand/denizen/objects/aH.java
@@ -1,6 +1,6 @@
 package net.aufdemrand.denizen.objects;
 
-import net.aufdemrand.denizen.scripts.ScriptQueue;
+import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizen.scripts.ScriptRegistry;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.ChatColor;
@@ -474,12 +474,6 @@ public static dNPC getNPCFrom(String arg) {
         return dNPC.valueOf(aH.getStringFrom(arg));
     }
 
-    @Deprecated
-    public static ScriptQueue getQueueFrom(String arg) {
-        arg = arg.replace("queue:", "");
-        return ScriptQueue._getQueue(getStringFrom(arg).toUpperCase());
-    }
-
     public static String getStringFrom(String arg) {
         String[] parts = arg.split(":", 2);
         return parts.length >=2 ? parts[1] : arg;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java
@@ -1,18 +1,9 @@
 package net.aufdemrand.denizen.objects;
 
-import net.aufdemrand.denizen.scripts.ScriptQueue;
-import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.aufdemrand.denizen.utilities.depends.Depends;
-import net.aufdemrand.denizen.utilities.depends.WorldGuardUtilities;
-import net.aufdemrand.denizen.utilities.entity.Rotation;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Sign;
 
 import java.util.*;
 import java.util.regex.Matcher;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptEngine.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptEngine.java
@@ -2,6 +2,7 @@
 
 import net.aufdemrand.denizen.Denizen;
 import net.aufdemrand.denizen.scripts.commands.CommandExecuter;
+import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizen.scripts.requirements.RequirementChecker;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 
@@ -50,7 +51,7 @@ public void revolve(ScriptQueue scriptQueue) {
                 // Set as last entry executed
                 scriptQueue.setLastEntryExecuted(scriptEntry);
 
-                if (scriptEntry.isInstant() || scriptQueue.ticks == 0 && !scriptQueue.hasInjectedItems) {
+                if (scriptEntry.isInstant() && !scriptQueue.hasInjectedItems) {
                     // Remove from execution list
                     scriptEntry = scriptQueue.getNext();
                 }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptEntry.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptEntry.java
@@ -3,6 +3,7 @@
 import net.aufdemrand.denizen.exceptions.ScriptEntryCreationException;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizen.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
 
 import java.util.*;