property impls for tag return type registration

DenizenScript · Oct 20, 2021 · f894e8e · f894e8e
1 parent 9535900
commit f894e8e
Show file tree

Hide file tree

Showing 54 changed files with 117 additions and 116 deletions.
diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityCanTick.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityCanTick.java
@@ -53,7 +53,7 @@ public static void registerTags() {
         // @description
         // If the entity is an armor stand, returns whether the armor stand can tick.
         // -->
-        PropertyParser.<EntityCanTick>registerTag("can_tick", (attribute, entity) -> {
+        PropertyParser.<EntityCanTick, ElementTag>registerTag(ElementTag.class, "can_tick", (attribute, entity) -> {
             return new ElementTag(((ArmorStand) entity.entity.getBukkitEntity()).canTick());
         });
     }

diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityExperienceOrb.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityExperienceOrb.java
@@ -55,7 +55,7 @@ public static void registerTags() {
         // If the entity is an experience orb, returns its spawn reason.
         // Valid spawn reasons can be found at <@link url https://papermc.io/javadocs/paper/org/bukkit/entity/ExperienceOrb.SpawnReason.html>
         // -->
-        PropertyParser.<EntityExperienceOrb>registerTag("xp_spawn_reason", (attribute, entity) -> {
+        PropertyParser.<EntityExperienceOrb, ElementTag>registerTag(ElementTag.class, "xp_spawn_reason", (attribute, entity) -> {
             return new ElementTag(((ExperienceOrb) entity.entity.getBukkitEntity()).getSpawnReason().name());
         });
 
@@ -68,7 +68,7 @@ public static void registerTags() {
         // If the entity is an experience orb, returns the entity that triggered it spawning (if any).
         // For example, if a player killed an entity this would return the player.
         // -->
-        PropertyParser.<EntityExperienceOrb>registerTag("xp_trigger", (attribute, entity) -> {
+        PropertyParser.<EntityExperienceOrb, EntityTag>registerTag(EntityTag.class, "xp_trigger", (attribute, entity) -> {
             UUID uuid = ((ExperienceOrb) entity.entity.getBukkitEntity()).getTriggerEntityId();
             if (uuid == null) {
                 return null;
@@ -89,7 +89,7 @@ public static void registerTags() {
         // If the entity is an experience orb, returns the entity that it was created from (if any).
         // For example, if the xp orb was spawned from breeding this would return the baby.
         // -->
-        PropertyParser.<EntityExperienceOrb>registerTag("xp_source", (attribute, entity) -> {
+        PropertyParser.<EntityExperienceOrb, EntityTag>registerTag(EntityTag.class, "xp_source", (attribute, entity) -> {
             UUID uuid = ((ExperienceOrb) entity.entity.getBukkitEntity()).getSourceEntityId();
             if (uuid == null) {
                 return null;

diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityFromSpawner.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntityFromSpawner.java
@@ -49,7 +49,7 @@ public static void registerTags() {
         // @description
         // Returns whether the entity was spawned from a spawner.
         // -->
-        PropertyParser.<EntityFromSpawner>registerTag("from_spawner", (attribute, entity) -> {
+        PropertyParser.<EntityFromSpawner, ElementTag>registerTag(ElementTag.class, "from_spawner", (attribute, entity) -> {
             return new ElementTag(entity.entity.getBukkitEntity().fromMobSpawner());
         });
     }

diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntitySpawnLocation.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/EntitySpawnLocation.java
@@ -50,7 +50,7 @@ public static void registerTags() {
         // @description
         // Returns the initial spawn location of this entity.
         // -->
-        PropertyParser.<EntitySpawnLocation>registerTag("spawn_location", (attribute, entity) -> {
+        PropertyParser.<EntitySpawnLocation, LocationTag>registerTag(LocationTag.class, "spawn_location", (attribute, entity) -> {
             Location loc = entity.entity.getBukkitEntity().getOrigin();
             return loc != null ? new LocationTag(loc) : null;
         });

diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/PaperItemTagProperties.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/PaperItemTagProperties.java
@@ -48,7 +48,7 @@ public static void registerTags() {
         // @description
         // Returns the rarity of an item, as "common", "uncommon", "rare", or "epic".
         // -->
-        PropertyParser.<PaperItemTagProperties>registerTag("rarity", (attribute, item) -> {
+        PropertyParser.<PaperItemTagProperties, ElementTag>registerTag(ElementTag.class, "rarity", (attribute, item) -> {
             return new ElementTag(item.item.getItemStack().getRarity().name());
         });
     }

diff --git a/...rc/main/java/com/denizenscript/denizen/paper/properties/PlayerAffectsMonsterSpawning.java b/...rc/main/java/com/denizenscript/denizen/paper/properties/PlayerAffectsMonsterSpawning.java
@@ -51,7 +51,7 @@ public static void registerTags() {
         // @description
         // Returns whether the player affects monster spawning. When false, no monsters will spawn naturally because of this player.
         // -->
-        PropertyParser.<PlayerAffectsMonsterSpawning>registerTag("affects_monster_spawning", (attribute, player) -> {
+        PropertyParser.<PlayerAffectsMonsterSpawning, ElementTag>registerTag(ElementTag.class, "affects_monster_spawning", (attribute, player) -> {
             return new ElementTag(player.player.getPlayerEntity().getAffectsSpawning());
         });
     }

diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/properties/WorldViewDistance.java b/paper/src/main/java/com/denizenscript/denizen/paper/properties/WorldViewDistance.java
@@ -52,7 +52,7 @@ public static void registerTags() {
         // @description
         // Returns the view distance of this world. Chunks are tracked inside this radius.
         // -->
-        PropertyParser.<WorldViewDistance>registerTag("view_distance", (attribute, world) -> {
+        PropertyParser.<WorldViewDistance, ElementTag>registerTag(ElementTag.class, "view_distance", (attribute, world) -> {
             return new ElementTag(world.world.getWorld().getViewDistance());
         });
 
@@ -66,7 +66,7 @@ public static void registerTags() {
         // Returns the non-ticking view distance of this world. Chunks will not be tracked between the world's view distance and its non-ticking view distance.
         // This allows your world to have a higher visual view distance without impacting performance.
         // -->
-        PropertyParser.<WorldViewDistance>registerTag("no_tick_view_distance", (attribute, world) -> {
+        PropertyParser.<WorldViewDistance, ElementTag>registerTag(ElementTag.class, "no_tick_view_distance", (attribute, world) -> {
             return new ElementTag(world.world.getWorld().getNoTickViewDistance());
         });
     }