clean event code

stupid casing
DenizenScript · Jul 23, 2019 · f1726d7 · f1726d7
1 parent 39e6447
commit f1726d7
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 40 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
@@ -6,7 +6,6 @@
 import com.denizenscript.denizen.utilities.Utilities;
 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;
 import org.black_ixx.bossshop.BossShop;

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
@@ -11,7 +11,6 @@
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
 import com.denizenscript.denizencore.objects.core.DurationTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
 import com.denizenscript.denizencore.utilities.debugging.Debug;

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
@@ -7,7 +7,6 @@
 import com.denizenscript.denizen.utilities.Utilities;
 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;
 import com.denizenscript.denizencore.utilities.debugging.Debug;

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java b/...in/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java
@@ -7,7 +7,6 @@
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsException;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
 import org.black_ixx.playerpoints.PlayerPoints;
 import com.denizenscript.denizencore.utilities.debugging.Debug;

diff --git a/...om/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java b/...om/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java
@@ -86,16 +86,18 @@ public ScriptEntryData getScriptEntryData() {
 
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
-        String determination = determinationObj.toString();
-        String determinationLow = CoreUtilities.toLowerCase(determination);
-        if (determinationLow.startsWith("max_players:")) {
-            maxPlayers = ArgumentHelper.getIntegerFrom(determination.substring("max_players:".length()));
-        }
-        else if (determinationLow.startsWith("version:")) {
-            version = determination.substring("version:".length());
-        }
-        else if (determinationLow.startsWith("motd:")) {
-            motd = determination.substring("motd:".length());
+        if (determinationObj instanceof ElementTag) {
+            String determination = determinationObj.toString();
+            String determinationLow = CoreUtilities.toLowerCase(determination);
+            if (determinationLow.startsWith("max_players:")) {
+                maxPlayers = ArgumentHelper.getIntegerFrom(determination.substring("max_players:".length()));
+            }
+            else if (determinationLow.startsWith("version:")) {
+                version = determination.substring("version:".length());
+            }
+            else if (determinationLow.startsWith("motd:")) {
+                motd = determination.substring("motd:".length());
+            }
         }
         return super.applyDetermination(path, determinationObj);
     }

diff --git a/...n/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java b/...n/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java
@@ -1,13 +1,11 @@
 package com.denizenscript.depenizen.bukkit.events.mcmmo;
 
-import com.denizenscript.denizencore.objects.Argument;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
 import com.denizenscript.denizen.BukkitScriptEntryData;
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
@@ -77,11 +75,8 @@ public String getName() {
 
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
-        String determination = determinationObj.toString();
-        String lower = CoreUtilities.toLowerCase(determination);
-
-        if (Argument.valueOf(lower).matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) {
-            xp = new ElementTag(lower);
+        if (determinationObj instanceof ElementTag && ((ElementTag) determinationObj).isFloat()) {
+            xp = (ElementTag) determinationObj;
             return true;
         }
         return super.applyDetermination(path, determinationObj);

diff --git a/...va/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java b/...va/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java
@@ -6,7 +6,6 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
@@ -75,11 +74,8 @@ public String getName() {
 
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
-        String determination = determinationObj.toString();
-        String lower = CoreUtilities.toLowerCase(determination);
-
-        if (ArgumentHelper.matchesInteger(lower)) {
-            level = ArgumentHelper.getIntegerFrom(lower);
+        if (determinationObj instanceof ElementTag && ((ElementTag) determinationObj).isInt()) {
+            level = ((ElementTag) determinationObj).asInt();
             return true;
         }
         return super.applyDetermination(path, determinationObj);

diff --git a/...java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java b/...java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java
@@ -6,7 +6,6 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
@@ -79,11 +78,8 @@ public String getName() {
 
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
-        String determination = determinationObj.toString();
-        String lower = CoreUtilities.toLowerCase(determination);
-
-        if (ArgumentHelper.matchesInteger(lower)) {
-            levels_lost = ArgumentHelper.getIntegerFrom(lower);
+        if (determinationObj instanceof ElementTag && ((ElementTag) determinationObj).isInt()) {
+            levels_lost = ((ElementTag) determinationObj).asInt();
             return true;
         }
         return super.applyDetermination(path, determinationObj);

diff --git a/...n/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java b/...n/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java
@@ -6,7 +6,6 @@
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
 import com.denizenscript.denizencore.scripts.containers.ScriptContainer;
@@ -80,11 +79,8 @@ public String getName() {
 
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
-        String determination = determinationObj.toString();
-        String lower = CoreUtilities.toLowerCase(determination);
-
-        if (ArgumentHelper.matchesInteger(lower)) {
-            levels_gained = ArgumentHelper.getIntegerFrom(lower);
+        if (determinationObj instanceof ElementTag && ((ElementTag) determinationObj).isInt()) {
+            levels_gained = ((ElementTag) determinationObj).asInt();
             return true;
         }
         return super.applyDetermination(path, determinationObj);

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java
@@ -108,8 +108,8 @@ public String getName() {
 
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
-        String determination = determinationObj.toString();
         if (isDefaultDetermination(determinationObj)) {
+            String determination = determinationObj.toString();
             Argument arg = new Argument(determination);
             if (arg.matchesPrefix("currency") && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) {
                 currency = new ElementTag(determination);