Update to 1.6.4

Author: 14mRh4X0r

src/BaseEntity.java

@@ -315,7 +315,7 @@ public void setNoDamageTicks(int ticks) {
      */
     public int getAirTicks() {
         // SRG return this.getEntity().func_70086_ai();
-        return this.getEntity().ak();
+        return this.getEntity().al();
     }
 
     /**
@@ -453,7 +453,7 @@ public void setMotionZ(double motion) {
      */
     public void destroy() {
         // SRG this.entity.func_70106_y();
-        this.entity.w();
+        this.entity.x();
     }
 
     /**
@@ -472,7 +472,7 @@ public String getName() {
      */
     public boolean getSprinting() {
         // SRG return this.entity.func_70051_ag();
-        return this.entity.ah();
+        return this.entity.ai();
     }
 
     /**
@@ -570,7 +570,7 @@ public void spawn(LivingEntity rider) {
      */
     public boolean isInvulnerable() {
         // SRG return getEntity().func_85032_ar();
-        return getEntity().aq();
+        return getEntity().ar();
     }
 
     /**
@@ -684,7 +684,7 @@ public float getEyeHeight() {
      */
     public boolean getSneaking() {
         // SRG return getEntity().func_70093_af();
-        return getEntity().ag();
+        return getEntity().ah();
     }
 
     /**

src/HopperMinecart.java

@@ -57,7 +57,7 @@ public OEntityMinecartHopper getEntity() {
      */
     public boolean isBlocked() {
         // SRG return this.getEntity().func_96111_ay();
-        return this.getEntity().ay();
+        return this.getEntity().u();
     }
 
     /**

src/HumanEntity.java

@@ -387,7 +387,7 @@ public Item getItemStackInHand() {
     public Location getRespawnLocation() {
         Location spawn = etc.getServer().getDefaultWorld().getSpawnLocation();
         // SRG OChunkCoordinates loc = getEntity().func_70997_bJ();
-        OChunkCoordinates loc = getEntity().bE();
+        OChunkCoordinates loc = getEntity().bF();
         if (loc != null) {
             // SRG spawn = new Location(etc.getServer().getDefaultWorld(), loc.field_71574_a, loc.field_71572_b, loc.field_71573_c);
             spawn = new Location(etc.getServer().getDefaultWorld(), loc.a, loc.b, loc.c);
@@ -401,7 +401,7 @@ public Location getRespawnLocation() {
      */
     public int getScore() {
         // SRG return getEntity().func_71037_bA();
-        return getEntity().bv();
+        return getEntity().bw();
     }
 
     /**
@@ -439,7 +439,7 @@ public float getXPBarProgress() {
      */
     public int getXPBarMax() {
         // SRG return getEntity().func_71050_bK();
-        return getEntity().bG();
+        return getEntity().bH();
     }
 
     /**
@@ -657,6 +657,6 @@ public void setInventory() {
      */
     public EnderChestInventory getEnderChest() {
         // SRG return new EnderChestInventory(getEntity().func_71005_bN(), this);
-        return new EnderChestInventory(getEntity().bJ(), this);
+        return new EnderChestInventory(getEntity().bK(), this);
     }
 }

src/LivingEntity.java

@@ -52,7 +52,7 @@ public void setItemInHand(Item item) {
      */
     public Item getItemStackInHand() {
         // SRG OItemStack stack = getEntity().func_70694_bm();
-        OItemStack stack = getEntity().aY();
+        OItemStack stack = getEntity().aZ();
         return stack == null ? null : new Item(stack);
     }
 

src/LivingEntityBase.java

@@ -38,7 +38,7 @@ public int getHealth() {
      */
     public float getHealthFloat() {
         // SRG return getEntity().func_110143_aJ();
-        return getEntity().aM();
+        return getEntity().aN();
     }
 
     /**
@@ -104,7 +104,7 @@ public int getMaxHealth() {
      */
     public double getMaxHealthDouble() {
         // SRG return getEntity().func_110138_aP();
-        return getEntity().aS();
+        return getEntity().aT();
     }
 
     /**
@@ -222,7 +222,7 @@ public boolean hasPotionEffect(PotionEffect.Type effectType) {
     @SuppressWarnings("unchecked")
     public List<PotionEffect> getPotionEffects() {
         // SRG Collection<OPotionEffect> potionEffects = getEntity().func_70651_bq();
-        Collection<OPotionEffect> potionEffects = getEntity().aK();
+        Collection<OPotionEffect> potionEffects = getEntity().aL();
         ArrayList<PotionEffect> list = new ArrayList<PotionEffect>();
 
         for (OPotionEffect potionEffect : potionEffects) {

src/OBlockLeaves.java

@@ -171,7 +171,7 @@ public void a(OWorld oworld, int i, int j, int k, int l, float f, int i1) {
     }
 
     public void a(OWorld oworld, OEntityPlayer oentityplayer, int i, int j, int k, int l) {
-        if (!oworld.I && oentityplayer.bx() != null && oentityplayer.bx().d == OItem.bg.cv) {
+        if (!oworld.I && oentityplayer.by() != null && oentityplayer.by().d == OItem.bg.cv) {
             oentityplayer.a(OStatList.C[this.cF], 1);
             this.b(oworld, i, j, k, new OItemStack(OBlock.P.cF, 1, l & 3));
         } else {

src/OBlockPortal.java

@@ -20,7 +20,7 @@ public void a(OWorld oworld, int i, int j, int k, Random random) {
                 OEntity oentity = OItemMonsterPlacer.a(oworld, 57, (double) i + 0.5D, (double) l + 1.1D, (double) k + 0.5D);
 
                 if (oentity != null) {
-                    oentity.ao = oentity.ab();
+                    oentity.ao = oentity.ac();
                 }
             }
         }
@@ -162,7 +162,7 @@ public int a(Random random) {
 
     public void a(OWorld oworld, int i, int j, int k, OEntity oentity) {
         if (oentity.o == null && oentity.n == null) {
-            oentity.aa();
+            oentity.ab();
         }
     }
 }

src/OChunk.java

@@ -635,7 +635,7 @@ public void a(OEntity oentity) {
                     "Entity not in this chunk! Chunk: {0}, {1} Entity: {2}",
                     new Object[] {this.g, this.h, oentity});
             this.e.Y().c("Destroying entity to prevent trouble", new RuntimeException());
-            oentity.w();
+            oentity.x(); // XXX: update me
             return;
         }
 
@@ -753,7 +753,7 @@ public void c() {
             while (iterator.hasNext()) {
                 OEntity oentity = (OEntity) iterator.next();
 
-                oentity.Q();
+                oentity.R();
             }
 
             this.e.a(this.j[i]);
@@ -801,7 +801,7 @@ public void a(OEntity oentity, OAxisAlignedBB oaxisalignedbb, List list, OIEntit
 
                 if (oentity1 != oentity && oentity1.E.b(oaxisalignedbb) && (oientityselector == null || oientityselector.a(oentity1))) {
                     list.add(oentity1);
-                    OEntity[] aoentity = oentity1.an();
+                    OEntity[] aoentity = oentity1.ao();
 
                     if (aoentity != null) {
                         for (int i1 = 0; i1 < aoentity.length; ++i1) {

src/OCommandBase.java

@@ -119,7 +119,7 @@ public static String e(OICommandSender oicommandsender, String s) {
         OEntityPlayerMP oentityplayermp = OPlayerSelector.a(oicommandsender, s);
 
         if (oentityplayermp != null) {
-            return oentityplayermp.am();
+            return oentityplayermp.an();
         } else if (OPlayerSelector.b(s)) {
             throw new OPlayerNotFoundException();
         } else {
@@ -226,7 +226,7 @@ public static String b(Collection collection) {
 
         OEntityLivingBase oentitylivingbase;
 
-        for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i++] = oentitylivingbase.ax()) {
+        for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i++] = oentitylivingbase.ay()) {
             oentitylivingbase = (OEntityLivingBase) iterator.next();
         }
 

src/OCommandHandler.java

@@ -72,7 +72,7 @@ public void notify(String message) {
                     for (int l = 0; l < k; ++l) {
                         OEntityPlayerMP oentityplayermp = aoentityplayermp1[l];
 
-                        astring[i] = oentityplayermp.am();
+                        astring[i] = oentityplayermp.an();
 
                         try {
                             oicommand.b(oicommandsender, astring);