diff --git a/src/main/java/me/youhavetrouble/entiddy/Entiddy.java b/src/main/java/me/youhavetrouble/entiddy/Entiddy.java index 96096cf..ab57f1b 100644 --- a/src/main/java/me/youhavetrouble/entiddy/Entiddy.java +++ b/src/main/java/me/youhavetrouble/entiddy/Entiddy.java @@ -40,6 +40,9 @@ public enum Entiddy { entity.setCustomName("Grumm"); } + /** + * @return True if entity is one of special/easter egg entities + */ public static boolean isSpecialEntity(@NotNull LivingEntity entity) { if (entity instanceof Player) return false; for (Entiddy enTiddy: Entiddy.values()) { diff --git a/src/main/java/me/youhavetrouble/entiddy/EntiddyInterface.java b/src/main/java/me/youhavetrouble/entiddy/EntiddyInterface.java index 5f20ec1..9bf89f2 100644 --- a/src/main/java/me/youhavetrouble/entiddy/EntiddyInterface.java +++ b/src/main/java/me/youhavetrouble/entiddy/EntiddyInterface.java @@ -15,6 +15,9 @@ public interface EntiddyInterface { */ Entity spawn(@NotNull Location location, @NotNull CreatureSpawnEvent.SpawnReason spawnReason); - boolean isInstance(LivingEntity entity); + /** + * @return True if the entity is an instance of the specific special/easter egg type + */ + boolean isInstance(@NotNull LivingEntity entity); } diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java index 708529a..581cf8f 100644 --- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java +++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java @@ -20,7 +20,7 @@ public class JebSheep implements EntiddyInterface { } @Override - public boolean isInstance(LivingEntity entity) { + public boolean isInstance(@NotNull LivingEntity entity) { if (!(entity instanceof Rabbit)) return false; return entity.getCustomName() != null && entity.getCustomName().equals("jeb_"); } diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Johnny.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Johnny.java index 0d874ef..8c390bf 100644 --- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Johnny.java +++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Johnny.java @@ -22,7 +22,7 @@ public class Johnny implements EntiddyInterface { } @Override - public boolean isInstance(LivingEntity entity) { + public boolean isInstance(@NotNull LivingEntity entity) { if (!(entity instanceof Vindicator)) return false; return ((Vindicator) entity).isJohnny(); } diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/KillerBunny.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/KillerBunny.java index 8389a4a..f745555 100644 --- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/KillerBunny.java +++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/KillerBunny.java @@ -23,7 +23,7 @@ public class KillerBunny implements EntiddyInterface { } @Override - public boolean isInstance(LivingEntity entity) { + public boolean isInstance(@NotNull LivingEntity entity) { if (!(entity instanceof Rabbit)) return false; return ((Rabbit) entity).getRabbitType().equals(Rabbit.Type.THE_KILLER_BUNNY); } diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java index d327197..8bedf20 100644 --- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java +++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java @@ -20,7 +20,7 @@ public class Toast implements EntiddyInterface { } @Override - public boolean isInstance(LivingEntity entity) { + public boolean isInstance(@NotNull LivingEntity entity) { if (!(entity instanceof Rabbit)) return false; return entity.getCustomName() != null && entity.getCustomName().equals("Toast"); }