update for core 'ObjectTag' rename

DenizenScript · Jul 13, 2019 · 2cc1577 · 2cc1577
1 parent 4012df7
commit 2cc1577
Show file tree

Hide file tree

Showing 141 changed files with 1,234 additions and 1,234 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/ASkyBlockBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/ASkyBlockBridge.java
@@ -13,7 +13,7 @@
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
-import com.denizenscript.denizencore.objects.Element;
+import com.denizenscript.denizencore.objects.ElementTag;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.depenizen.bukkit.properties.askyblock.ASkyBlockLocationProperties;
 import com.denizenscript.depenizen.bukkit.properties.askyblock.ASkyBlockPlayerProperties;
@@ -72,13 +72,13 @@ else if (attribute.startsWith("nether_world")) {
 
         // <--[tag]
         // @attribute <skyblock.island_count>
-        // @returns Element(Number)
+        // @returns ElementTag(Number)
         // @description
         // Returns the number of Skyblock Islands that exist.
         // @Plugin Depenizen, A SkyBlock
         // -->
         else if (attribute.startsWith("island_count")) {
-            event.setReplacedObject(new Element(api.getIslandCount()).getObjectAttribute(attribute.fulfill(1)));
+            event.setReplacedObject(new ElementTag(api.getIslandCount()).getObjectAttribute(attribute.fulfill(1)));
         }
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/EssentialsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/EssentialsBridge.java
@@ -15,7 +15,7 @@
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.TagRunnable;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
@@ -72,14 +72,14 @@ public void tagEvent(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <essentials.list_warps>
-        // @returns dList(Element)
+        // @returns ListTag(Element)
         // @description
         // Returns a list of all Warp names.
         // @Plugin Depenizen, Essentials
         // -->
         if (attribute.startsWith("list_warps")) {
             Essentials essentials = (Essentials) plugin;
-            dList warps = new dList();
+            ListTag warps = new ListTag();
             warps.addAll(essentials.getWarps().getList());
             event.setReplacedObject(warps.getObjectAttribute(attribute.fulfill(1)));
         }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/FactionsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/FactionsBridge.java
@@ -14,7 +14,7 @@
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.TagManager;
 
@@ -68,13 +68,13 @@ public void tagEvent(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <factions.list_factions>
-        // @returns dList(dFaction)
+        // @returns ListTag(dFaction)
         // @description
         // Returns a list of all current factions.
         // @Plugin Depenizen, Factions
         // -->
         if (attribute.startsWith("list_factions")) {
-            dList factions = new dList();
+            ListTag factions = new ListTag();
             for (Faction f : FactionColl.get().getAll()) {
                 factions.addObject(new dFaction(f));
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/JobsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/JobsBridge.java
@@ -10,7 +10,7 @@
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.TagRunnable;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
 import com.denizenscript.denizen.utilities.debugging.Debug;
@@ -53,12 +53,12 @@ public void tagEvent(ReplaceableTagEvent event) {
         else {
             // <--[tag]
             // @attribute <jobs[(<name>)]>
-            // @returns dList(dJob)/dJob
+            // @returns ListTag(dJob)/dJob
             // @description
             // Returns a list of all known dJobs, or the job by the given input name if one is given.
             // @Plugin Depenizen, Jobs
             // -->
-            dList jobList = new dList();
+            ListTag jobList = new ListTag();
             for (Job jb : Jobs.getJobs()) {
                 jobList.add(new JobsJob(jb).identify());
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LuckPermsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LuckPermsBridge.java
@@ -9,7 +9,7 @@
 import com.denizenscript.denizen.objects.dPlayer;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.TagRunnable;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
@@ -34,13 +34,13 @@ public void tagEvent(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <luckperms.list_tracks>
-        // @returns dList(luckpermstrack)
+        // @returns ListTag(luckpermstrack)
         // @description
         // Returns a list of all tracks.
         // @Plugin Depenizen, LuckPerms
         // -->
         if (attribute.startsWith("list_tracks")) {
-            dList tracks = new dList();
+            ListTag tracks = new ListTag();
             LuckPermsApi api = LuckPerms.getApi();
             for (Track track : api.getTracks()) {
                 tracks.add(new LuckPermsTrack(track).identify());

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java
@@ -16,7 +16,7 @@
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.depenizen.bukkit.events.mobarena.MobArenaWaveChangesScriptEvent;
 import com.denizenscript.denizencore.tags.TagManager;
@@ -68,13 +68,13 @@ else if (!event.hasAlternative()) {
 
         // <--[tag]
         // @attribute <mobarena.list_arenas>
-        // @returns dList(MobArena)
+        // @returns ListTag(MobArena)
         // @description
         // Returns a list of all MobArenas.
         // @Plugin Depenizen, MobArena
         // -->
         if (attribute.startsWith("list_arenas")) {
-            dList arenas = new dList();
+            ListTag arenas = new ListTag();
             for (Arena a : ((MobArena) plugin).getArenaMaster().getArenas()) {
                 if (((MobArena) plugin).getArenaMaster().getArenaWithName(a.configName()) == null) {
                     continue;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PVPArenaBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PVPArenaBridge.java
@@ -14,7 +14,7 @@
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.TagManager;
 import net.slipcor.pvparena.arena.Arena;
@@ -61,14 +61,14 @@ else if (!event.hasAlternative()) {
 
         // <--[tag]
         // @attribute <pvparena.list_arenas>
-        // @returns dList(PVPArena)
+        // @returns ListTag(PVPArena)
         // @description
         // Returns a list of all PVPArenas.
         // @Plugin Depenizen, PVPArena
         // -->
         attribute = attribute.fulfill(1);
         if (attribute.startsWith("list_arenas")) {
-            dList arenas = new dList();
+            ListTag arenas = new ListTag();
             for (Arena a : ArenaManager.getArenas()) {
                 arenas.add(new PVPArenaArena(a).identify());
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlaceholderAPIBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlaceholderAPIBridge.java
@@ -5,7 +5,7 @@
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import com.denizenscript.denizen.objects.dPlayer;
 import com.denizenscript.denizen.tags.BukkitTagContext;
-import com.denizenscript.denizencore.objects.Element;
+import com.denizenscript.denizencore.objects.ElementTag;
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
@@ -35,7 +35,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         Attribute attribute = event.getAttributes();
         // <--[tag]
         // @attribute <placeholder[<name>]>
-        // @returns Element
+        // @returns ElementTag
         // @description
         // Returns the value of the placeholder.
         // @Plugin Depenizen, PlaceholderAPI
@@ -47,7 +47,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         }
         Player player = ((BukkitTagContext) event.getContext()).player != null ?
                 ((BukkitTagContext) event.getContext()).player.getPlayerEntity() : null;
-        event.setReplacedObject(new Element(PlaceholderAPI.setPlaceholders(player, "%" + placeholder + "%"))
+        event.setReplacedObject(new ElementTag(PlaceholderAPI.setPlaceholders(player, "%" + placeholder + "%"))
                 .getObjectAttribute(attribute.fulfill(1)));
     }
 

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlotSquaredBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PlotSquaredBridge.java
@@ -12,7 +12,7 @@
 import com.denizenscript.denizen.objects.dLocation;
 import com.denizenscript.denizen.objects.dPlayer;
 import com.denizenscript.denizencore.events.ScriptEvent;
-import com.denizenscript.denizencore.objects.Element;
+import com.denizenscript.denizencore.objects.ElementTag;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 
@@ -26,7 +26,7 @@ public void init() {
         ScriptEvent.registerScriptEvent(new PlotClearScriptEvent());
         ObjectFetcher.registerWithObjectFetcher(dPlotSquaredPlot.class);
         PropertyParser.registerProperty(PlotSquaredPlayerProperties.class, dPlayer.class);
-        PropertyParser.registerProperty(PlotSquaredElementProperties.class, Element.class);
+        PropertyParser.registerProperty(PlotSquaredElementProperties.class, ElementTag.class);
         PropertyParser.registerProperty(PlotSquaredLocationProperties.class, dLocation.class);
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/SentinelBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/SentinelBridge.java
@@ -7,7 +7,7 @@
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.ScriptEvent;
-import com.denizenscript.denizencore.objects.dScript;
+import com.denizenscript.denizencore.objects.ScriptTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.containers.core.ProcedureScriptContainer;
 import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
@@ -49,7 +49,7 @@ public boolean isTarget(LivingEntity ent, String prefix, String value) {
                     }
                 }
                 if (prefix.equals("denizen_proc") && ent.getEquipment() != null) {
-                    dScript script = dScript.valueOf(value);
+                    ScriptTag script = ScriptTag.valueOf(value);
                     if (script == null) {
                         Debug.echoError("Invalid procedure script name '" + value + "' (non-existent) in a Sentinel NPC target.");
                         return false;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/TownyBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/TownyBridge.java
@@ -17,7 +17,7 @@
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.TagRunnable;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
 import com.denizenscript.denizen.utilities.debugging.Debug;
@@ -60,13 +60,13 @@ public void townyTagEvent(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <towny.list_towns[<world name>]>
-        // @returns dList(Element)
+        // @returns ListTag(Element)
         // @description
         // Returns a list of all towns. Optionally specify a world name.
         // @Plugin Depenizen, Towny
         // -->
         if (attribute.startsWith("list_towns")) {
-            dList towns = new dList();
+            ListTag towns = new ListTag();
             if (attribute.hasContext(1)) {
                 try {
                     for (Town town : TownyUniverse.getDataSource().getWorld(attribute.getContext(1)).getTowns()) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java
@@ -22,9 +22,9 @@
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.events.ScriptEvent;
-import com.denizenscript.denizencore.objects.Element;
+import com.denizenscript.denizencore.objects.ElementTag;
 import com.denizenscript.denizencore.objects.TagRunnable;
-import com.denizenscript.denizencore.objects.dList;
+import com.denizenscript.denizencore.objects.ListTag;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 import com.denizenscript.denizencore.tags.Attribute;
 import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
@@ -219,37 +219,37 @@ public void tagEvent(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <bungee.server>
-        // @returns Element
+        // @returns ElementTag
         // @description
         // Returns the name of the current server (according to the Bungee proxy config).
         // @Plugin Depenizen, BungeeCord
         // -->
         if (attribute.startsWith("server")) {
-            event.setReplacedObject(new Element(serverName)
+            event.setReplacedObject(new ElementTag(serverName)
                     .getObjectAttribute(attribute.fulfill(1)));
         }
 
         // <--[tag]
         // @attribute <bungee.list_servers>
-        // @returns dList
+        // @returns ListTag
         // @description
         // Returns a list of known bungee server names.
         // @Plugin Depenizen, BungeeCord
         // -->
         if (attribute.startsWith("list_servers")) {
-            event.setReplacedObject(new dList(knownServers)
+            event.setReplacedObject(new ListTag(knownServers)
                     .getObjectAttribute(attribute.fulfill(1)));
         }
 
         // <--[tag]
         // @attribute <bungee.connected>
-        // @returns Element(Boolean)
+        // @returns ElementTag(Boolean)
         // @description
         // Returns this server is currently connected to the BungeeCord proxy server.
         // @Plugin Depenizen, BungeeCord
         // -->
         if (attribute.startsWith("connected")) {
-            event.setReplacedObject(new Element(connected)
+            event.setReplacedObject(new ElementTag(connected)
                     .getObjectAttribute(attribute.fulfill(1)));
         }
     }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/in/RunScriptPacketIn.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/in/RunScriptPacketIn.java
@@ -7,8 +7,8 @@
 import com.denizenscript.denizen.BukkitScriptEntryData;
 import com.denizenscript.denizen.objects.dPlayer;
 import com.denizenscript.denizen.utilities.debugging.Debug;
-import com.denizenscript.denizencore.objects.dList;
-import com.denizenscript.denizencore.objects.dScript;
+import com.denizenscript.denizencore.objects.ListTag;
+import com.denizenscript.denizencore.objects.ScriptTag;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
 import com.denizenscript.denizencore.scripts.queues.core.InstantQueue;
@@ -61,14 +61,14 @@ public void run() {
                         // Ignore
                     }
                 }
-                dScript script = dScript.valueOf(scriptName);
+                ScriptTag script = ScriptTag.valueOf(scriptName);
                 List<ScriptEntry> entries = script.getContainer().getBaseEntries(new BukkitScriptEntryData(linkedPlayer, null));
                 if (entries.size() == 0) {
                     return;
                 }
                 ScriptQueue queue = new InstantQueue("BUNGEERUN_" + scriptName).addEntries(entries);
                 int x = 1;
-                dList definitions = dList.valueOf(defs);
+                ListTag definitions = ListTag.valueOf(defs);
                 String[] definition_names = null;
                 try {
                     if (script != null && script.getContainer() != 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
@@ -5,7 +5,7 @@
 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.ElementTag;
 import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
@@ -80,7 +80,7 @@ else if (!scriptEntry.hasObject("shop")) {
     public void execute(ScriptEntry scriptEntry) {
 
         dPlayer target = scriptEntry.getdObject("target");
-        Element dshop = scriptEntry.getdObject("shop");
+        ElementTag dshop = scriptEntry.getdObject("shop");
 
         // Report to dB
         Debug.report(scriptEntry, getName(),