Skip to content

Commit

Permalink
Update to 1.7.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@fullwall
fullwall committed Apr 12, 2014
1 parent fad04ea commit 8a4f7e8
Show file tree
Hide file tree
Showing 78 changed files with 481 additions and 479 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Expand Up @@ -6,13 +6,13 @@

<groupId>net.citizensnpcs</groupId>
<artifactId>citizens</artifactId>
<version>2.0.12-SNAPSHOT</version>
<version>2.0.13-SNAPSHOT</version>
<name>Citizens</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.7.5-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.12-SNAPSHOT</citizensapi.version>
<craftbukkit.version>1.7.8-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.13-SNAPSHOT</citizensapi.version>
<vault.version>1.2.19-SNAPSHOT</vault.version>
<powermock.version>1.4.12</powermock.version>
<build.number>Unknown</build.number>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/citizensnpcs/Citizens.java
View file
Expand Up @@ -454,5 +454,5 @@ private boolean suggestClosestModifier(CommandSender sender, String command, Str
return false;
}

private static final String COMPATIBLE_MC_VERSION = "1.7.5";
private static final String COMPATIBLE_MC_VERSION = "1.7.8";
}
6 changes: 4 additions & 2 deletions src/main/java/net/citizensnpcs/commands/NPCCommands.java
View file
Expand Up @@ -1302,8 +1302,9 @@ public void speak(CommandContext args, CommandSender sender, NPC npc) throws Com
context.addRecipient(target.getEntity());
} else {
Player player = Bukkit.getPlayer(args.getFlag("target"));
if (player != null)
if (player != null) {
context.addRecipient((Entity) player);
}
}
}

Expand Down Expand Up @@ -1440,8 +1441,9 @@ public void tpto(CommandContext args, CommandSender sender, NPC npc) throws Comm
to = toNPC.getEntity();
}
} catch (NumberFormatException e) {
if (!firstWasPlayer)
if (!firstWasPlayer) {
to = Bukkit.getPlayerExact(args.getString(2));
}
}
if (from == null)
throw new CommandException(Messages.FROM_ENTITY_NOT_FOUND);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View file
Expand Up @@ -23,11 +23,11 @@
import net.citizensnpcs.util.Messages;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.PacketPlayOutEntityTeleport;
import net.minecraft.server.v1_7_R3.PacketPlayOutEntityTeleport;

import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
Expand Down Expand Up @@ -167,7 +167,7 @@ public boolean spawn(Location at) {

at = at.clone();
entityController.spawn(at, this);
net.minecraft.server.v1_7_R2.Entity mcEntity = ((CraftEntity) getEntity()).getHandle();
net.minecraft.server.v1_7_R3.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) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/citizensnpcs/npc/MobEntityController.java
View file
Expand Up @@ -4,11 +4,11 @@
import java.util.Map;

import net.citizensnpcs.api.npc.NPC;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Location;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_7_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
import org.bukkit.entity.Entity;

import com.google.common.collect.Maps;
Expand All @@ -23,7 +23,7 @@ protected MobEntityController(Class<?> clazz) {

@Override
protected Entity createEntity(Location at, NPC npc) {
net.minecraft.server.v1_7_R2.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(),
net.minecraft.server.v1_7_R3.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(),
npc);
entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());

Expand All @@ -36,9 +36,9 @@ protected Entity createEntity(Location at, NPC npc) {
return entity.getBukkitEntity();
}

private net.minecraft.server.v1_7_R2.Entity createEntityFromClass(Object... args) {
private net.minecraft.server.v1_7_R3.Entity createEntityFromClass(Object... args) {
try {
return (net.minecraft.server.v1_7_R2.Entity) constructor.newInstance(args);
return (net.minecraft.server.v1_7_R3.Entity) constructor.newInstance(args);
} catch (Exception ex) {
ex.printStackTrace();
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
View file
Expand Up @@ -68,7 +68,7 @@ public boolean update() {
}
vector = plan.getCurrentVector();
}
net.minecraft.server.v1_7_R2.Entity handle = NMS.getHandle(npc.getEntity());
net.minecraft.server.v1_7_R3.Entity handle = NMS.getHandle(npc.getEntity());
double dX = vector.getBlockX() - handle.locX;
double dZ = vector.getBlockZ() - handle.locZ;
double dY = vector.getY() - handle.locY;
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/net/citizensnpcs/npc/ai/BlockBreaker.java
View file
Expand Up @@ -5,19 +5,19 @@
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.PlayerAnimation;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.Block;
import net.minecraft.server.v1_7_R2.Blocks;
import net.minecraft.server.v1_7_R2.Enchantment;
import net.minecraft.server.v1_7_R2.EnchantmentManager;
import net.minecraft.server.v1_7_R2.EntityLiving;
import net.minecraft.server.v1_7_R2.EntityPlayer;
import net.minecraft.server.v1_7_R2.ItemStack;
import net.minecraft.server.v1_7_R2.Material;
import net.minecraft.server.v1_7_R2.MobEffectList;
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 org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemStack;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;

Expand Down Expand Up @@ -45,7 +45,7 @@ private double distanceSquared() {
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_R2.ItemStack getCurrentItem() {
private net.minecraft.server.v1_7_R3.ItemStack getCurrentItem() {
return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item()) : entity.getEquipment(0);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
View file
Expand Up @@ -12,7 +12,7 @@
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.MathHelper;
import net.minecraft.server.v1_7_R3.MathHelper;

import org.bukkit.Location;
import org.bukkit.util.Vector;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
View file
Expand Up @@ -5,11 +5,11 @@
import net.citizensnpcs.api.ai.event.CancelReason;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.NMS;
import net.minecraft.server.v1_7_R2.EntityLiving;
import net.minecraft.server.v1_7_R2.Navigation;
import net.minecraft.server.v1_7_R3.EntityLiving;
import net.minecraft.server.v1_7_R3.Navigation;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftLivingEntity;

public class MCNavigationStrategy extends AbstractPathStrategy {
private final Navigation navigation;
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
View file
Expand Up @@ -11,15 +11,15 @@
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.PlayerAnimation;
import net.citizensnpcs.util.nms.PlayerNavigation;
import net.minecraft.server.v1_7_R2.AttributeInstance;
import net.minecraft.server.v1_7_R2.Entity;
import net.minecraft.server.v1_7_R2.EntityLiving;
import net.minecraft.server.v1_7_R2.EntityPlayer;
import net.minecraft.server.v1_7_R2.Navigation;
import net.minecraft.server.v1_7_R2.PathEntity;
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 org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftEntity;
import org.bukkit.entity.LivingEntity;

public class MCTargetStrategy implements PathStrategy, EntityTarget {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/citizensnpcs/npc/entity/BatController.java
View file
Expand Up @@ -7,13 +7,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityBat;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.EntityBat;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftBat;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.Bat;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -92,7 +92,7 @@ public boolean bN() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/citizensnpcs/npc/entity/BlazeController.java
View file
Expand Up @@ -7,13 +7,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityBlaze;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.EntityBlaze;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.Blaze;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -90,7 +90,7 @@ public void bp() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java
View file
Expand Up @@ -7,13 +7,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityCaveSpider;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.EntityCaveSpider;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.CaveSpider;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -114,7 +114,7 @@ public void bp() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/citizensnpcs/npc/entity/ChickenController.java
View file
Expand Up @@ -7,13 +7,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityChicken;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.EntityChicken;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftChicken;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.Chicken;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -112,7 +112,7 @@ public void bm() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/citizensnpcs/npc/entity/CowController.java
View file
Expand Up @@ -7,13 +7,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityCow;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.EntityCow;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftCow;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.Cow;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -114,7 +114,7 @@ public void bm() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/citizensnpcs/npc/entity/CreeperController.java
View file
Expand Up @@ -7,14 +7,14 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityCreeper;
import net.minecraft.server.v1_7_R2.EntityLightning;
import net.minecraft.server.v1_7_R2.World;
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 org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftCreeper;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.Creeper;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -110,7 +110,7 @@ public void bm() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java
View file
Expand Up @@ -7,13 +7,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_7_R2.EntityEnderDragon;
import net.minecraft.server.v1_7_R2.World;
import net.minecraft.server.v1_7_R3.EntityEnderDragon;
import net.minecraft.server.v1_7_R3.World;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEnderDragon;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftEntity;
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.entity.EnderDragon;
import org.bukkit.util.Vector;

Expand Down Expand Up @@ -87,7 +87,7 @@ public void bp() {
}

@Override
public void collide(net.minecraft.server.v1_7_R2.Entity entity) {
public void collide(net.minecraft.server.v1_7_R3.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Expand Down

0 comments on commit 8a4f7e8

Please sign in to comment.