diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/NMSEntityUtil.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/NMSEntityUtil.java
index c4730305..86c573f8 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/NMSEntityUtil.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/NMSEntityUtil.java
@@ -15,7 +15,7 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2;
+package com.dsh105.echopet.compat.nms.v1_8_R3;
import com.captainbern.minecraft.reflection.MinecraftReflection;
import com.captainbern.reflection.ClassTemplate;
@@ -24,8 +24,8 @@
import com.captainbern.reflection.SafeMethod;
import com.captainbern.reflection.accessor.FieldAccessor;
import com.captainbern.reflection.accessor.MethodAccessor;
-import net.minecraft.server.v1_8_R2.*;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftLivingEntity;
+import net.minecraft.server.v1_8_R3.*;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
import org.bukkit.entity.LivingEntity;
import java.util.List;
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/SpawnUtil.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/SpawnUtil.java
index 653559d1..408b53aa 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/SpawnUtil.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/SpawnUtil.java
@@ -15,18 +15,18 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2;
+package com.dsh105.echopet.compat.nms.v1_8_R3;
import com.dsh105.commodus.particle.Particle;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.event.PetPreSpawnEvent;
import com.dsh105.echopet.compat.api.plugin.EchoPet;
import com.dsh105.echopet.compat.api.util.ISpawnUtil;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
import org.bukkit.ChatColor;
import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.CreatureSpawnEvent;
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityAgeablePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityAgeablePet.java
index 0aab8843..bc551fb0 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityAgeablePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityAgeablePet.java
@@ -15,11 +15,11 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.SizeCategory;
-import net.minecraft.server.v1_8_R2.World;
+import net.minecraft.server.v1_8_R3.World;
public abstract class EntityAgeablePet extends EntityPet {
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityNoClipPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityNoClipPet.java
index 26ebcf01..1915d0a7 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityNoClipPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityNoClipPet.java
@@ -15,10 +15,10 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity;
import com.dsh105.echopet.compat.api.entity.IPet;
-import net.minecraft.server.v1_8_R2.World;
+import net.minecraft.server.v1_8_R3.World;
public abstract class EntityNoClipPet extends EntityPet {
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityPet.java
index aeb8bf1b..a0f68757 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityPet.java
@@ -15,7 +15,7 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity;
import com.dsh105.commodus.IdentUtil;
import com.dsh105.echopet.compat.api.ai.PetGoalSelector;
@@ -29,16 +29,16 @@
import com.dsh105.echopet.compat.api.util.Perm;
import com.dsh105.echopet.compat.api.util.menu.MenuOption;
import com.dsh105.echopet.compat.api.util.menu.PetMenu;
-import com.dsh105.echopet.compat.nms.v1_8_R2.NMSEntityUtil;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.ai.PetGoalFloat;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.ai.PetGoalFollowOwner;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.ai.PetGoalLookAtPlayer;
-import net.minecraft.server.v1_8_R2.*;
+import com.dsh105.echopet.compat.nms.v1_8_R3.NMSEntityUtil;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.ai.PetGoalFloat;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.ai.PetGoalFollowOwner;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.ai.PetGoalLookAtPlayer;
+import net.minecraft.server.v1_8_R3.*;
import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftCreature;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftCreature;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFloat.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFloat.java
index d06dc6c5..5d183220 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFloat.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFloat.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.ai;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.ai;
import com.dsh105.echopet.compat.api.ai.APetGoalFloat;
import com.dsh105.echopet.compat.api.ai.PetGoalType;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.Navigation;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.Navigation;
public class PetGoalFloat extends APetGoalFloat {
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFollowOwner.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFollowOwner.java
index 1bd78555..4d18e435 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFollowOwner.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFollowOwner.java
@@ -15,20 +15,20 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.ai;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.ai;
import com.dsh105.echopet.compat.api.ai.APetGoalFollowOwner;
import com.dsh105.echopet.compat.api.ai.PetGoalType;
import com.dsh105.echopet.compat.api.event.PetMoveEvent;
import com.dsh105.echopet.compat.api.plugin.EchoPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.type.EntityEnderDragonPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.type.EntityGhastPet;
-import net.minecraft.server.v1_8_R2.EntityPlayer;
-import net.minecraft.server.v1_8_R2.GenericAttributes;
-import net.minecraft.server.v1_8_R2.Navigation;
-import net.minecraft.server.v1_8_R2.PathEntity;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.type.EntityEnderDragonPet;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.type.EntityGhastPet;
+import net.minecraft.server.v1_8_R3.EntityPlayer;
+import net.minecraft.server.v1_8_R3.GenericAttributes;
+import net.minecraft.server.v1_8_R3.Navigation;
+import net.minecraft.server.v1_8_R3.PathEntity;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
public class PetGoalFollowOwner extends APetGoalFollowOwner {
@@ -99,7 +99,7 @@ public void start() {
this.timer = 0;
//Set pathfinding radius
- pet.getAttributeInstance(GenericAttributes.b).setValue(this.teleportDistance);
+ pet.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).setValue(this.teleportDistance);
}
@Override
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalLookAtPlayer.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalLookAtPlayer.java
index 15b17798..3bdcac73 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalLookAtPlayer.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalLookAtPlayer.java
@@ -15,13 +15,13 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.ai;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.ai;
import com.dsh105.echopet.compat.api.ai.APetGoalLookAtPlayer;
import com.dsh105.echopet.compat.api.ai.PetGoalType;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.Entity;
-import net.minecraft.server.v1_8_R2.EntityHuman;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.Entity;
+import net.minecraft.server.v1_8_R3.EntityHuman;
public class PetGoalLookAtPlayer extends APetGoalLookAtPlayer {
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBatPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBatPet.java
index 8abcf47f..1f843ab4 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBatPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBatPet.java
@@ -15,13 +15,13 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityBatPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.MathHelper;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.5F, height = 0.9F)
@EntityPetType(petType = PetType.BAT)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBlazePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBlazePet.java
index a5d4703e..8715bb6a 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBlazePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBlazePet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityBlazePet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 1.7F)
@EntityPetType(petType = PetType.BLAZE)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCaveSpiderPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCaveSpiderPet.java
index eda34d29..52f65ebd 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCaveSpiderPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCaveSpiderPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityCaveSpiderPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.7F, height = 0.5F)
@EntityPetType(petType = PetType.CAVESPIDER)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityChickenPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityChickenPet.java
index 9961c3c2..cf8e52f9 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityChickenPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityChickenPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityChickenPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.3F, height = 0.7F)
@EntityPetType(petType = PetType.CHICKEN)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCowPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCowPet.java
index 773b612b..e10bdebd 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCowPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCowPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityCowPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.9F, height = 1.3F)
@EntityPetType(petType = PetType.COW)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCreeperPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCreeperPet.java
index 50a496cf..8e673c15 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCreeperPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCreeperPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityCreeperPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 1.9F)
@EntityPetType(petType = PetType.CREEPER)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEnderDragonPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEnderDragonPet.java
index 386c940c..b1fb6807 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEnderDragonPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEnderDragonPet.java
@@ -15,18 +15,18 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityEnderDragonPet;
import com.dsh105.echopet.compat.api.event.PetRideJumpEvent;
import com.dsh105.echopet.compat.api.plugin.EchoPet;
import com.dsh105.echopet.compat.api.util.Logger;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityNoClipPet;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityNoClipPet;
import com.google.common.collect.Lists;
-import net.minecraft.server.v1_8_R2.*;
+import net.minecraft.server.v1_8_R3.*;
import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.util.Vector;
import java.util.ArrayList;
@@ -378,7 +378,7 @@ private void target() {
ArrayList arraylist = Lists.newArrayList(this.world.players);
Iterator iterator = arraylist.iterator();
while (iterator.hasNext()) {
- if (((EntityHuman) iterator.next()).v()) {
+ if (((EntityHuman) iterator.next()).isSpectator()) {
iterator.remove();
}
}
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermanPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermanPet.java
index 60520c0c..d18a2ec9 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermanPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermanPet.java
@@ -15,13 +15,13 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityEndermanPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.Block;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.Block;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 2.9F)
@EntityPetType(petType = PetType.ENDERMAN)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermitePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermitePet.java
index 851f7da2..b510daa9 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermitePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermitePet.java
@@ -1,10 +1,10 @@
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityEndermitePet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.EnumParticle;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.EnumParticle;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.4F, height = 0.3F)
@EntityPetType(petType = PetType.ENDERMITE)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGhastPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGhastPet.java
index 73747fa0..5a2731a6 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGhastPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGhastPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityGhastPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 4.0F, height = 4.0F)
@EntityPetType(petType = PetType.GHAST)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGiantPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGiantPet.java
index c0b2d890..0eac4ddf 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGiantPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGiantPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityGiantPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 5.5F, height = 5.5F)
@EntityPetType(petType = PetType.GIANT)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGuardianPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGuardianPet.java
index 024f39ae..d9631298 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGuardianPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGuardianPet.java
@@ -1,9 +1,9 @@
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityGuardianPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.85F, height = 0.85F)
@EntityPetType(petType = PetType.GUARDIAN)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityHorsePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityHorsePet.java
index 6ed11907..887b4629 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityHorsePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityHorsePet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityHorsePet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.*;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.*;
@EntitySize(width = 1.4F, height = 1.6F)
@EntityPetType(petType = PetType.HORSE)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityIronGolemPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityIronGolemPet.java
index 0c9fcf39..fc8d7faa 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityIronGolemPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityIronGolemPet.java
@@ -15,13 +15,13 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityIronGolemPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.Entity;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.Entity;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 1.4F, height = 2.9F)
@EntityPetType(petType = PetType.IRONGOLEM)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMagmaCubePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMagmaCubePet.java
index 8990ac6a..7094ca25 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMagmaCubePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMagmaCubePet.java
@@ -15,14 +15,14 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityMagmaCubePet;
-import net.minecraft.server.v1_8_R2.World;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 0.6F)
@EntityPetType(petType = PetType.MAGMACUBE)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMushroomCowPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMushroomCowPet.java
index e850f974..4857e32a 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMushroomCowPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityMushroomCowPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityMushroomCowPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.9F, height = 1.3F)
@EntityPetType(petType = PetType.MUSHROOMCOW)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityOcelotPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityOcelotPet.java
index cbf4e185..eba59aec 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityOcelotPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityOcelotPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityOcelotPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 0.8F)
@EntityPetType(petType = PetType.OCELOT)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigPet.java
index e7ded78b..7e2a92be 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityPigPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.9F, height = 0.9F)
@EntityPetType(petType = PetType.PIG)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigZombiePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigZombiePet.java
index 207bc1b7..bb994f6d 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigZombiePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityPigZombiePet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityPigZombiePet;
import com.dsh105.echopet.compat.api.plugin.EchoPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.ItemStack;
-import net.minecraft.server.v1_8_R2.Items;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.ItemStack;
+import net.minecraft.server.v1_8_R3.Items;
+import net.minecraft.server.v1_8_R3.World;
import org.bukkit.scheduler.BukkitRunnable;
@EntitySize(width = 0.6F, height = 1.8F)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityRabbitPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityRabbitPet.java
index 11f1812e..a013d235 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityRabbitPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityRabbitPet.java
@@ -1,10 +1,10 @@
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityRabbitPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
import org.bukkit.entity.Rabbit;
@EntitySize(width = 0.6F, height = 0.7F)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySheepPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySheepPet.java
index 3e9e8b5b..52422907 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySheepPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySheepPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySheepPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.9F, height = 1.3F)
@EntityPetType(petType = PetType.SHEEP)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySilverfishPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySilverfishPet.java
index 7af06929..3894c9ea 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySilverfishPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySilverfishPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySilverfishPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.3F, height = 0.7F)
@EntityPetType(petType = PetType.SILVERFISH)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySkeletonPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySkeletonPet.java
index 822bb064..70eeb8ef 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySkeletonPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySkeletonPet.java
@@ -15,16 +15,16 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySkeletonPet;
import com.dsh105.echopet.compat.api.entity.type.pet.ISkeletonPet;
import com.dsh105.echopet.compat.api.plugin.EchoPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.ItemStack;
-import net.minecraft.server.v1_8_R2.Items;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.ItemStack;
+import net.minecraft.server.v1_8_R3.Items;
+import net.minecraft.server.v1_8_R3.World;
import org.bukkit.scheduler.BukkitRunnable;
@EntitySize(width = 0.6F, height = 1.9F)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySlimePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySlimePet.java
index 665447dd..9412fed4 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySlimePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySlimePet.java
@@ -15,13 +15,13 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySlimePet;
import com.dsh105.echopet.compat.api.util.Perm;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 0.6F)
@EntityPetType(petType = PetType.SLIME)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySnowmanPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySnowmanPet.java
index 130c2b75..711a5cc1 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySnowmanPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySnowmanPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySnowmanPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.4F, height = 1.8F)
@EntityPetType(petType = PetType.SNOWMAN)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySpiderPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySpiderPet.java
index bfec1f56..9790f634 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySpiderPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySpiderPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySpiderPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 1.4F, height = 0.9F)
@EntityPetType(petType = PetType.SPIDER)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySquidPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySquidPet.java
index eeccd8f0..e641cdee 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySquidPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntitySquidPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntitySquidPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.95F, height = 0.95F)
@EntityPetType(petType = PetType.SQUID)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityVillagerPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityVillagerPet.java
index 6228c11a..33ac284d 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityVillagerPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityVillagerPet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.EntityPetType;
import com.dsh105.echopet.compat.api.entity.EntitySize;
import com.dsh105.echopet.compat.api.entity.IPet;
import com.dsh105.echopet.compat.api.entity.PetType;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityVillagerPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 1.8F)
@EntityPetType(petType = PetType.VILLAGER)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitchPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitchPet.java
index 6ec08eb7..53afaf16 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitchPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitchPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityWitchPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.6F, height = 1.9F)
@EntityPetType(petType = PetType.WITCH)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitherPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitherPet.java
index 5fe969f4..f85243f2 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitherPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWitherPet.java
@@ -15,12 +15,12 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityWitherPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.World;
@EntitySize(width = 0.9F, height = 4.0F)
@EntityPetType(petType = PetType.WITHER)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWolfPet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWolfPet.java
index 97354b20..7e1317c9 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWolfPet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityWolfPet.java
@@ -15,16 +15,16 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityWolfPet;
import com.dsh105.echopet.compat.api.entity.type.pet.IWolfPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityAgeablePet;
-import net.minecraft.server.v1_8_R2.EnumColor;
-import net.minecraft.server.v1_8_R2.EnumParticle;
-import net.minecraft.server.v1_8_R2.MathHelper;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityAgeablePet;
+import net.minecraft.server.v1_8_R3.EnumColor;
+import net.minecraft.server.v1_8_R3.EnumParticle;
+import net.minecraft.server.v1_8_R3.MathHelper;
+import net.minecraft.server.v1_8_R3.World;
import org.bukkit.DyeColor;
@EntitySize(width = 0.6F, height = 0.8F)
diff --git a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityZombiePet.java b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityZombiePet.java
index d04dc73e..c01e884c 100644
--- a/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityZombiePet.java
+++ b/modules/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityZombiePet.java
@@ -15,15 +15,15 @@
* along with EchoPet. If not, see .
*/
-package com.dsh105.echopet.compat.nms.v1_8_R2.entity.type;
+package com.dsh105.echopet.compat.nms.v1_8_R3.entity.type;
import com.dsh105.echopet.compat.api.entity.*;
import com.dsh105.echopet.compat.api.entity.type.nms.IEntityZombiePet;
import com.dsh105.echopet.compat.api.plugin.EchoPet;
-import com.dsh105.echopet.compat.nms.v1_8_R2.entity.EntityPet;
-import net.minecraft.server.v1_8_R2.ItemStack;
-import net.minecraft.server.v1_8_R2.Items;
-import net.minecraft.server.v1_8_R2.World;
+import com.dsh105.echopet.compat.nms.v1_8_R3.entity.EntityPet;
+import net.minecraft.server.v1_8_R3.ItemStack;
+import net.minecraft.server.v1_8_R3.Items;
+import net.minecraft.server.v1_8_R3.World;
import org.bukkit.scheduler.BukkitRunnable;
@EntitySize(width = 0.6F, height = 1.8F)