First pass update to 1.12

main/pom.xml

@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.12-pre6-SNAPSHOT</craftbukkit.version> 
+		<craftbukkit.version>1.12-R0.1-SNAPSHOT</craftbukkit.version> 
 		<citizensapi.version>2.0.22-SNAPSHOT</citizensapi.version>
 		<vault.version>1.5.4</vault.version>
 		<powermock.version>1.4.12</powermock.version>

v1_12_R1/pom.xml

@@ -11,7 +11,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<craftbukkit.version>1.12-pre6-SNAPSHOT</craftbukkit.version> 
+		<craftbukkit.version>1.12-R0.1-SNAPSHOT</craftbukkit.version> 
 	</properties>
 
 	<repositories> 

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java

@@ -61,8 +61,8 @@ public class BatController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java

@@ -60,8 +60,8 @@ public class BlazeController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java

@@ -68,8 +68,8 @@ public class CaveSpiderController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java

@@ -79,8 +79,8 @@ public class ChickenController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java

@@ -80,8 +80,8 @@ public class CowController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java

@@ -70,8 +70,8 @@ public class CreeperController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java

@@ -59,8 +59,8 @@ public class EnderDragonController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java

@@ -68,8 +68,8 @@ public class EndermanController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java

@@ -68,8 +68,8 @@ public class EndermiteController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java

@@ -320,7 +320,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     }
 
     public void livingEntityBaseTick() {
-        cA();
+        B_();
         this.aC = this.aD;
         this.aJ = this.aK;
         if (this.hurtTicks > 0) {
@@ -346,7 +346,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     private void moveOnCurrentHeading() {
         if (bd) {
             if (onGround && jumpTicks == 0) {
-                cs();
+                cu();
                 jumpTicks = 10;
             }
         } else {

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java

@@ -54,8 +54,8 @@ public class EvokerController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java

@@ -46,13 +46,13 @@ public class GhastController extends MobEntityController {
         }
 
         @Override
-        public boolean cA() {
+        public boolean cC() {
             return npc != null;
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java

@@ -55,8 +55,8 @@ public class GiantController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java

@@ -54,8 +54,8 @@ public class GuardianController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java

@@ -54,8 +54,8 @@ public class GuardianElderController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java

@@ -75,8 +75,8 @@ public class HorseController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java

@@ -75,8 +75,8 @@ public class HorseDonkeyController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java

@@ -75,8 +75,8 @@ public class HorseMuleController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java

@@ -76,8 +76,8 @@ public class HorseSkeletonController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java

@@ -76,8 +76,8 @@ public class HorseZombieController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java

@@ -64,8 +64,8 @@ public class IllusionerController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java

@@ -54,8 +54,8 @@ public class IronGolemController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java

@@ -75,8 +75,8 @@ public class LlamaController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java

@@ -65,8 +65,8 @@ public class MagmaCubeController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java

@@ -66,8 +66,8 @@ public class MushroomCowController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java

@@ -65,8 +65,8 @@ public class OcelotController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java

@@ -57,8 +57,8 @@ public class ParrotController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java

@@ -66,8 +66,8 @@ public class PigController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java

@@ -55,8 +55,8 @@ public class PigZombieController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java

@@ -56,8 +56,8 @@ public class PolarBearController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java

@@ -66,8 +66,8 @@ public class RabbitController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java

@@ -65,8 +65,8 @@ public class SheepController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java

@@ -64,8 +64,8 @@ public class ShulkerController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java

@@ -54,8 +54,8 @@ public class SilverfishController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java

@@ -54,8 +54,8 @@ public class SkeletonController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java

@@ -54,8 +54,8 @@ public class SkeletonStrayController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java

@@ -54,8 +54,8 @@ public class SkeletonWitherController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java

@@ -66,8 +66,8 @@ public class SlimeController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java

@@ -54,8 +54,8 @@ public class SnowmanController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java

@@ -54,8 +54,8 @@ public class SpiderController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java

@@ -54,8 +54,8 @@ public class SquidController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java

@@ -45,8 +45,8 @@ public class VexController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java

@@ -1,4 +1,4 @@
-package net.citizensnpcs.nms.v1_12_R1.entity; import net.minecraft.server.v1_12_R1.DamageSource;
+package net.citizensnpcs.nms.v1_12_R1.entity;
 
 import java.util.List;
 
@@ -17,6 +17,7 @@ import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
 import net.minecraft.server.v1_12_R1.BlockPosition;
+import net.minecraft.server.v1_12_R1.DamageSource;
 import net.minecraft.server.v1_12_R1.EntityHuman;
 import net.minecraft.server.v1_12_R1.EntityVillager;
 import net.minecraft.server.v1_12_R1.EnumHand;
@@ -84,13 +85,17 @@ public class VillagerController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        public void a(float f, float f1, float f2) {
+            if (npc == null || !npc.isFlyable()) {
+                super.a(f, f1, f2);
+            } else {
+                NMSImpl.flyingMoveLogic(this, f, f1, f2);
+            }
         }
 
         @Override
-        protected SoundEffect d(DamageSource damagesource) {
-            return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override
@@ -103,18 +108,23 @@ public class VillagerController extends MobEntityController {
             }
         }
 
+        @Override
+        protected SoundEffect d(DamageSource damagesource) {
+            return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.HURT_SOUND_METADATA);
+        }
+
         @Override
         public boolean d(NBTTagCompound save) {
             return npc == null ? super.d(save) : false;
         }
 
         @Override
-        public boolean dk() {
+        public boolean do_() {
             if (blockingATrade) {
                 blockingATrade = false;
                 return true;
             }
-            return super.dk();
+            return super.do_();
         }
 
         @Override
@@ -157,15 +167,6 @@ public class VillagerController extends MobEntityController {
             // cancelled.
         }
 
-        @Override
-        public void a(float f, float f1, float f2) {
-            if (npc == null || !npc.isFlyable()) {
-                super.a(f, f1, f2);
-            } else {
-                NMSImpl.flyingMoveLogic(this, f, f1, f2);
-            }
-        }
-
         @Override
         protected SoundEffect F() {
             return NMSImpl.getSoundEffect(npc, super.F(), NPC.AMBIENT_SOUND_METADATA);

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java

@@ -65,8 +65,8 @@ public class VindicatorController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java

@@ -54,8 +54,8 @@ public class WitchController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java

@@ -45,8 +45,8 @@ public class WitherController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java

@@ -67,8 +67,8 @@ public class WolfController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java

@@ -54,8 +54,8 @@ public class ZombieController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java

@@ -54,8 +54,8 @@ public class ZombieHuskController extends MobEntityController {
         }
 
         @Override
-        protected SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        protected SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java

@@ -54,8 +54,8 @@ public class ZombieVillagerController extends MobEntityController {
         }
 
         @Override
-        public SoundEffect cd() {
-            return NMSImpl.getSoundEffect(npc, super.cd(), NPC.DEATH_SOUND_METADATA);
+        public SoundEffect cf() {
+            return NMSImpl.getSoundEffect(npc, super.cf(), NPC.DEATH_SOUND_METADATA);
         }
 
         @Override

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java

@@ -994,7 +994,7 @@ public class NMSImpl implements NMSBridge {
     @Override
     public boolean tick(org.bukkit.entity.Entity next) {
         Entity entity = NMSImpl.getHandle(next);
-        Entity entity1 = entity.bH();
+        Entity entity1 = entity.bJ();
         if (entity1 != null) {
             if ((entity1.dead) || (!entity1.w(entity))) {
                 entity.stopRiding();
@@ -1169,7 +1169,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void flyingMoveLogic(EntityLiving entity, float f, float f1, float f2) {
-        if ((entity.cA()) || (entity.bG())) {
+        if ((entity.cC()) || (entity.bI())) {
             if ((entity.isInWater())) {
                 double d2 = entity.locY;
                 float f4 = entity instanceof EntityPolarBear ? 0.98F : 0.8F;
@@ -1183,7 +1183,7 @@ public class NMSImpl implements NMSBridge {
                 }
                 if (f5 > 0.0F) {
                     f4 += (0.54600006F - f4) * f5 / 3.0F;
-                    f3 += (entity.cw() - f3) * f5 / 3.0F;
+                    f3 += (entity.cy() - f3) * f5 / 3.0F;
                 }
                 entity.b(f, f1, f2, f3);
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
@@ -1211,11 +1211,11 @@ public class NMSImpl implements NMSBridge {
                         && (entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ))) {
                     entity.motY = 0.30000001192092896D;
                 }
-            } else if (entity.cN()) {
+            } else if (entity.cP()) {
                 if (entity.motY > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-                Vec3D vec3d = entity.aH();
+                Vec3D vec3d = entity.aJ();
                 float f6 = entity.pitch * 0.017453292F;
 
                 double d0 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
@@ -1268,7 +1268,7 @@ public class NMSImpl implements NMSBridge {
                 float f4 = 0.16277136F / (f9 * f9 * f9);
                 float f3;
                 if (entity.onGround) {
-                    f3 = entity.cw() * f4;
+                    f3 = entity.cy() * f4;
                 } else {
                     f3 = entity.aR;
                 }

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java

@@ -52,7 +52,7 @@ public class PlayerControllerMove extends ControllerMove {
                 speed.setValue(0.1D * this.e);
             }
             float movement = (float) (this.e * speed.getValue()) * 10;
-            this.a.m(movement);
+            this.a.k(movement);
             this.a.bg = movement;
             if (shouldSlimeJump() || ((d2 > 0.0D) && (d0 * d0 + d1 * d1 < 1.0D))) {
                 this.h = cg();

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java

@@ -164,7 +164,7 @@ public class PlayerNavigation extends NavigationAbstract {
             } else {
                 this.l = localVec3D;
                 double d1 = paramVec3D.f(this.l);
-                this.o = (this.a.cw() > 0.0F ? d1 / this.a.cw() * 1000.0D : 0.0D);
+                this.o = (this.a.cy() > 0.0F ? d1 / this.a.cy() * 1000.0D : 0.0D);
             }
             if ((this.o > 0.0D) && (this.m > this.o * 3.0D)) {
                 this.l = Vec3D.a;

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderNormal.java

@@ -249,7 +249,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             int i = 0;
             while ((paramInt2 > 0) && (localPathType1 == PathType.OPEN)) {
                 paramInt2--;
-                if (i++ >= this.b.be()) {
+                if (i++ >= this.b.bg()) {
                     return null;
                 }
                 localPathType1 = a(this.b, paramInt1, paramInt2, paramInt3);