diff --git a/.../v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntitySquidPetBase.java b/.../v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntitySquidPetBase.java
diff --git a/..._7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityVillagerPetBase.java b/..._7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityVillagerPetBase.java
diff --git a/...v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityWitherPetBase.java b/...v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityWitherPetBase.java
diff --git a/...s/v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityWolfPetBase.java b/...s/v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityWolfPetBase.java
diff --git a/...v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityZombiePetBase.java b/...v1_7_R3/src/main/java/com/dsh105/echopet/nms/v1_7_R3/entity/type/EntityZombiePetBase.java
diff --git a/modules/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/NMSEntityUtil.java b/modules/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/NMSEntityUtil.java
diff --git a/modules/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/EchoEntityPetBase.java b/modules/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/EchoEntityPetBase.java
diff --git a/...es/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityBatPet.java b/...es/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityBatPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityBlazePet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityBlazePet.java
diff --git a/..._R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityCaveSpiderPet.java b/..._R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityCaveSpiderPet.java
diff --git a/...1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityChickenPet.java b/...1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityChickenPet.java
diff --git a/...es/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityCowPet.java b/...es/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityCowPet.java
diff --git a/...1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityCreeperPet.java b/...1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityCreeperPet.java
diff --git a/...R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityEnderDragonPet.java b/...R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityEnderDragonPet.java
diff --git a/..._7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityEndermanPet.java b/..._7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityEndermanPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityGhastPet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityGhastPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityGiantPet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityGiantPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityHorsePet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityHorsePet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityHumanPet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityHumanPet.java
diff --git a/...7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityIronGolemPet.java b/...7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityIronGolemPet.java
diff --git a/...7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityMagmaCubePet.java b/...7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityMagmaCubePet.java
diff --git a/...entity/type/EchoEntityMushroomCowPet.java → ...4/entity/type/EchoEntityMooshroomPet.java b/...entity/type/EchoEntityMushroomCowPet.java → ...4/entity/type/EchoEntityMooshroomPet.java
diff --git a/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityOcelotPet.java b/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityOcelotPet.java
diff --git a/...es/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityPigPet.java b/...es/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityPigPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySheepPet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySheepPet.java
diff --git a/..._R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySilverfishPet.java b/..._R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySilverfishPet.java
diff --git a/..._7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySkeletonPet.java b/..._7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySkeletonPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySlimePet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySlimePet.java
diff --git a/...1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySnowmanPet.java b/...1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySnowmanPet.java
diff --git a/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySpiderPet.java b/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySpiderPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySquidPet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntitySquidPet.java
diff --git a/..._7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityVillagerPet.java b/..._7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityVillagerPet.java
diff --git a/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityWitchPet.java b/.../v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityWitchPet.java
diff --git a/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityWitherPet.java b/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityWitherPet.java
diff --git a/...s/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityWolfPet.java b/...s/v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityWolfPet.java
diff --git a/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityZombiePet.java b/...v1_7_R4/src/main/java/com/dsh105/echopet/nms/v1_7_R4/entity/type/EchoEntityZombiePet.java
diff --git a/...4/entity/type/EchoEntityPigZombiePet.java → ...ntity/type/EchoEntityZombiePigmanPet.java b/...4/entity/type/EchoEntityPigZombiePet.java → ...ntity/type/EchoEntityZombiePigmanPet.java
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml