organize command files a bit

DenizenScript · Jun 26, 2019 · e638abc · e638abc
1 parent 30d8439
commit e638abc
Show file tree

Hide file tree

Showing 23 changed files with 55 additions and 48 deletions.
diff --git a/src/main/java/net/aufdemrand/denizencore/objects/Element.java b/src/main/java/net/aufdemrand/denizencore/objects/Element.java
@@ -1,6 +1,6 @@
 package net.aufdemrand.denizencore.objects;
 
-import net.aufdemrand.denizencore.scripts.commands.core.Comparable;
+import net.aufdemrand.denizencore.scripts.commands.queue.Comparable;
 import net.aufdemrand.denizencore.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizencore.tags.Attribute;
 import net.aufdemrand.denizencore.tags.TagContext;

diff --git a/src/main/java/net/aufdemrand/denizencore/scripts/commands/CommandRegistry.java b/src/main/java/net/aufdemrand/denizencore/scripts/commands/CommandRegistry.java
@@ -3,6 +3,10 @@
 import net.aufdemrand.denizencore.interfaces.RegistrationableInstance;
 import net.aufdemrand.denizencore.interfaces.dRegistry;
 import net.aufdemrand.denizencore.scripts.commands.core.*;
+import net.aufdemrand.denizencore.scripts.commands.file.FileCopyCommand;
+import net.aufdemrand.denizencore.scripts.commands.file.LogCommand;
+import net.aufdemrand.denizencore.scripts.commands.file.YamlCommand;
+import net.aufdemrand.denizencore.scripts.commands.queue.*;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 import net.aufdemrand.denizencore.utilities.debugging.dB;
 

diff --git a/...cripts/commands/core/FileCopyCommand.java → ...cripts/commands/file/FileCopyCommand.java b/...cripts/commands/core/FileCopyCommand.java → ...cripts/commands/file/FileCopyCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.file;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -22,7 +22,7 @@ public class FileCopyCommand extends AbstractCommand implements Holdable {
     // @Syntax filecopy [origin:<origin>] [destination:<destination>] (overwrite)
     // @Required 2
     // @Short Copies a file from one location to another.
-    // @Group core
+    // @Group file
     //
     // @Description
     // Copies a file from one location to another.

diff --git a/...ore/scripts/commands/core/LogCommand.java → ...ore/scripts/commands/file/LogCommand.java b/...ore/scripts/commands/core/LogCommand.java → ...ore/scripts/commands/file/LogCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.file;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -22,7 +22,7 @@ public class LogCommand extends AbstractCommand {
     // @Syntax log [<text>] (type:{info}/severe/warning/fine/finer/finest/none/clear) [file:<name>]
     // @Required 2
     // @Short Logs some debugging info to a file.
-    // @Group core
+    // @Group file
     //
     // @Description
     // This is a quick and simple way to store debugging information for admins to read.

diff --git a/...re/scripts/commands/core/YamlCommand.java → ...re/scripts/commands/file/YamlCommand.java b/...re/scripts/commands/core/YamlCommand.java → ...re/scripts/commands/file/YamlCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.file;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -29,7 +29,7 @@ public class YamlCommand extends AbstractCommand implements Holdable {
     // @Syntax yaml [create]/[load:<file> (fix_formatting)]/[loadtext:<text> (fix_formatting)]/[unload]/[savefile:<file>]/[copykey:<source key> <target key> (to_id:<name>)]/[set <key>([<#>])(:<action>):<value>] [id:<name>]
     // @Required 2
     // @Short Edits a YAML configuration file.
-    // @Group core
+    // @Group file
     //
     // @Description
     // Edits a YAML configuration file.

diff --git a/...e/scripts/commands/core/AsyncCommand.java → .../scripts/commands/queue/AsyncCommand.java b/...e/scripts/commands/core/AsyncCommand.java → .../scripts/commands/queue/AsyncCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
@@ -16,7 +16,7 @@ public class AsyncCommand extends BracedCommand implements Holdable {
     // @Required 0
     // @Short Runs commands asynchronously. Inverse of <@link command sync>. (WARNING: DO NOT USE. See description for safety warning!)
     // @Warning Do NOT use this. This is VERY dangerous. It is added purely as a tech experiment, not something to use in serious code!
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Runs commands asynchronously. This means that anything executed within will run off the main

diff --git a/.../scripts/commands/core/ChooseCommand.java → ...scripts/commands/queue/ChooseCommand.java b/.../scripts/commands/core/ChooseCommand.java → ...scripts/commands/queue/ChooseCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -18,7 +18,7 @@ public class ChooseCommand extends BracedCommand {
     // @Syntax choose [<option>] [<cases>]
     // @Required 1
     // @Short Chooses an option from the list of cases.
-    // @Group core
+    // @Group queue
 
     // @Description
     // Chooses an option from the list of cases.

diff --git a/...ore/scripts/commands/core/Comparable.java → ...re/scripts/commands/queue/Comparable.java b/...ore/scripts/commands/core/Comparable.java → ...re/scripts/commands/queue/Comparable.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.objects.Duration;
@@ -72,12 +72,12 @@ public static enum Logic {
         REGULAR, NEGATIVE
     }
 
-    Logic logic = Logic.REGULAR;
-    Bridge bridge = Bridge.FIRST;
-    Object comparable = null;
-    Operator operator = Operator.EQUALS;
-    Object comparedto = "true";
-    Boolean outcome = null;
+    public Logic logic = Logic.REGULAR;
+    public Bridge bridge = Bridge.FIRST;
+    public Object comparable = null;
+    public Operator operator = Operator.EQUALS;
+    public Object comparedto = "true";
+    public Boolean outcome = null;
 
 
     public void setNegativeLogic() {

diff --git a/.../scripts/commands/core/DefineCommand.java → ...scripts/commands/queue/DefineCommand.java b/.../scripts/commands/core/DefineCommand.java → ...scripts/commands/queue/DefineCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -23,7 +23,7 @@ public class DefineCommand extends AbstractCommand {
     // @Syntax define [<id>](:<action>)[:<value>]
     // @Required 1
     // @Short Creates a temporary variable inside a script queue.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Definitions are queue-level (or script-level) 'variables' that can be used throughout a script, once

diff --git a/...ripts/commands/core/DetermineCommand.java → ...ipts/commands/queue/DetermineCommand.java b/...ripts/commands/core/DetermineCommand.java → ...ipts/commands/queue/DetermineCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -16,7 +16,7 @@ public class DetermineCommand extends AbstractCommand {
     // @Syntax determine (passively) [<value>]
     // @Required 1
     // @Short Sets the outcome of a world event.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // TODO: Document Command Details

diff --git a/...re/scripts/commands/core/ElseCommand.java → ...e/scripts/commands/queue/ElseCommand.java b/...re/scripts/commands/core/ElseCommand.java → ...e/scripts/commands/queue/ElseCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.scripts.ScriptEntry;
@@ -12,13 +12,16 @@ public class ElseCommand extends AbstractCommand {
     // @Syntax else (if <comparison logic>)
     // @Required 0
     // @Short Helper command for usage with the if command.
-    // @Group core
+    // @Group queue
     // @Video /denizen/vids/Alternate/Dynamic%20Actions:%20The%20If%20Command
+    //
     // @Description
     // A helper command for ':' syntax if commands.
     // See IF command documentation.
+    //
     // @Tags
     // See IF command documentation.
+    //
     // @Usage
     // See IF command documentation.
     // -->

diff --git a/...scripts/commands/core/ForeachCommand.java → ...cripts/commands/queue/ForeachCommand.java b/...scripts/commands/core/ForeachCommand.java → ...cripts/commands/queue/ForeachCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -18,7 +18,7 @@ public class ForeachCommand extends BracedCommand {
     // @Syntax foreach [stop/next/<object>|...] (as:<name>) [<commands>]
     // @Required 1
     // @Short Loops through a dList, running a set of commands for each item.
-    // @Group core
+    // @Group queue
     // @Video /denizen/vids/Loops
     //
     // @Description

diff --git a/...re/scripts/commands/core/GotoCommand.java → ...e/scripts/commands/queue/GotoCommand.java b/...re/scripts/commands/core/GotoCommand.java → ...e/scripts/commands/queue/GotoCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -16,7 +16,7 @@ public class GotoCommand extends AbstractCommand {
     // @Syntax goto [<name>]
     // @Required 1
     // @Short Jump forward to a location marked by <@link command mark>.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Jumps forward to a marked location in the script.

diff --git a/...core/scripts/commands/core/IfCommand.java → ...ore/scripts/commands/queue/IfCommand.java b/...core/scripts/commands/core/IfCommand.java → ...ore/scripts/commands/queue/IfCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -19,7 +19,7 @@ public class IfCommand extends BracedCommand {
     // @Syntax if [<value>] (!)(<operator> <value>) (&&/|| ...) [<commands>] (else <commands>)
     // @Required 1
     // @Short Compares values, and runs one script if they match, or a different script if they don't match.
-    // @Group core
+    // @Group queue
     // @Video /denizen/vids/Alternate/Dynamic%20Actions:%20The%20If%20Command
     //
     // @Description

diff --git a/.../scripts/commands/core/InjectCommand.java → ...scripts/commands/queue/InjectCommand.java b/.../scripts/commands/core/InjectCommand.java → ...scripts/commands/queue/InjectCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -18,7 +18,7 @@ public class InjectCommand extends AbstractCommand {
     // @Required 1
     // @Short Runs a script in the current ScriptQueue.
     // @Video /denizen/vids/Run%20And%20Inject
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Injects a script into the current ScriptQueue.

diff --git a/...re/scripts/commands/core/MarkCommand.java → ...e/scripts/commands/queue/MarkCommand.java b/...re/scripts/commands/core/MarkCommand.java → ...e/scripts/commands/queue/MarkCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -14,7 +14,7 @@ public class MarkCommand extends AbstractCommand {
     // @Syntax mark [<name>]
     // @Required 1
     // @Short Marks a location for <@link command goto>.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Marks a location for the goto command. See <@link command goto> for details.

diff --git a/...e/scripts/commands/core/QueueCommand.java → .../scripts/commands/queue/QueueCommand.java b/...e/scripts/commands/core/QueueCommand.java → .../scripts/commands/queue/QueueCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Duration;
@@ -16,7 +16,7 @@ public class QueueCommand extends AbstractCommand {
     // @Syntax queue (<queue>) [clear/stop/pause/resume/delay:<#>]
     // @Required 1
     // @Short Modifies the current state of a script queue.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Allows queues to be modified during their run. It can also be used to modify other queues currently running

diff --git a/.../scripts/commands/core/RandomCommand.java → ...scripts/commands/queue/RandomCommand.java b/.../scripts/commands/core/RandomCommand.java → ...scripts/commands/queue/RandomCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -18,7 +18,7 @@ public class RandomCommand extends BracedCommand {
     // @Syntax random [<#>/<commands>]
     // @Required 0
     // @Short Selects a random choice from the following script commands.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // The random command picks one of the following script command

diff --git a/.../scripts/commands/core/RepeatCommand.java → ...scripts/commands/queue/RepeatCommand.java b/.../scripts/commands/core/RepeatCommand.java → ...scripts/commands/queue/RepeatCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Element;
@@ -16,7 +16,7 @@ public class RepeatCommand extends BracedCommand {
     // @Syntax repeat [stop/next/<amount>] [<commands>] (as:<name>)
     // @Required 1
     // @Short Runs a series of braced commands several times.
-    // @Group core
+    // @Group queue
     // @Video /denizen/vids/Loops
     //
     // @Description

diff --git a/...ore/scripts/commands/core/RunCommand.java → ...re/scripts/commands/queue/RunCommand.java b/...ore/scripts/commands/core/RunCommand.java → ...re/scripts/commands/queue/RunCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -21,7 +21,7 @@ public class RunCommand extends AbstractCommand implements Holdable {
     // @Required 1
     // @Short Runs a script in a new ScriptQueue.
     // @Video /denizen/vids/Run%20And%20Inject
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Runs a new script queue, either in the local script or in a different task script.

diff --git a/...re/scripts/commands/core/SyncCommand.java → ...e/scripts/commands/queue/SyncCommand.java b/...re/scripts/commands/core/SyncCommand.java → ...e/scripts/commands/queue/SyncCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -19,7 +19,7 @@ public class SyncCommand extends BracedCommand implements Holdable {
     // @Syntax sync [<commands>]
     // @Required 0
     // @Short Runs commands synchronously. Inverse of <@link command async>.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Runs commands synchronously. This means that anything executed within will run on the

diff --git a/...re/scripts/commands/core/WaitCommand.java → ...e/scripts/commands/queue/WaitCommand.java b/...re/scripts/commands/core/WaitCommand.java → ...e/scripts/commands/queue/WaitCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Duration;
@@ -16,7 +16,7 @@ public class WaitCommand extends AbstractCommand {
     // @Syntax wait (<duration>) (queue:<name>)
     // @Required 0
     // @Short Delays a script for a specified amount of time.
-    // @Group core
+    // @Group queue
     //
     // @Description
     // Pauses the script queue for the duration specified. If no duration is specified it defaults to 3 seconds.

diff --git a/...e/scripts/commands/core/WhileCommand.java → .../scripts/commands/queue/WhileCommand.java b/...e/scripts/commands/core/WhileCommand.java → .../scripts/commands/queue/WhileCommand.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizencore.scripts.commands.core;
+package net.aufdemrand.denizencore.scripts.commands.queue;
 
 import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
@@ -18,7 +18,7 @@ public class WhileCommand extends BracedCommand {
     // @Syntax while [stop/next/[<value>] (!)(<operator> <value>) (&&/|| ...)] [<commands>]
     // @Required 1
     // @Short Runs a series of braced commands until the tag returns false.
-    // @Group core
+    // @Group queue
     // @Video /denizen/vids/Loops
     //
     // @Description