From 6ad59413d48d5c79b292ebb6342fd223eeb5699e Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Fri, 12 Jul 2019 23:11:56 -0700 Subject: [PATCH] update for core class name changes --- .../bukkit/bridges/PlaceholderAPIBridge.java | 6 ++--- .../commands/bossshop/BossShopCommand.java | 15 ++++++------ .../bukkit/commands/bungee/BungeeCommand.java | 10 ++++---- .../commands/bungee/BungeeExecuteCommand.java | 5 ++-- .../commands/bungee/BungeeRunCommand.java | 5 ++-- .../commands/bungee/BungeeTagCommand.java | 8 +++---- .../commands/effectlib/EffectLibCommand.java | 17 +++++++------- .../bukkit/commands/jobs/JobsCommand.java | 7 +++--- .../libsdisguises/DisguiseCommand.java | 23 ++++++++++--------- .../bukkit/commands/mcmmo/McMMOCommand.java | 7 +++--- .../commands/mobarena/MobArenaCommand.java | 15 ++++++------ .../mythicmobs/MythicSpawnCommand.java | 15 ++++++------ .../commands/noteblockapi/NBSCommand.java | 15 ++++++------ .../playerpoints/PlayerPointsCommand.java | 13 ++++++----- .../commands/worldguard/RegionCommand.java | 7 +++--- .../BungeeProxyServerListPingScriptEvent.java | 4 ++-- .../magicspells/ManaChangeScriptEvent.java | 4 ++-- .../magicspells/SpellCastScriptEvent.java | 8 +++---- .../mcmmo/mcMMOPlayerGainsXPScriptEvent.java | 5 ++-- .../mcMMOPlayerLevelChangeScriptEvent.java | 6 ++--- .../mcMMOPlayerLevelDownScriptEvent.java | 6 ++--- .../mcmmo/mcMMOPlayerLevelUpScriptEvent.java | 6 ++--- .../mythicmobs/MythicMobsDeathEvent.java | 13 ++++------- .../bukkit/objects/areashop/dAreaShop.java | 4 ++-- .../griefprevention/GriefPreventionClaim.java | 6 ++--- .../bukkit/objects/mcmmo/dParty.java | 4 ++-- .../objects/mobarena/MobArenaArena.java | 4 ++-- .../objects/mythicmobs/MythicMobsMob.java | 6 ++--- .../objects/pvparena/PVPArenaArena.java | 4 ++-- .../bukkit/objects/residence/dResidence.java | 4 ++-- .../objects/shopkeepers/ShopKeeper.java | 4 ++-- .../essentials/EssentialsItemProperties.java | 4 ++-- .../factions/FactionsPlayerNPCProperties.java | 4 ++-- .../WorldGuardPlayerProperties.java | 6 ++--- 34 files changed, 141 insertions(+), 129 deletions(-) diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlaceholderAPIBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlaceholderAPIBridge.java index ec545f229..9382316a6 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlaceholderAPIBridge.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlaceholderAPIBridge.java @@ -11,7 +11,7 @@ import com.denizenscript.denizencore.tags.ReplaceableTagEvent; import com.denizenscript.denizencore.tags.TagManager; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; @@ -20,7 +20,7 @@ public class PlaceholderAPIBridge extends Bridge { @Override public void init() { if (!new PlaceholderHook().register()) { - dB.echoError("Failed to register placeholder for identifier 'denizen'!" + + Debug.echoError("Failed to register placeholder for identifier 'denizen'!" + " Denizen PlaceholderAPI placeholders will not function."); } TagManager.registerTagHandler(new TagRunnable.RootForm() { @@ -42,7 +42,7 @@ public void tagEvent(ReplaceableTagEvent event) { // --> String placeholder = CoreUtilities.toLowerCase(attribute.getContext(1)); if (placeholder.startsWith("denizen_")) { - dB.echoError("Cannot use tags with 'denizen' prefix!"); + Debug.echoError("Cannot use tags with 'denizen' prefix!"); return; } Player player = ((BukkitTagContext) event.getContext()).player != null ? 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 index 25a1f5303..09a1c71e3 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bossshop/BossShopCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bossshop/BossShopCommand.java @@ -1,16 +1,17 @@ package com.denizenscript.depenizen.bukkit.commands.bossshop; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.bridges.BossShopBridge; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +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; import org.black_ixx.bossshop.core.BSShop; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; public class BossShopCommand extends AbstractCommand { // <--[command] @@ -43,7 +44,7 @@ public class BossShopCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("target") && arg.matchesPrefix("target")) { @@ -82,24 +83,24 @@ public void execute(ScriptEntry scriptEntry) { Element dshop = scriptEntry.getdObject("shop"); // Report to dB - dB.report(scriptEntry, getName(), + Debug.report(scriptEntry, getName(), (target != null ? target.debug() : "") + (dshop != null ? dshop.debug() : "")); if (target == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Target not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Target not found!"); return; } if (dshop == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Shop not Specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Shop not Specified!"); return; } BossShop bs = (BossShop) BossShopBridge.instance.plugin; BSShop shop = bs.getAPI().getShop(dshop.asString()); if (shop == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Shop not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Shop not found!"); return; } 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 index c52d95a65..2253cdaaa 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeCommand.java @@ -1,5 +1,7 @@ package com.denizenscript.depenizen.bukkit.commands.bungee; +import com.denizenscript.denizencore.objects.Argument; +import com.denizenscript.denizencore.utilities.debugging.Debug; import com.denizenscript.depenizen.bukkit.bungee.BungeeBridge; import com.denizenscript.depenizen.bukkit.bungee.packets.out.KeepAlivePacketOut; import com.denizenscript.depenizen.bukkit.bungee.packets.out.RedirectPacketOut; @@ -7,7 +9,7 @@ import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizen.utilities.debugging.dB; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dList; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntry; @@ -50,7 +52,7 @@ public void onEnable() { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpretArguments(scriptEntry.aHArgs)) { + for (Argument arg : ArgumentHelper.interpretArguments(scriptEntry.aHArgs)) { if (!scriptEntry.hasObject("servers")) { scriptEntry.addObject("servers", arg.asType(dList.class)); } @@ -79,12 +81,12 @@ public void execute(ScriptEntry scriptEntry) { } List bdlist = (List) scriptEntry.getObject("braces"); if (bdlist == null || bdlist.isEmpty()) { - com.denizenscript.denizencore.utilities.debugging.dB.echoError(scriptEntry.getResidingQueue(), "Empty braces (internal)!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Empty braces (internal)!"); return; } List bracedCommandsList = bdlist.get(0).value; if (bracedCommandsList == null || bracedCommandsList.isEmpty()) { - com.denizenscript.denizencore.utilities.debugging.dB.echoError(scriptEntry.getResidingQueue(), "Empty braces!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Empty braces!"); return; } StringBuilder toSend = new StringBuilder(); 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 index 4f672bb33..a666db984 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeExecuteCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeExecuteCommand.java @@ -1,12 +1,13 @@ package com.denizenscript.depenizen.bukkit.commands.bungee; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.bungee.BungeeBridge; import com.denizenscript.depenizen.bukkit.bungee.packets.out.ExecuteCommandPacketOut; import com.denizenscript.depenizen.bukkit.bungee.packets.out.KeepAlivePacketOut; import com.denizenscript.denizen.utilities.debugging.dB; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; @@ -34,7 +35,7 @@ public class BungeeExecuteCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpretArguments(scriptEntry.aHArgs)) { + for (Argument arg : ArgumentHelper.interpretArguments(scriptEntry.aHArgs)) { 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 index c58a9a77f..09687e92a 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeRunCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeRunCommand.java @@ -1,5 +1,6 @@ package com.denizenscript.depenizen.bukkit.commands.bungee; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.bungee.BungeeBridge; import com.denizenscript.depenizen.bukkit.bungee.packets.out.KeepAlivePacketOut; import com.denizenscript.depenizen.bukkit.bungee.packets.out.RedirectPacketOut; @@ -8,7 +9,7 @@ import com.denizenscript.denizen.utilities.debugging.dB; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dList; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; @@ -39,7 +40,7 @@ public class BungeeRunCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpretArguments(scriptEntry.aHArgs)) { + for (Argument arg : ArgumentHelper.interpretArguments(scriptEntry.aHArgs)) { if (!scriptEntry.hasObject("def") && arg.matchesPrefix("def")) { scriptEntry.addObject("def", arg.asElement()); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java index 9f9c532d1..3dd31691d 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/bungee/BungeeTagCommand.java @@ -12,7 +12,7 @@ import com.denizenscript.denizencore.scripts.commands.AbstractCommand; import com.denizenscript.denizencore.scripts.commands.Holdable; import com.denizenscript.denizencore.tags.TagManager; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import java.util.HashMap; import java.util.Map; @@ -63,7 +63,7 @@ else if (!scriptEntry.hasObject("tag")) { scriptEntry.addObject("tag", new Element(arg)); } else { - dB.echoError('\'' + arg + "' is an unknown argument!"); + Debug.echoError('\'' + arg + "' is an unknown argument!"); } } if (!scriptEntry.hasObject("tag")) { @@ -95,10 +95,10 @@ public void execute(ScriptEntry scriptEntry) { Element tag = scriptEntry.getElement("tag"); Element server = scriptEntry.getElement("server"); if (scriptEntry.dbCallShouldDebug()) { - dB.report(scriptEntry, getName(), tag.debug() + server.debug()); + Debug.report(scriptEntry, getName(), tag.debug() + server.debug()); } if (!BungeeBridge.instance.connected) { - dB.echoError("Cannot BungeeTag: bungee is not connected!"); + Debug.echoError("Cannot BungeeTag: bungee is not connected!"); scriptEntry.setFinished(true); return; } 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 index 3e83a86e4..4ad2f96e5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/effectlib/EffectLibCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/effectlib/EffectLibCommand.java @@ -1,5 +1,6 @@ package com.denizenscript.depenizen.bukkit.commands.effectlib; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.bridges.EffectLibBridge; import de.slikey.effectlib.EffectManager; import de.slikey.effectlib.effect.ArcEffect; @@ -10,10 +11,10 @@ import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Duration; -import com.denizenscript.denizencore.objects.aH; +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.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.Location; public class EffectLibCommand extends AbstractCommand { @@ -54,7 +55,7 @@ private enum Action { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("target") && arg.matchesPrefix("target")) { @@ -107,21 +108,21 @@ public void execute(final ScriptEntry scriptEntry) { dLocation location = (dLocation) scriptEntry.getObject("location"); // Report to dB - dB.report(scriptEntry, getName(), (target != null ? target.debug() : "") + Debug.report(scriptEntry, getName(), (target != null ? target.debug() : "") + (action != null ? action.toString() : "") + (duration != null ? duration.debug() : "") + (location != null ? location.debug() : "")); if (target == null && location == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Target not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Target not found!"); return; } if (action == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Effect type not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Effect type not specified!"); return; } if (duration == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Duration not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Duration not specified!"); return; } @@ -201,7 +202,7 @@ public void run() { } default: { - dB.echoError(scriptEntry.getResidingQueue(), "Effect type not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Effect type not found!"); } } 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 index 96c7489a8..7dbaa1d5b 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/jobs/JobsCommand.java @@ -1,12 +1,13 @@ package com.denizenscript.depenizen.bukkit.commands.jobs; +import com.denizenscript.denizencore.objects.Argument; import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.container.JobsPlayer; import com.denizenscript.denizen.BukkitScriptEntryData; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJob; @@ -52,7 +53,7 @@ public JobsCommand() { public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { // Iterate through arguments - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("action") && arg.matchesEnum(Action.values())) { @@ -65,7 +66,7 @@ else if (!scriptEntry.hasObject("job") } else if (!scriptEntry.hasObject("number") - && arg.matchesPrimitive(aH.PrimitiveType.Integer)) { + && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { scriptEntry.addObject("number", new Element(arg.getValue())); } 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 index 91c1cae67..0ce2513e2 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/libsdisguises/DisguiseCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/libsdisguises/DisguiseCommand.java @@ -1,15 +1,16 @@ package com.denizenscript.depenizen.bukkit.commands.libsdisguises; +import com.denizenscript.denizencore.objects.Argument; import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.disguisetypes.*; import com.denizenscript.denizen.objects.dEntity; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +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.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; public class DisguiseCommand extends AbstractCommand { // <--[command] @@ -76,7 +77,7 @@ private enum Action {REMOVE, MOB, PLAYER, MISC} @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("target") && arg.matchesPrefix("target")) { @@ -167,7 +168,7 @@ public void execute(ScriptEntry scriptEntry) { Element self = scriptEntry.getdObject("self"); // Report to dB - dB.report(scriptEntry, getName(), action.debug() + Debug.report(scriptEntry, getName(), action.debug() + (target != null ? target.debug() : "") + (type != null ? type.debug() : "") + (name != null ? name.debug() : "") @@ -176,12 +177,12 @@ public void execute(ScriptEntry scriptEntry) { + (baby != null ? baby.debug() : "")); if (target == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Target not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Target not found!"); return; } if (baby == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Baby not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Baby not specified!"); return; } @@ -191,7 +192,7 @@ public void execute(ScriptEntry scriptEntry) { else if (action.asString().equalsIgnoreCase("mob")) { if (type == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Entity not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Entity not specified!"); return; } MobDisguise mobDisguise = new MobDisguise(DisguiseType.valueOf(type.toString().toUpperCase()), !baby.asBoolean()); @@ -210,7 +211,7 @@ else if (action.asString().equalsIgnoreCase("mob")) { else if (action.asString().equalsIgnoreCase("player")) { if (name == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Name not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Name not specified!"); return; } PlayerDisguise playerDisguise = new PlayerDisguise(name.toString()); @@ -224,15 +225,15 @@ else if (action.asString().equalsIgnoreCase("player")) { else if (action.asString().equalsIgnoreCase("misc")) { if (type == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Entity not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Entity not specified!"); return; } if (id == null) { - dB.echoError(scriptEntry.getResidingQueue(), "ID not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "ID not specified!"); return; } if (data == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Data not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Data not specified!"); return; } MiscDisguise miscDisguise = new MiscDisguise(DisguiseType.valueOf(type.toString().toUpperCase()), id.asInt(), data.asInt()); 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 index de32823bb..d6544b1ed 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java @@ -1,5 +1,6 @@ package com.denizenscript.depenizen.bukkit.commands.mcmmo; +import com.denizenscript.denizencore.objects.Argument; import com.gmail.nossr50.api.ExperienceAPI; import com.gmail.nossr50.api.PartyAPI; import com.gmail.nossr50.config.Config; @@ -12,7 +13,7 @@ import com.denizenscript.denizen.utilities.debugging.dB; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; @@ -62,7 +63,7 @@ public McMMOCommand() { public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { // Iterate through arguments - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("action") && arg.matchesEnum(Action.values())) { @@ -87,7 +88,7 @@ else if (!scriptEntry.hasObject("skill") else if (!scriptEntry.hasObject("qty") && arg.matchesPrefix("q", "qty", "quantity") - && arg.matchesPrimitive(aH.PrimitiveType.Double)) { + && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { scriptEntry.addObject("qty", arg.asElement()); } 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 index 65040e956..68e1e7e65 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mobarena/MobArenaCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mobarena/MobArenaCommand.java @@ -1,14 +1,15 @@ package com.denizenscript.depenizen.bukkit.commands.mobarena; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.objects.mobarena.MobArenaArena; import com.garbagemule.MobArena.framework.Arena; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dList; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import java.util.List; @@ -50,7 +51,7 @@ public class MobArenaCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("arena") && (arg.matchesPrefix("arena") || MobArenaArena.matches(arg.getValue()))) { scriptEntry.addObject("arena", MobArenaArena.valueOf(arg.getValue())); @@ -91,10 +92,10 @@ public void execute(ScriptEntry scriptEntry) { List remove = (List) scriptEntry.getObject("remove"); List spectate = (List) scriptEntry.getObject("spectate"); - dB.report(scriptEntry, getName(), arena.debug() - + aH.debugList("Add Players", add) - + aH.debugList("Remove Players", remove) - + aH.debugList("Spectate Players", spectate)); + Debug.report(scriptEntry, getName(), arena.debug() + + ArgumentHelper.debugList("Add Players", add) + + ArgumentHelper.debugList("Remove Players", remove) + + ArgumentHelper.debugList("Spectate Players", spectate)); Arena mobArena = arena.getArena(); 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 index dfb7d1c60..031b61ede 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mythicmobs/MythicSpawnCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mythicmobs/MythicSpawnCommand.java @@ -1,13 +1,14 @@ package com.denizenscript.depenizen.bukkit.commands.mythicmobs; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.bridges.MythicMobsBridge; import com.denizenscript.denizen.objects.dLocation; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +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.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import io.lumine.xikage.mythicmobs.mobs.MythicMob; import com.denizenscript.depenizen.bukkit.objects.mythicmobs.MythicMobsMob; import org.bukkit.entity.Entity; @@ -37,7 +38,7 @@ public class MythicSpawnCommand extends AbstractCommand { @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("location") && arg.matchesArgumentType(dLocation.class)) { @@ -46,7 +47,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException else if (!scriptEntry.hasObject("level") && arg.matchesPrefix("level", "l") - && arg.matchesPrimitive(aH.PrimitiveType.Integer)) { + && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Integer)) { scriptEntry.addObject("level", arg.asElement()); } @@ -74,19 +75,19 @@ public void execute(ScriptEntry scriptEntry) { dLocation location = scriptEntry.getdObject("location"); Element level = scriptEntry.getElement("level"); - dB.report(scriptEntry, getName(), name.debug() + location.debug() + level.debug()); + Debug.report(scriptEntry, getName(), name.debug() + location.debug() + level.debug()); try { MythicMob mob = MythicMobsBridge.getMythicMob(name.asString()); if (mob == null) { - dB.echoError("MythicMob does not exist: " + name.asString()); + Debug.echoError("MythicMob does not exist: " + name.asString()); return; } Entity entity = MythicMobsBridge.spawnMythicMob(mob, location, level.asInt()); scriptEntry.addObject("spawned_mythicmob", new MythicMobsMob(MythicMobsBridge.getActiveMob(entity))); } catch (Exception e) { - dB.echoError(e); + Debug.echoError(e); } } 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 index fc4beb310..48930136a 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/noteblockapi/NBSCommand.java @@ -1,5 +1,6 @@ package com.denizenscript.depenizen.bukkit.commands.noteblockapi; +import com.denizenscript.denizencore.objects.Argument; import com.xxmicloxx.NoteBlockAPI.NoteBlockAPI; import com.xxmicloxx.NoteBlockAPI.model.Song; import com.xxmicloxx.NoteBlockAPI.songplayer.RadioSongPlayer; @@ -9,11 +10,11 @@ import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dList; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import java.io.File; import java.net.URLDecoder; @@ -61,7 +62,7 @@ private enum Action {PLAY, STOP} @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("targets") && arg.matchesPrefix("targets", "targets") @@ -106,18 +107,18 @@ public void execute(ScriptEntry scriptEntry) { List targets = (List) scriptEntry.getObject("targets"); // Report to dB - dB.report(scriptEntry, getName(), action.debug() - + aH.debugList("targets", targets) + Debug.report(scriptEntry, getName(), action.debug() + + ArgumentHelper.debugList("targets", targets) + (file != null ? file.debug() : "")); if (targets == null || targets.isEmpty()) { - dB.echoError(scriptEntry.getResidingQueue(), "Targets not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Targets not found!"); return; } if (action.asString().equalsIgnoreCase("play")) { if (file == null) { - dB.echoError(scriptEntry.getResidingQueue(), "File not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "File not specified!"); return; } String directory = URLDecoder.decode(System.getProperty("user.dir")); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java index ebada2933..54ca6fa6f 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/playerpoints/PlayerPointsCommand.java @@ -1,15 +1,16 @@ package com.denizenscript.depenizen.bukkit.commands.playerpoints; +import com.denizenscript.denizencore.objects.Argument; import com.denizenscript.depenizen.bukkit.bridges.PlayerPointsBridge; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; import com.denizenscript.denizencore.scripts.ScriptEntry; -import com.denizenscript.denizencore.objects.aH; +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.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; public class PlayerPointsCommand extends AbstractCommand { // <--[command] @@ -48,7 +49,7 @@ private enum Action {SET, GIVE, TAKE} @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("target") && arg.matchesPrefix("target")) { @@ -96,17 +97,17 @@ public void execute(ScriptEntry scriptEntry) { Element amount = scriptEntry.getdObject("amount"); // Report to dB - dB.report(scriptEntry, getName(), action.debug() + Debug.report(scriptEntry, getName(), action.debug() + (target != null ? target.debug() : "") + (amount != null ? amount.debug() : "")); if (target == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Target not found!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Target not found!"); return; } if (amount == null) { - dB.echoError(scriptEntry.getResidingQueue(), "Entity not specified!"); + Debug.echoError(scriptEntry.getResidingQueue(), "Entity not specified!"); return; } 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 index 2965fdf0a..b2aad6f5f 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/worldguard/RegionCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/worldguard/RegionCommand.java @@ -1,5 +1,6 @@ package com.denizenscript.depenizen.bukkit.commands.worldguard; +import com.denizenscript.denizencore.objects.Argument; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldguard.WorldGuard; @@ -10,7 +11,7 @@ import com.denizenscript.denizen.utilities.debugging.dB; import com.denizenscript.denizencore.exceptions.InvalidArgumentsException; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; import org.bukkit.Location; @@ -48,7 +49,7 @@ private enum Action {ADD, REMOVE} @Override public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { - for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { + for (Argument arg : ArgumentHelper.interpret(scriptEntry.getArguments())) { if (!scriptEntry.hasObject("region_id") && arg.matchesPrefix("id")) { @@ -111,7 +112,7 @@ public void execute(ScriptEntry scriptEntry) { } dB.report(scriptEntry, getName(), region_id.debug() + (cuboid != null ? cuboid.debug() : "") - + aH.debugObj("world", world.getName()) + action.debug()); + + ArgumentHelper.debugObj("world", world.getName()) + action.debug()); RegionManager regionManager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world)); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java index f65bfeeed..89fd3a333 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java @@ -4,7 +4,7 @@ import com.denizenscript.denizen.BukkitScriptEntryData; import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; @@ -88,7 +88,7 @@ public ScriptEntryData getScriptEntryData() { public boolean applyDetermination(ScriptContainer container, String determination) { String determinationLow = CoreUtilities.toLowerCase(determination); if (determinationLow.startsWith("max_players:")) { - maxPlayers = aH.getIntegerFrom(determination.substring("max_players:".length())); + maxPlayers = ArgumentHelper.getIntegerFrom(determination.substring("max_players:".length())); } else if (determinationLow.startsWith("version:")) { version = determination.substring("version:".length()); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java index c2459a5b3..91d23dc3f 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java @@ -9,7 +9,7 @@ import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -73,7 +73,7 @@ public boolean applyDetermination(ScriptContainer container, String determinatio if (determination.length() > 0 && !isDefaultDetermination(determination)) { Element mana = new Element(determination); if (!mana.isInt()) { - dB.echoError("Determination for 'mana' must be a valid number."); + Debug.echoError("Determination for 'mana' must be a valid number."); return false; } new_mana = mana.asInt(); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java index a1c5c47df..b0cfb349c 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java @@ -12,7 +12,7 @@ import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; @@ -94,7 +94,7 @@ public boolean applyDetermination(ScriptContainer container, String determinatio if (lower.startsWith("power:")) { Element num = new Element(determination.substring("power:".length())); if (!num.isFloat()) { - dB.echoError("Determination for 'power' must be a valid decimal number."); + Debug.echoError("Determination for 'power' must be a valid decimal number."); return false; } event.setPower(num.asFloat()); @@ -103,7 +103,7 @@ public boolean applyDetermination(ScriptContainer container, String determinatio else if (lower.startsWith("cast_time:")) { Element max = new Element(determination.substring("cast_time:".length())); if (!max.isInt()) { - dB.echoError("Determination for 'cast_time' must be a valid number."); + Debug.echoError("Determination for 'cast_time' must be a valid number."); return false; } event.setCastTime(max.asInt()); @@ -112,7 +112,7 @@ else if (lower.startsWith("cast_time:")) { else if (lower.startsWith("cooldown:")) { Element num = new Element(determination.substring("cooldown:".length())); if (!num.isFloat()) { - dB.echoError("Determination for 'cooldown' must be a valid decimal number."); + Debug.echoError("Determination for 'cooldown' must be a valid decimal number."); return false; } event.setCooldown(num.asFloat()); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java index b8aac338c..4e36cdbd8 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java @@ -1,12 +1,13 @@ 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.dEntity; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; @@ -78,7 +79,7 @@ public String getName() { public boolean applyDetermination(ScriptContainer container, String determination) { String lower = CoreUtilities.toLowerCase(determination); - if (aH.Argument.valueOf(lower).matchesPrimitive(aH.PrimitiveType.Float)) { + if (Argument.valueOf(lower).matchesPrimitive(ArgumentHelper.PrimitiveType.Float)) { xp = new Element(lower); return true; } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java index 3bc5f78b1..3fced92bd 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java @@ -6,7 +6,7 @@ import com.denizenscript.denizen.objects.dEntity; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; @@ -77,8 +77,8 @@ public String getName() { public boolean applyDetermination(ScriptContainer container, String determination) { String lower = CoreUtilities.toLowerCase(determination); - if (aH.matchesInteger(lower)) { - level = aH.getIntegerFrom(lower); + if (ArgumentHelper.matchesInteger(lower)) { + level = ArgumentHelper.getIntegerFrom(lower); return true; } return super.applyDetermination(container, determination); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java index 66f03543f..88470ac89 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java @@ -6,7 +6,7 @@ import com.denizenscript.denizen.objects.dEntity; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; @@ -81,8 +81,8 @@ public String getName() { public boolean applyDetermination(ScriptContainer container, String determination) { String lower = CoreUtilities.toLowerCase(determination); - if (aH.matchesInteger(lower)) { - levels_lost = aH.getIntegerFrom(lower); + if (ArgumentHelper.matchesInteger(lower)) { + levels_lost = ArgumentHelper.getIntegerFrom(lower); return true; } return super.applyDetermination(container, determination); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java index eaa7e5d0b..0e5ffa32c 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java @@ -6,7 +6,7 @@ import com.denizenscript.denizen.objects.dEntity; import com.denizenscript.denizen.objects.dPlayer; import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; @@ -82,8 +82,8 @@ public String getName() { public boolean applyDetermination(ScriptContainer container, String determination) { String lower = CoreUtilities.toLowerCase(determination); - if (aH.matchesInteger(lower)) { - levels_gained = aH.getIntegerFrom(lower); + if (ArgumentHelper.matchesInteger(lower)) { + levels_gained = ArgumentHelper.getIntegerFrom(lower); return true; } return super.applyDetermination(container, determination); 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 index a6aded131..4afa551c6 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java @@ -1,14 +1,11 @@ package com.denizenscript.depenizen.bukkit.events.mythicmobs; +import com.denizenscript.denizencore.objects.*; import com.denizenscript.depenizen.bukkit.objects.mythicmobs.MythicMobsMob; import com.denizenscript.denizen.BukkitScriptEntryData; import com.denizenscript.denizen.events.BukkitScriptEvent; import com.denizenscript.denizen.objects.dEntity; import com.denizenscript.denizen.objects.dItem; -import com.denizenscript.denizencore.objects.Element; -import com.denizenscript.denizencore.objects.aH; -import com.denizenscript.denizencore.objects.dList; -import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.scripts.ScriptEntryData; import com.denizenscript.denizencore.scripts.containers.ScriptContainer; import com.denizenscript.denizencore.utilities.CoreUtilities; @@ -110,16 +107,16 @@ public String getName() { @Override public boolean applyDetermination(ScriptContainer container, String determination) { if (isDefaultDetermination(determination)) { - aH.Argument arg = new aH.Argument(determination); - if (arg.matchesPrefix("currency") && arg.matchesPrimitive(aH.PrimitiveType.Double)) { + Argument arg = new Argument(determination); + if (arg.matchesPrefix("currency") && arg.matchesPrimitive(ArgumentHelper.PrimitiveType.Double)) { currency = new Element(determination); return true; } - else if (aH.matchesInteger(determination)) { // "xp" prefix, but not required for back support reasons. + else if (ArgumentHelper.matchesInteger(determination)) { // "xp" prefix, but not required for back support reasons. experience = new Element(determination); return true; } - else if (aH.Argument.valueOf(determination).matchesArgumentList(dItem.class)) { + else if (Argument.valueOf(determination).matchesArgumentList(dItem.class)) { if (newDrops == null) { newDrops = new ArrayList<>(); } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/areashop/dAreaShop.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/areashop/dAreaShop.java index c095640d5..4640fa8bd 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/areashop/dAreaShop.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/areashop/dAreaShop.java @@ -9,7 +9,7 @@ import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import com.denizenscript.depenizen.bukkit.objects.worldguard.WorldGuardRegion; public class dAreaShop implements dObject { @@ -47,7 +47,7 @@ public dAreaShop(GeneralRegion areaShop) { this.areaShop = areaShop; } else { - dB.echoError("AreaShop referenced is null!"); + Debug.echoError("AreaShop referenced is null!"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaim.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaim.java index 25f80fbc6..2d67ffda8 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaim.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaim.java @@ -13,7 +13,7 @@ import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.Chunk; import java.util.ArrayList; @@ -299,7 +299,7 @@ else if (CoreUtilities.toLowerCase(mechanism.getValue().asString()).equals("admi } } catch (Exception e) { - dB.echoError("Unable to transfer ownership of claim: " + this.identify() + "."); + Debug.echoError("Unable to transfer ownership of claim: " + this.identify() + "."); } } @@ -331,6 +331,6 @@ else if (CoreUtilities.toLowerCase(mechanism.getValue().asString()).equals("admi @Override public void applyProperty(Mechanism mechanism) { - dB.echoError("Cannot apply Properties to a GriefPreventionClaim!"); + Debug.echoError("Cannot apply Properties to a GriefPreventionClaim!"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mcmmo/dParty.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mcmmo/dParty.java index 6771f2acc..4f7c9cfcd 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mcmmo/dParty.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mcmmo/dParty.java @@ -11,7 +11,7 @@ import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import java.util.UUID; @@ -62,7 +62,7 @@ public dParty(Party party) { this.party = party; } else { - dB.echoError("Party referenced is null!"); + Debug.echoError("Party referenced is null!"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mobarena/MobArenaArena.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mobarena/MobArenaArena.java index e8ef517db..391038d27 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mobarena/MobArenaArena.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mobarena/MobArenaArena.java @@ -10,7 +10,7 @@ import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.entity.Player; public class MobArenaArena implements dObject { @@ -47,7 +47,7 @@ public MobArenaArena(Arena arena) { this.arena = arena; } else { - dB.echoError("Arena referenced is null"); + Debug.echoError("Arena referenced is null"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mythicmobs/MythicMobsMob.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mythicmobs/MythicMobsMob.java index 62fe17888..13483a475 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/mythicmobs/MythicMobsMob.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/mythicmobs/MythicMobsMob.java @@ -6,7 +6,7 @@ import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import io.lumine.xikage.mythicmobs.adapters.AbstractEntity; import io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitEntity; import io.lumine.xikage.mythicmobs.mobs.ActiveMob; @@ -50,7 +50,7 @@ public MythicMobsMob(ActiveMob mob) { this.mobType = mob.getType(); } else { - dB.echoError("ActiveMob referenced is null!"); + Debug.echoError("ActiveMob referenced is null!"); } } @@ -339,6 +339,6 @@ else if (mechanism.matches("target") && mechanism.requireObject(dEntity.class)) @Override public void applyProperty(Mechanism mechanism) { - dB.echoError("Cannot apply properties to a MythicMob!"); + Debug.echoError("Cannot apply properties to a MythicMob!"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/pvparena/PVPArenaArena.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/pvparena/PVPArenaArena.java index 1eadc0d06..b1899caf0 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/pvparena/PVPArenaArena.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/pvparena/PVPArenaArena.java @@ -6,7 +6,7 @@ import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import net.slipcor.pvparena.arena.Arena; import net.slipcor.pvparena.arena.ArenaPlayer; import net.slipcor.pvparena.managers.ArenaManager; @@ -38,7 +38,7 @@ public PVPArenaArena(Arena a) { this.arena = a; } else { - dB.echoError("Arena referenced is null"); + Debug.echoError("Arena referenced is null"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/residence/dResidence.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/residence/dResidence.java index df54af551..e92661516 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/residence/dResidence.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/residence/dResidence.java @@ -10,7 +10,7 @@ import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; import com.denizenscript.denizencore.utilities.CoreUtilities; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; public class dResidence implements dObject { @@ -47,7 +47,7 @@ public dResidence(ClaimedResidence residence) { this.residence = residence; } else { - dB.echoError("Residence referenced is null!"); + Debug.echoError("Residence referenced is null!"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/shopkeepers/ShopKeeper.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/shopkeepers/ShopKeeper.java index 64a9848cb..8624a067c 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/objects/shopkeepers/ShopKeeper.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/objects/shopkeepers/ShopKeeper.java @@ -15,7 +15,7 @@ import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.tags.TagContext; import com.denizenscript.denizencore.tags.core.EscapeTags; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.inventory.ItemStack; @@ -69,7 +69,7 @@ public ShopKeeper(Shopkeeper shopkeeper) { this.shopkeeper = shopkeeper; } else { - dB.echoError("Shopkeeper referenced is null!"); + Debug.echoError("Shopkeeper referenced is null!"); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsItemProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsItemProperties.java index 5babf17b8..a8b8db8c3 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsItemProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/essentials/EssentialsItemProperties.java @@ -5,7 +5,7 @@ import com.denizenscript.denizen.utilities.debugging.dB; import com.denizenscript.denizencore.objects.Element; import com.denizenscript.denizencore.objects.Mechanism; -import com.denizenscript.denizencore.objects.aH; +import com.denizenscript.denizencore.objects.ArgumentHelper; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; import com.denizenscript.denizencore.objects.properties.Property; @@ -83,7 +83,7 @@ public String getAttribute(Attribute attribute) { // @Plugin Depenizen, Essentials // --> if (attribute.getAttribute(2).startsWith("quantity") && - attribute.hasContext(2) && aH.matchesInteger(attribute.getContext(2))) { + attribute.hasContext(2) && ArgumentHelper.matchesInteger(attribute.getContext(2))) { return new Element(price * attribute.getIntContext(2)).getAttribute(attribute.fulfill(2)); } return new Element(price).getAttribute(attribute.fulfill(1)); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/factions/FactionsPlayerNPCProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/factions/FactionsPlayerNPCProperties.java index 9041f68f8..bb2a907a6 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/factions/FactionsPlayerNPCProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/factions/FactionsPlayerNPCProperties.java @@ -11,7 +11,7 @@ import com.denizenscript.denizencore.objects.Element; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; public class FactionsPlayerNPCProperties implements Property { @@ -57,7 +57,7 @@ private FactionsPlayerNPCProperties(dObject object) { : object instanceof dNPC ? ((dNPC) object).getName() : null; if (name == null) { - dB.echoError("Invalid dObject! Must be a dPlayer or dNPC!"); + Debug.echoError("Invalid dObject! Must be a dPlayer or dNPC!"); return; } player = MPlayer.get(IdUtil.getId(name)); diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldguard/WorldGuardPlayerProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldguard/WorldGuardPlayerProperties.java index 315942825..ce0f7021a 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldguard/WorldGuardPlayerProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/worldguard/WorldGuardPlayerProperties.java @@ -15,7 +15,7 @@ import com.denizenscript.denizencore.objects.Element; import com.denizenscript.denizencore.objects.dObject; import com.denizenscript.denizencore.tags.Attribute; -import com.denizenscript.denizencore.utilities.debugging.dB; +import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -101,12 +101,12 @@ public String getAttribute(Attribute attribute) { // --> if (attribute.startsWith("test_flag")) { if (!attribute.hasContext(1)) { - dB.echoError("The tag p@player.worlduard.test_flag[...] must have a value."); + Debug.echoError("The tag p@player.worlduard.test_flag[...] must have a value."); return null; } StateFlag flag = getStateFlag(attribute.getContext(1)); if (flag == null) { - dB.echoError("The tag p@player.worlduard.test_flag[...] has an invalid value: " + attribute.getContext(1)); + Debug.echoError("The tag p@player.worlduard.test_flag[...] has an invalid value: " + attribute.getContext(1)); return null; }