update for dbuk objects rename

DenizenScript · Jul 13, 2019 · a2a0cfc · a2a0cfc
1 parent 243db28
commit a2a0cfc
Show file tree

Hide file tree

Showing 151 changed files with 918 additions and 918 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
@@ -6,9 +6,9 @@
 import com.denizenscript.depenizen.bukkit.events.askyblock.SkyBlockCreatedScriptEvent;
 import com.denizenscript.depenizen.bukkit.events.askyblock.SkyBlockResetScriptEvent;
 import com.wasteofplastic.askyblock.ASkyBlockAPI;
-import com.denizenscript.denizen.objects.dLocation;
-import com.denizenscript.denizen.objects.dPlayer;
-import com.denizenscript.denizen.objects.dWorld;
+import com.denizenscript.denizen.objects.LocationTag;
+import com.denizenscript.denizen.objects.PlayerTag;
+import com.denizenscript.denizen.objects.WorldTag;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
@@ -26,9 +26,9 @@ public class ASkyBlockBridge extends Bridge {
     @Override
     public void init() {
         api = ASkyBlockAPI.getInstance();
-        PropertyParser.registerProperty(ASkyBlockPlayerProperties.class, dPlayer.class);
-        PropertyParser.registerProperty(ASkyBlockLocationProperties.class, dLocation.class);
-        PropertyParser.registerProperty(ASkyBlockWorldProperties.class, dWorld.class);
+        PropertyParser.registerProperty(ASkyBlockPlayerProperties.class, PlayerTag.class);
+        PropertyParser.registerProperty(ASkyBlockLocationProperties.class, LocationTag.class);
+        PropertyParser.registerProperty(ASkyBlockWorldProperties.class, WorldTag.class);
         ScriptEvent.registerScriptEvent(new SkyBlockCreatedScriptEvent());
         ScriptEvent.registerScriptEvent(new SkyBlockResetScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerEntersSkyBlockScriptEvent());
@@ -50,24 +50,24 @@ public void tagEvent(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <skyblock.island_world>
-        // @returns dWorld
+        // @returns WorldTag
         // @description
         // Returns the world that A Skyblock uses for islands.
         // @Plugin Depenizen, A SkyBlock
         // -->
         if (attribute.startsWith("island_world")) {
-            event.setReplacedObject(new dWorld(api.getIslandWorld()).getObjectAttribute(attribute.fulfill(1)));
+            event.setReplacedObject(new WorldTag(api.getIslandWorld()).getObjectAttribute(attribute.fulfill(1)));
         }
 
         // <--[tag]
         // @attribute <skyblock.nether_world>
-        // @returns dWorld
+        // @returns WorldTag
         // @description
         // Returns the world that A Skyblock uses for the nether.
         // @Plugin Depenizen, A SkyBlock
         // -->
         else if (attribute.startsWith("nether_world")) {
-            event.setReplacedObject(new dWorld(api.getNetherWorld()).getObjectAttribute(attribute.fulfill(1)));
+            event.setReplacedObject(new WorldTag(api.getNetherWorld()).getObjectAttribute(attribute.fulfill(1)));
         }
 
         // <--[tag]

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/AreaShopBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/AreaShopBridge.java
@@ -4,7 +4,7 @@
 import com.denizenscript.depenizen.bukkit.events.areashop.AreaShopExpiresScriptEvent;
 import com.denizenscript.depenizen.bukkit.properties.areashop.AreaShopPlayerProperties;
 import com.denizenscript.depenizen.bukkit.objects.areashop.dAreaShop;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
@@ -14,7 +14,7 @@ public class AreaShopBridge extends Bridge {
     @Override
     public void init() {
         ObjectFetcher.registerWithObjectFetcher(dAreaShop.class);
-        PropertyParser.registerProperty(AreaShopPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(AreaShopPlayerProperties.class, PlayerTag.class);
         ScriptEvent.registerScriptEvent(new AreaShopExpiresScriptEvent());
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/BossShopBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/BossShopBridge.java
@@ -3,7 +3,7 @@
 import com.denizenscript.depenizen.bukkit.commands.bossshop.BossShopCommand;
 import com.denizenscript.depenizen.bukkit.properties.bossshop.BossShopInventoryProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dInventory;
+import com.denizenscript.denizen.objects.InventoryTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 
@@ -15,6 +15,6 @@ public class BossShopBridge extends Bridge {
     public void init() {
         instance = this;
         DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(BossShopCommand.class, "BOSSSHOP", "bosshop [<shop name>] (target:<player>)", 1);
-        PropertyParser.registerProperty(BossShopInventoryProperties.class, dInventory.class);
+        PropertyParser.registerProperty(BossShopInventoryProperties.class, InventoryTag.class);
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/EssentialsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/EssentialsBridge.java
@@ -9,9 +9,9 @@
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.commands.WarpNotFoundException;
-import com.denizenscript.denizen.objects.dItem;
-import com.denizenscript.denizen.objects.dLocation;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.ItemTag;
+import com.denizenscript.denizen.objects.LocationTag;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.TagRunnable;
@@ -40,16 +40,16 @@ public void run(ReplaceableTagEvent event) {
         ScriptEvent.registerScriptEvent(new PlayerGodModeStatusScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerJailStatusScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerMuteStatusScriptEvent());
-        PropertyParser.registerProperty(EssentialsPlayerProperties.class, dPlayer.class);
-        PropertyParser.registerProperty(EssentialsItemProperties.class, dItem.class);
+        PropertyParser.registerProperty(EssentialsPlayerProperties.class, PlayerTag.class);
+        PropertyParser.registerProperty(EssentialsItemProperties.class, ItemTag.class);
     }
 
     public void tagEvent(ReplaceableTagEvent event) {
         Attribute attribute = event.getAttributes().fulfill(1);
 
         // <--[tag]
         // @attribute <essentials.warp[<warp name>]>
-        // @returns dLocation
+        // @returns LocationTag
         // @description
         // Returns the location of the warp name.
         // @Plugin Depenizen, Essentials
@@ -59,7 +59,7 @@ public void tagEvent(ReplaceableTagEvent event) {
                 Essentials essentials = (Essentials) plugin;
                 try {
                     Location loc = essentials.getWarps().getWarp(attribute.getContext(1));
-                    event.setReplacedObject(new dLocation(loc).getObjectAttribute(attribute.fulfill(1)));
+                    event.setReplacedObject(new LocationTag(loc).getObjectAttribute(attribute.fulfill(1)));
                 }
                 catch (WarpNotFoundException e) {
                     Debug.echoError("Warp not found");

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/FactionsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/FactionsBridge.java
@@ -7,9 +7,9 @@
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.FactionColl;
 import com.denizenscript.depenizen.bukkit.properties.factions.FactionsLocationProperties;
-import com.denizenscript.denizen.objects.dLocation;
-import com.denizenscript.denizen.objects.dNPC;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.LocationTag;
+import com.denizenscript.denizen.objects.NPCTag;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
@@ -26,9 +26,9 @@ public void init() {
             throw new BridgeLoadException("Only Factions 1.x.x is supported.");
         }
         ObjectFetcher.registerWithObjectFetcher(dFaction.class);
-        PropertyParser.registerProperty(FactionsPlayerNPCProperties.class, dNPC.class);
-        PropertyParser.registerProperty(FactionsPlayerNPCProperties.class, dPlayer.class);
-        PropertyParser.registerProperty(FactionsLocationProperties.class, dLocation.class);
+        PropertyParser.registerProperty(FactionsPlayerNPCProperties.class, NPCTag.class);
+        PropertyParser.registerProperty(FactionsPlayerNPCProperties.class, PlayerTag.class);
+        PropertyParser.registerProperty(FactionsLocationProperties.class, LocationTag.class);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
             public void run(ReplaceableTagEvent event) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/GriefPreventionBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/GriefPreventionBridge.java
@@ -3,8 +3,8 @@
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.depenizen.bukkit.properties.griefprevention.GriefPreventionPlayerProperties;
 import com.denizenscript.depenizen.bukkit.objects.griefprevention.GriefPreventionClaim;
-import com.denizenscript.denizen.objects.dLocation;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.LocationTag;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.depenizen.bukkit.events.griefprevention.GPClaimEnterEvent;
 import com.denizenscript.depenizen.bukkit.properties.griefprevention.GriefPreventionLocationProperties;
 import com.denizenscript.denizencore.events.ScriptEvent;
@@ -16,8 +16,8 @@ public class GriefPreventionBridge extends Bridge {
     @Override
     public void init() {
         ObjectFetcher.registerWithObjectFetcher(GriefPreventionClaim.class);
-        PropertyParser.registerProperty(GriefPreventionPlayerProperties.class, dPlayer.class);
-        PropertyParser.registerProperty(GriefPreventionLocationProperties.class, dLocation.class);
+        PropertyParser.registerProperty(GriefPreventionPlayerProperties.class, PlayerTag.class);
+        PropertyParser.registerProperty(GriefPreventionLocationProperties.class, LocationTag.class);
         ScriptEvent.registerScriptEvent(new GPClaimEnterEvent());
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/JobsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/JobsBridge.java
@@ -6,7 +6,7 @@
 import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJob;
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.container.Job;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.TagRunnable;
@@ -24,7 +24,7 @@ public class JobsBridge extends Bridge {
     public void init() {
         ObjectFetcher.registerWithObjectFetcher(JobsJob.class);
         PropertyParser.registerProperty(JobPlayer.class, JobsJob.class);
-        PropertyParser.registerProperty(JobsPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(JobsPlayerProperties.class, PlayerTag.class);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
             public void run(ReplaceableTagEvent event) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LibsDisguisesBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LibsDisguisesBridge.java
@@ -6,7 +6,7 @@
 import com.denizenscript.depenizen.bukkit.properties.libsdisguise.LibsDisguiseEntityProperties;
 import com.denizenscript.depenizen.bukkit.objects.libsdisguises.LibsDisguise;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dEntity;
+import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
@@ -19,7 +19,7 @@ public void init() {
         ScriptEvent.registerScriptEvent(new EntityDisguisesScriptEvent());
         ScriptEvent.registerScriptEvent(new EntityUndisguisesScriptEvent());
         ObjectFetcher.registerWithObjectFetcher(LibsDisguise.class);
-        PropertyParser.registerProperty(LibsDisguiseEntityProperties.class, dEntity.class);
+        PropertyParser.registerProperty(LibsDisguiseEntityProperties.class, EntityTag.class);
         DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(DisguiseCommand.class, "DISGUISE",
                 "disguise [remove/player/mob/misc] (type:<entity type>) (target:<entity>) (name:<text>) (baby:true/false) (id:<number>) (data:<number>) (self:true/false)", 1);
     }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LuckPermsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LuckPermsBridge.java
@@ -6,7 +6,7 @@
 import me.lucko.luckperms.LuckPerms;
 import me.lucko.luckperms.api.LuckPermsApi;
 import me.lucko.luckperms.api.Track;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.TagRunnable;
 import com.denizenscript.denizencore.objects.core.ListTag;
@@ -26,7 +26,7 @@ public void run(ReplaceableTagEvent event) {
             }
         }, "luckperms");
         ObjectFetcher.registerWithObjectFetcher(LuckPermsTrack.class);
-        PropertyParser.registerProperty(LuckPermsPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(LuckPermsPlayerProperties.class, PlayerTag.class);
     }
 
     public void tagEvent(ReplaceableTagEvent event) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MagicSpellsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MagicSpellsBridge.java
@@ -3,15 +3,15 @@
 import com.denizenscript.depenizen.bukkit.events.magicspells.*;
 import com.denizenscript.depenizen.bukkit.properties.magicspells.MagicSpellsPlayerProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 
 public class MagicSpellsBridge extends Bridge {
 
     @Override
     public void init() {
-        PropertyParser.registerProperty(MagicSpellsPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(MagicSpellsPlayerProperties.class, PlayerTag.class);
         ScriptEvent.registerScriptEvent(new SpellCastScriptEvent());
         ScriptEvent.registerScriptEvent(new SpellCastedScriptEvent());
         ScriptEvent.registerScriptEvent(new ManaChangeScriptEvent());

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/McMMOBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/McMMOBridge.java
@@ -6,8 +6,8 @@
 import com.denizenscript.depenizen.bukkit.properties.mcmmo.McMMOPlayerProperties;
 import com.denizenscript.depenizen.bukkit.objects.mcmmo.dParty;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dEntity;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.EntityTag;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.events.ScriptEvent;
@@ -29,8 +29,8 @@ public void run(ReplaceableTagEvent event) {
                 tagEvent(event);
             }
         }, "party");
-        PropertyParser.registerProperty(McMMOPlayerProperties.class, dPlayer.class);
-        PropertyParser.registerProperty(McMMOEntityProperties.class, dEntity.class);
+        PropertyParser.registerProperty(McMMOPlayerProperties.class, PlayerTag.class);
+        PropertyParser.registerProperty(McMMOEntityProperties.class, EntityTag.class);
         DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(McMMOCommand.class,
                 "MCMMO", "mcmmo [add/remove/set] [levels/xp/xprate/vampirism/hardcore/leader] (skill:<skill>) (state:{toggle}/true/false) (qty:<#>) (party:<party>)", 1);
         ScriptEvent.registerScriptEvent(new mcMMOPlayerLevelChangeScriptEvent());

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java
@@ -8,7 +8,7 @@
 import com.denizenscript.depenizen.bukkit.events.mobarena.MobArenaEndsScriptEvent;
 import com.denizenscript.depenizen.bukkit.properties.mobarena.MobArenaPlayerProperties;
 import com.denizenscript.depenizen.bukkit.objects.mobarena.MobArenaArena;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.events.ScriptEvent;
@@ -40,7 +40,7 @@ public void run(ReplaceableTagEvent event) {
         ScriptEvent.registerScriptEvent(new MobArenaStartsScriptEvent());
         ScriptEvent.registerScriptEvent(new MobArenaEndsScriptEvent());
         ScriptEvent.registerScriptEvent(new MobArenaWaveChangesScriptEvent());
-        PropertyParser.registerProperty(MobArenaPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(MobArenaPlayerProperties.class, PlayerTag.class);
     }
 
     public void tagEvent(ReplaceableTagEvent event) {

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java
@@ -4,7 +4,7 @@
 import com.denizenscript.depenizen.bukkit.commands.mythicmobs.MythicSpawnCommand;
 import com.denizenscript.depenizen.bukkit.properties.mythicmobs.MythicMobsEntityProperties;
 import com.denizenscript.depenizen.bukkit.objects.mythicmobs.MythicMobsMob;
-import com.denizenscript.denizen.objects.dEntity;
+import com.denizenscript.denizen.objects.EntityTag;
 import io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitAdapter;
 import io.lumine.xikage.mythicmobs.mobs.ActiveMob;
 import io.lumine.xikage.mythicmobs.mobs.MythicMob;
@@ -24,7 +24,7 @@ public class MythicMobsBridge extends Bridge {
     @Override
     public void init() {
         ObjectFetcher.registerWithObjectFetcher(MythicMobsMob.class);
-        PropertyParser.registerProperty(MythicMobsEntityProperties.class, dEntity.class);
+        PropertyParser.registerProperty(MythicMobsEntityProperties.class, EntityTag.class);
         ScriptEvent.registerScriptEvent(new MythicMobsDeathEvent());
         DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(MythicSpawnCommand.class,
                 "MYTHICSPAWN", "mythicspawn [<name>] [<location>] (level:<#>)", 2);

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/NoCheatPlusBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/NoCheatPlusBridge.java
@@ -1,14 +1,14 @@
 package com.denizenscript.depenizen.bukkit.bridges;
 
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.depenizen.bukkit.properties.nocheatplus.NoCheatPlusPlayerProperties;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 
 public class NoCheatPlusBridge extends Bridge {
 
     @Override
     public void init() {
-        PropertyParser.registerProperty(NoCheatPlusPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(NoCheatPlusPlayerProperties.class, PlayerTag.class);
     }
 }
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/NoteBlockAPIBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/NoteBlockAPIBridge.java
@@ -3,7 +3,7 @@
 import com.denizenscript.depenizen.bukkit.commands.noteblockapi.NBSCommand;
 import com.denizenscript.depenizen.bukkit.properties.noteblockapi.NoteBlockAPIPlayerProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dPlayer;
+import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 
@@ -12,7 +12,7 @@ public class NoteBlockAPIBridge extends Bridge {
     @Override
     public void init() {
 
-        PropertyParser.registerProperty(NoteBlockAPIPlayerProperties.class, dPlayer.class);
+        PropertyParser.registerProperty(NoteBlockAPIPlayerProperties.class, PlayerTag.class);
         DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(NBSCommand.class,
                 "NBS", "nbs [play/stop] (file:<file path>) [targets:<entity>|...]", 1);
     }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/OpenTerrainGeneratorBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/OpenTerrainGeneratorBridge.java
@@ -2,13 +2,13 @@
 
 import com.denizenscript.depenizen.bukkit.properties.terraincontrol.TCLocationProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
-import com.denizenscript.denizen.objects.dLocation;
+import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
 
 public class OpenTerrainGeneratorBridge extends Bridge {
 
     @Override
     public void init() {
-        PropertyParser.registerProperty(TCLocationProperties.class, dLocation.class);
+        PropertyParser.registerProperty(TCLocationProperties.class, LocationTag.class);
     }
 }