diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityAgeable.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityAgeable.java
index e3352f2..de47650 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityAgeable.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityAgeable.java
@@ -14,7 +14,7 @@ public abstract class EntityAgeable extends EntityCreature
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(12, new Integer(0));
+        dataWatcher.addObject(12, Integer.valueOf(0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBlaze.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBlaze.java
index 1933720..001a783 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBlaze.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBlaze.java
@@ -34,7 +34,7 @@ public class EntityBlaze extends EntityMob
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(16, new Byte((byte)0));
+        dataWatcher.addObject(16, Byte.valueOf((byte)0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBoat.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBoat.java
index 171f4b2..e28c6be 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBoat.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityBoat.java
@@ -42,9 +42,9 @@ public class EntityBoat extends Entity
 
     protected void entityInit()
     {
-        dataWatcher.addObject(17, new Integer(0));
-        dataWatcher.addObject(18, new Integer(1));
-        dataWatcher.addObject(19, new Integer(0));
+        dataWatcher.addObject(17, Integer.valueOf(0));
+        dataWatcher.addObject(18, Integer.valueOf(1));
+        dataWatcher.addObject(19, Integer.valueOf(0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityDragon.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityDragon.java
index 688c1a1..12ea227 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityDragon.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityDragon.java
@@ -68,7 +68,7 @@ public class EntityDragon extends EntityDragonBase
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(16, new Integer(maxHealth));
+        dataWatcher.addObject(16, Integer.valueOf(maxHealth));
     }
 
     public double[] func_00203(int par1, float par2)
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityEnderman.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityEnderman.java
index a9c8e57..4b18200 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityEnderman.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityEnderman.java
@@ -44,8 +44,8 @@ public class EntityEnderman extends EntityMob
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(16, new Byte((byte)0));
-        dataWatcher.addObject(17, new Byte((byte)0));
+        dataWatcher.addObject(16, Byte.valueOf((byte)0));
+        dataWatcher.addObject(17, Byte.valueOf((byte)0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityMinecart.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityMinecart.java
index ad5faf3..5861aa0 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityMinecart.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityMinecart.java
@@ -123,10 +123,10 @@ public class EntityMinecart extends Entity implements IInventory
 
     protected void entityInit()
     {
-        dataWatcher.addObject(16, new Byte((byte)0));
-        dataWatcher.addObject(17, new Integer(0));
-        dataWatcher.addObject(18, new Integer(1));
-        dataWatcher.addObject(19, new Integer(0));
+        dataWatcher.addObject(16, Byte.valueOf((byte)0));
+        dataWatcher.addObject(17, Integer.valueOf(0));
+        dataWatcher.addObject(18, Integer.valueOf(1));
+        dataWatcher.addObject(19, Integer.valueOf(0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySheep.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySheep.java
index 3f6e8d4..cc6b750 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySheep.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySheep.java
@@ -114,7 +114,7 @@ public class EntitySheep extends EntityAnimal
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(16, new Byte((byte)0));
+        dataWatcher.addObject(16, Byte.valueOf((byte)0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySlime.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySlime.java
index 84f709f..1b47895 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySlime.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySlime.java
@@ -31,12 +31,12 @@ public class EntitySlime extends EntityLiving implements IMob
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(16, new Byte((byte)1));
+        dataWatcher.addObject(16, Byte.valueOf((byte)1));
     }
 
     public void setSlimeSize(int par1)
     {
-        dataWatcher.updateObject(16, new Byte((byte)par1));
+        dataWatcher.updateObject(16, Byte.valueOf((byte)par1));
         setSize(0.6F * (float)par1, 0.6F * (float)par1);
         setPosition(posX, posY, posZ);
         setEntityHealth(getMaxHealth());
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySpider.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySpider.java
index 0ffbb14..da0d9bf 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySpider.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntitySpider.java
@@ -22,7 +22,7 @@ public class EntitySpider extends EntityMob
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(16, new Byte((byte)0));
+        dataWatcher.addObject(16, Byte.valueOf((byte)0));
     }
 
     /**
diff --git a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityWolf.java b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityWolf.java
index 8c0ed39..344d86e 100644
--- a/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityWolf.java
+++ b/shared/src/main/java/ru/di9/minecraft/shared/entity/EntityWolf.java
@@ -91,7 +91,7 @@ public class EntityWolf extends EntityTameable
     protected void entityInit()
     {
         super.entityInit();
-        dataWatcher.addObject(18, new Integer(getHealth()));
+        dataWatcher.addObject(18, Integer.valueOf(getHealth()));
     }
 
     /**