From 6e9593c4c3a376b73e32d9c1b1df8ae7f2b4c4c8 Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 16 Nov 2012 15:47:51 +0800 Subject: [PATCH] Update more names for 1.4.4 --- .../java/net/citizensnpcs/npc/entity/CitizensBatNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensBlazeNPC.java | 4 ++-- .../citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java | 8 ++++---- .../net/citizensnpcs/npc/entity/CitizensChickenNPC.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/CitizensCowNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensCreeperNPC.java | 4 ++-- .../citizensnpcs/npc/entity/CitizensEnderDragonNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensEndermanNPC.java | 8 ++++---- .../net/citizensnpcs/npc/entity/CitizensGhastNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensGiantNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java | 8 ++++---- .../citizensnpcs/npc/entity/CitizensMushroomCowNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensOcelotNPC.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/CitizensPigNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java | 8 ++++---- .../net/citizensnpcs/npc/entity/CitizensSheepNPC.java | 4 ++-- .../citizensnpcs/npc/entity/CitizensSilverfishNPC.java | 8 ++++---- .../net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensSlimeNPC.java | 8 ++++---- .../net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensSpiderNPC.java | 8 ++++---- .../net/citizensnpcs/npc/entity/CitizensSquidNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensVillagerNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensWitchNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensWitherNPC.java | 4 ++-- .../java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java | 4 ++-- .../net/citizensnpcs/npc/entity/CitizensZombieNPC.java | 4 ++-- src/main/java/net/citizensnpcs/util/NMS.java | 4 ++-- 29 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensBatNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensBatNPC.java index c3a02f17e..bd6119765 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensBatNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensBatNPC.java @@ -59,9 +59,9 @@ public class CitizensBatNPC extends CitizensMobNPC { } @Override - public void bi() { + public void bl() { if (npc == null) - super.bi(); + super.bl(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java index 9cebf125e..4acf3cc5b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java @@ -59,11 +59,11 @@ public class CitizensBlazeNPC extends CitizensMobNPC { } @Override - public void bk() { + public void bn() { if (npc != null) npc.update(); else - super.bk(); + super.bn(); } @Override diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java index e93720c19..8780800c0 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java @@ -58,16 +58,16 @@ public class CitizensCaveSpiderNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java index 00d1780b7..cec290687 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java @@ -58,8 +58,8 @@ public class CitizensChickenNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java index b64270e15..ef7edb31c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java @@ -59,8 +59,8 @@ public class CitizensCowNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java index eb239371e..b95cd64f7 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java @@ -66,8 +66,8 @@ public class CitizensCreeperNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java index 12360d20c..cc6966df9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java @@ -59,9 +59,9 @@ public class CitizensEnderDragonNPC extends CitizensMobNPC { } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); } @Override diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java index 7f9577eb6..65dcdd73c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java @@ -92,16 +92,16 @@ public class CitizensEndermanNPC extends CitizensMobNPC implements Equipable { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java index ed2236d92..8dafd3442 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java @@ -45,11 +45,11 @@ public class CitizensGhastNPC extends CitizensMobNPC { } @Override - public void bk() { + public void bn() { if (npc != null) npc.update(); else - super.bk(); + super.bn(); } @Override diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java index 154d8d654..14dc23887 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java @@ -45,9 +45,9 @@ public class CitizensGiantNPC extends CitizensMobNPC { } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java index 04e3cbf30..d76e12aa6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java @@ -45,8 +45,8 @@ public class CitizensIronGolemNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java index 9d5702f6b..f2ba38314 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java @@ -47,16 +47,16 @@ public class CitizensMagmaCubeNPC extends CitizensMobNPC { @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java index 2ebb78ecd..362cb44b5 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java @@ -45,8 +45,8 @@ public class CitizensMushroomCowNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java index 7854bc7b0..e35944fb2 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java @@ -45,8 +45,8 @@ public class CitizensOcelotNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java index 3f16a5287..fef3941df 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java @@ -75,8 +75,8 @@ public class CitizensPigNPC extends CitizensMobNPC implements Equipable { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java index 193ea0f57..f99dccbc6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java @@ -45,16 +45,16 @@ public class CitizensPigZombieNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java index 9e19adcb1..ab867206e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java @@ -74,8 +74,8 @@ public class CitizensSheepNPC extends CitizensMobNPC implements Equipable { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java index b262da526..ea994c1ef 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java @@ -45,16 +45,16 @@ public class CitizensSilverfishNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java index 66ed7406d..a74fb0c83 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java @@ -45,8 +45,8 @@ public class CitizensSkeletonNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java index 98bd3cecf..54a66926c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java @@ -46,16 +46,16 @@ public class CitizensSlimeNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { npc.update(); NMS.updateAI(this); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java index b03d80332..846c78f5f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java @@ -45,8 +45,8 @@ public class CitizensSnowmanNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java index 3f555f851..f18054a44 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java @@ -44,16 +44,16 @@ public class CitizensSpiderNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } @Override - public void bk() { + public void bn() { if (npc == null) - super.bk(); + super.bn(); else { NMS.updateAI(this); npc.update(); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java index 942b1523c..9bce88dc6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java @@ -45,11 +45,11 @@ public class CitizensSquidNPC extends CitizensMobNPC { } @Override - public void bk() { + public void bn() { if (npc != null) npc.update(); else - super.bk(); + super.bn(); } @Override diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java index b39929bb0..c3512432b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java @@ -46,8 +46,8 @@ public class CitizensVillagerNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensWitchNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensWitchNPC.java index b5e0e9f0d..4d679ebea 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensWitchNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensWitchNPC.java @@ -44,8 +44,8 @@ public class CitizensWitchNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensWitherNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensWitherNPC.java index 6f1b6da7f..55b1a6b32 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensWitherNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensWitherNPC.java @@ -44,8 +44,8 @@ public class CitizensWitherNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java index b980ccbe8..1688ef920 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java @@ -45,8 +45,8 @@ public class CitizensWolfNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java index f2b6f3bf7..cd80062e3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java @@ -45,8 +45,8 @@ public class CitizensZombieNPC extends CitizensMobNPC { } @Override - public void bi() { - super.bi(); + public void bl() { + super.bl(); if (npc != null) npc.update(); } diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java index 13dd4184c..e36092729 100644 --- a/src/main/java/net/citizensnpcs/util/NMS.java +++ b/src/main/java/net/citizensnpcs/util/NMS.java @@ -301,8 +301,8 @@ public class NMS { MOVEMENT_SPEEDS.put(EntityType.PLAYER, 1F); MOVEMENT_SPEEDS.put(EntityType.VILLAGER, 0.3F); - LAND_SPEED_MODIFIER_FIELD = getField(EntityLiving.class, "bQ"); - SPEED_FIELD = getField(EntityLiving.class, "bI"); + LAND_SPEED_MODIFIER_FIELD = getField(EntityLiving.class, "bO"); + SPEED_FIELD = getField(EntityLiving.class, "bG"); NAVIGATION_WORLD_FIELD = getField(Navigation.class, "b"); PATHFINDING_RANGE = getField(Navigation.class, "e"); GOAL_FIELD = getField(PathfinderGoalSelector.class, "a");