match core/buk commit

DenizenScript · Jul 20, 2019 · 5c31f38 · 5c31f38
1 parent a42ae57
commit 5c31f38
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 16 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bossshop/BossShopCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bossshop/BossShopCommand.java
@@ -44,7 +44,7 @@ public class BossShopCommand extends AbstractCommand {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("target")
                     && arg.matchesPrefix("target")) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java
@@ -8,7 +8,6 @@
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.core.ListTag;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
@@ -51,7 +50,7 @@ public void onEnable() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : ArgumentHelper.interpretArguments(scriptEntry.aHArgs)) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
             if (!scriptEntry.hasObject("servers")) {
                 scriptEntry.addObject("servers", arg.asType(ListTag.class));
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeExecuteCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeExecuteCommand.java
@@ -7,7 +7,6 @@
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
 
@@ -35,7 +34,7 @@ public class BungeeExecuteCommand extends AbstractCommand {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : ArgumentHelper.interpretArguments(scriptEntry.aHArgs)) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
             if (!scriptEntry.hasObject("command")) {
                 scriptEntry.addObject("command", arg.asElement());
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeRunCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeRunCommand.java
@@ -9,7 +9,6 @@
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.core.ListTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
@@ -40,7 +39,7 @@ public class BungeeRunCommand extends AbstractCommand {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : ArgumentHelper.interpretArguments(scriptEntry.aHArgs)) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
             if (!scriptEntry.hasObject("def")
                     && arg.matchesPrefix("def")) {
                 scriptEntry.addObject("def", arg.asElement());

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/effectlib/EffectLibCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/effectlib/EffectLibCommand.java
@@ -55,7 +55,7 @@ private enum Action {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("target")
                     && arg.matchesPrefix("target")) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java
@@ -53,7 +53,7 @@ public JobsCommand() {
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
         // Iterate through arguments
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/libsdisguises/DisguiseCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/libsdisguises/DisguiseCommand.java
@@ -77,7 +77,7 @@ private enum Action {REMOVE, MOB, PLAYER, MISC}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("target")
                     && arg.matchesPrefix("target")) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java
@@ -63,7 +63,7 @@ public McMMOCommand() {
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
         // Iterate through arguments
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mobarena/MobArenaCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mobarena/MobArenaCommand.java
@@ -51,7 +51,7 @@ public class MobArenaCommand extends AbstractCommand {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
             if (!scriptEntry.hasObject("arena") &&
                     (arg.matchesPrefix("arena") || MobArenaArenaTag.matches(arg.getValue()))) {
                 scriptEntry.addObject("arena", MobArenaArenaTag.valueOf(arg.getValue()));

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mythicmobs/MythicSpawnCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mythicmobs/MythicSpawnCommand.java
@@ -38,7 +38,7 @@ public class MythicSpawnCommand extends AbstractCommand {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("location")
                     && arg.matchesArgumentType(LocationTag.class)) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java
@@ -62,7 +62,7 @@ private enum Action {PLAY, STOP}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("targets")
                     && arg.matchesPrefix("targets", "targets")

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java b/...in/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java
@@ -49,7 +49,7 @@ private enum Action {SET, GIVE, TAKE}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("target")
                     && arg.matchesPrefix("target")) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/worldguard/RegionCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/worldguard/RegionCommand.java
@@ -49,7 +49,7 @@ private enum Action {ADD, REMOVE}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) {
+        for (Argument arg : scriptEntry.getProcessedArgs()) {
 
             if (!scriptEntry.hasObject("region_id")
                     && arg.matchesPrefix("id")) {