From 163ff9fb19b2dc581aea4243ee4d2b26063cf0b6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Thu, 10 Jul 2014 19:52:40 -0700 Subject: [PATCH] 1.7.10 --- pom.xml | 6 +- src/main/java/net/citizensnpcs/Citizens.java | 2 +- src/main/java/net/citizensnpcs/Metrics.java | 2 +- .../net/citizensnpcs/npc/CitizensNPC.java | 6 +- .../citizensnpcs/npc/MobEntityController.java | 10 ++-- .../npc/ai/AStarNavigationStrategy.java | 2 +- .../net/citizensnpcs/npc/ai/BlockBreaker.java | 24 ++++---- .../npc/ai/FlyingAStarNavigationStrategy.java | 2 +- .../npc/ai/MCNavigationStrategy.java | 6 +- .../citizensnpcs/npc/ai/MCTargetStrategy.java | 14 ++--- .../npc/entity/BatController.java | 32 +++++------ .../npc/entity/BlazeController.java | 24 ++++---- .../npc/entity/CaveSpiderController.java | 28 +++++----- .../npc/entity/ChickenController.java | 24 ++++---- .../npc/entity/CowController.java | 24 ++++---- .../npc/entity/CreeperController.java | 26 ++++----- .../npc/entity/EnderDragonController.java | 24 ++++---- .../npc/entity/EndermanController.java | 30 +++++----- .../npc/entity/EntityHumanNPC.java | 40 ++++++------- .../npc/entity/GhastController.java | 24 ++++---- .../npc/entity/GiantController.java | 24 ++++---- .../npc/entity/HorseController.java | 22 ++++---- .../npc/entity/HumanController.java | 8 +-- .../npc/entity/IronGolemController.java | 24 ++++---- .../npc/entity/MagmaCubeController.java | 28 +++++----- .../npc/entity/MushroomCowController.java | 24 ++++---- .../npc/entity/OcelotController.java | 24 ++++---- .../npc/entity/PigController.java | 26 ++++----- .../npc/entity/PigZombieController.java | 28 +++++----- .../npc/entity/SheepController.java | 24 ++++---- .../npc/entity/SilverfishController.java | 28 +++++----- .../npc/entity/SkeletonController.java | 24 ++++---- .../npc/entity/SlimeController.java | 28 +++++----- .../npc/entity/SnowmanController.java | 24 ++++---- .../npc/entity/SpiderController.java | 28 +++++----- .../npc/entity/SquidController.java | 24 ++++---- .../npc/entity/VillagerController.java | 26 ++++----- .../npc/entity/WitchController.java | 24 ++++---- .../npc/entity/WitherController.java | 30 +++++----- .../npc/entity/WolfController.java | 24 ++++---- .../npc/entity/ZombieController.java | 24 ++++---- .../npc/entity/nonliving/ArrowController.java | 12 ++-- .../npc/entity/nonliving/BoatController.java | 12 ++-- .../npc/entity/nonliving/EggController.java | 16 +++--- .../nonliving/EnderCrystalController.java | 12 ++-- .../nonliving/EnderPearlController.java | 12 ++-- .../nonliving/EnderSignalController.java | 12 ++-- .../nonliving/ExperienceOrbController.java | 12 ++-- .../nonliving/FallingBlockController.java | 22 ++++---- .../entity/nonliving/FireworkController.java | 12 ++-- .../nonliving/FishingHookController.java | 12 ++-- .../npc/entity/nonliving/ItemController.java | 22 ++++---- .../entity/nonliving/ItemFrameController.java | 12 ++-- .../nonliving/LargeFireballController.java | 12 ++-- .../npc/entity/nonliving/LeashController.java | 12 ++-- .../nonliving/MinecartChestController.java | 12 ++-- .../nonliving/MinecartCommandController.java | 12 ++-- .../nonliving/MinecartFurnaceController.java | 12 ++-- .../nonliving/MinecartHopperController.java | 6 +- .../nonliving/MinecartRideableController.java | 12 ++-- .../nonliving/MinecartSpawnerController.java | 6 +- .../nonliving/MinecartTNTController.java | 6 +- .../entity/nonliving/PaintingController.java | 12 ++-- .../nonliving/SmallFireballController.java | 12 ++-- .../entity/nonliving/SnowballController.java | 12 ++-- .../entity/nonliving/TNTPrimedController.java | 12 ++-- .../nonliving/ThrownExpBottleController.java | 12 ++-- .../nonliving/ThrownPotionController.java | 12 ++-- .../nonliving/WitherSkullController.java | 12 ++-- .../npc/network/EmptyNetHandler.java | 10 ++-- .../npc/network/EmptyNetworkManager.java | 2 +- .../net/citizensnpcs/trait/Controllable.java | 20 +++---- .../waypoint/EntityEnderSignalMarker.java | 6 +- src/main/java/net/citizensnpcs/util/NMS.java | 56 +++++++++---------- .../citizensnpcs/util/PlayerAnimation.java | 12 ++-- .../util/nms/PlayerControllerLook.java | 6 +- .../util/nms/PlayerControllerMove.java | 6 +- .../util/nms/PlayerNavigation.java | 36 ++++++------ 78 files changed, 681 insertions(+), 681 deletions(-) diff --git a/pom.xml b/pom.xml index b2c0c95b7..a6644ff68 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,9 @@ UTF-8 - 1.7.9-R0.1-SNAPSHOT + 1.7.10-R0.1-SNAPSHOT 2.0.13-SNAPSHOT - 1.2.19-SNAPSHOT + 1.4.1 1.4.12 Unknown Unknown @@ -30,7 +30,7 @@ vault-repo - http://ci.herocraftonline.com/plugin/repository/everything + http://nexus.theyeticave.net/content/repositories/pub_releases diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index 86ef3bad2..6f03db631 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -454,5 +454,5 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { return false; } - private static final String COMPATIBLE_MC_VERSION = "1.7.9"; + private static final String COMPATIBLE_MC_VERSION = "1.7.10"; } diff --git a/src/main/java/net/citizensnpcs/Metrics.java b/src/main/java/net/citizensnpcs/Metrics.java index fb1eafbbb..f5f3e7a3b 100644 --- a/src/main/java/net/citizensnpcs/Metrics.java +++ b/src/main/java/net/citizensnpcs/Metrics.java @@ -288,7 +288,7 @@ public class Metrics { // is enabled String pluginVersion = description.getVersion(); String serverVersion = Bukkit.getVersion(); - int playersOnline = Bukkit.getServer().getOnlinePlayers().length; + int playersOnline = Bukkit.getServer().getOnlinePlayers().size(); // END server software specific section -- all code below does not use // any code outside of this class / Java diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index 3ffd1638e..4da0551f7 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -23,11 +23,11 @@ import net.citizensnpcs.trait.CurrentLocation; import net.citizensnpcs.util.Messages; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.PacketPlayOutEntityTeleport; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityTeleport; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; @@ -168,7 +168,7 @@ public class CitizensNPC extends AbstractNPC { at = at.clone(); entityController.spawn(at, this); - net.minecraft.server.v1_7_R3.Entity mcEntity = ((CraftEntity) getEntity()).getHandle(); + net.minecraft.server.v1_7_R4.Entity mcEntity = ((CraftEntity) getEntity()).getHandle(); boolean couldSpawn = !Util.isLoaded(at) ? false : mcEntity.world.addEntity(mcEntity, SpawnReason.CUSTOM); mcEntity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); if (!couldSpawn) { diff --git a/src/main/java/net/citizensnpcs/npc/MobEntityController.java b/src/main/java/net/citizensnpcs/npc/MobEntityController.java index afb986ebd..43e6fea9a 100644 --- a/src/main/java/net/citizensnpcs/npc/MobEntityController.java +++ b/src/main/java/net/citizensnpcs/npc/MobEntityController.java @@ -4,11 +4,11 @@ import java.lang.reflect.Constructor; import java.util.Map; import net.citizensnpcs.api.npc.NPC; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Location; import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; import org.bukkit.entity.Entity; import com.google.common.collect.Maps; @@ -23,7 +23,7 @@ public abstract class MobEntityController extends AbstractEntityController { @Override protected Entity createEntity(Location at, NPC npc) { - net.minecraft.server.v1_7_R3.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(), + net.minecraft.server.v1_7_R4.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(), npc); entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); @@ -36,9 +36,9 @@ public abstract class MobEntityController extends AbstractEntityController { return entity.getBukkitEntity(); } - private net.minecraft.server.v1_7_R3.Entity createEntityFromClass(Object... args) { + private net.minecraft.server.v1_7_R4.Entity createEntityFromClass(Object... args) { try { - return (net.minecraft.server.v1_7_R3.Entity) constructor.newInstance(args); + return (net.minecraft.server.v1_7_R4.Entity) constructor.newInstance(args); } catch (Exception ex) { ex.printStackTrace(); return null; diff --git a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java index 74806949d..4fa6d82e0 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java @@ -71,7 +71,7 @@ public class AStarNavigationStrategy extends AbstractPathStrategy { } vector = plan.getCurrentVector(); } - net.minecraft.server.v1_7_R3.Entity handle = NMS.getHandle(npc.getEntity()); + net.minecraft.server.v1_7_R4.Entity handle = NMS.getHandle(npc.getEntity()); double dX = vector.getBlockX() - handle.locX; double dZ = vector.getBlockZ() - handle.locZ; double dY = vector.getY() - handle.locY; diff --git a/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java b/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java index 8019f4ffe..d1a8c0a0e 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java +++ b/src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java @@ -5,19 +5,19 @@ import net.citizensnpcs.api.ai.tree.BehaviorStatus; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.PlayerAnimation; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.Block; -import net.minecraft.server.v1_7_R3.Blocks; -import net.minecraft.server.v1_7_R3.Enchantment; -import net.minecraft.server.v1_7_R3.EnchantmentManager; -import net.minecraft.server.v1_7_R3.EntityLiving; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.ItemStack; -import net.minecraft.server.v1_7_R3.Material; -import net.minecraft.server.v1_7_R3.MobEffectList; +import net.minecraft.server.v1_7_R4.Block; +import net.minecraft.server.v1_7_R4.Blocks; +import net.minecraft.server.v1_7_R4.Enchantment; +import net.minecraft.server.v1_7_R4.EnchantmentManager; +import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.ItemStack; +import net.minecraft.server.v1_7_R4.Material; +import net.minecraft.server.v1_7_R4.MobEffectList; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftLivingEntity; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -45,7 +45,7 @@ public class BlockBreaker extends BehaviorGoalAdapter { return Math.pow(entity.locX - x, 2) + Math.pow(entity.locY - y, 2) + Math.pow(entity.locZ - z, 2); } - private net.minecraft.server.v1_7_R3.ItemStack getCurrentItem() { + private net.minecraft.server.v1_7_R4.ItemStack getCurrentItem() { return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item()) : entity.getEquipment(0); } diff --git a/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java index 2fa184840..7318728d1 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java @@ -12,7 +12,7 @@ import net.citizensnpcs.api.astar.pathfinder.VectorNode; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.MathHelper; +import net.minecraft.server.v1_7_R4.MathHelper; import org.bukkit.Location; import org.bukkit.util.Vector; diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java index 307f7a963..1e411efcd 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java @@ -5,11 +5,11 @@ import net.citizensnpcs.api.ai.TargetType; import net.citizensnpcs.api.ai.event.CancelReason; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_7_R3.EntityLiving; -import net.minecraft.server.v1_7_R3.Navigation; +import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_7_R4.Navigation; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity; public class MCNavigationStrategy extends AbstractPathStrategy { private final Navigation navigation; diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java index 3e0d909d7..132d78058 100644 --- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java +++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java @@ -11,15 +11,15 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.PlayerAnimation; import net.citizensnpcs.util.nms.PlayerNavigation; -import net.minecraft.server.v1_7_R3.AttributeInstance; -import net.minecraft.server.v1_7_R3.Entity; -import net.minecraft.server.v1_7_R3.EntityLiving; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.Navigation; -import net.minecraft.server.v1_7_R3.PathEntity; +import net.minecraft.server.v1_7_R4.AttributeInstance; +import net.minecraft.server.v1_7_R4.Entity; +import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.Navigation; +import net.minecraft.server.v1_7_R4.PathEntity; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.LivingEntity; public class MCTargetStrategy implements PathStrategy, EntityTarget { diff --git a/src/main/java/net/citizensnpcs/npc/entity/BatController.java b/src/main/java/net/citizensnpcs/npc/entity/BatController.java index 1286cd474..3d6169e5b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BatController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BatController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityBat; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityBat; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftBat; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftBat; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Bat; import org.bukkit.util.Vector; @@ -57,21 +57,21 @@ public class BatController extends MobEntityController { } } - @Override - protected String aS() { - return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.aS() : npc.data().get( - NPC.HURT_SOUND_METADATA, super.aS()); - } - @Override protected String aT() { - return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.aT() : npc.data().get( + NPC.HURT_SOUND_METADATA, super.aT()); } @Override - public void bm() { + protected String aU() { + return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); + } + + @Override + public void bn() { if (npc == null) { - super.bm(); + super.bn(); } else { NMS.updateAI(this); npc.update(); @@ -93,7 +93,7 @@ public class BatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -144,7 +144,7 @@ public class BatController extends MobEntityController { } public void setFlying(boolean flying) { - setStartled(flying); + setAsleep(flying); } @Override diff --git a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java index f964185ed..3d399cfcd 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityBlaze; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityBlaze; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftBlaze; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftBlaze; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Blaze; import org.bukkit.util.Vector; @@ -57,13 +57,13 @@ public class BlazeController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,17 +80,17 @@ public class BlazeController extends MobEntityController { } @Override - public void bp() { + public void bq() { if (npc != null) { NMS.updateAI(this); npc.update(); } else { - super.bp(); + super.bq(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java index e1fd7961c..2e69c14c8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityCaveSpider; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityCaveSpider; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftCaveSpider; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCaveSpider; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.CaveSpider; import org.bukkit.util.Vector; @@ -64,13 +64,13 @@ public class CaveSpiderController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -96,17 +96,17 @@ public class CaveSpiderController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } } @Override - public void bp() { + public void bq() { if (npc == null) { - super.bp(); + super.bq(); } else { NMS.updateAI(this); npc.update(); @@ -114,7 +114,7 @@ public class CaveSpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java index 654e1b172..1aea92e33 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityChicken; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityChicken; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftChicken; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftChicken; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Chicken; import org.bukkit.util.Vector; @@ -75,13 +75,13 @@ public class ChickenController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -105,14 +105,14 @@ public class ChickenController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CowController.java b/src/main/java/net/citizensnpcs/npc/entity/CowController.java index 9e646ba0b..1fac1d480 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CowController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityCow; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityCow; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftCow; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCow; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Cow; import org.bukkit.util.Vector; @@ -76,13 +76,13 @@ public class CowController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -106,15 +106,15 @@ public class CowController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java index cc198ab5c..790f12493 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java @@ -7,14 +7,14 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityCreeper; -import net.minecraft.server.v1_7_R3.EntityLightning; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityCreeper; +import net.minecraft.server.v1_7_R4.EntityLightning; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftCreeper; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCreeper; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Creeper; import org.bukkit.util.Vector; @@ -72,13 +72,13 @@ public class CreeperController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -102,15 +102,15 @@ public class CreeperController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java index 8a0494f9d..f0738b976 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEnderDragon; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityEnderDragon; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEnderDragon; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEnderDragon; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.EnderDragon; import org.bukkit.util.Vector; @@ -57,13 +57,13 @@ public class EnderDragonController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,14 +80,14 @@ public class EnderDragonController extends MobEntityController { } @Override - public void bp() { + public void bq() { if (npc == null) { - super.bp(); + super.bq(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java index fae0bddc9..8ce4ea4f0 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEnderman; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityEnderman; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEnderman; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEnderman; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Enderman; import org.bukkit.util.Vector; @@ -65,13 +65,13 @@ public class EndermanController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -82,8 +82,8 @@ public class EndermanController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @@ -102,9 +102,9 @@ public class EndermanController extends MobEntityController { } @Override - public void bp() { + public void bq() { if (npc == null) - super.bp(); + super.bq(); else { NMS.updateAI(this); npc.update(); @@ -112,7 +112,7 @@ public class EndermanController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -204,7 +204,7 @@ public class EndermanController extends MobEntityController { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bi(); + bj(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java index 386f954c0..c3223691e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java +++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java @@ -18,27 +18,27 @@ import net.citizensnpcs.util.nms.PlayerControllerJump; import net.citizensnpcs.util.nms.PlayerControllerLook; import net.citizensnpcs.util.nms.PlayerControllerMove; import net.citizensnpcs.util.nms.PlayerNavigation; -import net.minecraft.server.v1_7_R3.AttributeInstance; -import net.minecraft.server.v1_7_R3.Entity; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.EnumGamemode; -import net.minecraft.server.v1_7_R3.GenericAttributes; -import net.minecraft.server.v1_7_R3.MathHelper; -import net.minecraft.server.v1_7_R3.MinecraftServer; -import net.minecraft.server.v1_7_R3.Navigation; -import net.minecraft.server.v1_7_R3.NetworkManager; -import net.minecraft.server.v1_7_R3.Packet; -import net.minecraft.server.v1_7_R3.PacketPlayOutEntityEquipment; -import net.minecraft.server.v1_7_R3.PacketPlayOutEntityHeadRotation; -import net.minecraft.server.v1_7_R3.PacketPlayOutPlayerInfo; -import net.minecraft.server.v1_7_R3.PlayerInteractManager; -import net.minecraft.server.v1_7_R3.WorldServer; +import net.minecraft.server.v1_7_R4.AttributeInstance; +import net.minecraft.server.v1_7_R4.Entity; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.EnumGamemode; +import net.minecraft.server.v1_7_R4.GenericAttributes; +import net.minecraft.server.v1_7_R4.MathHelper; +import net.minecraft.server.v1_7_R4.MinecraftServer; +import net.minecraft.server.v1_7_R4.Navigation; +import net.minecraft.server.v1_7_R4.NetworkManager; +import net.minecraft.server.v1_7_R4.Packet; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityEquipment; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityHeadRotation; +import net.minecraft.server.v1_7_R4.PacketPlayOutPlayerInfo; +import net.minecraft.server.v1_7_R4.PlayerInteractManager; +import net.minecraft.server.v1_7_R4.WorldServer; import net.minecraft.util.com.mojang.authlib.GameProfile; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; import org.bukkit.util.Vector; @@ -80,7 +80,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -205,7 +205,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { AttributeInstance range = this.getAttributeInstance(GenericAttributes.b); if (range == null) { - range = this.bb().b(GenericAttributes.b); + range = this.getAttributeMap().b(GenericAttributes.b); } range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble()); controllerJump = new PlayerControllerJump(this); @@ -222,7 +222,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder { NMS.updateAI(this); if (bc) { if (onGround && jumpTicks == 0) { - bi(); + bj(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java index 09fdee562..bc734aadb 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityGhast; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityGhast; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftGhast; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftGhast; import org.bukkit.entity.Ghast; import org.bukkit.util.Vector; @@ -43,13 +43,13 @@ public class GhastController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -66,15 +66,15 @@ public class GhastController extends MobEntityController { } @Override - public void bp() { + public void bq() { if (npc != null) { npc.update(); } else - super.bp(); + super.bq(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java index f77d3003f..2ab03123a 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityGiantZombie; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityGiantZombie; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftGiant; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftGiant; import org.bukkit.entity.Giant; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class GiantController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,9 +80,9 @@ public class GiantController extends MobEntityController { } @Override - public void bp() { + public void bq() { if (npc == null) { - super.bp(); + super.bq(); } else { NMS.updateAI(this); npc.update(); @@ -90,7 +90,7 @@ public class GiantController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java index 31ffa9639..dd6945b56 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java @@ -8,14 +8,14 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityHorse; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityHorse; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftHorse; import org.bukkit.entity.Horse; import org.bukkit.util.Vector; @@ -71,13 +71,13 @@ public class HorseController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -101,7 +101,7 @@ public class HorseController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -187,7 +187,7 @@ public class HorseController extends MobEntityController { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bi(); + bj(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java index df2682b24..e7be1d5b6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java @@ -11,8 +11,8 @@ import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.util.Colorizer; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_7_R3.PlayerInteractManager; -import net.minecraft.server.v1_7_R3.WorldServer; +import net.minecraft.server.v1_7_R4.PlayerInteractManager; +import net.minecraft.server.v1_7_R4.WorldServer; import net.minecraft.util.com.google.common.collect.Iterables; import net.minecraft.util.com.mojang.authlib.Agent; import net.minecraft.util.com.mojang.authlib.GameProfile; @@ -24,8 +24,8 @@ import net.minecraft.util.com.mojang.authlib.properties.Property; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.ChatColor; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java index 529e9297b..4df9956b2 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityIronGolem; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityIronGolem; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftIronGolem; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftIronGolem; import org.bukkit.entity.IronGolem; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class IronGolemController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,14 +80,14 @@ public class IronGolemController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java index 0c80f4f60..f4b407389 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMagmaCube; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMagmaCube; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftMagmaCube; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftMagmaCube; import org.bukkit.entity.MagmaCube; import org.bukkit.util.Vector; @@ -51,13 +51,13 @@ public class MagmaCubeController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -81,16 +81,16 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void bp() { + public void bq() { if (npc == null) - super.bp(); + super.bq(); else { NMS.updateAI(this); npc.update(); @@ -98,7 +98,7 @@ public class MagmaCubeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java index 36f9151c1..5cc3333b6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMushroomCow; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMushroomCow; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftMushroomCow; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftMushroomCow; import org.bukkit.entity.MushroomCow; import org.bukkit.util.Vector; @@ -62,13 +62,13 @@ public class MushroomCowController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -92,14 +92,14 @@ public class MushroomCowController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java index 228874028..c0d04cfb8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityOcelot; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityOcelot; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftOcelot; import org.bukkit.entity.Ocelot; import org.bukkit.util.Vector; @@ -61,13 +61,13 @@ public class OcelotController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -91,14 +91,14 @@ public class OcelotController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigController.java b/src/main/java/net/citizensnpcs/npc/entity/PigController.java index 9a761e78e..15a152f2c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigController.java @@ -7,14 +7,14 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityLightning; -import net.minecraft.server.v1_7_R3.EntityPig; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityLightning; +import net.minecraft.server.v1_7_R4.EntityPig; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPig; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPig; import org.bukkit.entity.Pig; import org.bukkit.util.Vector; @@ -68,13 +68,13 @@ public class PigController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -98,14 +98,14 @@ public class PigController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java index 42312506d..412e545e8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityPigZombie; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityPigZombie; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPigZombie; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPigZombie; import org.bukkit.entity.PigZombie; import org.bukkit.util.Vector; @@ -51,13 +51,13 @@ public class PigZombieController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -81,16 +81,16 @@ public class PigZombieController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void bp() { + public void bq() { if (npc == null) { - super.bp(); + super.bq(); } else { NMS.updateAI(this); npc.update(); @@ -98,7 +98,7 @@ public class PigZombieController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java index 6a7307db2..c4363d3d1 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySheep; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySheep; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSheep; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSheep; import org.bukkit.entity.Sheep; import org.bukkit.util.Vector; @@ -61,13 +61,13 @@ public class SheepController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -91,14 +91,14 @@ public class SheepController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java index 02d0c443a..4ba222821 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySilverfish; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySilverfish; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSilverfish; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSilverfish; import org.bukkit.entity.Silverfish; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class SilverfishController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,16 +80,16 @@ public class SilverfishController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void bp() { + public void bq() { if (npc == null) { - super.bp(); + super.bq(); } else { NMS.updateAI(this); npc.update(); @@ -97,7 +97,7 @@ public class SilverfishController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java index 6b5f106b8..c852829d7 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySkeleton; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySkeleton; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSkeleton; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSkeleton; import org.bukkit.entity.Skeleton; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class SkeletonController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -67,8 +67,8 @@ public class SkeletonController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } @@ -88,7 +88,7 @@ public class SkeletonController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java index b378b3a8f..e1dd51ace 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySlime; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySlime; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSlime; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSlime; import org.bukkit.entity.Slime; import org.bukkit.util.Vector; @@ -52,13 +52,13 @@ public class SlimeController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -82,16 +82,16 @@ public class SlimeController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void bp() { + public void bq() { if (npc == null) { - super.bp(); + super.bq(); } else { npc.update(); NMS.updateAI(this); @@ -99,7 +99,7 @@ public class SlimeController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java index 76e4c86f8..b3510b1cf 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySnowman; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySnowman; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSnowman; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSnowman; import org.bukkit.entity.Snowman; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class SnowmanController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,14 +80,14 @@ public class SnowmanController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java index c6086142c..71627b570 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySpider; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySpider; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSpider; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSpider; import org.bukkit.entity.Spider; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class SpiderController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,16 +80,16 @@ public class SpiderController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void bp() { + public void bq() { if (npc == null) - super.bp(); + super.bq(); else { NMS.updateAI(this); npc.update(); @@ -97,7 +97,7 @@ public class SpiderController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java index 5f71c2453..5df02cff7 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySquid; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySquid; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSquid; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSquid; import org.bukkit.entity.Squid; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class SquidController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,15 +80,15 @@ public class SquidController extends MobEntityController { } @Override - public void bp() { + public void bq() { if (npc != null) { npc.update(); } else - super.bp(); + super.bq(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java index 51d73a5b0..ed3cacc02 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java @@ -7,14 +7,14 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityHuman; -import net.minecraft.server.v1_7_R3.EntityVillager; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityHuman; +import net.minecraft.server.v1_7_R4.EntityVillager; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftVillager; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftVillager; import org.bukkit.entity.Villager; import org.bukkit.util.Vector; @@ -69,13 +69,13 @@ public class VillagerController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -99,15 +99,15 @@ public class VillagerController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java index 7971ebac8..5c6461ffb 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityWitch; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityWitch; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftWitch; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftWitch; import org.bukkit.entity.Witch; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class WitchController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,14 +80,14 @@ public class WitchController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) npc.update(); } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java index b24e9f96c..3d49e2539 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityWither; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityWither; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftWither; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftWither; import org.bukkit.entity.Wither; import org.bukkit.util.Vector; @@ -43,19 +43,19 @@ public class WitherController extends MobEntityController { } } - @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); - } - @Override protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - public void bm() { - super.bm(); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); + } + + @Override + public void bn() { + super.bn(); if (npc != null) { npc.update(); } @@ -75,7 +75,7 @@ public class WitherController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); @@ -140,7 +140,7 @@ public class WitherController extends MobEntityController { motY += 0.04; } else //(handled elsewhere)*/ if (onGround && jumpTicks == 0) { - bi(); + bj(); jumpTicks = 10; } } else { diff --git a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java index a68a66171..ff4d7b4aa 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityWolf; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityWolf; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftWolf; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftWolf; import org.bukkit.entity.Wolf; import org.bukkit.util.Vector; @@ -61,13 +61,13 @@ public class WolfController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -91,15 +91,15 @@ public class WolfController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java index 59b363f7d..5c7fee3b1 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityZombie; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityZombie; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftZombie; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftZombie; import org.bukkit.entity.Zombie; import org.bukkit.util.Vector; @@ -50,13 +50,13 @@ public class ZombieController extends MobEntityController { } @Override - protected String aS() { - return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS()); + protected String aT() { + return npc == null ? super.aT() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aT()); } @Override - protected String aT() { - return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT()); + protected String aU() { + return npc == null ? super.aU() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aU()); } @Override @@ -80,15 +80,15 @@ public class ZombieController extends MobEntityController { } @Override - public void bm() { - super.bm(); + public void bn() { + super.bn(); if (npc != null) { npc.update(); } } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ArrowController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ArrowController.java index c6d90947f..e6dbe68b6 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ArrowController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ArrowController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityArrow; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityArrow; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftArrow; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Arrow; import org.bukkit.util.Vector; @@ -53,7 +53,7 @@ public class ArrowController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/BoatController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/BoatController.java index d891687b8..c00a7a674 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/BoatController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/BoatController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityBoat; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityBoat; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftBoat; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Boat; import org.bukkit.util.Vector; @@ -53,7 +53,7 @@ public class BoatController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EggController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EggController.java index 683625dec..1ccc67957 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EggController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EggController.java @@ -6,16 +6,16 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEgg; -import net.minecraft.server.v1_7_R3.World; -import net.minecraft.server.v1_7_R3.WorldServer; +import net.minecraft.server.v1_7_R4.EntityEgg; +import net.minecraft.server.v1_7_R4.World; +import net.minecraft.server.v1_7_R4.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEgg; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEgg; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Egg; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; @@ -69,7 +69,7 @@ public class EggController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderCrystalController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderCrystalController.java index b764eeb4f..341b531ea 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderCrystalController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderCrystalController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEnderCrystal; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityEnderCrystal; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEnderCrystal; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEnderCrystal; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.EnderCrystal; import org.bukkit.util.Vector; @@ -53,7 +53,7 @@ public class EnderCrystalController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderPearlController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderPearlController.java index 2f75dbcab..7338a1043 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderPearlController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderPearlController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEnderPearl; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityEnderPearl; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEnderPearl; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEnderPearl; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.EnderPearl; import org.bukkit.util.Vector; @@ -53,7 +53,7 @@ public class EnderPearlController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderSignalController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderSignalController.java index 30d31b9bd..e309b2d40 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderSignalController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderSignalController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEnderSignal; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityEnderSignal; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEnderSignal; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEnderSignal; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.EnderSignal; import org.bukkit.util.Vector; @@ -53,7 +53,7 @@ public class EnderSignalController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ExperienceOrbController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ExperienceOrbController.java index 72feaea67..bb28e039f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ExperienceOrbController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ExperienceOrbController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityExperienceOrb; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityExperienceOrb; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftExperienceOrb; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftExperienceOrb; import org.bukkit.entity.ExperienceOrb; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class ExperienceOrbController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/FallingBlockController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/FallingBlockController.java index 5ddd6f4fa..8c81639aa 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/FallingBlockController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/FallingBlockController.java @@ -6,20 +6,20 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.Block; -import net.minecraft.server.v1_7_R3.Blocks; -import net.minecraft.server.v1_7_R3.EntityFallingBlock; -import net.minecraft.server.v1_7_R3.World; -import net.minecraft.server.v1_7_R3.WorldServer; +import net.minecraft.server.v1_7_R4.Block; +import net.minecraft.server.v1_7_R4.Blocks; +import net.minecraft.server.v1_7_R4.EntityFallingBlock; +import net.minecraft.server.v1_7_R4.World; +import net.minecraft.server.v1_7_R4.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftFallingSand; -import org.bukkit.craftbukkit.v1_7_R3.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftFallingSand; +import org.bukkit.craftbukkit.v1_7_R4.util.CraftMagicNumbers; import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; import org.bukkit.util.Vector; @@ -66,7 +66,7 @@ public class FallingBlockController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/FireworkController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/FireworkController.java index b22529391..900a7bbef 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/FireworkController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/FireworkController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityFireworks; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityFireworks; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftFirework; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftFirework; import org.bukkit.entity.Firework; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class FireworkController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/FishingHookController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/FishingHookController.java index 69ebb093f..f5990c00e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/FishingHookController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/FishingHookController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityFishingHook; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityFishingHook; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftFish; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftFish; import org.bukkit.entity.Fish; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class FishingHookController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemController.java index 3af50cf3f..b7df076cb 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemController.java @@ -6,20 +6,20 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityHuman; -import net.minecraft.server.v1_7_R3.EntityItem; -import net.minecraft.server.v1_7_R3.ItemStack; -import net.minecraft.server.v1_7_R3.World; -import net.minecraft.server.v1_7_R3.WorldServer; +import net.minecraft.server.v1_7_R4.EntityHuman; +import net.minecraft.server.v1_7_R4.EntityItem; +import net.minecraft.server.v1_7_R4.ItemStack; +import net.minecraft.server.v1_7_R4.World; +import net.minecraft.server.v1_7_R4.WorldServer; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftItem; -import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftItem; +import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.Item; import org.bukkit.util.Vector; @@ -68,7 +68,7 @@ public class ItemController extends AbstractEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemFrameController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemFrameController.java index e3d5c1d17..863196ac7 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemFrameController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ItemFrameController.java @@ -6,14 +6,14 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityItemFrame; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityItemFrame; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftItemFrame; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftItemFrame; import org.bukkit.entity.ItemFrame; import org.bukkit.util.Vector; @@ -43,7 +43,7 @@ public class ItemFrameController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/LargeFireballController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/LargeFireballController.java index cf8a829ff..09421e14d 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/LargeFireballController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/LargeFireballController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityLargeFireball; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityLargeFireball; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftLargeFireball; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLargeFireball; import org.bukkit.entity.LargeFireball; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class LargeFireballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/LeashController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/LeashController.java index c9b510593..cd0d9503a 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/LeashController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/LeashController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityLeash; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityLeash; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftLeash; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLeash; import org.bukkit.entity.LeashHitch; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class LeashController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartChestController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartChestController.java index 6efa4ba0f..d3159b738 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartChestController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartChestController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartChest; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartChest; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftMinecartChest; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftMinecartChest; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -40,7 +40,7 @@ public class MinecartChestController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartCommandController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartCommandController.java index cf464f218..7141facc3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartCommandController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartCommandController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartCommandBlock; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartCommandBlock; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftMinecartCommand; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftMinecartCommand; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -40,7 +40,7 @@ public class MinecartCommandController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartFurnaceController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartFurnaceController.java index 5c703d120..04f2ceb07 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartFurnaceController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartFurnaceController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartFurnace; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartFurnace; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftMinecartFurnace; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftMinecartFurnace; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -40,7 +40,7 @@ public class MinecartFurnaceController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartHopperController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartHopperController.java index add8a1ac1..c2885f0e2 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartHopperController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartHopperController.java @@ -7,8 +7,8 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartHopper; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartHopper; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -36,7 +36,7 @@ public class MinecartHopperController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartRideableController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartRideableController.java index 48be2c0dc..57525f150 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartRideableController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartRideableController.java @@ -7,13 +7,13 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartRideable; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartRideable; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftMinecartRideable; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftMinecartRideable; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -40,7 +40,7 @@ public class MinecartRideableController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartSpawnerController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartSpawnerController.java index cccd13363..d650ab5e2 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartSpawnerController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartSpawnerController.java @@ -7,8 +7,8 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartMobSpawner; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartMobSpawner; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -36,7 +36,7 @@ public class MinecartSpawnerController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartTNTController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartTNTController.java index 4a513dc89..325b5fc86 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartTNTController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/MinecartTNTController.java @@ -7,8 +7,8 @@ import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityMinecartTNT; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityMinecartTNT; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.entity.Minecart; import org.bukkit.util.Vector; @@ -36,7 +36,7 @@ public class MinecartTNTController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/PaintingController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/PaintingController.java index 28d8f2d0d..bef2c165b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/PaintingController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/PaintingController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityPainting; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityPainting; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPainting; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPainting; import org.bukkit.entity.Painting; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class PaintingController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/SmallFireballController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/SmallFireballController.java index 781205cac..dcd80cab3 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/SmallFireballController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/SmallFireballController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySmallFireball; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySmallFireball; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSmallFireball; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSmallFireball; import org.bukkit.entity.SmallFireball; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class SmallFireballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/SnowballController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/SnowballController.java index 6748aa926..a64a5cc17 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/SnowballController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/SnowballController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntitySnowball; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntitySnowball; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftSnowball; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftSnowball; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.Snowball; import org.bukkit.util.Vector; @@ -53,7 +53,7 @@ public class SnowballController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/TNTPrimedController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/TNTPrimedController.java index f8737a4bd..892f0226b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/TNTPrimedController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/TNTPrimedController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityTNTPrimed; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityTNTPrimed; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftTNTPrimed; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftTNTPrimed; import org.bukkit.entity.TNTPrimed; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class TNTPrimedController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownExpBottleController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownExpBottleController.java index c83c29b21..911b26303 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownExpBottleController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownExpBottleController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityThrownExpBottle; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityThrownExpBottle; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftThrownExpBottle; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftThrownExpBottle; import org.bukkit.entity.ThrownExpBottle; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class ThrownExpBottleController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownPotionController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownPotionController.java index 0bedcef61..40574269f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownPotionController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/ThrownPotionController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityPotion; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityPotion; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftThrownPotion; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftThrownPotion; import org.bukkit.entity.ThrownPotion; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class ThrownPotionController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/entity/nonliving/WitherSkullController.java b/src/main/java/net/citizensnpcs/npc/entity/nonliving/WitherSkullController.java index 2c7ab9052..8d28e0752 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/nonliving/WitherSkullController.java +++ b/src/main/java/net/citizensnpcs/npc/entity/nonliving/WitherSkullController.java @@ -6,13 +6,13 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.MobEntityController; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityWitherSkull; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.EntityWitherSkull; +import net.minecraft.server.v1_7_R4.World; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftWitherSkull; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftWitherSkull; import org.bukkit.entity.WitherSkull; import org.bukkit.util.Vector; @@ -39,7 +39,7 @@ public class WitherSkullController extends MobEntityController { } @Override - public void collide(net.minecraft.server.v1_7_R3.Entity entity) { + public void collide(net.minecraft.server.v1_7_R4.Entity entity) { // this method is called by both the entities involved - cancelling // it will not stop the NPC from moving. super.collide(entity); diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java index 1cc8a97f9..3527e9e8c 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetHandler.java @@ -1,10 +1,10 @@ package net.citizensnpcs.npc.network; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.MinecraftServer; -import net.minecraft.server.v1_7_R3.NetworkManager; -import net.minecraft.server.v1_7_R3.Packet; -import net.minecraft.server.v1_7_R3.PlayerConnection; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.MinecraftServer; +import net.minecraft.server.v1_7_R4.NetworkManager; +import net.minecraft.server.v1_7_R4.Packet; +import net.minecraft.server.v1_7_R4.PlayerConnection; public class EmptyNetHandler extends PlayerConnection { public EmptyNetHandler(MinecraftServer minecraftServer, NetworkManager networkManager, EntityPlayer entityPlayer) { diff --git a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java index 269233efa..0e48f670a 100644 --- a/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java +++ b/src/main/java/net/citizensnpcs/npc/network/EmptyNetworkManager.java @@ -3,7 +3,7 @@ package net.citizensnpcs.npc.network; import java.io.IOException; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_7_R3.NetworkManager; +import net.minecraft.server.v1_7_R4.NetworkManager; public class EmptyNetworkManager extends NetworkManager { public EmptyNetworkManager(boolean flag) throws IOException { diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java index 2d146f9fb..bb7c2622d 100644 --- a/src/main/java/net/citizensnpcs/trait/Controllable.java +++ b/src/main/java/net/citizensnpcs/trait/Controllable.java @@ -14,11 +14,11 @@ import net.citizensnpcs.api.trait.trait.Owner; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; -import net.minecraft.server.v1_7_R3.EntityEnderDragon; -import net.minecraft.server.v1_7_R3.EntityLiving; -import net.minecraft.server.v1_7_R3.EntityPlayer; +import net.minecraft.server.v1_7_R4.EntityEnderDragon; +import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_7_R4.EntityPlayer; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -75,7 +75,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab } } - private net.minecraft.server.v1_7_R3.Entity getHandle() { + private net.minecraft.server.v1_7_R4.Entity getHandle() { return NMS.getHandle(npc.getEntity()); } @@ -182,7 +182,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab return enabled; } - private void setMountedYaw(net.minecraft.server.v1_7_R3.Entity handle) { + private void setMountedYaw(net.minecraft.server.v1_7_R4.Entity handle) { if (handle instanceof EntityEnderDragon || !Setting.USE_BOAT_CONTROLS.asBoolean()) return; // EnderDragon handles this separately double tX = handle.locX + handle.motX; @@ -204,7 +204,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab return enabled; } - private double updateHorizontalSpeed(net.minecraft.server.v1_7_R3.Entity handle, double speed, float speedMod) { + private double updateHorizontalSpeed(net.minecraft.server.v1_7_R4.Entity handle, double speed, float speedMod) { double oldSpeed = Math.sqrt(handle.motX * handle.motX + handle.motZ * handle.motZ); double horizontal = ((EntityLiving) handle.passenger).be; if (horizontal > 0.0D) { @@ -250,7 +250,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab @Override public void run(Player rider) { - net.minecraft.server.v1_7_R3.Entity handle = getHandle(); + net.minecraft.server.v1_7_R4.Entity handle = getHandle(); boolean onGround = handle.onGround; float speedMod = npc.getNavigator().getDefaultParameters() .modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED)); @@ -301,7 +301,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab } Vector dir = rider.getEyeLocation().getDirection(); dir.multiply(npc.getNavigator().getDefaultParameters().speedModifier()); - net.minecraft.server.v1_7_R3.Entity handle = getHandle(); + net.minecraft.server.v1_7_R4.Entity handle = getHandle(); handle.motX = dir.getX(); handle.motY = dir.getY(); handle.motZ = dir.getZ(); @@ -344,7 +344,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab getHandle().motY = 0.001; return; } - net.minecraft.server.v1_7_R3.Entity handle = getHandle(); + net.minecraft.server.v1_7_R4.Entity handle = getHandle(); this.speed = updateHorizontalSpeed(handle, this.speed, 1F); boolean shouldJump = NMS.shouldJump(handle.passenger); if (shouldJump) { diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java index c24b57804..eeb884bbe 100644 --- a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java +++ b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java @@ -1,8 +1,8 @@ package net.citizensnpcs.trait.waypoint; -import net.minecraft.server.v1_7_R3.DamageSource; -import net.minecraft.server.v1_7_R3.EntityEnderSignal; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.DamageSource; +import net.minecraft.server.v1_7_R4.EntityEnderSignal; +import net.minecraft.server.v1_7_R4.World; public class EntityEnderSignalMarker extends EntityEnderSignal { public EntityEnderSignalMarker(World world) { diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java index d06896349..b9efb98ef 100644 --- a/src/main/java/net/citizensnpcs/util/NMS.java +++ b/src/main/java/net/citizensnpcs/util/NMS.java @@ -16,36 +16,36 @@ import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.entity.EntityHumanNPC; import net.citizensnpcs.npc.network.EmptyChannel; -import net.minecraft.server.v1_7_R3.AttributeInstance; -import net.minecraft.server.v1_7_R3.ControllerJump; -import net.minecraft.server.v1_7_R3.DamageSource; -import net.minecraft.server.v1_7_R3.EnchantmentManager; -import net.minecraft.server.v1_7_R3.Entity; -import net.minecraft.server.v1_7_R3.EntityHorse; -import net.minecraft.server.v1_7_R3.EntityHuman; -import net.minecraft.server.v1_7_R3.EntityInsentient; -import net.minecraft.server.v1_7_R3.EntityLiving; -import net.minecraft.server.v1_7_R3.EntityMinecartAbstract; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.EntityTypes; -import net.minecraft.server.v1_7_R3.GenericAttributes; -import net.minecraft.server.v1_7_R3.MathHelper; -import net.minecraft.server.v1_7_R3.MobEffectList; -import net.minecraft.server.v1_7_R3.Navigation; -import net.minecraft.server.v1_7_R3.NetworkManager; -import net.minecraft.server.v1_7_R3.Packet; -import net.minecraft.server.v1_7_R3.PathfinderGoalSelector; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.AttributeInstance; +import net.minecraft.server.v1_7_R4.ControllerJump; +import net.minecraft.server.v1_7_R4.DamageSource; +import net.minecraft.server.v1_7_R4.EnchantmentManager; +import net.minecraft.server.v1_7_R4.Entity; +import net.minecraft.server.v1_7_R4.EntityHorse; +import net.minecraft.server.v1_7_R4.EntityHuman; +import net.minecraft.server.v1_7_R4.EntityInsentient; +import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_7_R4.EntityMinecartAbstract; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.EntityTypes; +import net.minecraft.server.v1_7_R4.GenericAttributes; +import net.minecraft.server.v1_7_R4.MathHelper; +import net.minecraft.server.v1_7_R4.MobEffectList; +import net.minecraft.server.v1_7_R4.Navigation; +import net.minecraft.server.v1_7_R4.NetworkManager; +import net.minecraft.server.v1_7_R4.Packet; +import net.minecraft.server.v1_7_R4.PathfinderGoalSelector; +import net.minecraft.server.v1_7_R4.World; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; -import org.bukkit.craftbukkit.v1_7_R3.CraftServer; -import org.bukkit.craftbukkit.v1_7_R3.CraftSound; -import org.bukkit.craftbukkit.v1_7_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_7_R4.CraftServer; +import org.bukkit.craftbukkit.v1_7_R4.CraftSound; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; import org.bukkit.entity.LivingEntity; @@ -132,7 +132,7 @@ public class NMS { entity.motX *= 0.800000011920929D; entity.motY *= 0.800000011920929D; entity.motZ *= 0.800000011920929D; - } else if (entity.O()) { + } else if (entity.P()) { entity.a(f, f1, 0.02F); entity.move(entity.motX, entity.motY, entity.motZ); entity.motX *= 0.5D; @@ -264,7 +264,7 @@ public class NMS { Entity mcEntity = getHandle(entity); if (mcEntity == null) return false; - return mcEntity.L() || mcEntity.O(); + return mcEntity.L() || mcEntity.P(); } public static boolean isNavigationFinished(Navigation navigation) { @@ -277,7 +277,7 @@ public class NMS { public static void look(Entity handle, Entity target) { if (handle instanceof EntityInsentient) { - ((EntityInsentient) handle).getControllerLook().a(target, 10.0F, ((EntityInsentient) handle).bv()); + ((EntityInsentient) handle).getControllerLook().a(target, 10.0F, ((EntityInsentient) handle).x()); } else if (handle instanceof EntityHumanNPC) { ((EntityHumanNPC) handle).setTargetLook(target, 10F, 40F); } @@ -449,7 +449,7 @@ public class NMS { handle.be = (float) d; } - public static boolean shouldJump(net.minecraft.server.v1_7_R3.Entity entity) { + public static boolean shouldJump(net.minecraft.server.v1_7_R4.Entity entity) { if (JUMP_FIELD == null || !(entity instanceof EntityLiving)) return false; try { diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java index a9ce80b8a..7d76d6b10 100644 --- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java +++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java @@ -2,13 +2,13 @@ package net.citizensnpcs.util; import java.util.Arrays; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.Packet; -import net.minecraft.server.v1_7_R3.PacketPlayOutAnimation; -import net.minecraft.server.v1_7_R3.PacketPlayOutBed; -import net.minecraft.server.v1_7_R3.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.Packet; +import net.minecraft.server.v1_7_R4.PacketPlayOutAnimation; +import net.minecraft.server.v1_7_R4.PacketPlayOutBed; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityMetadata; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.Player; public enum PlayerAnimation { diff --git a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java index 88beca1b7..77538f591 100644 --- a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java +++ b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerLook.java @@ -1,9 +1,9 @@ package net.citizensnpcs.util.nms; import net.citizensnpcs.npc.entity.EntityHumanNPC; -import net.minecraft.server.v1_7_R3.Entity; -import net.minecraft.server.v1_7_R3.EntityLiving; -import net.minecraft.server.v1_7_R3.MathHelper; +import net.minecraft.server.v1_7_R4.Entity; +import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_7_R4.MathHelper; public class PlayerControllerLook { private final EntityHumanNPC a; diff --git a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java index 98dc7bd78..5df6772df 100644 --- a/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java +++ b/src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java @@ -2,9 +2,9 @@ package net.citizensnpcs.util.nms; import net.citizensnpcs.npc.entity.EntityHumanNPC; import net.citizensnpcs.util.NMS; -import net.minecraft.server.v1_7_R3.AttributeInstance; -import net.minecraft.server.v1_7_R3.GenericAttributes; -import net.minecraft.server.v1_7_R3.MathHelper; +import net.minecraft.server.v1_7_R4.AttributeInstance; +import net.minecraft.server.v1_7_R4.GenericAttributes; +import net.minecraft.server.v1_7_R4.MathHelper; public class PlayerControllerMove { private final EntityHumanNPC a; diff --git a/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java b/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java index 45e601d56..93a746459 100644 --- a/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java +++ b/src/main/java/net/citizensnpcs/util/nms/PlayerNavigation.java @@ -1,20 +1,20 @@ package net.citizensnpcs.util.nms; import net.citizensnpcs.npc.entity.EntityHumanNPC; -import net.minecraft.server.v1_7_R3.AttributeInstance; -import net.minecraft.server.v1_7_R3.Block; -import net.minecraft.server.v1_7_R3.Blocks; -import net.minecraft.server.v1_7_R3.Entity; -import net.minecraft.server.v1_7_R3.EntityChicken; -import net.minecraft.server.v1_7_R3.EntityInsentient; -import net.minecraft.server.v1_7_R3.GenericAttributes; -import net.minecraft.server.v1_7_R3.Material; -import net.minecraft.server.v1_7_R3.MathHelper; -import net.minecraft.server.v1_7_R3.Navigation; -import net.minecraft.server.v1_7_R3.PathEntity; -import net.minecraft.server.v1_7_R3.PathPoint; -import net.minecraft.server.v1_7_R3.Vec3D; -import net.minecraft.server.v1_7_R3.World; +import net.minecraft.server.v1_7_R4.AttributeInstance; +import net.minecraft.server.v1_7_R4.Block; +import net.minecraft.server.v1_7_R4.Blocks; +import net.minecraft.server.v1_7_R4.Entity; +import net.minecraft.server.v1_7_R4.EntityChicken; +import net.minecraft.server.v1_7_R4.EntityInsentient; +import net.minecraft.server.v1_7_R4.GenericAttributes; +import net.minecraft.server.v1_7_R4.Material; +import net.minecraft.server.v1_7_R4.MathHelper; +import net.minecraft.server.v1_7_R4.Navigation; +import net.minecraft.server.v1_7_R4.PathEntity; +import net.minecraft.server.v1_7_R4.PathPoint; +import net.minecraft.server.v1_7_R4.Vec3D; +import net.minecraft.server.v1_7_R4.World; public class PlayerNavigation extends Navigation { @@ -100,7 +100,7 @@ public class PlayerNavigation extends Navigation { return false; } - if (material == Material.WATER && !this.a.L()) { + if (material == Material.WATER && !this.a.M()) { return false; } @@ -341,7 +341,7 @@ public class PlayerNavigation extends Navigation { } private int k() { - if (this.a.L() && this.m) { + if (this.a.M() && this.m) { int i = (int) this.a.boundingBox.b; Block block = this.b.getType(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ)); int j = 0; @@ -363,11 +363,11 @@ public class PlayerNavigation extends Navigation { } private boolean l() { - return this.a.onGround || this.m && this.m() || this.a.al() && this.a.vehicle instanceof EntityChicken; + return this.a.onGround || this.m && this.m() || this.a.am() && this.a.vehicle instanceof EntityChicken; } private boolean m() { - return this.a.L() || this.a.O(); + return this.a.M() || this.a.P(); } private void n() {