diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java index daf3d75637..3641869f71 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java @@ -74,7 +74,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { return true; } if (Argument.valueOf(determination) - .matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + .matchesBoolean()) { fire = determination.equalsIgnoreCase("true"); return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java index 256991d61d..7ef4420b1d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java @@ -63,7 +63,7 @@ else if (!scriptEntry.hasObject("agetype") scriptEntry.addObject("agetype", AgeType.valueOf(arg.getValue().toUpperCase())); } else if (!scriptEntry.hasObject("age") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("age", arg.asElement()); } else if (!scriptEntry.hasObject("lock") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java index cae066aab2..0695fe728c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java @@ -77,7 +77,7 @@ else if (!scriptEntry.hasObject("duration") } else if (!scriptEntry.hasObject("amplifier") && arg.matchesPrefix("power", "p", "amplifier", "a") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("amplifier", arg.asElement()); } else if (!scriptEntry.hasObject("effect") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java index b12638d471..35c2f8c6ed 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java @@ -57,12 +57,12 @@ public class FeedCommand extends AbstractCommand { public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { for (Argument arg : scriptEntry.getProcessedArgs()) { - if (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer) + if (arg.matchesInteger() && arg.matchesPrefix("amount", "amt", "quantity", "qty", "a", "q") && !scriptEntry.hasObject("amount")) { scriptEntry.addObject("amount", arg.asElement()); } - else if (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer) + else if (arg.matchesInteger() && arg.matchesPrefix("saturation", "sat", "s") && !scriptEntry.hasObject("saturation")) { scriptEntry.addObject("saturation", arg.asElement()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java index 20a18c6984..889454cc7d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java @@ -92,12 +92,12 @@ else if (!scriptEntry.hasObject("entities") } else if (!scriptEntry.hasObject("rotation_threshold") && arg.matchesPrefix("rotationthreshold", "rotation", "r") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) { + && arg.matchesFloat()) { scriptEntry.addObject("rotation_threshold", arg.asElement()); } else if (!scriptEntry.hasObject("speed") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("speed", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java index e6a0c5a80e..e0c0411204 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java @@ -62,12 +62,12 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("stop", new ElementTag(true)); } else if (!scriptEntry.hasObject("lead") && - arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) && + arg.matchesFloat() && arg.matchesPrefix("l", "lead")) { scriptEntry.addObject("lead", arg.asElement()); } else if (!scriptEntry.hasObject("max") && - arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) && + arg.matchesFloat() && arg.matchesPrefix("max")) { scriptEntry.addObject("max", arg.asElement()); } @@ -76,7 +76,7 @@ else if (!scriptEntry.hasObject("allow_wander") && scriptEntry.addObject("allow_wander", new ElementTag(true)); } else if (!scriptEntry.hasObject("speed") && - arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Percentage) && + arg.matchesFloat() && arg.matchesPrefix("s", "speed")) { scriptEntry.addObject("speed", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java index 3d784f666f..648abd8159 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java @@ -52,7 +52,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException for (Argument arg : scriptEntry.getProcessedArgs()) { if (!scriptEntry.hasObject("amount") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("amount", arg.asElement()); } else if (!scriptEntry.hasObject("entities") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java index 8a54e5731c..ca2837b75f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java @@ -68,7 +68,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("target", Arrays.asList(Utilities.getEntryPlayer(scriptEntry).getDenizenEntity())); } else if (!scriptEntry.hasObject("qty") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("qty", arg.asElement()); } else if (!scriptEntry.hasObject("target") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java index 1ac59f7080..72fab267d8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java @@ -67,8 +67,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException for (Argument arg : scriptEntry.getProcessedArgs()) { if (!scriptEntry.hasObject("amount") - && (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) - || arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer))) { + && (arg.matchesFloat() + || arg.matchesInteger())) { scriptEntry.addObject("amount", arg.asElement()); } else if (!scriptEntry.hasObject("source") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java index 516dcaa7b5..7dbbc8291c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java @@ -103,7 +103,7 @@ else if (!scriptEntry.hasObject("duration") scriptEntry.addObject("duration", arg.asType(DurationTag.class)); } else if (!scriptEntry.hasObject("speed") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("speed", "s")) { scriptEntry.addObject("speed", arg.asElement()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java index 9fbf10a24a..f01aa2d77c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java @@ -87,13 +87,13 @@ else if (!scriptEntry.hasObject("frequency") } else if (!scriptEntry.hasObject("yaw") && arg.matchesPrefix("yaw", "y", "rotation", "r") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) { + && arg.matchesFloat()) { scriptEntry.addObject("yaw", arg.asElement()); } else if (!scriptEntry.hasObject("pitch") && arg.matchesPrefix("pitch", "p", "tilt", "t") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) { + && arg.matchesFloat()) { scriptEntry.addObject("pitch", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java index 2ea8eec18a..3c3f20a475 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java @@ -118,13 +118,13 @@ else if (!scriptEntry.hasObject("lead") scriptEntry.addObject("lead", arg.asType(LocationTag.class)); } else if (!scriptEntry.hasObject("height") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("height", "h")) { scriptEntry.addObject("height", arg.asElement()); } else if (!scriptEntry.hasObject("speed") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("speed")) { scriptEntry.addObject("speed", arg.asElement()); @@ -147,13 +147,13 @@ else if (!scriptEntry.hasObject("entities") // Don't document this argument; it is for debug purposes only else if (!scriptEntry.hasObject("gravity") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("gravity", "g")) { scriptEntry.addObject("gravity", arg.asElement()); } else if (!scriptEntry.hasObject("spread") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("spread")) { scriptEntry.addObject("spread", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java index ddc379313d..41d504b108 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java @@ -73,7 +73,7 @@ else if (!scriptEntry.hasObject("target") scriptEntry.addObject("target", arg.asType(EntityTag.class)); } else if (!scriptEntry.hasObject("spread") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("spread", arg.asElement()); } else if (!scriptEntry.hasObject("persistent") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java index a77875061d..cb9498b980 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java @@ -95,7 +95,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("lookat", arg.asType(LocationTag.class)); } else if (!scriptEntry.hasObject("speed") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Percentage) + && arg.matchesFloat() && arg.matchesPrefix("s", "speed")) { scriptEntry.addObject("speed", arg.asElement()); } @@ -104,7 +104,7 @@ else if (!scriptEntry.hasObject("auto_range") scriptEntry.addObject("auto_range", new ElementTag(true)); } else if (!scriptEntry.hasObject("radius") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("radius")) { scriptEntry.addObject("radius", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java index 12515aa3e8..e2a40dddf5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java @@ -66,7 +66,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException if (!scriptEntry.hasObject("qty") && arg.matchesPrefix("q", "qty", "quantity") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("qty", arg.asElement()); scriptEntry.addObject("set_quantity", new ElementTag(true)); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java index a41e32e7d9..bd8e4fd059 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java @@ -95,12 +95,12 @@ else if (!scriptEntry.hasObject("resize") } else if (!scriptEntry.hasObject("width") && arg.matchesPrefix("width") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("width", arg.asElement()); } else if (!scriptEntry.hasObject("height") && arg.matchesPrefix("height") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("height", arg.asElement()); } else if (!scriptEntry.hasObject("script") @@ -110,16 +110,16 @@ else if (!scriptEntry.hasObject("script") } else if (!scriptEntry.hasObject("x-value") && arg.matchesPrefix("x") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("x-value", arg.asElement()); } else if (!scriptEntry.hasObject("y-value") && arg.matchesPrefix("y") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("y-value", arg.asElement()); } else if (!scriptEntry.hasObject("map-id") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("map-id", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java index 7271238845..fc43da1c54 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java @@ -86,7 +86,7 @@ else if (!scriptEntry.hasObject("type") } else if (!scriptEntry.hasObject("qty") && arg.matchesPrefix("q", "qty", "quantity") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("qty", arg.asElement()); } else if (!scriptEntry.hasObject("items") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java index b01ab6ef68..aa0361793c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java @@ -64,7 +64,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("action", Action.valueOf(arg.getValue().toUpperCase())); } else if (!scriptEntry.hasObject("range") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("range", "r")) { scriptEntry.addObject("range", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java index 8de59e1ec0..7352170a8d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java @@ -69,7 +69,7 @@ else if (!scriptEntry.hasObject("npc") scriptEntry.addObject("npc", arg.asType(NPCTag.class)); } else if (!scriptEntry.hasObject("radius") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("radius", arg.asElement()); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java index 76fa9a0c55..98635c105d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java @@ -64,7 +64,7 @@ else if (!scriptEntry.hasObject("stop") } else if (!scriptEntry.hasObject("percent") && arg.matchesPrefix("catchpercent", "percent", "chance", "c") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("percent", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java index 96ee4bd8c7..ccfa50920a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java @@ -55,10 +55,10 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException if (arg.matches("realistic", "realistically")) { scriptEntry.addObject("realistic", new ElementTag(true)); } - else if (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + else if (arg.matchesInteger()) { scriptEntry.addObject("range", arg.asElement()); } - else if (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + else if (arg.matchesBoolean()) { scriptEntry.addObject("toggle", arg.asElement()); } else if (arg.matchesArgumentType(NPCTag.class)) // TODO: better way of handling this? diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java index c2034aa435..7c1d4d6135 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java @@ -55,7 +55,7 @@ else if (!scriptEntry.hasObject("delay") } else if (!scriptEntry.hasObject("return") && arg.matchesPrefix("return", "r") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + && arg.matchesBoolean()) { scriptEntry.addObject("return", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java index feaa2214bd..b9c966e827 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java @@ -74,7 +74,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } else if (!scriptEntry.hasObject("radius") && arg.matchesPrefix("radius", "r") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("radius", arg.asElement()); } else if (!scriptEntry.hasObject("toggle") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java index f2be181a07..21d39c68bd 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java @@ -125,27 +125,27 @@ else if (!scriptEntry.hasObject("frame") } else if (!scriptEntry.hasObject("toast") && arg.matchesPrefix("toast", "show") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + && arg.matchesBoolean()) { scriptEntry.addObject("toast", arg.asElement()); } else if (!scriptEntry.hasObject("announce") && arg.matchesPrefix("announce", "chat") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + && arg.matchesBoolean()) { scriptEntry.addObject("announce", arg.asElement()); } else if (!scriptEntry.hasObject("hidden") && arg.matchesPrefix("hidden", "hide", "h") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + && arg.matchesBoolean()) { scriptEntry.addObject("hidden", arg.asElement()); } else if (!scriptEntry.hasObject("x") && arg.matchesPrefix("x") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) { + && arg.matchesFloat()) { scriptEntry.addObject("x", arg.asElement()); } else if (!scriptEntry.hasObject("y") && arg.matchesPrefix("y") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) { + && arg.matchesFloat()) { scriptEntry.addObject("y", arg.asElement()); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java index 0a55e2c899..d5e2e7c7ac 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java @@ -63,7 +63,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("players", arg.asType(ListTag.class).filter(PlayerTag.class, scriptEntry)); } else if (arg.matchesPrefix("progress") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("progress", arg.asElement()); } else if (arg.matchesArgumentType(LocationTag.class)) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java index 20ee7caa8c..6e9637f81d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java @@ -86,7 +86,7 @@ else if (arg.matchesPrefix("talker", "talkers")) { } else if (arg.matchesPrefix("range", "r")) { - if (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + if (arg.matchesFloat()) { scriptEntry.addObject("range", arg.asElement()); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java index f7c3436ac5..cbc35d7474 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java @@ -86,7 +86,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException for (Argument arg : scriptEntry.getProcessedArgs()) { - if (arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + if (arg.matchesInteger()) { amount = arg.asElement().asInt(); } else if (arg.matches("set", "give", "take")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java index cbc5b0fff6..79d13374bf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java @@ -69,7 +69,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry)); } else if (!scriptEntry.hasObject("glowing") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + && arg.matchesBoolean()) { scriptEntry.addObject("glowing", arg.asElement()); } else { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java index e31c22383a..3a01bf828e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java @@ -70,7 +70,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("action", arg.asElement()); } else if (!scriptEntry.hasObject("quantity") && arg.matchesPrefix("quantity", "qty", "q") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("quantity", arg.asElement()); } else if (!scriptEntry.hasObject("players") && arg.matchesPrefix("to", "from", "players", "player") && diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java index d4a3d7b1b8..e909de2246 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java @@ -60,7 +60,7 @@ else if (!scriptEntry.hasObject("mode") scriptEntry.addObject("mode", arg.asElement()); } else if (!scriptEntry.hasObject("amount") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("amount", arg.asElement()); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java index 9ce947dbf9..c9bef0d9ee 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java @@ -76,7 +76,7 @@ else if (!scriptEntry.hasObject("statistic") scriptEntry.addObject("statistic", arg.asElement()); } else if (!scriptEntry.hasObject("amount") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("amount", arg.asElement()); } else if (arg.matchesPrefix("qualifier", "q") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java index 1dcaa42f61..f8f059ba2c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java @@ -80,7 +80,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException } else if (!scriptEntry.hasObject("progress") && arg.matchesPrefix("progress", "health", "p", "h") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("progress", arg.asElement()); } else if (!scriptEntry.hasObject("color") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java index c9ba8a0b82..87ff50721a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java @@ -125,7 +125,7 @@ else if (!scriptEntry.hasObject("criteria") scriptEntry.addObject("criteria", arg.asElement()); } else if (!scriptEntry.hasObject("score") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("score", arg.asElement()); } else if (!scriptEntry.hasObject("displayslot") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java index 63901b0a41..7cd7716542 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java @@ -78,7 +78,7 @@ else if (!scriptEntry.hasObject("location") } else if (!scriptEntry.hasObject("sound") && arg.matchesPrefix("sound") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Boolean)) { + && arg.matchesBoolean()) { scriptEntry.addObject("sound", arg.asElement()); } else if (!scriptEntry.hasObject("players") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java index 079b26333b..70e0b69182 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java @@ -79,7 +79,7 @@ else if (!scriptEntry.hasObject("settings") } else if (!scriptEntry.hasObject("seed") && arg.matchesPrefix("seed", "s") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("seed", arg.asElement()); } else if (!scriptEntry.hasObject("world_name")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java index 2922cb9c3b..2515a34ae4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java @@ -95,11 +95,11 @@ else if (!scriptEntry.hasObject("location") } else if (!scriptEntry.hasObject("speed") && arg.matchesPrefix("speed") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + && arg.matchesFloat()) { scriptEntry.addObject("speed", arg.asElement()); } else if (!scriptEntry.hasObject("qty") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) + && arg.matchesInteger()) // Quantity arg { scriptEntry.addObject("qty", arg.asElement().setPrefix("qty")); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java index 801538000c..307b6f9cbe 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java @@ -60,7 +60,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("location", arg.asType(LocationTag.class)); } else if (!scriptEntry.hasObject("power") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Float) + && arg.matchesFloat() && arg.matchesPrefix("power", "p")) { scriptEntry.addObject("power", arg.asElement()); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java index d6c6c9707e..5033f93cf0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java @@ -80,7 +80,7 @@ else if (!scriptEntry.hasObject("type") scriptEntry.addObject("type", arg.asElement()); } else if (!scriptEntry.hasObject("power") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("power", arg.asElement()); } else if (!scriptEntry.hasObject("flicker") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java index 4ff23b31c8..b4df09a435 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java @@ -54,7 +54,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("location", arg.asType(LocationTag.class)); } else if (!scriptEntry.hasObject("light") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("light", arg.asElement()); } else if (!scriptEntry.hasObject("reset") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java index 71a9e43cec..620ea7fcda 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java @@ -74,12 +74,12 @@ else if (!scriptEntry.hasObject("entities") && scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry)); } else if (!scriptEntry.hasObject("volume") && - arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) && + arg.matchesFloat() && arg.matchesPrefix("volume", "vol", "v")) { scriptEntry.addObject("volume", arg.asElement()); } else if (!scriptEntry.hasObject("tempo") && - arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { + arg.matchesFloat()) { scriptEntry.addObject("tempo", arg.asElement()); } else if (!scriptEntry.hasObject("file")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java index 52a6bcbe4c..9991c70596 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java @@ -104,17 +104,17 @@ else if (!scriptEntry.hasObject("materials") } else if (!scriptEntry.hasObject("radius") && arg.matchesPrefix("radius", "r") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("radius", new ElementTag(arg.getValue())); } else if (!scriptEntry.hasObject("height") && arg.matchesPrefix("height", "h") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("height", new ElementTag(arg.getValue())); } else if (!scriptEntry.hasObject("depth") && arg.matchesPrefix("depth", "d") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("depth", new ElementTag(arg.getValue())); } else if (arg.matches("no_physics")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java index f0b9e43745..d2d8033c3c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java @@ -154,13 +154,13 @@ else if (NMSHandler.getParticleHelper().effectRemap.containsKey(arg.getValue().t } } if (!scriptEntry.hasObject("radius") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("visibility", "v", "radius", "r")) { scriptEntry.addObject("radius", arg.asElement()); } else if (!scriptEntry.hasObject("data") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("data", "d")) { scriptEntry.addObject("data", arg.asElement()); @@ -170,13 +170,13 @@ else if (!scriptEntry.hasObject("special_data") scriptEntry.addObject("special_data", arg.asElement()); } else if (!scriptEntry.hasObject("qty") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer) + && arg.matchesInteger() && arg.matchesPrefix("qty", "q", "quantity")) { scriptEntry.addObject("qty", arg.asElement()); } else if (!scriptEntry.hasObject("offset") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("offset", "o")) { double offset = arg.asElement().asDouble(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java index 5e80bc7668..04cabe8b22 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java @@ -75,17 +75,16 @@ else if (!scriptEntry.hasObject("locations") scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(PlayerTag.class, scriptEntry)); } else if (!scriptEntry.hasObject("volume") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("volume", "v")) { scriptEntry.addObject("volume", arg.asElement()); } else if (!scriptEntry.hasObject("pitch") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("pitch", "p")) { scriptEntry.addObject("pitch", arg.asElement()); } - else if (!scriptEntry.hasObject("sound") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.String)) { + else if (!scriptEntry.hasObject("sound")) { scriptEntry.addObject("sound", arg.asElement()); } else if (!scriptEntry.hasObject("custom") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java index 44373a4ddb..c291ae41dc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java @@ -161,7 +161,7 @@ else if (!scriptEntry.hasObject("filename") } else if (!scriptEntry.hasObject("angle") && arg.matchesPrefix("angle") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { + && arg.matchesInteger()) { scriptEntry.addObject("angle", arg.asElement()); } else if (!scriptEntry.hasObject("delayed") diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java index cba6e68447..e73ab0c826 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java @@ -72,22 +72,22 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException scriptEntry.addObject("center", arg.asType(LocationTag.class)); } else if (!scriptEntry.hasObject("damage") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("damage")) { scriptEntry.addObject("damage", arg.asElement()); } else if (!scriptEntry.hasObject("damagebuffer") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("damagebuffer")) { scriptEntry.addObject("damagebuffer", arg.asElement()); } else if (!scriptEntry.hasObject("size") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("size")) { scriptEntry.addObject("size", arg.asElement()); } else if (!scriptEntry.hasObject("current_size") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double) + && arg.matchesFloat() && arg.matchesPrefix("current_size")) { scriptEntry.addObject("current_size", arg.asElement()); } @@ -97,7 +97,7 @@ else if (!scriptEntry.hasObject("duration") scriptEntry.addObject("duration", arg.asType(DurationTag.class)); } else if (!scriptEntry.hasObject("warningdistance") - && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer) + && arg.matchesInteger() && arg.matchesPrefix("warningdistance")) { scriptEntry.addObject("warningdistance", arg.asElement()); }