object renames to ObjectTag form

DenizenScript · Jul 13, 2019 · 93786de · 93786de
1 parent a2a0cfc
commit 93786de
Show file tree

Hide file tree

Showing 84 changed files with 519 additions and 519 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/AreaShopBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/AreaShopBridge.java
@@ -3,7 +3,7 @@
 import com.denizenscript.depenizen.bukkit.Bridge;
 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.depenizen.bukkit.objects.areashop.AreaShopTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.events.ScriptEvent;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
@@ -13,7 +13,7 @@ public class AreaShopBridge extends Bridge {
 
     @Override
     public void init() {
-        ObjectFetcher.registerWithObjectFetcher(dAreaShop.class);
+        ObjectFetcher.registerWithObjectFetcher(AreaShopTag.class);
         PropertyParser.registerProperty(AreaShopPlayerProperties.class, PlayerTag.class);
         ScriptEvent.registerScriptEvent(new AreaShopExpiresScriptEvent());
     }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/FactionsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/FactionsBridge.java
@@ -1,7 +1,7 @@
 package com.denizenscript.depenizen.bukkit.bridges;
 
 import com.denizenscript.depenizen.bukkit.properties.factions.FactionsPlayerNPCProperties;
-import com.denizenscript.depenizen.bukkit.factions.dFaction;
+import com.denizenscript.depenizen.bukkit.objects.factions.FactionTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.depenizen.bukkit.utilities.BridgeLoadException;
 import com.massivecraft.factions.entity.Faction;
@@ -25,7 +25,7 @@ public void init() {
         if (plugin.getDescription().getVersion().startsWith("1.")) {
             throw new BridgeLoadException("Only Factions 1.x.x is supported.");
         }
-        ObjectFetcher.registerWithObjectFetcher(dFaction.class);
+        ObjectFetcher.registerWithObjectFetcher(FactionTag.class);
         PropertyParser.registerProperty(FactionsPlayerNPCProperties.class, NPCTag.class);
         PropertyParser.registerProperty(FactionsPlayerNPCProperties.class, PlayerTag.class);
         PropertyParser.registerProperty(FactionsLocationProperties.class, LocationTag.class);
@@ -47,7 +47,7 @@ public void factionTagEvent(ReplaceableTagEvent event) {
         Attribute attribute = event.getAttributes().fulfill(1);
         // <--[tag]
         // @attribute <faction[<name>]>
-        // @returns dFaction
+        // @returns FactionTag
         // @description
         // Returns the faction for the input name.
         // @Plugin Depenizen, Factions
@@ -58,7 +58,7 @@ public void factionTagEvent(ReplaceableTagEvent event) {
             f = FactionColl.get().get(nameOrId);
         }
         if (f != null) {
-            event.setReplacedObject(new dFaction(f).getObjectAttribute(attribute.fulfill(1)));
+            event.setReplacedObject(new FactionTag(f).getObjectAttribute(attribute.fulfill(1)));
         }
 
     }
@@ -76,7 +76,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         if (attribute.startsWith("list_factions")) {
             ListTag factions = new ListTag();
             for (Faction f : FactionColl.get().getAll()) {
-                factions.addObject(new dFaction(f));
+                factions.addObject(new FactionTag(f));
             }
             event.setReplacedObject(factions.getObjectAttribute(attribute.fulfill(1)));
         }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/GriefPreventionBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/GriefPreventionBridge.java
@@ -2,7 +2,7 @@
 
 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.depenizen.bukkit.objects.griefprevention.GriefPreventionClaimTag;
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.depenizen.bukkit.events.griefprevention.GPClaimEnterEvent;
@@ -15,7 +15,7 @@ public class GriefPreventionBridge extends Bridge {
 
     @Override
     public void init() {
-        ObjectFetcher.registerWithObjectFetcher(GriefPreventionClaim.class);
+        ObjectFetcher.registerWithObjectFetcher(GriefPreventionClaimTag.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
@@ -3,7 +3,7 @@
 import com.denizenscript.depenizen.bukkit.properties.jobs.JobPlayer;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.depenizen.bukkit.commands.jobs.JobsCommand;
-import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJob;
+import com.denizenscript.depenizen.bukkit.objects.jobs.JobsJobTag;
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.container.Job;
 import com.denizenscript.denizen.objects.PlayerTag;
@@ -22,8 +22,8 @@ public class JobsBridge extends Bridge {
 
     @Override
     public void init() {
-        ObjectFetcher.registerWithObjectFetcher(JobsJob.class);
-        PropertyParser.registerProperty(JobPlayer.class, JobsJob.class);
+        ObjectFetcher.registerWithObjectFetcher(JobsJobTag.class);
+        PropertyParser.registerProperty(JobPlayer.class, JobsJobTag.class);
         PropertyParser.registerProperty(JobsPlayerProperties.class, PlayerTag.class);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
@@ -38,12 +38,12 @@ public void run(ReplaceableTagEvent event) {
     public void tagEvent(ReplaceableTagEvent event) {
         Attribute attribute = event.getAttributes();
 
-        JobsJob j = null;
+        JobsJobTag j = null;
 
         if (attribute.hasContext(1)) {
             // Documented below.
-            if (JobsJob.matches(attribute.getContext(1))) {
-                j = JobsJob.valueOf(attribute.getContext(1));
+            if (JobsJobTag.matches(attribute.getContext(1))) {
+                j = JobsJobTag.valueOf(attribute.getContext(1));
             }
             else {
                 Debug.echoError("Could not match '" + attribute.getContext(1) + "' to a valid job!");
@@ -60,7 +60,7 @@ public void tagEvent(ReplaceableTagEvent event) {
             // -->
             ListTag jobList = new ListTag();
             for (Job jb : Jobs.getJobs()) {
-                jobList.add(new JobsJob(jb).identify());
+                jobList.add(new JobsJobTag(jb).identify());
             }
             event.setReplacedObject(jobList.getObjectAttribute(attribute.fulfill(1)));
         }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LibsDisguisesBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/LibsDisguisesBridge.java
@@ -4,7 +4,7 @@
 import com.denizenscript.depenizen.bukkit.events.libsdisguises.EntityDisguisesScriptEvent;
 import com.denizenscript.depenizen.bukkit.events.libsdisguises.EntityUndisguisesScriptEvent;
 import com.denizenscript.depenizen.bukkit.properties.libsdisguise.LibsDisguiseEntityProperties;
-import com.denizenscript.depenizen.bukkit.objects.libsdisguises.LibsDisguise;
+import com.denizenscript.depenizen.bukkit.objects.libsdisguises.LibsDisguiseTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
@@ -18,7 +18,7 @@ public class LibsDisguisesBridge extends Bridge {
     public void init() {
         ScriptEvent.registerScriptEvent(new EntityDisguisesScriptEvent());
         ScriptEvent.registerScriptEvent(new EntityUndisguisesScriptEvent());
-        ObjectFetcher.registerWithObjectFetcher(LibsDisguise.class);
+        ObjectFetcher.registerWithObjectFetcher(LibsDisguiseTag.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
@@ -1,7 +1,7 @@
 package com.denizenscript.depenizen.bukkit.bridges;
 
 import com.denizenscript.depenizen.bukkit.properties.luckperms.LuckPermsPlayerProperties;
-import com.denizenscript.depenizen.bukkit.objects.luckperms.LuckPermsTrack;
+import com.denizenscript.depenizen.bukkit.objects.luckperms.LuckPermsTrackTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import me.lucko.luckperms.LuckPerms;
 import me.lucko.luckperms.api.LuckPermsApi;
@@ -25,7 +25,7 @@ public void run(ReplaceableTagEvent event) {
                 tagEvent(event);
             }
         }, "luckperms");
-        ObjectFetcher.registerWithObjectFetcher(LuckPermsTrack.class);
+        ObjectFetcher.registerWithObjectFetcher(LuckPermsTrackTag.class);
         PropertyParser.registerProperty(LuckPermsPlayerProperties.class, PlayerTag.class);
     }
 
@@ -43,7 +43,7 @@ public void tagEvent(ReplaceableTagEvent event) {
             ListTag tracks = new ListTag();
             LuckPermsApi api = LuckPerms.getApi();
             for (Track track : api.getTracks()) {
-                tracks.add(new LuckPermsTrack(track).identify());
+                tracks.add(new LuckPermsTrackTag(track).identify());
             }
             event.setReplacedObject(tracks.getObjectAttribute(attribute.fulfill(1)));
         }
@@ -58,7 +58,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         if (attribute.startsWith("track")) {
             if (attribute.hasContext(1)) {
                 LuckPermsApi api = LuckPerms.getApi();
-                event.setReplacedObject(new LuckPermsTrack(api.getTrack(attribute.getContext(1))).getObjectAttribute(attribute.fulfill(1)));
+                event.setReplacedObject(new LuckPermsTrackTag(api.getTrack(attribute.getContext(1))).getObjectAttribute(attribute.fulfill(1)));
             }
         }
     }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/McMMOBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/McMMOBridge.java
@@ -4,7 +4,7 @@
 import com.denizenscript.depenizen.bukkit.events.mcmmo.*;
 import com.denizenscript.depenizen.bukkit.properties.mcmmo.McMMOEntityProperties;
 import com.denizenscript.depenizen.bukkit.properties.mcmmo.McMMOPlayerProperties;
-import com.denizenscript.depenizen.bukkit.objects.mcmmo.dParty;
+import com.denizenscript.depenizen.bukkit.objects.mcmmo.PartyTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.objects.PlayerTag;
@@ -22,7 +22,7 @@ public class McMMOBridge extends Bridge {
 
     @Override
     public void init() {
-        ObjectFetcher.registerWithObjectFetcher(dParty.class);
+        ObjectFetcher.registerWithObjectFetcher(PartyTag.class);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
             public void run(ReplaceableTagEvent event) {
@@ -45,7 +45,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         Attribute attribute = event.getAttributes();
 
         if (attribute.startsWith("party") && attribute.hasContext(1)) {
-            dParty party = dParty.valueOf(attribute.getContext(1));
+            PartyTag party = PartyTag.valueOf(attribute.getContext(1));
             if (party != null) {
                 event.setReplacedObject(party.getObjectAttribute(attribute.fulfill(1)));
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MobArenaBridge.java
@@ -7,7 +7,7 @@
 import com.denizenscript.depenizen.bukkit.commands.mobarena.MobArenaCommand;
 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.depenizen.bukkit.objects.mobarena.MobArenaArenaTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizen.utilities.debugging.Debug;
@@ -28,7 +28,7 @@ public class MobArenaBridge extends Bridge {
     @Override
     public void init() {
         instance = this;
-        ObjectFetcher.registerWithObjectFetcher(MobArenaArena.class);
+        ObjectFetcher.registerWithObjectFetcher(MobArenaArenaTag.class);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
             public void run(ReplaceableTagEvent event) {
@@ -54,7 +54,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         // @Plugin Depenizen, MobArena
         // -->
         if (attribute.hasContext(1)) {
-            MobArenaArena arena = MobArenaArena.valueOf(attribute.getContext(1));
+            MobArenaArenaTag arena = MobArenaArenaTag.valueOf(attribute.getContext(1));
             if (arena != null) {
                 event.setReplacedObject(arena.getObjectAttribute(attribute.fulfill(1)));
             }
@@ -79,7 +79,7 @@ else if (!event.hasAlternative()) {
                 if (((MobArena) plugin).getArenaMaster().getArenaWithName(a.configName()) == null) {
                     continue;
                 }
-                arenas.add(new MobArenaArena(a).identify());
+                arenas.add(new MobArenaArenaTag(a).identify());
             }
             event.setReplacedObject(arenas.getObjectAttribute(attribute.fulfill(1)));
         }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/MythicMobsBridge.java
@@ -3,7 +3,7 @@
 import com.denizenscript.depenizen.bukkit.Bridge;
 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.depenizen.bukkit.objects.mythicmobs.MythicMobsMobTag;
 import com.denizenscript.denizen.objects.EntityTag;
 import io.lumine.xikage.mythicmobs.adapters.bukkit.BukkitAdapter;
 import io.lumine.xikage.mythicmobs.mobs.ActiveMob;
@@ -23,7 +23,7 @@ public class MythicMobsBridge extends Bridge {
 
     @Override
     public void init() {
-        ObjectFetcher.registerWithObjectFetcher(MythicMobsMob.class);
+        ObjectFetcher.registerWithObjectFetcher(MythicMobsMobTag.class);
         PropertyParser.registerProperty(MythicMobsEntityProperties.class, EntityTag.class);
         ScriptEvent.registerScriptEvent(new MythicMobsDeathEvent());
         DenizenAPI.getCurrentInstance().getCommandRegistry().registerCoreMember(MythicSpawnCommand.class,

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PVPArenaBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/PVPArenaBridge.java
@@ -5,7 +5,7 @@
 import com.denizenscript.depenizen.bukkit.events.pvparena.PlayerLeavesPVPArenaScriptEvent;
 import com.denizenscript.depenizen.bukkit.events.pvparena.PVPArenaStartsScriptEvent;
 import com.denizenscript.depenizen.bukkit.properties.pvparena.PVPArenaPlayerProperties;
-import com.denizenscript.depenizen.bukkit.objects.pvparena.PVPArenaArena;
+import com.denizenscript.depenizen.bukkit.objects.pvparena.PVPArenaArenaTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.debugging.Debug;
@@ -29,7 +29,7 @@ public void init() {
         ScriptEvent.registerScriptEvent(new PlayerLeavesPVPArenaScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerExitsPVPArenaScriptEvent());
         PropertyParser.registerProperty(PVPArenaPlayerProperties.class, PlayerTag.class);
-        ObjectFetcher.registerWithObjectFetcher(PVPArenaArena.class);
+        ObjectFetcher.registerWithObjectFetcher(PVPArenaArenaTag.class);
         TagManager.registerTagHandler(new TagRunnable.RootForm() {
             @Override
             public void run(ReplaceableTagEvent event) {
@@ -49,7 +49,7 @@ public void tagEvent(ReplaceableTagEvent event) {
         // @Plugin Depenizen, PVPArena
         // -->
         if (attribute.hasContext(1)) {
-            PVPArenaArena arena = PVPArenaArena.valueOf(attribute.getContext(1));
+            PVPArenaArenaTag arena = PVPArenaArenaTag.valueOf(attribute.getContext(1));
             if (arena != null) {
                 event.setReplacedObject(arena.getObjectAttribute(attribute.fulfill(1)));
             }
@@ -70,7 +70,7 @@ else if (!event.hasAlternative()) {
         if (attribute.startsWith("list_arenas")) {
             ListTag arenas = new ListTag();
             for (Arena a : ArenaManager.getArenas()) {
-                arenas.add(new PVPArenaArena(a).identify());
+                arenas.add(new PVPArenaArenaTag(a).identify());
             }
             event.setReplacedObject(arenas.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
@@ -7,7 +7,7 @@
 import com.denizenscript.depenizen.bukkit.properties.plotsquared.PlotSquaredElementProperties;
 import com.denizenscript.depenizen.bukkit.properties.plotsquared.PlotSquaredLocationProperties;
 import com.denizenscript.depenizen.bukkit.properties.plotsquared.PlotSquaredPlayerProperties;
-import com.denizenscript.depenizen.bukkit.objects.plotsquared.dPlotSquaredPlot;
+import com.denizenscript.depenizen.bukkit.objects.plotsquared.PlotSquaredPlotTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.PlayerTag;
@@ -24,7 +24,7 @@ public void init() {
         ScriptEvent.registerScriptEvent(new PlayerLeavePlotScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerClaimPlotScriptEvent());
         ScriptEvent.registerScriptEvent(new PlotClearScriptEvent());
-        ObjectFetcher.registerWithObjectFetcher(dPlotSquaredPlot.class);
+        ObjectFetcher.registerWithObjectFetcher(PlotSquaredPlotTag.class);
         PropertyParser.registerProperty(PlotSquaredPlayerProperties.class, PlayerTag.class);
         PropertyParser.registerProperty(PlotSquaredElementProperties.class, ElementTag.class);
         PropertyParser.registerProperty(PlotSquaredLocationProperties.class, LocationTag.class);

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/ResidenceBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/ResidenceBridge.java
@@ -5,7 +5,7 @@
 import com.denizenscript.depenizen.bukkit.properties.residence.ResidencePlayerProperties;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.depenizen.bukkit.events.residence.PlayerEntersResidenceScriptEvent;
-import com.denizenscript.depenizen.bukkit.objects.residence.dResidence;
+import com.denizenscript.depenizen.bukkit.objects.residence.ResidenceTag;
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizencore.events.ScriptEvent;
@@ -16,7 +16,7 @@ public class ResidenceBridge extends Bridge {
 
     @Override
     public void init() {
-        ObjectFetcher.registerWithObjectFetcher(dResidence.class);
+        ObjectFetcher.registerWithObjectFetcher(ResidenceTag.class);
         PropertyParser.registerProperty(ResidencePlayerProperties.class, PlayerTag.class);
         PropertyParser.registerProperty(ResidenceLocationProperties.class, LocationTag.class);
         ScriptEvent.registerScriptEvent(new PlayerEntersResidenceScriptEvent());

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/ShopkeepersBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/ShopkeepersBridge.java
@@ -2,7 +2,7 @@
 
 import com.denizenscript.depenizen.bukkit.events.shopkeepers.ShopKeeperTradeScriptEvent;
 import com.denizenscript.depenizen.bukkit.properties.shopkeepers.ShopKeepersEntityProperties;
-import com.denizenscript.depenizen.bukkit.objects.shopkeepers.ShopKeeper;
+import com.denizenscript.depenizen.bukkit.objects.shopkeepers.ShopKeeperTag;
 import com.denizenscript.depenizen.bukkit.Bridge;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizencore.events.ScriptEvent;
@@ -16,7 +16,7 @@ public class ShopkeepersBridge extends Bridge {
     @Override
     public void init() {
         instance = this;
-        ObjectFetcher.registerWithObjectFetcher(ShopKeeper.class);
+        ObjectFetcher.registerWithObjectFetcher(ShopKeeperTag.class);
         ScriptEvent.registerScriptEvent(new ShopKeeperTradeScriptEvent());
         PropertyParser.registerProperty(ShopKeepersEntityProperties.class, EntityTag.class);
     }