Skip to content

Commit

Permalink
Entity Properties Update - Part 1 (#2319)
Browse files Browse the repository at this point in the history 
* Update `EntityAge`

* Update `EntityAI` + `EntityAge` imports cleanup

* Update `EntityAnger` + remove `handledTags`

* Update `EntityArmorBonus`

* Update `EntityArms`

* Update `EntityArrowDamage` + remove arrow damage methods from EntityHelper

* Update `EntityAttributeBaseValues`

* Update `EntityAttributeModifiers`

* Update `EntityBasePlate`

* Update `EntityBeamTarget`

* Update `EntityBoatType`

* Update `EntityBodyArrows`

* Update `EntityBoundingBox`

* Quick fixes

* Update `EntityAge`

* Update `EntityAI` + `EntityAge` imports cleanup

* Update `EntityAnger` + remove `handledTags`

* Update `EntityArmorBonus`

* Update `EntityArms`

* Update `EntityArrowDamage` + remove arrow damage methods from EntityHelper

* Update `EntityAttributeBaseValues`

* Update `EntityAttributeModifiers`

* Update `EntityBasePlate`

* Update `EntityBeamTarget`

* Update `EntityBoatType`

* Update `EntityBodyArrows`

* Update `EntityBoundingBox`

* Quick fixes

* Update `EntityEquipment`

* `EntityAge` cleanups

* Cleanups
  • Loading branch information
@tal5
tal5 committed Feb 9, 2022
1 parent 9cecdb5 commit 5295572
Show file tree
Hide file tree
Showing 21 changed files with 337 additions and 527 deletions.
4 changes: 0 additions & 4 deletions plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java
View file
Expand Up @@ -56,10 +56,6 @@ public void setBodyArrows(Entity entity, int numArrows) {
((LivingEntity) entity).setArrowsInBody(numArrows);
}

public abstract double getArrowDamage(Entity arrow);

public abstract void setArrowDamage(Entity arrow, double damage);

public abstract String getArrowPickupStatus(Entity entity);

public abstract void setArrowPickupStatus(Entity entity, String status);
Expand Down
22 changes: 5 additions & 17 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java
View file
Expand Up @@ -5,7 +5,7 @@
import com.denizenscript.denizencore.objects.Mechanism;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.objects.properties.Property;
import com.denizenscript.denizencore.tags.Attribute;
import com.denizenscript.denizencore.objects.properties.PropertyParser;

public class EntityAI implements Property {

Expand All @@ -23,10 +23,6 @@ public static EntityAI getFrom(ObjectTag entity) {
}
}

public static final String[] handledTags = new String[] {
"has_ai"
};

public static final String[] handledMechs = new String[] {
"has_ai", "toggle_ai"
};
Expand All @@ -47,12 +43,7 @@ public String getPropertyId() {
return "has_ai";
}

@Override
public ObjectTag getObjectAttribute(Attribute attribute) {

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

// <--[tag]
// @attribute <EntityTag.has_ai>
Expand All @@ -65,12 +56,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// This generally shouldn't be used with NPCs. NPCs do not have vanilla AI, regardless of what this tag returns.
// Other programmatic methods of blocking AI might also not be accounted for by this tag.
// -->
if (attribute.startsWith("has_ai")) {
return new ElementTag(entity.getLivingEntity().hasAI())
.getObjectAttribute(attribute.fulfill(1));
}

return null;
PropertyParser.<EntityAI, ElementTag>registerTag(ElementTag.class, "has_ai", (attribute, object) -> {
return new ElementTag(object.entity.getLivingEntity().hasAI());
});
}

@Override
Expand Down
147 changes: 53 additions & 94 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java
View file
@@ -1,27 +1,22 @@
package com.denizenscript.denizen.objects.properties.entity;

import com.denizenscript.denizen.objects.EntityTag;
import com.denizenscript.denizencore.objects.ArgumentHelper;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.Mechanism;
import com.denizenscript.denizencore.objects.core.ListTag;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.objects.properties.Property;
import com.denizenscript.denizencore.tags.Attribute;
import net.citizensnpcs.api.npc.NPC;
import com.denizenscript.denizencore.objects.properties.PropertyParser;
import net.citizensnpcs.trait.Age;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Breedable;
import org.bukkit.entity.Zombie;

public class EntityAge implements Property {

public static boolean describes(ObjectTag entity) {
if (!(entity instanceof EntityTag)) {
return false;
}
// Check if entity is Ageable, or a Zombie
return (((EntityTag) entity).getBukkitEntity() instanceof Ageable)
|| (((EntityTag) entity).getBukkitEntity() instanceof Zombie);
return entity instanceof EntityTag
&& ((EntityTag) entity).getBukkitEntity() instanceof Ageable;
}

public static EntityAge getFrom(ObjectTag entity) {
Expand All @@ -33,10 +28,6 @@ public static EntityAge getFrom(ObjectTag entity) {
}
}

public static final String[] handledTags = new String[] {
"age", "is_age_locked", "is_baby"
};

public static final String[] handledMechs = new String[] {
"age_lock", "age"
};
Expand All @@ -47,84 +38,48 @@ private EntityAge(EntityTag entity) {

EntityTag ageable;

public boolean isBaby() {
return !((Ageable) ageable.getBukkitEntity()).isAdult();
}

public void setBaby(boolean bool) {
public void setAge(int val) {
if (ageable.isCitizensNPC()) {
NPC ageable_npc = ageable.getDenizenNPC().getCitizen();
if (!ageable_npc.hasTrait(Age.class)) {
ageable_npc.addTrait(Age.class);
}
ageable_npc.getOrAddTrait(Age.class).setAge(bool ? -24000 : 0);
ageable.getDenizenNPC().getCitizen().getOrAddTrait(Age.class).setAge(val);
}
else {
if (bool) {
((Ageable) ageable.getBukkitEntity()).setBaby();
}
else {
((Ageable) ageable.getBukkitEntity()).setAdult();
}
getAgeable().setAge(val);
}
}

public void setAge(int val) {
if (ageable.isCitizensNPC()) {
NPC ageable_npc = ageable.getDenizenNPC().getCitizen();
ageable_npc.getOrAddTrait(Age.class).setAge(val);
}
else {
if (ageable.getBukkitEntity() instanceof Zombie) {
setBaby(val < 0);
}
else {
((Ageable) ageable.getBukkitEntity()).setAge(val);
}
public void setLock(boolean bool) {
if (isBreedable()) {
getBreedable().setAgeLock(bool);
}
}

public int getAge() {
if (ageable.getBukkitEntity() instanceof Zombie) {
return ((Zombie) ageable.getBukkitEntity()).isAdult() ? 0 : -24000;
}
else {
return ((Ageable) ageable.getBukkitEntity()).getAge();
}
public boolean getLock() {
return !isBreedable() || getBreedable().getAgeLock();
}

public void setLock(boolean bool) {
if (ageable.getBukkitEntity() instanceof Breedable) {
((Breedable) ageable.getBukkitEntity()).setAgeLock(bool);
}
public boolean isBreedable() {
return ageable.getBukkitEntity() instanceof Breedable;
}

public boolean getLock() {
if (ageable.getBukkitEntity() instanceof Breedable) {
return ((Breedable) ageable.getBukkitEntity()).getAgeLock();
}
return true;
public Ageable getAgeable() {
return (Ageable) ageable.getBukkitEntity();
}

public Breedable getBreedable() {
return (Breedable) ageable.getBukkitEntity();
}

@Override
public String getPropertyString() {
if (ageable.getBukkitEntity() instanceof Zombie) {
return ((Zombie) ageable.getBukkitEntity()).isAdult() ? "adult" : "baby";
}
return getAge() + (getLock() ? "|locked" : "");
return getAgeable().getAge() + (getLock() ? "|locked" : "");
}

@Override
public String getPropertyId() {
return "age";
}

@Override
public ObjectTag getObjectAttribute(Attribute attribute) {

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

// <--[tag]
// @attribute <EntityTag.age>
Expand All @@ -138,10 +93,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// A standard adult is 0.
// An adult that just bred is 6000.
// -->
if (attribute.startsWith("age")) {
return new ElementTag(getAge())
.getObjectAttribute(attribute.fulfill(1));
}
PropertyParser.<EntityAge, ElementTag>registerTag(ElementTag.class, "age", (attribute, object) -> {
return new ElementTag(object.getAgeable().getAge());
});

// <--[tag]
// @attribute <EntityTag.is_age_locked>
Expand All @@ -151,10 +105,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// @description
// If the entity is ageable, returns whether the entity is age locked.
// -->
if (attribute.startsWith("is_age_locked")) {
return new ElementTag(getLock())
.getObjectAttribute(attribute.fulfill(1));
}
PropertyParser.<EntityAge, ElementTag>registerTag(ElementTag.class, "is_age_locked", (attribute, object) -> {
return new ElementTag(object.getLock());
});

// <--[tag]
// @attribute <EntityTag.is_baby>
Expand All @@ -164,12 +117,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// @description
// If the entity is ageable, returns whether the entity is a baby.
// -->
if (attribute.startsWith("is_baby")) {
return new ElementTag(isBaby())
.getObjectAttribute(attribute.fulfill(1));
}

return null;
PropertyParser.<EntityAge, ElementTag>registerTag(ElementTag.class, "is_baby", (attribute, object) -> {
return new ElementTag(!object.getAgeable().isAdult());
});
}

@Override
Expand All @@ -188,8 +138,7 @@ public void adjust(Mechanism mechanism) {
// <EntityTag.is_age_locked>
// <EntityTag.ageable>
// -->
if (mechanism.matches("age_lock")
&& mechanism.requireBoolean()) {
if (mechanism.matches("age_lock") && mechanism.requireBoolean()) {
setLock(mechanism.getValue().asBoolean());
}

Expand All @@ -209,26 +158,36 @@ public void adjust(Mechanism mechanism) {
// <EntityTag.is_age_locked>
// <EntityTag.ageable>
// -->
if (mechanism.matches("age")) {
if (mechanism.matches("age") && mechanism.requireObject(ListTag.class)) {
ListTag list = mechanism.valueAsType(ListTag.class);
if (list.isEmpty()) {
mechanism.echoError("Missing value for 'age' mechanism!");
return;
}
if (list.get(0).equalsIgnoreCase("baby")) {
setBaby(true);
String input = list.get(0);
if (input.equalsIgnoreCase("baby")) {
setAge(-24000);
}
else if (list.get(0).equalsIgnoreCase("adult")) {
setBaby(false);
else if (input.equalsIgnoreCase("adult")) {
setAge(0);
}
else if (new ElementTag(list.get(0)).isInt()) {
setAge(new ElementTag(list.get(0)).asInt());
else if (ArgumentHelper.matchesInteger(input)) {
setAge(new ElementTag(input).asInt());
}
if (list.size() > 1 && list.get(1).equalsIgnoreCase("locked")) {
setLock(true);
else {
mechanism.echoError("Invalid age '" + input + "': must be 'baby', 'adult', or a valid age number.");
}
else if (list.size() > 1 && list.get(1).equalsIgnoreCase("unlocked")) {
setLock(false);
if (list.size() > 1) {
input = list.get(1);
if (input.equalsIgnoreCase("locked")) {
setLock(true);
}
else if (input.equalsIgnoreCase("unlocked")) {
setLock(false);
}
else {
mechanism.echoError("Invalid lock state '" + input + "': must be 'locked' or 'unlocked'.");
}
}
}

Expand Down

0 comments on commit 5295572

Please sign in to comment.