Skip to content

Added Zombie Nautiluses to the EntityTag.Variant Property #2801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MC-Samuel wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −2
Open

Added Zombie Nautiluses to the EntityTag.Variant Property #2801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVariant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ public class EntityVariant extends EntityProperty<ElementTag> {
// @name variant
// @input ElementTag
// @description
// Controls which variant a chicken, copper golem, cow, pig, or wolf is.
// Controls which variant a chicken, copper golem, cow, pig, wolf, or zombie nautilus is.
// A list of valid chicken variants can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/Chicken.Variant.html>.
// A list of valid copper golem variants can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/CopperGolem.CopperWeatherState.html>.
// A list of valid cow variants can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/Cow.Variant.html>.
// A list of valid pig variants can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/Pig.Variant.html>.
// A list of valid wolf variants can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/Wolf.Variant.html>.
// A list of valid zombie nautilus variants can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/ZombieNautilus.Variant.html>.
// -->

public static boolean describes(EntityTag entityTag) {
Expand All @@ -49,7 +50,8 @@ public static boolean describes(EntityTag entityTag) {
|| (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && (entity instanceof Chicken
|| entity instanceof CopperGolem
|| entity instanceof Cow
|| entity instanceof Pig));
|| entity instanceof Pig
|| entity instanceof ZombieNautilus));
}

@Override
Expand All @@ -76,6 +78,9 @@ else if (COW_GET_VARIANT != null && getEntity() instanceof Cow cow) {
else if (getEntity() instanceof Pig pig) {
return new ElementTag(Utilities.namespacedKeyToString(pig.getVariant().getKey()), true);
}
else if (getEntity() instanceof ZombieNautilus zombieNautilus) {
return new ElementTag(Utilities.namespacedKeyToString(zombieNautilus.getVariant().getKey()), true);
}
}
return null;
}
Expand Down Expand Up @@ -115,6 +120,12 @@ else if (getEntity() instanceof Pig pig) {
pig.setVariant(pigVariant);
}
}
else if (getEntity() instanceof ZombieNautilus zombieNautilus) {
ZombieNautilus.Variant zombieNautilusVariant= Utilities.elementToRequiredEnumLike(variant, ZombieNautilus.Variant.class, mechanism);
if (zombieNautilusVariant != null) {
zombieNautilus.setVariant(zombieNautilusVariant);
}
}
}
}

Expand Down