Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Also minimized all the nms diffs and generic cleanups all around.

src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java

@@ -1,7 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityCreeper;
-import net.minecraft.server.WorldServer;
 
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Creeper;
@@ -13,13 +12,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
         super(server, entity);
     }
 
+    @Override
+    public EntityCreeper getHandle() {
+        return (EntityCreeper) super.getHandle();
+    }
+
     @Override
     public String toString() {
         return "CraftCreeper";
     }
 
     public boolean isPowered() {
-        return getHandle().Z().a(17) == 1;
+        return getHandle().isPowered();
     }
 
     public void setPowered(boolean powered) {
@@ -32,14 +36,14 @@ public class CraftCreeper extends CraftMonster implements Creeper {
             server.getPluginManager().callEvent(event);
 
             if (!event.isCancelled()) {
-                getHandle().Z().b(17, (byte) 1);
+                getHandle().setPowered(true);
             }
         } else {
             CreeperPowerEvent event = new CreeperPowerEvent(entity, CreeperPowerEvent.PowerCause.SET_OFF);
             server.getPluginManager().callEvent(event);
 
             if (!event.isCancelled()) {
-                getHandle().Z().b(17, (byte) 0);
+                getHandle().setPowered(false);
             }
         }
 

src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

@@ -40,7 +40,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         }
 
         if (entity instanceof EntityPlayer && health == 0) {
-            ((EntityPlayer) entity).a((Entity) null);
+            ((EntityPlayer) entity).die((Entity) null);
         }
 
         getHandle().health = health;

src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java

@@ -10,11 +10,11 @@ public class CraftPig extends CraftAnimals implements Pig {
     }
 
     public boolean hasSaddle() {
-        return getHandle().x();
+        return getHandle().hasSaddle();
     }
 
     public void setSaddle(boolean saddled) {
-        getHandle().a(saddled);
+        getHandle().setSaddle(saddled);
     }
 
     public EntityPig getHandle() {

src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

@@ -169,8 +169,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void sendBlockChange(Location loc, int material, byte data) {
         Packet53BlockChange packet = new Packet53BlockChange(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), ((CraftWorld) loc.getWorld()).getHandle());
 
-        packet.d = material;
-        packet.e = data;
+        packet.material = material;
+        packet.data = data;
         getHandle().netServerHandler.sendPacket(packet);
     }
 
@@ -228,7 +228,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         if (fromWorld == toWorld) {
             entity.netServerHandler.teleport(to);
         } else {
-            server.getHandle().a(entity, toWorld.dimension, to);
+            server.getHandle().moveToWorld(entity, toWorld.dimension, to);
         }
         return true;
     }
@@ -250,7 +250,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     }
 
     public void updateInventory() {
-        getHandle().a(getHandle().activeContainer);
+        getHandle().updateInventory(getHandle().activeContainer);
     }
 
     public void setSleepingIgnored(boolean isSleeping) {

src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java

@@ -16,28 +16,33 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
         return "CraftTNTPrimed";
     }
 
+    @Override
+    public EntityTNTPrimed getHandle() {
+        return (EntityTNTPrimed) super.getHandle();
+    }
+
     public float getYield() {
-        return ((EntityTNTPrimed) getHandle()).yield;
+        return getHandle().yield;
     }
 
     public boolean isIncendiary() {
-        return ((EntityTNTPrimed) getHandle()).isIncendiary;
+        return getHandle().isIncendiary;
     }
 
     public void setIsIncendiary(boolean isIncendiary) {
-        ((EntityTNTPrimed) getHandle()).isIncendiary = isIncendiary;
+        getHandle().isIncendiary = isIncendiary;
     }
 
     public void setYield(float yield) {
-        ((EntityTNTPrimed) getHandle()).yield = yield;
+        getHandle().yield = yield;
     }
 
     public int getFuseTicks() {
-        return ((EntityTNTPrimed) getHandle()).a;
+        return getHandle().fuseTicks;
     }
 
     public void setFuseTicks(int fuseTicks) {
-        ((EntityTNTPrimed) getHandle()).a = fuseTicks;
+        getHandle().fuseTicks = fuseTicks;
     }
 
 }

src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java

@@ -35,11 +35,11 @@ public class CraftWolf extends CraftAnimals implements Wolf {
     }
 
     public boolean isTamed() {
-        return getHandle().A();
+        return getHandle().isTamed();
     }
 
     public void setTamed(boolean tame) {
-        getHandle().d(tame);
+        getHandle().setTamed(tame);
     }
 
     public AnimalTamer getOwner() {
@@ -75,11 +75,11 @@ public class CraftWolf extends CraftAnimals implements Wolf {
      * @return the owner's name, if they are a player; otherwise, the empty string or null.
      */
     String getOwnerName() {
-        return getHandle().x();
+        return getHandle().getOwnerName();
     }
 
     void setOwnerName(String ownerName) {
-        getHandle().a(ownerName);
+        getHandle().setOwnerName(ownerName);
     }
 
     /**
@@ -88,7 +88,7 @@ public class CraftWolf extends CraftAnimals implements Wolf {
      * @param pathentity currently the MC defined PathEntity class. Should be replaced with an API interface at some point.
      */
     private void setPath(PathEntity pathentity) {
-        getHandle().a(pathentity);
+        getHandle().setPathEntity(pathentity);
     }
 
     /*