Update obfuscation where necessary to elevate status to: it compiles!

DSH105 · May 21, 2015 · df95f0b · df95f0b
1 parent d39909f
commit df95f0b
Show file tree

Hide file tree

Showing 40 changed files with 149 additions and 149 deletions.
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
@@ -15,7 +15,7 @@
  * along with EchoPet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,18 +15,18 @@
  * along with EchoPet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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/.../v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityAgeablePet.java b/.../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 <http://www.gnu.org/licenses/>.
  */
 
-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/...s/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/EntityNoClipPet.java b/...s/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 <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,7 +15,7 @@
  * along with EchoPet.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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/...s/v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFloat.java b/...s/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 <http://www.gnu.org/licenses/>.
  */
 
-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/..._R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalFollowOwner.java b/..._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 <http://www.gnu.org/licenses/>.
  */
 
-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/...R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/ai/PetGoalLookAtPlayer.java b/...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 <http://www.gnu.org/licenses/>.
  */
 
-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/...v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBatPet.java b/...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 <http://www.gnu.org/licenses/>.
  */
 
-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/..._8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityBlazePet.java b/..._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 <http://www.gnu.org/licenses/>.
  */
 
-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/.../src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCaveSpiderPet.java b/.../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 <http://www.gnu.org/licenses/>.
  */
 
-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/..._R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityChickenPet.java b/..._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 <http://www.gnu.org/licenses/>.
  */
 
-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/...v1_8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCowPet.java b/...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 <http://www.gnu.org/licenses/>.
  */
 
-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/..._R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityCreeperPet.java b/..._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 <http://www.gnu.org/licenses/>.
  */
 
-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/...src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEnderDragonPet.java b/...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 <http://www.gnu.org/licenses/>.
  */
 
-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/...R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermanPet.java b/...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 <http://www.gnu.org/licenses/>.
  */
 
-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/...3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityEndermitePet.java b/...3/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/..._8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGhastPet.java b/..._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 <http://www.gnu.org/licenses/>.
  */
 
-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/..._8_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGiantPet.java b/..._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 <http://www.gnu.org/licenses/>.
  */
 
-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/...R3/src/main/java/com/dsh105/echopet/compat/nms/v1_8_R3/entity/type/EntityGuardianPet.java b/...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)