Merge pull request #16 from D3v1s0m/master

Added all mob type

src/main/java/io/github/znetworkw/znpcservers/npc/NPCType.java

@@ -15,50 +15,85 @@ import static io.github.znetworkw.znpcservers.reflection.Reflections.*;
 
 @SuppressWarnings("unused")
 public enum NPCType {
+    ALLAY(ENTITY_ALLAY_CLASS, -1.14),
+    ARMOR_STAND(ENTITY_ARMOR_STAND_CLASS, 0.2775, "setSmall", "setArms"),
+    AXOLOTL(ENTITY_AXOLOTL_CLASS, -1.395, "setVariant", "setAge"),
+    BAT(ENTITY_BAT_CLASS, -0.915, "setAwake"),
+    BEE(ENTITY_BEE_CLASS, -1.215, "setAnger", "setHasNectar", "setHasStung"),
+    BLAZE(ENTITY_BLAZE_CLASS, -0.015),
+    CAT(ENTITY_CAT_CLASS, -1.115, "setCatType", "setAge", "setCollarColor", "setTamed"),
+    CAVE_SPIDER(ENTITY_CAVE_SPIDER_CLASS, -1.315),
+    CHICKEN(ENTITY_CHICKEN_CLASS, -1.115, "setAge"),
+    COD(ENTITY_COD_CLASS, -1.515),
+    COW(ENTITY_COW_CLASS, -0.415, "setAge"),
+    CREEPER(ENTITY_CREEPER_CLASS, -0.115, "setPowered"),
+    DOLPHIN(ENTITY_DOLPHIN_CLASS, -1.215),
+    DONKEY(ENTITY_DONKEY_CLASS, -0.315, "setAge", "setCarryingChest"),
+    DROWNED(ENTITY_DROWNED_CLASS, 0.135),
+    ELDER_GUARDIAN(ENTITY_ELDER_GUARDIAN_CLASS, 0.182),
+    ENDER_DRAGON(ENTITY_ENDER_DRAGON_CLASS, 6.185, "setSilent"),
+    ENDERMAN(ENTITY_ENDERMAN_CLASS, 1.085),
+    ENDERMITE(ENTITY_ENDERMITE_CLASS, -1.515),
+    EVOKER(ENTITY_EVOKER_CLASS, 0.135, "setCurrentSpell"),
+    FOX(ENTITY_FOX_CLASS, -1.115, "setFoxType", "setSitting", "setSleeping", "setAge", "setCrouching"),
+    FROG(ENTITY_FROG_CLASS, -1.315, "setVariant"),
+    GHAST(ENTITY_GHAST_CLASS, 2.185),
+    GIANT(ENTITY_GIANT_ZOMBIE_CLASS, 10.185),
+    GLOW_SQUID(ENTITY_GLOW_SQUID_CLASS, -1.015),
+    GOAT(ENTITY_GOAT_CLASS, -0.515, "setScreamingGoat", "setAge", "setLeftHorn", "setRightHorn"),
+    GUARDIAN(ENTITY_GUARDIAN_CLASS, -0.965),
+    HORSE(ENTITY_HORSE_CLASS, -0.215, "setStyle", "setAge", "setColor", "setVariant"),
+    HOGLIN(ENTITY_HOGLIN_CLASS, -0.415, "setAge"),
+    HUSK(ENTITY_HUSK_CLASS, 0.135),
+    ILLUSIONER(ENTITY_ILLUSIONER_CLASS, 0.135),
+    IRON_GOLEM(ENTITY_IRON_GOLEM_CLASS, 0.885),
+    LLAMA(ENTITY_LLAMA_CLASS, 0.055, "setAge", "setColor"),
+    MAGMA_CUBE(ENTITY_MAGMA_CUBE_CLASS, 0.225, "setSize"),
+    MUSHROOM_COW(ENTITY_MUSHROOM_COW_CLASS, -0.415, "setAge", "setVariant"),
+    MULE(ENTITY_MULE_CLASS, -0.215, "setAge", "setCarryingChest"),
+    OCELOT(ENTITY_OCELOT_CLASS, -1.115, "setCatType", "setAge"),
+    PANDA(ENTITY_PANDA_CLASS, -0.565, "setAge", "setMainGene", "setHiddenGene"),
+    PARROT(ENTITY_PARROT_CLASS, -0.915, "setVariant", "setAge", "setSitting"),
+    PHANTOM(ENTITY_PHANTOM_CLASS, -1.315, "setSize"),
+    PIG(ENTITY_PIG_CLASS, -0.915, "setAge", "setSaddle"),
+    PIGLIN(ENTITY_PIGLIN_CLASS, 0.135, "setBaby"),
+    PIGLIN_BRUTE(ENTITY_PIGLIN_BRUTE_CLASS, 0.135, "setBaby"),
+    PILLAGER(ENTITY_PILLAGER_CLASS, 0.135),
     PLAYER(ENTITY_PLAYER_CLASS, 0.0),
-    ARMOR_STAND(ENTITY_ARMOR_STAND_CLASS, 0.0, "setSmall", "setArms"),
+    POLAR_BEAR(ENTITY_POLAR_BEAR_CLASS, -0.415, "setAge"),
-    CREEPER(ENTITY_CREEPER_CLASS, -0.15, "setPowered"),
+    PUFFERFISH(ENTITY_PUFFERFISH_CLASS, -1.115, "setPuffState"),
-    BAT(ENTITY_BAT_CLASS, -0.5, "setAwake"),
+    RABBIT(ENTITY_RABBIT_CLASS, -1.315, "setRabbitType"),
-    BLAZE(ENTITY_BLAZE_CLASS, 0.0),
+    RAVAGER(ENTITY_RAVAGER_CLASS, 0.385),
-    CAVE_SPIDER(ENTITY_CAVE_SPIDER_CLASS, -1.0),
+    SALMON(ENTITY_SALMON_CLASS, -1.415),
-    COW(ENTITY_COW_CLASS, -0.25, "setAge"),
+    SHEEP(ENTITY_SHEEP_CLASS, -0.515, "setAge", "setSheared", "setColor"),
-    CHICKEN(ENTITY_CHICKEN_CLASS, -1.0, "setAge"),
+    SHULKER(ENTITY_SHULKER_CLASS, -0.815, "setPeek", "setColor"),
-    ENDER_DRAGON(ENTITY_ENDER_DRAGON_CLASS, 1.5),
+    SILVERFISH(ENTITY_SILVERFISH_CLASS, -1.515),
-    ENDERMAN(ENTITY_ENDERMAN_CLASS, 0.7),
+    SKELETON(ENTITY_SKELETON_CLASS, 0.175, "setSkeletonType"),
-    ENDERMITE(ENTITY_ENDERMITE_CLASS, -1.5),
+    SKELETON_HORSE(ENTITY_SKELETON_HORSE_CLASS, -0.215),
-    GHAST(ENTITY_GHAST_CLASS, 3.0),
+    SLIME(ENTITY_SLIME_CLASS, 0.225, "setSize"),
-    IRON_GOLEM(ENTITY_IRON_GOLEM_CLASS, 0.75),
+    SNOWMAN(ENTITY_SNOWMAN_CLASS, 0.085, "setHasPumpkin", "setDerp"),
-    GIANT(ENTITY_GIANT_ZOMBIE_CLASS, 11.0),
+    SPIDER(ENTITY_SPIDER_CLASS, -0.915),
-    GUARDIAN(ENTITY_GUARDIAN_CLASS, -0.7),
+    SQUID(ENTITY_SQUID_CLASS, -1.015),
-    HORSE(ENTITY_HORSE_CLASS, 0.0, "setStyle", "setAge", "setColor", "setVariant"),
+    STRAY(ENTITY_STRAY_CLASS, 0.175),
-    LLAMA(ENTITY_LLAMA_CLASS, 0.0, "setAge"),
+    STRIDER(ENTITY_STRIDER_CLASS, -0.115, "setSaddled", "setShivering", "setBaby"),
-    MAGMA_CUBE(ENTITY_MAGMA_CUBE_CLASS, -1.25, "setSize"),
+    TADPOLE(ENTITY_TADPOLE_CLASS, -1.515, "setAge"),
-    MUSHROOM_COW(ENTITY_MUSHROOM_COW_CLASS, -0.25, "setAge"),
+    TRADER_LLAMA(ENTITY_TRADER_LLAMA_CLASS, 0.055, "setAge", "setColor"),
-    OCELOT(ENTITY_OCELOT_CLASS, -1.0, "setCatType", "setAge"),
+    TROPICAL_FISH(ENTITY_TROPICAL_FISH_CLASS, -1.415, "setPattern", "setBodyColor", "setPatternColor"),
-    PARROT(ENTITY_PARROT_CLASS, -1.5, "setVariant"),
+    TURTLE(ENTITY_TURTLE, -1.415, "setAge"),
-    PIG(ENTITY_PIG_CLASS, -1.0, "setAge"),
+    VEX(ENTITY_VEX_CLASS, -1.015, "setCharging"),
-    PANDA(ENTITY_PANDA_CLASS, -0.6, "setAge", "setMainGene", "setHiddenGene"),
+    VILLAGER(ENTITY_VILLAGER_CLASS, 0.135, "setProfession", "setVillagerType", "setAge", "setVillagerLevel"),
-    RABBIT(ENTITY_RABBIT_CLASS, -1.0, "setRabbitType"),
+    VINDICATOR(ENTITY_VINDICATOR_CLASS, 0.135),
-    POLAR_BEAR(ENTITY_POLAR_BEAR_CLASS, -0.5),
+    WANDERING_TRADER(ENTITY_WANDERING_TRADER_CLASS, 0.135),
-    SHEEP(ENTITY_SHEEP_CLASS, -0.5, "setAge", "setSheared", "setColor"),
+    WARDEN(ENTITY_WARDEN, 1.085, "setSilent"),
-    SILVERFISH(ENTITY_SILVERFISH_CLASS, -1.5),
+    WITCH(ENTITY_WITCH_CLASS, 0.135),
-    SNOWMAN(ENTITY_SNOWMAN_CLASS, 0.0, "setHasPumpkin", "setDerp"),
+    WITHER(ENTITY_WITHER_CLASS, 1.685),
-    SKELETON(ENTITY_SKELETON_CLASS, 0.0),
+    WITHER_SKELETON(ENTITY_WITHER_SKELETON_CLASS, 0.585),
-    SHULKER(ENTITY_SHULKER_CLASS, 0.0),
+    WOLF(ENTITY_WOLF_CLASS, -0.965, "setSitting", "setTamed", "setAngry", "setAge", "setCollarColor"),
-    SLIME(ENTITY_SLIME_CLASS, -1.25, "setSize"),
+    ZOGLIN(ENTITY_ZOGLIN_CLASS, -0.415, "setBaby"),
-    SPIDER(ENTITY_SPIDER_CLASS, -1.0),
+    ZOMBIE(ENTITY_ZOMBIE_CLASS, 0.135, "setBaby"),
-    SQUID(ENTITY_SQUID_CLASS, -1.0),
+    ZOMBIE_HORSE(ENTITY_ZOMBIE_HORSE_CLASS, -0.215, "setBaby"),
-    VILLAGER(ENTITY_VILLAGER_CLASS, 0.0, "setProfession", "setVillagerType", "setAge"),
+    ZOMBIE_VILLAGER(ENTITY_ZOMBIE_VILLAGER_CLASS, 0.135, "setVillagerType", "setVillagerProfession", "setBaby"),
-    WITCH(ENTITY_WITCH_CLASS, 0.5),
+    ZOMBIFIED_PIGLIN(ENTITY_ZOMBIFIED_PIGLIN_CLASS, 0.135, "setBaby");
-    WITHER(ENTITY_WITHER_CLASS, 1.75),
-    ZOMBIE(ENTITY_ZOMBIE_CLASS, 0.0, "setBaby"),
-    WOLF(ENTITY_WOLF_CLASS, -1.0, "setSitting", "setTamed", "setAngry", "setAge", "setCollarColor"),
-    FOX(ENTITY_FOX_CLASS, -1.0, "setFoxType", "setSitting", "setSleeping", "setAge", "setCrouching"),
-    BEE(ENTITY_BEE_CLASS, -1.0, "setAnger", "setHasNectar", "setHasStung"),
-    TURTLE(ENTITY_TURTLE, -1.0),
-    WARDEN(ENTITY_WARDEN, 1.0),
-    AXOLOTL(ENTITY_AXOLOTL_CLASS, -1.0, "setVariant", "setAge"),
-    GOAT(ENTITY_GOAT_CLASS, -0.5, "setScreamingGoat", "setAge");
 
     private final double holoHeight;
     private final CustomizationLoader customizationLoader;

src/main/java/io/github/znetworkw/znpcservers/reflection/Reflections.java

@@ -35,8 +35,13 @@ public final class Reflections {
     public static final Class<?> ENTITY_LIVING = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withClassName("EntityLiving")).get();
 
-    public static final Class<?> ENTITY_PLAYER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.SERVER_LEVEL)
+    public static final Class<?> ENTITY_ALLAY_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withClassName("EntityPlayer")).get();
+            .withSubClass("animal.allay")
+            .withClassName("Allay").setStrict(Utils.versionNewer(19))).get();
+
+    public static final Class<?> ENTITY_AXOLOTL_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.axolotl")
+            .withClassName("Axolotl").setStrict(Utils.versionNewer(17))).get();
 
     public static final Class<?> ENTITY_ARMOR_STAND_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("decoration")
@@ -46,10 +51,18 @@ public final class Reflections {
             .withSubClass("ambient")
             .withClassName("EntityBat")).get();
 
+    public static final Class<?> ENTITY_BEE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityBee").setStrict(Utils.versionNewer(15))).get();
+
     public static final Class<?> ENTITY_BLAZE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityBlaze")).get();
 
+    public static final Class<?> ENTITY_CAT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityCat").setStrict(Utils.versionNewer(14))).get();
+
     public static final Class<?> ENTITY_CAVE_SPIDER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityCaveSpider")).get();
@@ -58,6 +71,10 @@ public final class Reflections {
             .withSubClass("animal")
             .withClassName("EntityChicken")).get();
 
+    public static final Class<?> ENTITY_COD_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityCod").setStrict(Utils.versionNewer(13))).get();
+
     public static final Class<?> ENTITY_COW_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
             .withClassName("EntityCow")).get();
@@ -66,6 +83,22 @@ public final class Reflections {
             .withSubClass("monster")
             .withClassName("EntityCreeper")).get();
 
+    public static final Class<?> ENTITY_DOLPHIN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityDolphin").setStrict(Utils.versionNewer(13))).get();
+
+    public static final Class<?> ENTITY_DONKEY_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.horse")
+            .withClassName("EntityHorseDonkey")).get();
+
+    public static final Class<?> ENTITY_DROWNED_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityDrowned").setStrict(Utils.versionNewer(13))).get();
+
+    public static final Class<?> ENTITY_ELDER_GUARDIAN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityGuardianElder")).get();
+
     public static final Class<?> ENTITY_ENDER_DRAGON_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("boss.enderdragon")
             .withClassName("EntityEnderDragon")).get();
@@ -74,26 +107,37 @@ public final class Reflections {
             .withSubClass("monster")
             .withClassName("EntityEnderman")).get();
 
-    public static final Class<?> ENTITY_HUMAN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("player")
-            .withClassName("EntityHuman")).get();
-
     public static final Class<?> ENTITY_ENDERMITE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityEndermite")).get();
 
+    public static final Class<?> ENTITY_EVOKER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityEvoker").setStrict(Utils.versionNewer(11))).get();
+
+    public static final Class<?> ENTITY_FOX_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityFox").setStrict(Utils.versionNewer(14))).get();
+
+    public static final Class<?> ENTITY_FROG_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.frog")
+            .withClassName("Frog").setStrict(Utils.versionNewer(19))).get();
+
     public static final Class<?> ENTITY_GHAST_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityGhast")).get();
 
-    public static final Class<?> ENTITY_IRON_GOLEM_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal")
-            .withClassName("EntityIronGolem")).get();
-
     public static final Class<?> ENTITY_GIANT_ZOMBIE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityGiantZombie")).get();
 
+    public static final Class<?> ENTITY_GLOW_SQUID_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withClassName("GlowSquid").setStrict(Utils.versionNewer(17))).get();
+
+    public static final Class<?> ENTITY_GOAT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.goat")
+            .withClassName("Goat").setStrict(Utils.versionNewer(17))).get();
+
     public static final Class<?> ENTITY_GUARDIAN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityGuardian")).get();
@@ -102,10 +146,25 @@ public final class Reflections {
             .withSubClass("animal.horse")
             .withClassName("EntityHorse")).get();
 
+    public static final Class<?> ENTITY_HOGLIN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster.hoglin")
+            .withClassName("EntityHoglin").setStrict(Utils.versionNewer(16))).get();
+
+    public static final Class<?> ENTITY_HUSK_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityZombieHusk").setStrict(Utils.versionNewer(10))).get();
+
+    public static final Class<?> ENTITY_ILLUSIONER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityIllagerIllusioner").setStrict(Utils.versionNewer(11))).get();
+
+    public static final Class<?> ENTITY_IRON_GOLEM_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityIronGolem")).get();
+
     public static final Class<?> ENTITY_LLAMA_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal.horse")
-            .withClassName("EntityLlama")
+            .withClassName("EntityLlama").setStrict(Utils.versionNewer(11))).get();
-            .setStrict(Utils.versionNewer(11))).get();
 
     public static final Class<?> ENTITY_MAGMA_CUBE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
@@ -115,61 +174,72 @@ public final class Reflections {
             .withSubClass("animal")
             .withClassName("EntityMushroomCow")).get();
 
+    public static final Class<?> ENTITY_MULE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.horse")
+            .withClassName("EntityHorseMule")).get();
+
     public static final Class<?> ENTITY_OCELOT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
             .withClassName("EntityOcelot")).get();
 
-    public static final Class<?> ENTITY_TURTLE = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_PANDA_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
-            .withClassName("EntityTurtle")
+            .withClassName("EntityPanda").setStrict(Utils.versionNewer(14))).get();
-            .setStrict(Utils.versionNewer(13))).get();
-
-    public static final Class<?> ENTITY_WARDEN = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("monster.warden")
-            .withClassName("EntityWarden")
-            .withClassName("Warden")
-            .setStrict(Utils.versionNewer(19))).get();
-
-    public static final Class<?> ENTITY_BEE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal")
-            .withClassName("EntityBee")
-            .setStrict(Utils.versionNewer(15))).get();
 
     public static final Class<?> ENTITY_PARROT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
-            .withClassName("EntityParrot")
+            .withClassName("EntityParrot").setStrict(Utils.versionNewer(12))).get();
-            .setStrict(Utils.versionNewer(12))).get();
+
+    public static final Class<?> ENTITY_PHANTOM_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityPhantom").setStrict(Utils.versionNewer(13))).get();
 
     public static final Class<?> ENTITY_PIG_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
             .withClassName("EntityPig")).get();
 
+    public static final Class<?> ENTITY_PIGLIN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster.piglin")
+            .withClassName("EntityPiglin").setStrict(Utils.versionNewer(16))).get();
+
+    public static final Class<?> ENTITY_PIGLIN_BRUTE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster.piglin")
+            .withClassName("EntityPiglinBrute").setStrict(Utils.versionNewer(16))).get();
+
+    public static final Class<?> ENTITY_PILLAGER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityPillager").setStrict(Utils.versionNewer(14))).get();
+
+    public static final Class<?> ENTITY_PLAYER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.SERVER_LEVEL)
+            .withClassName("EntityPlayer")).get();
+
+    public static final Class<?> ENTITY_POLAR_BEAR_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityPolarBear").setStrict(Utils.versionNewer(10))).get();
+
+    public static final Class<?> ENTITY_PUFFERFISH_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityPufferFish").setStrict(Utils.versionNewer(13))).get();
+
     public static final Class<?> ENTITY_RABBIT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
             .withClassName("EntityRabbit")).get();
 
-    public static final Class<?> ENTITY_POLAR_BEAR_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_RAVAGER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal")
+            .withSubClass("monster")
-            .withClassName("EntityPolarBear")
+            .withClassName("EntityRavager").setStrict(Utils.versionNewer(14))).get();
-            .setStrict(Utils.versionNewer(10))).get();
 
-    public static final Class<?> ENTITY_PANDA_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_SALMON_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
-            .withClassName("EntityPanda")
+            .withClassName("EntitySalmon").setStrict(Utils.versionNewer(13))).get();
-            .setStrict(Utils.versionNewer(14))).get();
 
     public static final Class<?> ENTITY_SHEEP_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
             .withClassName("EntitySheep")).get();
 
-    public static final Class<?> ENTITY_SNOWMAN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal")
-            .withClassName("EntitySnowman")).get();
-
     public static final Class<?> ENTITY_SHULKER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
-            .withClassName("EntityShulker")
+            .withClassName("EntityShulker").setStrict(Utils.versionNewer(9))).get();
-            .setStrict(Utils.versionNewer(9))).get();
 
     public static final Class<?> ENTITY_SILVERFISH_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
@@ -179,10 +249,19 @@ public final class Reflections {
             .withSubClass("monster")
             .withClassName("EntitySkeleton")).get();
 
+    public static final Class<?> ENTITY_SKELETON_HORSE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.horse")
+            .withClassName("EntityHorseSkeleton")).get();
+
     public static final Class<?> ENTITY_SLIME_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntitySlime")).get();
 
+    public static final Class<?> ENTITY_SNOWMAN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntitySnowman")).get();
+
+
     public static final Class<?> ENTITY_SPIDER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntitySpider")).get();
@@ -191,10 +270,51 @@ public final class Reflections {
             .withSubClass("animal")
             .withClassName("EntitySquid")).get();
 
+    public static final Class<?> ENTITY_STRAY_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntitySkeletonStray").setStrict(Utils.versionNewer(10))).get();
+
+    public static final Class<?> ENTITY_STRIDER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityStrider").setStrict(Utils.versionNewer(16))).get();
+
+    public static final Class<?> ENTITY_TADPOLE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.frog")
+            .withClassName("Tadpole").setStrict(Utils.versionNewer(19))).get();
+
+    public static final Class<?> ENTITY_TRADER_LLAMA_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal.horse")
+            .withClassName("EntityLlamaTrader").setStrict(Utils.versionNewer(11))).get();
+
+    public static final Class<?> ENTITY_TROPICAL_FISH_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityTropicalFish").setStrict(Utils.versionNewer(13))).get();
+
+    public static final Class<?> ENTITY_TURTLE = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("animal")
+            .withClassName("EntityTurtle").setStrict(Utils.versionNewer(13))).get();
+
+    public static final Class<?> ENTITY_VEX_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityVex").setStrict(Utils.versionNewer(11))).get();
+
     public static final Class<?> ENTITY_VILLAGER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("npc")
             .withClassName("EntityVillager")).get();
 
+    public static final Class<?> ENTITY_VINDICATOR_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityVindicator").setStrict(Utils.versionNewer(11))).get();
+
+    public static final Class<?> ENTITY_WANDERING_TRADER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("npc")
+            .withClassName("EntityVillagerTrader").setStrict(Utils.versionNewer(14))).get();
+
+    public static final Class<?> ENTITY_WARDEN = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster.warden")
+            .withClassName("EntityWarden")
+            .withClassName("Warden").setStrict(Utils.versionNewer(19))).get();
+
     public static final Class<?> ENTITY_WITCH_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
             .withClassName("EntityWitch")).get();
@@ -203,32 +323,41 @@ public final class Reflections {
             .withSubClass("boss.wither")
             .withClassName("EntityWither")).get();
 
-    public static final Class<?> ENTITY_ZOMBIE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_WITHER_SKELETON_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("monster")
-            .withClassName("EntityZombie")).get();
+            .withClassName("EntitySkeletonWither")).get();
 
     public static final Class<?> ENTITY_WOLF_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withSubClass("animal")
             .withClassName("EntityWolf")).get();
 
-    public static final Class<?> ENTITY_AXOLOTL_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_ZOGLIN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal.axolotl")
+            .withSubClass("monster")
-            .withClassName("Axolotl")
+            .withClassName("EntityZoglin").setStrict(Utils.versionNewer(16))).get();
-            .setStrict(Utils.versionNewer(17))).get();
 
-    public static final Class<?> ENTITY_GOAT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_ZOMBIE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal.goat")
+            .withSubClass("monster")
-            .withClassName("Goat")
+            .withClassName("EntityZombie")).get();
-            .setStrict(Utils.versionNewer(17))).get();
 
-    public static final Class<?> ENTITY_FOX_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+    public static final Class<?> ENTITY_ZOMBIE_HORSE_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
-            .withSubClass("animal")
+            .withSubClass("animal.horse")
-            .withClassName("EntityFox")
+            .withClassName("EntityHorseZombie")).get();
-            .setStrict(Utils.versionNewer(14))).get();
+
+    public static final Class<?> ENTITY_ZOMBIE_VILLAGER_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityZombieVillager")).get();
+
+    public static final Class<?> ENTITY_ZOMBIFIED_PIGLIN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("monster")
+            .withClassName("EntityPigZombie")).get();
 
     public static final Class<?> ENTITY_TYPES_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
             .withClassName("EntityTypes")).get();
 
+    public static final Class<?> ENTITY_HUMAN_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.ENTITY)
+            .withSubClass("player")
+            .withClassName("EntityHuman")).get();
+
     public static final Class<?> ENUM_CHAT_CLASS = new ClassReflection(new ReflectionBuilder(ReflectionPackage.MINECRAFT)
             .withClassName("EnumChatFormat")).get();
 

src/main/java/lol/pyr/znpcsplus/ZNPCsPlus.java

@@ -60,7 +60,7 @@ public class ZNPCsPlus extends JavaPlugin {
         NPC find = NPC.find(id);
         if (find != null)
             return find;
-        NPCModel pojo = (new NPCModel(id)).withHologramLines(Collections.singletonList(name)).withLocation(new ZLocation(location)).withNpcType(npcType);
+        NPCModel pojo = (new NPCModel(id)).withHologramLines(Collections.singletonList(name)).withHologramHeight(npcType.getHoloHeight()).withLocation(new ZLocation(location)).withNpcType(npcType);
         ConfigurationConstants.NPC_LIST.add(pojo);
         return new NPC(pojo, true);
     }