Skip to content

Commit

Permalink
First pass update to 1.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@fullwall
fullwall committed May 10, 2016
1 parent 0231284 commit ed36a50
Show file tree
Hide file tree
Showing 93 changed files with 1,148 additions and 1,471 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.17-SNAPSHOT</version>
<version>2.0.18-SNAPSHOT</version>
<name>Citizens</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.9-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.17-SNAPSHOT</citizensapi.version>
<craftbukkit.version>1.9.4-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.18-SNAPSHOT</citizensapi.version>
<vault.version>1.5.4</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 @@ -459,5 +459,5 @@ private boolean suggestClosestModifier(CommandSender sender, String command, Str
return false;
}

private static final String COMPATIBLE_MC_REVISION = "1_9_R1";
private static final String COMPATIBLE_MC_REVISION = "1_9_R2";
}
8 changes: 4 additions & 4 deletions src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View file
Expand Up @@ -8,8 +8,8 @@
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
Expand Down Expand Up @@ -47,7 +47,7 @@
import net.citizensnpcs.util.Messages;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.PacketPlayOutEntityTeleport;
import net.minecraft.server.v1_9_R2.PacketPlayOutEntityTeleport;

public class CitizensNPC extends AbstractNPC {
private EntityController entityController;
Expand Down Expand Up @@ -194,7 +194,7 @@ public boolean spawn(Location at) {

entityController.spawn(at, this);

net.minecraft.server.v1_9_R1.Entity mcEntity = ((CraftEntity) getEntity()).getHandle();
net.minecraft.server.v1_9_R2.Entity mcEntity = ((CraftEntity) getEntity()).getHandle();
boolean couldSpawn = !Util.isLoaded(at) ? false : mcEntity.world.addEntity(mcEntity, SpawnReason.CUSTOM);

// send skin packets, if applicable, before other NMS packets are sent
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/citizensnpcs/npc/MobEntityController.java
View file
Expand Up @@ -5,13 +5,13 @@

import org.bukkit.Location;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_9_R2.CraftWorld;
import org.bukkit.entity.Entity;

import com.google.common.collect.Maps;

import net.citizensnpcs.api.npc.NPC;
import net.minecraft.server.v1_9_R1.World;
import net.minecraft.server.v1_9_R2.World;

public abstract class MobEntityController extends AbstractEntityController {
private final Constructor<?> constructor;
Expand All @@ -23,7 +23,7 @@ protected MobEntityController(Class<?> clazz) {

@Override
protected Entity createEntity(Location at, NPC npc) {
net.minecraft.server.v1_9_R1.Entity entity = createEntityFromClass(((CraftWorld) at.getWorld()).getHandle(),
net.minecraft.server.v1_9_R2.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_9_R1.Entity createEntityFromClass(Object... args) {
private net.minecraft.server.v1_9_R2.Entity createEntityFromClass(Object... args) {
try {
return (net.minecraft.server.v1_9_R1.Entity) constructor.newInstance(args);
return (net.minecraft.server.v1_9_R2.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 @@ -70,7 +70,7 @@ public boolean update() {
}
vector = plan.getCurrentVector();
}
net.minecraft.server.v1_9_R1.Entity handle = NMS.getHandle(npc.getEntity());
net.minecraft.server.v1_9_R2.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
28 changes: 14 additions & 14 deletions src/main/java/net/citizensnpcs/npc/ai/CitizensBlockBreaker.java
View file
@@ -1,26 +1,26 @@
package net.citizensnpcs.npc.ai;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
import org.bukkit.entity.Player;

import net.citizensnpcs.api.ai.tree.BehaviorStatus;
import net.citizensnpcs.api.npc.BlockBreaker;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.PlayerAnimation;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.BlockPosition;
import net.minecraft.server.v1_9_R1.Blocks;
import net.minecraft.server.v1_9_R1.EnchantmentManager;
import net.minecraft.server.v1_9_R1.Entity;
import net.minecraft.server.v1_9_R1.EntityLiving;
import net.minecraft.server.v1_9_R1.EntityPlayer;
import net.minecraft.server.v1_9_R1.EnumItemSlot;
import net.minecraft.server.v1_9_R1.IBlockData;
import net.minecraft.server.v1_9_R1.ItemStack;
import net.minecraft.server.v1_9_R1.Material;
import net.minecraft.server.v1_9_R1.MobEffects;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.Blocks;
import net.minecraft.server.v1_9_R2.EnchantmentManager;
import net.minecraft.server.v1_9_R2.Entity;
import net.minecraft.server.v1_9_R2.EntityLiving;
import net.minecraft.server.v1_9_R2.EntityPlayer;
import net.minecraft.server.v1_9_R2.EnumItemSlot;
import net.minecraft.server.v1_9_R2.IBlockData;
import net.minecraft.server.v1_9_R2.ItemStack;
import net.minecraft.server.v1_9_R2.Material;
import net.minecraft.server.v1_9_R2.MobEffects;

public class CitizensBlockBreaker extends BlockBreaker {
private final BlockBreakerConfiguration configuration;
Expand All @@ -47,7 +47,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_9_R1.ItemStack getCurrentItem() {
private net.minecraft.server.v1_9_R2.ItemStack getCurrentItem() {
return configuration.item() != null ? CraftItemStack.asNMSCopy(configuration.item())
: entity instanceof EntityLiving ? ((EntityLiving) entity).getEquipment(EnumItemSlot.MAINHAND) : null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
View file
Expand Up @@ -18,7 +18,7 @@
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.MathHelper;
import net.minecraft.server.v1_9_R2.MathHelper;

public class FlyingAStarNavigationStrategy extends AbstractPathStrategy {
private final NPC npc;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
View file
@@ -1,15 +1,15 @@
package net.citizensnpcs.npc.ai;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftLivingEntity;

import net.citizensnpcs.api.ai.NavigatorParameters;
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_9_R1.EntityLiving;
import net.minecraft.server.v1_9_R1.NavigationAbstract;
import net.minecraft.server.v1_9_R2.EntityLiving;
import net.minecraft.server.v1_9_R2.NavigationAbstract;

public class MCNavigationStrategy extends AbstractPathStrategy {
private final EntityLiving handle;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
View file
@@ -1,7 +1,7 @@
package net.citizensnpcs.npc.ai;

import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.entity.LivingEntity;

import net.citizensnpcs.api.ai.AttackStrategy;
Expand All @@ -12,10 +12,10 @@
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.PlayerAnimation;
import net.minecraft.server.v1_9_R1.Entity;
import net.minecraft.server.v1_9_R1.EntityLiving;
import net.minecraft.server.v1_9_R1.EntityPlayer;
import net.minecraft.server.v1_9_R1.NavigationAbstract;
import net.minecraft.server.v1_9_R2.Entity;
import net.minecraft.server.v1_9_R2.EntityLiving;
import net.minecraft.server.v1_9_R2.EntityPlayer;
import net.minecraft.server.v1_9_R2.NavigationAbstract;

public class MCTargetStrategy implements PathStrategy, EntityTarget {
private final boolean aggro;
Expand Down
30 changes: 15 additions & 15 deletions src/main/java/net/citizensnpcs/npc/entity/BatController.java
View file
@@ -1,9 +1,9 @@
package net.citizensnpcs.npc.entity;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftBat;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftBat;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.entity.Bat;
import org.bukkit.util.Vector;

Expand All @@ -15,11 +15,11 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.EntityBat;
import net.minecraft.server.v1_9_R1.MinecraftKey;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import net.minecraft.server.v1_9_R1.SoundEffect;
import net.minecraft.server.v1_9_R1.World;
import net.minecraft.server.v1_9_R2.EntityBat;
import net.minecraft.server.v1_9_R2.MinecraftKey;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import net.minecraft.server.v1_9_R2.SoundEffect;
import net.minecraft.server.v1_9_R2.World;

public class BatController extends MobEntityController {
public BatController() {
Expand Down Expand Up @@ -62,21 +62,21 @@ public EntityBatNPC(World world, NPC npc) {
}

@Override
protected SoundEffect bR() {
return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.bR()
protected SoundEffect bS() {
return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.bS()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.HURT_SOUND_METADATA, SoundEffect.a.b(super.bR()).toString())));
npc.data().get(NPC.HURT_SOUND_METADATA, SoundEffect.a.b(super.bS()).toString())));
}

@Override
protected SoundEffect bS() {
return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.bS()
protected SoundEffect bT() {
return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.bT()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bR()).toString())));
npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bT()).toString())));
}

@Override
public void collide(net.minecraft.server.v1_9_R1.Entity entity) {
public void collide(net.minecraft.server.v1_9_R2.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
30 changes: 15 additions & 15 deletions src/main/java/net/citizensnpcs/npc/entity/BlazeController.java
View file
@@ -1,9 +1,9 @@
package net.citizensnpcs.npc.entity;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.entity.Blaze;
import org.bukkit.util.Vector;

Expand All @@ -15,11 +15,11 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.EntityBlaze;
import net.minecraft.server.v1_9_R1.MinecraftKey;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import net.minecraft.server.v1_9_R1.SoundEffect;
import net.minecraft.server.v1_9_R1.World;
import net.minecraft.server.v1_9_R2.EntityBlaze;
import net.minecraft.server.v1_9_R2.MinecraftKey;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import net.minecraft.server.v1_9_R2.SoundEffect;
import net.minecraft.server.v1_9_R2.World;

public class BlazeController extends MobEntityController {
public BlazeController() {
Expand Down Expand Up @@ -61,21 +61,21 @@ public EntityBlazeNPC(World world, NPC npc) {
}

@Override
protected SoundEffect bR() {
return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.bR()
protected SoundEffect bS() {
return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.bS()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.HURT_SOUND_METADATA, SoundEffect.a.b(super.bR()).toString())));
npc.data().get(NPC.HURT_SOUND_METADATA, SoundEffect.a.b(super.bS()).toString())));
}

@Override
protected SoundEffect bS() {
return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.bS()
protected SoundEffect bT() {
return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.bT()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bR()).toString())));
npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bT()).toString())));
}

@Override
public void collide(net.minecraft.server.v1_9_R1.Entity entity) {
public void collide(net.minecraft.server.v1_9_R2.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
34 changes: 17 additions & 17 deletions src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java
View file
@@ -1,9 +1,9 @@
package net.citizensnpcs.npc.entity;

import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftEntity;
import org.bukkit.entity.CaveSpider;
import org.bukkit.util.Vector;

Expand All @@ -15,13 +15,13 @@
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_9_R1.BlockPosition;
import net.minecraft.server.v1_9_R1.EntityCaveSpider;
import net.minecraft.server.v1_9_R1.IBlockData;
import net.minecraft.server.v1_9_R1.MinecraftKey;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import net.minecraft.server.v1_9_R1.SoundEffect;
import net.minecraft.server.v1_9_R1.World;
import net.minecraft.server.v1_9_R2.BlockPosition;
import net.minecraft.server.v1_9_R2.EntityCaveSpider;
import net.minecraft.server.v1_9_R2.IBlockData;
import net.minecraft.server.v1_9_R2.MinecraftKey;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import net.minecraft.server.v1_9_R2.SoundEffect;
import net.minecraft.server.v1_9_R2.World;

public class CaveSpiderController extends MobEntityController {
public CaveSpiderController() {
Expand Down Expand Up @@ -70,21 +70,21 @@ protected void a(double d0, boolean flag, IBlockData block, BlockPosition blockp
}

@Override
protected SoundEffect bR() {
return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.bR()
protected SoundEffect bS() {
return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.bS()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.HURT_SOUND_METADATA, SoundEffect.a.b(super.bR()).toString())));
npc.data().get(NPC.HURT_SOUND_METADATA, SoundEffect.a.b(super.bS()).toString())));
}

@Override
protected SoundEffect bS() {
return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.bS()
protected SoundEffect bT() {
return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.bT()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bR()).toString())));
npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bT()).toString())));
}

@Override
public void collide(net.minecraft.server.v1_9_R1.Entity entity) {
public void collide(net.minecraft.server.v1_9_R2.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 ed36a50

Please sign in to comment.