Skip to content

Commit

Permalink
continued tag modernization work
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Sep 15, 2019
1 parent 265867d commit a837f41
Show file tree
Hide file tree
Showing 5 changed files with 162 additions and 201 deletions.
107 changes: 49 additions & 58 deletions plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
View file
Expand Up @@ -1328,8 +1328,7 @@ public boolean matchesEntity(String ent) {
return false;
}

@Override
public String getAttribute(Attribute attribute) {
public static void registerTags() {

// <--[tag]
// @attribute <EntityTag.type>
Expand Down Expand Up @@ -1804,61 +1803,6 @@ public ObjectTag run(Attribute attribute, ObjectTag object) {
}
});

// <--[tag]
// @attribute <EntityTag.location.cursor_on[<range>]>
// @returns LocationTag
// @group location
// @description
// Returns the location of the block the entity is looking at.
// Optionally, specify a maximum range to find the location from.
// -->
// <--[tag]
// @attribute <EntityTag.location.cursor_on[<range>].ignore[<material>|...]>
// @returns LocationTag
// @group location
// @description
// Returns the location of the block the entity is looking at, ignoring
// the specified materials along the way. Note that air is always an
// ignored material.
// Optionally, specify a maximum range to find the location from.
// -->
registerSpawnedOnlyTag("location.cursor_on", new TagRunnable.ObjectForm() {
@Override
public ObjectTag run(Attribute attribute, ObjectTag object) {
int range = attribute.getIntContext(2);
if (range < 1) {
range = 50;
}
Set<Material> set = new HashSet<>();
set.add(Material.AIR);
attribute = attribute.fulfill(2);
if (attribute.startsWith("ignore") && attribute.hasContext(1)) {
List<MaterialTag> ignoreList = ListTag.valueOf(attribute.getContext(1)).filter(MaterialTag.class, attribute.context);
for (MaterialTag material : ignoreList) {
set.add(material.getMaterial());
}
attribute = attribute.fulfill(1);
}
return new LocationTag(getTargetBlockSafe(set, range)).getObjectAttribute(attribute);
}
});

// <--[tag]
// @attribute <EntityTag.location.standing_on>
// @returns LocationTag
// @group location
// @description
// Returns the location of what the entity is standing on.
// Works with offline players.
// -->
registerSpawnedOnlyTag("location.standing_on", new TagRunnable.ObjectForm() {
@Override
public ObjectTag run(Attribute attribute, ObjectTag object) {
return new LocationTag(entity.getLocation().clone().add(0, -0.5f, 0))
.getObjectAttribute(attribute.fulfill(2));
}
});

// <--[tag]
// @attribute <EntityTag.location>
// @returns LocationTag
Expand All @@ -1870,7 +1814,54 @@ public ObjectTag run(Attribute attribute, ObjectTag object) {
registerSpawnedOnlyTag("location", new TagRunnable.ObjectForm() {
@Override
public ObjectTag run(Attribute attribute, ObjectTag object) {
return new LocationTag(entity.getLocation())
// <--[tag]
// @attribute <EntityTag.location.cursor_on[<range>]>
// @returns LocationTag
// @group location
// @description
// Returns the location of the block the entity is looking at.
// Optionally, specify a maximum range to find the location from.
// -->
if (attribute.getAttributeWithoutContext(2).equals("cursor_on")) {
int range = attribute.getIntContext(2);
if (range < 1) {
range = 50;
}
Set<Material> set = new HashSet<>();
set.add(Material.AIR);
attribute = attribute.fulfill(2);
// <--[tag]
// @attribute <EntityTag.location.cursor_on[<range>].ignore[<material>|...]>
// @returns LocationTag
// @group location
// @description
// Returns the location of the block the entity is looking at, ignoring
// the specified materials along the way. Note that air is always an
// ignored material.
// Optionally, specify a maximum range to find the location from.
// -->
if (attribute.startsWith("ignore") && attribute.hasContext(1)) {
List<MaterialTag> ignoreList = ListTag.valueOf(attribute.getContext(1)).filter(MaterialTag.class, attribute.context);
for (MaterialTag material : ignoreList) {
set.add(material.getMaterial());
}
attribute = attribute.fulfill(1);
}
return new LocationTag(((EntityTag) object).getTargetBlockSafe(set, range)).getObjectAttribute(attribute);
}
// <--[tag]
// @attribute <EntityTag.location.standing_on>
// @returns LocationTag
// @group location
// @description
// Returns the location of what the entity is standing on.
// Works with offline players.
// -->
if (attribute.getAttributeWithoutContext(2).equals("standing_on")) {
return new LocationTag(((EntityTag) object).entity.getLocation().clone().add(0, -0.5f, 0))
.getObjectAttribute(attribute.fulfill(2));
}
return new LocationTag(((EntityTag) object).entity.getLocation())
.getObjectAttribute(attribute.fulfill(1));
}
});
Expand Down
6 changes: 1 addition & 5 deletions plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
View file
Expand Up @@ -1270,11 +1270,7 @@ public String toString() {
/////////////////////


public String getAttribute(Attribute attribute) {

if (attribute == null) {
return null;
}
public static void registerTags() {

// <--[tag]
// @attribute <InventoryTag.empty_slots>
Expand Down
7 changes: 1 addition & 6 deletions plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
View file
Expand Up @@ -752,12 +752,7 @@ public String toString() {
return identify();
}

@Override
public String getAttribute(Attribute attribute) {
if (attribute == null) {
return null;
}

public static void registerTags() {

/////////////////////
// BLOCK ATTRIBUTES
Expand Down
7 changes: 1 addition & 6 deletions plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
View file
Expand Up @@ -446,12 +446,7 @@ public int hashCode() {
return getId();
}

@Override
public String getAttribute(Attribute attribute) {

if (attribute == null) {
return null;
}
public static void registerTags() {

// Defined in EntityTag
registerTag("is_npc", new TagRunnable.ObjectForm() {
Expand Down

0 comments on commit a837f41

Please sign in to comment.