Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-09 08:52:03 +01:00
Code Issues Projects Releases Wiki Activity

Initial 1.16.2 update

Browse Source
This commit is contained in:
fullwall 2020-08-12 22:21:12 +08:00
parent 73250c300a
commit a5d2010c41
130 changed files with 2871 additions and 2869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.16.1-R0.1-SNAPSHOT</craftbukkit.version> <craftbukkit.version>1.16.2-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>${project.version}</citizensapi.version> <citizensapi.version>${project.version}</citizensapi.version>
<powermock.version>1.4.12</powermock.version> <powermock.version>1.4.12</powermock.version>
</properties> </properties>

2
pom.xml
View File

@ -24,7 +24,7 @@
<module>v1_13_R2</module> <module>v1_13_R2</module>
<module>v1_14_R1</module> <module>v1_14_R1</module>
<module>v1_15_R1</module> <module>v1_15_R1</module>
<module>v1_16_R1</module> <module>v1_16_R2</module>
<module>dist</module> <module>dist</module>
</modules> </modules>
</project> </project>

4
v1_16_R1/pom.xml → v1_16_R2/pom.xml
View File

@ -8,11 +8,11 @@
<artifactId>citizens-parent</artifactId> <artifactId>citizens-parent</artifactId>
<version>2.0.27-SNAPSHOT</version> <version>2.0.27-SNAPSHOT</version>
</parent> </parent>
<artifactId>citizens-v1_16_R1</artifactId> <artifactId>citizens-v1_16_R2</artifactId>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.16.1-R0.1-SNAPSHOT</craftbukkit.version> <craftbukkit.version>1.16.2-R0.1-SNAPSHOT</craftbukkit.version>
</properties> </properties>
<repositories> <repositories>

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/BatController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/BatController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftBat; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBat;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Bat; import org.bukkit.entity.Bat;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBat; import net.minecraft.server.v1_16_R2.EntityBat;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class BatController extends MobEntityController { public class BatController extends MobEntityController {
public BatController() { public BatController() {
@ -72,7 +72,7 @@ public class BatController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -128,21 +128,21 @@ public class BatController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/BeeController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/BeeController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftBee; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBee;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Bee; import org.bukkit.entity.Bee;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBee; import net.minecraft.server.v1_16_R2.EntityBee;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class BeeController extends MobEntityController { public class BeeController extends MobEntityController {
public BeeController() { public BeeController() {
@ -71,7 +71,7 @@ public class BeeController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -127,21 +127,21 @@ public class BeeController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/BlazeController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/BlazeController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftBlaze; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBlaze;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Blaze; import org.bukkit.entity.Blaze;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBlaze; import net.minecraft.server.v1_16_R2.EntityBlaze;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class BlazeController extends MobEntityController { public class BlazeController extends MobEntityController {
public BlazeController() { public BlazeController() {
@ -71,7 +71,7 @@ public class BlazeController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -127,14 +127,14 @@ public class BlazeController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -142,7 +142,7 @@ public class BlazeController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/CatController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/CatController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftCat; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCat;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Cat; import org.bukkit.entity.Cat;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityCat; import net.minecraft.server.v1_16_R2.EntityCat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class CatController extends MobEntityController { public class CatController extends MobEntityController {
public CatController() { public CatController() {
@ -101,7 +101,7 @@ public class CatController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -116,9 +116,9 @@ public class CatController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -166,21 +166,21 @@ public class CatController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/CaveSpiderController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/CaveSpiderController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftCaveSpider; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCaveSpider;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.CaveSpider; import org.bukkit.entity.CaveSpider;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityCaveSpider; import net.minecraft.server.v1_16_R2.EntityCaveSpider;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class CaveSpiderController extends MobEntityController { public class CaveSpiderController extends MobEntityController {
public CaveSpiderController() { public CaveSpiderController() {
@ -89,7 +89,7 @@ public class CaveSpiderController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -104,9 +104,9 @@ public class CaveSpiderController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -154,21 +154,21 @@ public class CaveSpiderController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ChickenController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ChickenController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftChicken; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftChicken;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Chicken; import org.bukkit.entity.Chicken;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityChicken; import net.minecraft.server.v1_16_R2.EntityChicken;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ChickenController extends MobEntityController { public class ChickenController extends MobEntityController {
public ChickenController() { public ChickenController() {
@ -102,7 +102,7 @@ public class ChickenController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -117,9 +117,9 @@ public class ChickenController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -167,21 +167,21 @@ public class ChickenController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/CodController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/CodController.java
View File

@ -1,33 +1,33 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftCod; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCod;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Cod; import org.bukkit.entity.Cod;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityCod; import net.minecraft.server.v1_16_R2.EntityCod;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class CodController extends MobEntityController { public class CodController extends MobEntityController {
public CodController() { public CodController() {
@ -94,7 +94,7 @@ public class CodController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -108,9 +108,9 @@ public class CodController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -158,21 +158,21 @@ public class CodController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

60
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/CowController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/CowController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftCow; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCow;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Cow; import org.bukkit.entity.Cow;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityCow; import net.minecraft.server.v1_16_R2.EntityCow;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.ItemStack; import net.minecraft.server.v1_16_R2.ItemStack;
import net.minecraft.server.v1_16_R1.Items; import net.minecraft.server.v1_16_R2.Items;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class CowController extends MobEntityController { public class CowController extends MobEntityController {
public CowController() { public CowController() {
@ -117,7 +117,7 @@ public class CowController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -145,9 +145,9 @@ public class CowController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -182,21 +182,21 @@ public class CowController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

69
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/CreeperController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/CreeperController.java
View File

@ -1,32 +1,33 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftCreeper;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftCreeper; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity;
import org.bukkit.entity.Creeper; import org.bukkit.entity.Creeper;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityCreeper; import net.minecraft.server.v1_16_R2.EntityCreeper;
import net.minecraft.server.v1_16_R1.EntityLightning; import net.minecraft.server.v1_16_R2.EntityLightning;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R2.WorldServer;
public class CreeperController extends MobEntityController { public class CreeperController extends MobEntityController {
public CreeperController() { public CreeperController() {
@ -91,7 +92,7 @@ public class CreeperController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -104,15 +105,6 @@ public class CreeperController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -126,6 +118,15 @@ public class CreeperController extends MobEntityController {
} }
} }
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -155,14 +156,14 @@ public class CreeperController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -170,7 +171,7 @@ public class CreeperController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -217,9 +218,9 @@ public class CreeperController extends MobEntityController {
} }
@Override @Override
public void onLightningStrike(EntityLightning entitylightning) { public void onLightningStrike(WorldServer server, EntityLightning entitylightning) {
if (npc == null || allowPowered) { if (npc == null || allowPowered) {
super.onLightningStrike(entitylightning); super.onLightningStrike(server, entitylightning);
} }
} }

60
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/DolphinController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/DolphinController.java
View File

@ -1,35 +1,35 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftDolphin; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDolphin;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Dolphin; import org.bukkit.entity.Dolphin;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityDolphin; import net.minecraft.server.v1_16_R2.EntityDolphin;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Navigation; import net.minecraft.server.v1_16_R2.Navigation;
import net.minecraft.server.v1_16_R1.NavigationAbstract; import net.minecraft.server.v1_16_R2.NavigationAbstract;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class DolphinController extends MobEntityController { public class DolphinController extends MobEntityController {
public DolphinController() { public DolphinController() {
@ -81,8 +81,8 @@ public class DolphinController extends MobEntityController {
} }
@Override @Override
public boolean aC() { public boolean aF() {
return npc == null ? super.aC() : true; return npc == null ? super.aF() : true;
} }
@Override @Override
@ -106,7 +106,7 @@ public class DolphinController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -133,9 +133,9 @@ public class DolphinController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -170,21 +170,21 @@ public class DolphinController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/DrownedController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/DrownedController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftDrowned; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDrowned;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Drowned; import org.bukkit.entity.Drowned;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityDrowned; import net.minecraft.server.v1_16_R2.EntityDrowned;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class DrownedController extends MobEntityController { public class DrownedController extends MobEntityController {
public DrownedController() { public DrownedController() {
@ -89,7 +89,7 @@ public class DrownedController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -103,9 +103,9 @@ public class DrownedController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -153,21 +153,21 @@ public class DrownedController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

40
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/EnderDragonController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/EnderDragonController.java
View File

@ -1,29 +1,29 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEnderDragon; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderDragon;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.EnderDragon; import org.bukkit.entity.EnderDragon;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityEnderDragon; import net.minecraft.server.v1_16_R2.EntityEnderDragon;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EnderDragonController extends MobEntityController { public class EnderDragonController extends MobEntityController {
public EnderDragonController() { public EnderDragonController() {
@ -72,7 +72,7 @@ public class EnderDragonController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -136,21 +136,21 @@ public class EnderDragonController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/EndermanController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/EndermanController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEnderman; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderman;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Enderman; import org.bukkit.entity.Enderman;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityEnderman; import net.minecraft.server.v1_16_R2.EntityEnderman;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EndermanController extends MobEntityController { public class EndermanController extends MobEntityController {
public EndermanController() { public EndermanController() {
@ -97,7 +97,7 @@ public class EndermanController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -124,9 +124,9 @@ public class EndermanController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -161,21 +161,21 @@ public class EndermanController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/EndermiteController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/EndermiteController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEndermite; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEndermite;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Endermite; import org.bukkit.entity.Endermite;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityEndermite; import net.minecraft.server.v1_16_R2.EntityEndermite;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EndermiteController extends MobEntityController { public class EndermiteController extends MobEntityController {
public EndermiteController() { public EndermiteController() {
@ -89,7 +89,7 @@ public class EndermiteController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -103,9 +103,9 @@ public class EndermiteController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -153,21 +153,21 @@ public class EndermiteController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

114
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/EntityHumanNPC.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/EntityHumanNPC.java
View File

@ -1,4 +1,4 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.io.IOException; import java.io.IOException;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
@ -9,8 +9,8 @@ import java.util.function.Consumer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -28,16 +28,16 @@ import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.trait.trait.Inventory; import net.citizensnpcs.api.trait.trait.Inventory;
import net.citizensnpcs.nms.v1_16_R1.network.EmptyNetHandler; import net.citizensnpcs.nms.v1_16_R2.network.EmptyNetHandler;
import net.citizensnpcs.nms.v1_16_R1.network.EmptyNetworkManager; import net.citizensnpcs.nms.v1_16_R2.network.EmptyNetworkManager;
import net.citizensnpcs.nms.v1_16_R1.network.EmptySocket; import net.citizensnpcs.nms.v1_16_R2.network.EmptySocket;
import net.citizensnpcs.nms.v1_16_R1.util.EmptyAdvancementDataPlayer; import net.citizensnpcs.nms.v1_16_R2.util.EmptyAdvancementDataPlayer;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerJump; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerJump;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerLook; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerLook;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerNavigation; import net.citizensnpcs.nms.v1_16_R2.util.PlayerNavigation;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerlistTracker; import net.citizensnpcs.nms.v1_16_R2.util.PlayerlistTracker;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.npc.skin.SkinPacketTracker; import net.citizensnpcs.npc.skin.SkinPacketTracker;
@ -46,32 +46,32 @@ import net.citizensnpcs.trait.Gravity;
import net.citizensnpcs.trait.SkinTrait; import net.citizensnpcs.trait.SkinTrait;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.AttributeBase; import net.minecraft.server.v1_16_R2.AttributeBase;
import net.minecraft.server.v1_16_R1.AttributeMapBase; import net.minecraft.server.v1_16_R2.AttributeMapBase;
import net.minecraft.server.v1_16_R1.AttributeModifiable; import net.minecraft.server.v1_16_R2.AttributeModifiable;
import net.minecraft.server.v1_16_R1.AttributeProvider; import net.minecraft.server.v1_16_R2.AttributeProvider;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ChatComponentText; import net.minecraft.server.v1_16_R2.ChatComponentText;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityPlayer; import net.minecraft.server.v1_16_R2.EntityPlayer;
import net.minecraft.server.v1_16_R1.EnumGamemode; import net.minecraft.server.v1_16_R2.EnumGamemode;
import net.minecraft.server.v1_16_R1.EnumItemSlot; import net.minecraft.server.v1_16_R2.EnumItemSlot;
import net.minecraft.server.v1_16_R1.EnumProtocolDirection; import net.minecraft.server.v1_16_R2.EnumProtocolDirection;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.IChatBaseComponent; import net.minecraft.server.v1_16_R2.IChatBaseComponent;
import net.minecraft.server.v1_16_R1.ItemStack; import net.minecraft.server.v1_16_R2.ItemStack;
import net.minecraft.server.v1_16_R1.MinecraftServer; import net.minecraft.server.v1_16_R2.MinecraftServer;
import net.minecraft.server.v1_16_R1.NavigationAbstract; import net.minecraft.server.v1_16_R2.NavigationAbstract;
import net.minecraft.server.v1_16_R1.NetworkManager; import net.minecraft.server.v1_16_R2.NetworkManager;
import net.minecraft.server.v1_16_R1.Packet; import net.minecraft.server.v1_16_R2.Packet;
import net.minecraft.server.v1_16_R1.PacketPlayOutEntityEquipment; import net.minecraft.server.v1_16_R2.PacketPlayOutEntityEquipment;
import net.minecraft.server.v1_16_R1.PathType; import net.minecraft.server.v1_16_R2.PathType;
import net.minecraft.server.v1_16_R1.PlayerInteractManager; import net.minecraft.server.v1_16_R2.PlayerInteractManager;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class EntityHumanNPC extends EntityPlayer implements NPCHolder, SkinnableEntity { public class EntityHumanNPC extends EntityPlayer implements NPCHolder, SkinnableEntity {
private final Map<PathType, Float> bz = Maps.newEnumMap(PathType.class); private final Map<PathType, Float> bz = Maps.newEnumMap(PathType.class);
@ -137,7 +137,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -200,9 +200,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -256,14 +256,14 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -271,7 +271,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -352,9 +352,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
} else { } else {
jumpTicks = 0; jumpTicks = 0;
} }
aY *= 0.98F; aR *= 0.98F;
ba *= 0.98F; aT *= 0.98F;
f(new Vec3D(this.aY, this.aZ, this.ba)); // movement method g(new Vec3D(this.aR, this.aS, this.aT)); // movement method
NMS.setHeadYaw(getBukkitEntity(), yaw); NMS.setHeadYaw(getBukkitEntity(), yaw);
if (jumpTicks > 0) { if (jumpTicks > 0) {
jumpTicks--; jumpTicks--;
@ -362,11 +362,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
} }
@Override @Override
public Packet<?> O() { public Packet<?> P() {
if (playerlistTracker != null) { if (playerlistTracker != null) {
playerlistTracker.updateLastPlayer(); playerlistTracker.updateLastPlayer();
} }
return super.O(); return super.P();
} }
@Override @Override
@ -380,7 +380,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
if (!navigating && getBukkitEntity() != null if (!navigating && getBukkitEntity() != null
&& (!npc.hasTrait(Gravity.class) || npc.getTrait(Gravity.class).hasGravity()) && (!npc.hasTrait(Gravity.class) || npc.getTrait(Gravity.class).hasGravity())
&& Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION))) { && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION))) {
f(new Vec3D(0, 0, 0)); g(new Vec3D(0, 0, 0));
} }
Vec3D mot = getMot(); Vec3D mot = getMot();
if (Math.abs(mot.getX()) < EPSILON && Math.abs(mot.getY()) < EPSILON && Math.abs(mot.getZ()) < EPSILON) { if (Math.abs(mot.getX()) < EPSILON && Math.abs(mot.getY()) < EPSILON && Math.abs(mot.getZ()) < EPSILON) {
@ -394,14 +394,14 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
} }
NMSImpl.updateAI(this); NMSImpl.updateAI(this);
this.ay = this.az; this.ar = this.as;
if (this.hurtTicks > 0) { if (this.hurtTicks > 0) {
this.hurtTicks -= 1; this.hurtTicks -= 1;
} }
tickPotionEffects(); tickPotionEffects();
this.aT = this.aS; this.aM = this.aL;
this.aI = this.aH; this.aB = this.aA;
this.aK = this.aJ; this.aD = this.aC;
this.lastYaw = this.yaw; this.lastYaw = this.yaw;
this.lastPitch = this.pitch; this.lastPitch = this.pitch;
} }
@ -417,7 +417,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
@Override @Override
public void setSkinFlags(byte flags) { public void setSkinFlags(byte flags) {
// set skin flag byte // set skin flag byte
getDataWatcher().set(EntityHuman.bp, flags); getDataWatcher().set(EntityHuman.bi, flags);
} }
@Override @Override

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/EvokerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/EvokerController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEvoker; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEvoker;
import org.bukkit.entity.Evoker; import org.bukkit.entity.Evoker;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityEvoker; import net.minecraft.server.v1_16_R2.EntityEvoker;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EvokerController extends MobEntityController { public class EvokerController extends MobEntityController {
public EvokerController() { public EvokerController() {
@ -75,7 +75,7 @@ public class EvokerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,9 +90,9 @@ public class EvokerController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,21 +140,21 @@ public class EvokerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/FoxController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/FoxController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftFox; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFox;
import org.bukkit.entity.Fox; import org.bukkit.entity.Fox;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityFox; import net.minecraft.server.v1_16_R2.EntityFox;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class FoxController extends MobEntityController { public class FoxController extends MobEntityController {
public FoxController() { public FoxController() {
@ -87,7 +87,7 @@ public class FoxController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -102,9 +102,9 @@ public class FoxController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -152,21 +152,21 @@ public class FoxController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/GhastController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/GhastController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftGhast; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftGhast;
import org.bukkit.entity.Ghast; import org.bukkit.entity.Ghast;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityGhast; import net.minecraft.server.v1_16_R2.EntityGhast;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class GhastController extends MobEntityController { public class GhastController extends MobEntityController {
public GhastController() { public GhastController() {
@ -57,7 +57,7 @@ public class GhastController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -113,21 +113,21 @@ public class GhastController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/GiantController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/GiantController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftGiant; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftGiant;
import org.bukkit.entity.Giant; import org.bukkit.entity.Giant;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityGiantZombie; import net.minecraft.server.v1_16_R2.EntityGiantZombie;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class GiantController extends MobEntityController { public class GiantController extends MobEntityController {
public GiantController() { public GiantController() {
@ -75,7 +75,7 @@ public class GiantController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class GiantController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class GiantController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/GuardianController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/GuardianController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftGuardian; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftGuardian;
import org.bukkit.entity.Guardian; import org.bukkit.entity.Guardian;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityGuardian; import net.minecraft.server.v1_16_R2.EntityGuardian;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class GuardianController extends MobEntityController { public class GuardianController extends MobEntityController {
public GuardianController() { public GuardianController() {
@ -75,7 +75,7 @@ public class GuardianController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,9 +90,9 @@ public class GuardianController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,21 +140,21 @@ public class GuardianController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/GuardianElderController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/GuardianElderController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftElderGuardian; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftElderGuardian;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.ElderGuardian; import org.bukkit.entity.ElderGuardian;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityGuardianElder; import net.minecraft.server.v1_16_R2.EntityGuardianElder;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class GuardianElderController extends MobEntityController { public class GuardianElderController extends MobEntityController {
public GuardianElderController() { public GuardianElderController() {
@ -75,7 +75,7 @@ public class GuardianElderController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,9 +90,9 @@ public class GuardianElderController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,21 +140,21 @@ public class GuardianElderController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HoglinController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HoglinController.java
View File

@ -1,34 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.util.TreeMap; import java.util.TreeMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftHoglin; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHoglin;
import org.bukkit.entity.Hoglin; import org.bukkit.entity.Hoglin;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BehaviorController; import net.minecraft.server.v1_16_R2.BehaviorController;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHoglin; import net.minecraft.server.v1_16_R2.EntityHoglin;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class HoglinController extends MobEntityController { public class HoglinController extends MobEntityController {
public HoglinController() { public HoglinController() {
@ -80,7 +80,7 @@ public class HoglinController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -107,9 +107,9 @@ public class HoglinController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -144,14 +144,14 @@ public class HoglinController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -159,7 +159,7 @@ public class HoglinController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -199,7 +199,7 @@ public class HoglinController extends MobEntityController {
this.behaviorMap.clear(); this.behaviorMap.clear();
NMSImpl.clearGoals(npc, goalSelector, targetSelector); NMSImpl.clearGoals(npc, goalSelector, targetSelector);
} }
t(npc.isProtected()); // ImmuneToZombification setImmuneToZombification(npc.isProtected());
} }
super.mobTick(); super.mobTick();
if (npc != null) { if (npc != null) {

76
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HorseController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HorseController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftHorse; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHorse;
import org.bukkit.entity.Horse; import org.bukkit.entity.Horse;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.Controllable;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHorse; import net.minecraft.server.v1_16_R2.EntityHorse;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
public class HorseController extends MobEntityController { public class HorseController extends MobEntityController {
public HorseController() { public HorseController() {
@ -112,7 +112,7 @@ public class HorseController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -126,20 +126,6 @@ public class HorseController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean es() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.es();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -153,6 +139,20 @@ public class HorseController extends MobEntityController {
} }
} }
@Override
public boolean er() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.er();
}
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -182,21 +182,21 @@ public class HorseController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

76
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HorseDonkeyController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HorseDonkeyController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftDonkey; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDonkey;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Donkey; import org.bukkit.entity.Donkey;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.Controllable;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHorseDonkey; import net.minecraft.server.v1_16_R2.EntityHorseDonkey;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
public class HorseDonkeyController extends MobEntityController { public class HorseDonkeyController extends MobEntityController {
public HorseDonkeyController() { public HorseDonkeyController() {
@ -111,7 +111,7 @@ public class HorseDonkeyController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -125,20 +125,6 @@ public class HorseDonkeyController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean es() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.es();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -152,6 +138,20 @@ public class HorseDonkeyController extends MobEntityController {
} }
} }
@Override
public boolean er() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.er();
}
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -181,21 +181,21 @@ public class HorseDonkeyController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

76
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HorseMuleController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HorseMuleController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMule; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMule;
import org.bukkit.entity.Mule; import org.bukkit.entity.Mule;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.Controllable;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHorseMule; import net.minecraft.server.v1_16_R2.EntityHorseMule;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
public class HorseMuleController extends MobEntityController { public class HorseMuleController extends MobEntityController {
public HorseMuleController() { public HorseMuleController() {
@ -111,7 +111,7 @@ public class HorseMuleController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -125,20 +125,6 @@ public class HorseMuleController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean es() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.es();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -152,6 +138,20 @@ public class HorseMuleController extends MobEntityController {
} }
} }
@Override
public boolean er() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.er();
}
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -181,21 +181,21 @@ public class HorseMuleController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

76
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HorseSkeletonController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HorseSkeletonController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSkeletonHorse; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSkeletonHorse;
import org.bukkit.entity.SkeletonHorse; import org.bukkit.entity.SkeletonHorse;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.Controllable;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHorseSkeleton; import net.minecraft.server.v1_16_R2.EntityHorseSkeleton;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
public class HorseSkeletonController extends MobEntityController { public class HorseSkeletonController extends MobEntityController {
public HorseSkeletonController() { public HorseSkeletonController() {
@ -112,7 +112,7 @@ public class HorseSkeletonController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -126,20 +126,6 @@ public class HorseSkeletonController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean es() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.es();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -153,6 +139,20 @@ public class HorseSkeletonController extends MobEntityController {
} }
} }
@Override
public boolean er() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.er();
}
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -182,21 +182,21 @@ public class HorseSkeletonController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

76
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HorseZombieController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HorseZombieController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftZombieHorse; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftZombieHorse;
import org.bukkit.entity.ZombieHorse; import org.bukkit.entity.ZombieHorse;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.Controllable; import net.citizensnpcs.trait.Controllable;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHorseZombie; import net.minecraft.server.v1_16_R2.EntityHorseZombie;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
public class HorseZombieController extends MobEntityController { public class HorseZombieController extends MobEntityController {
public HorseZombieController() { public HorseZombieController() {
@ -112,7 +112,7 @@ public class HorseZombieController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -126,20 +126,6 @@ public class HorseZombieController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean es() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.es();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -153,6 +139,20 @@ public class HorseZombieController extends MobEntityController {
} }
} }
@Override
public boolean er() {
return npc != null && npc.getNavigator().isNavigating() ? false : super.er();
}
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -182,21 +182,21 @@ public class HorseZombieController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

8
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/HumanController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/HumanController.java
View File

@ -1,10 +1,10 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Scoreboard;
@ -20,8 +20,8 @@ import net.citizensnpcs.npc.skin.Skin;
import net.citizensnpcs.npc.skin.SkinnableEntity; import net.citizensnpcs.npc.skin.SkinnableEntity;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.PlayerInteractManager; import net.minecraft.server.v1_16_R2.PlayerInteractManager;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class HumanController extends AbstractEntityController { public class HumanController extends AbstractEntityController {
public HumanController() { public HumanController() {

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/IllusionerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/IllusionerController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftIllusioner; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftIllusioner;
import org.bukkit.entity.Illusioner; import org.bukkit.entity.Illusioner;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityIllagerIllusioner; import net.minecraft.server.v1_16_R2.EntityIllagerIllusioner;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class IllusionerController extends MobEntityController { public class IllusionerController extends MobEntityController {
public IllusionerController() { public IllusionerController() {
@ -75,7 +75,7 @@ public class IllusionerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,9 +90,9 @@ public class IllusionerController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,21 +140,21 @@ public class IllusionerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/IronGolemController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/IronGolemController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftIronGolem; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftIronGolem;
import org.bukkit.entity.IronGolem; import org.bukkit.entity.IronGolem;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityIronGolem; import net.minecraft.server.v1_16_R2.EntityIronGolem;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class IronGolemController extends MobEntityController { public class IronGolemController extends MobEntityController {
public IronGolemController() { public IronGolemController() {
@ -75,7 +75,7 @@ public class IronGolemController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class IronGolemController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class IronGolemController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/LlamaController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/LlamaController.java
View File

@ -1,35 +1,35 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftLlama; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLlama;
import org.bukkit.entity.Llama; import org.bukkit.entity.Llama;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityLlama; import net.minecraft.server.v1_16_R2.EntityLlama;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class LlamaController extends MobEntityController { public class LlamaController extends MobEntityController {
public LlamaController() { public LlamaController() {
@ -98,7 +98,7 @@ public class LlamaController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -113,9 +113,9 @@ public class LlamaController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -163,21 +163,21 @@ public class LlamaController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

54
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/MagmaCubeController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/MagmaCubeController.java
View File

@ -1,34 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMagmaCube; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMagmaCube;
import org.bukkit.entity.MagmaCube; import org.bukkit.entity.MagmaCube;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityMagmaCube; import net.minecraft.server.v1_16_R2.EntityMagmaCube;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MagmaCubeController extends MobEntityController { public class MagmaCubeController extends MobEntityController {
public MagmaCubeController() { public MagmaCubeController() {
@ -82,7 +82,7 @@ public class MagmaCubeController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -96,9 +96,9 @@ public class MagmaCubeController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -146,21 +146,21 @@ public class MagmaCubeController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

18
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/MobEntityController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/MobEntityController.java
View File

@ -1,20 +1,20 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.Map; import java.util.Map;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.AbstractEntityController;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public abstract class MobEntityController extends AbstractEntityController { public abstract class MobEntityController extends AbstractEntityController {
private final Class<?> clazz; private final Class<?> clazz;
@ -29,7 +29,7 @@ public abstract class MobEntityController extends AbstractEntityController {
@Override @Override
protected Entity createEntity(Location at, NPC npc) { protected Entity createEntity(Location at, NPC npc) {
EntityTypes<?> type = NMSImpl.getEntityType(clazz); EntityTypes<?> type = NMSImpl.getEntityType(clazz);
net.minecraft.server.v1_16_R1.Entity entity = createEntityFromClass(type, net.minecraft.server.v1_16_R2.Entity entity = createEntityFromClass(type,
((CraftWorld) at.getWorld()).getHandle(), npc); ((CraftWorld) at.getWorld()).getHandle(), npc);
entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
@ -37,14 +37,14 @@ public abstract class MobEntityController extends AbstractEntityController {
// that things like pathfinding still work *immediately* after spawn. // that things like pathfinding still work *immediately* after spawn.
org.bukkit.Material beneath = at.getBlock().getRelative(BlockFace.DOWN).getType(); org.bukkit.Material beneath = at.getBlock().getRelative(BlockFace.DOWN).getType();
if (beneath.isBlock()) { if (beneath.isBlock()) {
entity.c(true); entity.setOnGround(true);
} }
return entity.getBukkitEntity(); return entity.getBukkitEntity();
} }
private net.minecraft.server.v1_16_R1.Entity createEntityFromClass(Object... args) { private net.minecraft.server.v1_16_R2.Entity createEntityFromClass(Object... args) {
try { try {
return (net.minecraft.server.v1_16_R1.Entity) constructor.newInstance(args); return (net.minecraft.server.v1_16_R2.Entity) constructor.newInstance(args);
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
return null; return null;

56
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/MushroomCowController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/MushroomCowController.java
View File

@ -1,35 +1,35 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMushroomCow; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMushroomCow;
import org.bukkit.entity.MushroomCow; import org.bukkit.entity.MushroomCow;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityMushroomCow; import net.minecraft.server.v1_16_R2.EntityMushroomCow;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MushroomCowController extends MobEntityController { public class MushroomCowController extends MobEntityController {
@ -99,7 +99,7 @@ public class MushroomCowController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -126,9 +126,9 @@ public class MushroomCowController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -163,21 +163,21 @@ public class MushroomCowController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/OcelotController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/OcelotController.java
View File

@ -1,33 +1,33 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftOcelot; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftOcelot;
import org.bukkit.entity.Ocelot; import org.bukkit.entity.Ocelot;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityOcelot; import net.minecraft.server.v1_16_R2.EntityOcelot;
import net.minecraft.server.v1_16_R1.EntityPose; import net.minecraft.server.v1_16_R2.EntityPose;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class OcelotController extends MobEntityController { public class OcelotController extends MobEntityController {
public OcelotController() { public OcelotController() {
@ -89,7 +89,7 @@ public class OcelotController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -104,9 +104,9 @@ public class OcelotController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -154,21 +154,21 @@ public class OcelotController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PandaController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PandaController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPanda; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPanda;
import org.bukkit.entity.Panda; import org.bukkit.entity.Panda;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityPanda; import net.minecraft.server.v1_16_R2.EntityPanda;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class PandaController extends MobEntityController { public class PandaController extends MobEntityController {
public PandaController() { public PandaController() {
@ -87,7 +87,7 @@ public class PandaController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -102,9 +102,9 @@ public class PandaController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -152,21 +152,21 @@ public class PandaController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

44
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ParrotController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ParrotController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftParrot; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftParrot;
import org.bukkit.entity.Parrot; import org.bukkit.entity.Parrot;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityParrot; import net.minecraft.server.v1_16_R2.EntityParrot;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ParrotController extends MobEntityController { public class ParrotController extends MobEntityController {
public ParrotController() { public ParrotController() {
@ -69,7 +69,7 @@ public class ParrotController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -125,21 +125,21 @@ public class ParrotController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

62
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PhantomController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PhantomController.java
View File

@ -1,36 +1,36 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPhantom; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPhantom;
import org.bukkit.entity.Phantom; import org.bukkit.entity.Phantom;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerLook; import net.minecraft.server.v1_16_R2.ControllerLook;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityPhantom; import net.minecraft.server.v1_16_R2.EntityPhantom;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumDifficulty; import net.minecraft.server.v1_16_R2.EnumDifficulty;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R1.WorldDataServer; import net.minecraft.server.v1_16_R2.WorldDataServer;
public class PhantomController extends MobEntityController { public class PhantomController extends MobEntityController {
public PhantomController() { public PhantomController() {
@ -88,7 +88,7 @@ public class PhantomController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -102,9 +102,9 @@ public class PhantomController extends MobEntityController {
} }
@Override @Override
public boolean eH() { public boolean eG() {
if (npc == null || !npc.isProtected()) if (npc == null || !npc.isProtected())
return super.eH(); return super.eG();
return false; return false;
} }
@ -122,9 +122,9 @@ public class PhantomController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -159,21 +159,21 @@ public class PhantomController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

83
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PigController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PigController.java
View File

@ -1,33 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPig;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPig;
import org.bukkit.entity.Pig; import org.bukkit.entity.Pig;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityLightning; import net.minecraft.server.v1_16_R2.EntityLightning;
import net.minecraft.server.v1_16_R1.EntityPig; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityPig;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R2.WorldServer;
public class PigController extends MobEntityController { public class PigController extends MobEntityController {
public PigController() { public PigController() {
@ -89,7 +90,7 @@ public class PigController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -103,21 +104,6 @@ public class PigController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean es() {
// block carrot-on-a-stick behaviour
return npc == null ? super.es() : false;
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.f(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -131,6 +117,21 @@ public class PigController extends MobEntityController {
} }
} }
@Override
public boolean er() {
// block carrot-on-a-stick behaviour
return npc == null ? super.er() : false;
}
@Override
public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) {
super.g(vec3d);
} else {
NMSImpl.flyingMoveLogic(this, vec3d);
}
}
@Override @Override
public CraftEntity getBukkitEntity() { public CraftEntity getBukkitEntity() {
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
@ -160,21 +161,21 @@ public class PigController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -221,9 +222,9 @@ public class PigController extends MobEntityController {
} }
@Override @Override
public void onLightningStrike(EntityLightning entitylightning) { public void onLightningStrike(WorldServer server, EntityLightning entitylightning) {
if (npc == null) { if (npc == null) {
super.onLightningStrike(entitylightning); super.onLightningStrike(server, entitylightning);
} }
} }
} }

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PigZombieController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PigZombieController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPigZombie; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPigZombie;
import org.bukkit.entity.PigZombie; import org.bukkit.entity.PigZombie;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityPigZombie; import net.minecraft.server.v1_16_R2.EntityPigZombie;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class PigZombieController extends MobEntityController { public class PigZombieController extends MobEntityController {
@ -76,7 +76,7 @@ public class PigZombieController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,9 +90,9 @@ public class PigZombieController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,14 +140,14 @@ public class PigZombieController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -155,7 +155,7 @@ public class PigZombieController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PiglinController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PiglinController.java
View File

@ -1,34 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.util.TreeMap; import java.util.TreeMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPiglin; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPiglin;
import org.bukkit.entity.Piglin; import org.bukkit.entity.Piglin;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BehaviorController; import net.minecraft.server.v1_16_R2.BehaviorController;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityPiglin; import net.minecraft.server.v1_16_R2.EntityPiglin;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class PiglinController extends MobEntityController { public class PiglinController extends MobEntityController {
public PiglinController() { public PiglinController() {
@ -80,7 +80,7 @@ public class PiglinController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -107,9 +107,9 @@ public class PiglinController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -144,14 +144,14 @@ public class PiglinController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -159,7 +159,7 @@ public class PiglinController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -199,7 +199,7 @@ public class PiglinController extends MobEntityController {
this.behaviorMap.clear(); this.behaviorMap.clear();
NMSImpl.clearGoals(npc, goalSelector, targetSelector); NMSImpl.clearGoals(npc, goalSelector, targetSelector);
} }
t(npc.isProtected()); // ImmuneToZombification setImmuneToZombification(npc.isProtected());
} }
super.mobTick(); super.mobTick();
if (npc != null) { if (npc != null) {

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PillagerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PillagerController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPillager; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPillager;
import org.bukkit.entity.Pillager; import org.bukkit.entity.Pillager;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityPillager; import net.minecraft.server.v1_16_R2.EntityPillager;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class PillagerController extends MobEntityController { public class PillagerController extends MobEntityController {
public PillagerController() { public PillagerController() {
@ -87,7 +87,7 @@ public class PillagerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -102,9 +102,9 @@ public class PillagerController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -152,21 +152,21 @@ public class PillagerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

40
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PolarBearController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PolarBearController.java
View File

@ -1,29 +1,29 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPolarBear; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPolarBear;
import org.bukkit.entity.PolarBear; import org.bukkit.entity.PolarBear;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityPolarBear; import net.minecraft.server.v1_16_R2.EntityPolarBear;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class PolarBearController extends MobEntityController { public class PolarBearController extends MobEntityController {
public PolarBearController() { public PolarBearController() {
@ -71,7 +71,7 @@ public class PolarBearController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -127,21 +127,21 @@ public class PolarBearController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

56
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/PufferFishController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/PufferFishController.java
View File

@ -1,36 +1,36 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPufferFish; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPufferFish;
import org.bukkit.entity.PufferFish; import org.bukkit.entity.PufferFish;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.versioned.PufferFishTrait; import net.citizensnpcs.trait.versioned.PufferFishTrait;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityPose; import net.minecraft.server.v1_16_R2.EntityPose;
import net.minecraft.server.v1_16_R1.EntityPufferFish; import net.minecraft.server.v1_16_R2.EntityPufferFish;
import net.minecraft.server.v1_16_R1.EntitySize; import net.minecraft.server.v1_16_R2.EntitySize;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class PufferFishController extends MobEntityController { public class PufferFishController extends MobEntityController {
public PufferFishController() { public PufferFishController() {
@ -91,7 +91,7 @@ public class PufferFishController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -111,9 +111,9 @@ public class PufferFishController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -161,21 +161,21 @@ public class PufferFishController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/RabbitController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/RabbitController.java
View File

@ -1,34 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftRabbit; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftRabbit;
import org.bukkit.entity.Rabbit; import org.bukkit.entity.Rabbit;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityLiving; import net.minecraft.server.v1_16_R2.EntityLiving;
import net.minecraft.server.v1_16_R1.EntityRabbit; import net.minecraft.server.v1_16_R2.EntityRabbit;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class RabbitController extends MobEntityController { public class RabbitController extends MobEntityController {
public RabbitController() { public RabbitController() {
@ -91,7 +91,7 @@ public class RabbitController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -106,9 +106,9 @@ public class RabbitController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -161,21 +161,21 @@ public class RabbitController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/RavagerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/RavagerController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftRavager; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftRavager;
import org.bukkit.entity.Ravager; import org.bukkit.entity.Ravager;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityRavager; import net.minecraft.server.v1_16_R2.EntityRavager;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class RavagerController extends MobEntityController { public class RavagerController extends MobEntityController {
public RavagerController() { public RavagerController() {
@ -87,7 +87,7 @@ public class RavagerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -102,9 +102,9 @@ public class RavagerController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -152,21 +152,21 @@ public class RavagerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SalmonController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SalmonController.java
View File

@ -1,33 +1,33 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSalmon; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSalmon;
import org.bukkit.entity.Salmon; import org.bukkit.entity.Salmon;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySalmon; import net.minecraft.server.v1_16_R2.EntitySalmon;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SalmonController extends MobEntityController { public class SalmonController extends MobEntityController {
public SalmonController() { public SalmonController() {
@ -80,7 +80,7 @@ public class SalmonController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -94,9 +94,9 @@ public class SalmonController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -144,21 +144,21 @@ public class SalmonController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SheepController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SheepController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSheep; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSheep;
import org.bukkit.entity.Sheep; import org.bukkit.entity.Sheep;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySheep; import net.minecraft.server.v1_16_R2.EntitySheep;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SheepController extends MobEntityController { public class SheepController extends MobEntityController {
public SheepController() { public SheepController() {
@ -89,7 +89,7 @@ public class SheepController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -103,9 +103,9 @@ public class SheepController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -153,21 +153,21 @@ public class SheepController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ShulkerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ShulkerController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftShulker; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftShulker;
import org.bukkit.entity.Shulker; import org.bukkit.entity.Shulker;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityAIBodyControl; import net.minecraft.server.v1_16_R2.EntityAIBodyControl;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityShulker; import net.minecraft.server.v1_16_R2.EntityShulker;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ShulkerController extends MobEntityController { public class ShulkerController extends MobEntityController {
public ShulkerController() { public ShulkerController() {
@ -76,7 +76,7 @@ public class ShulkerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -103,9 +103,9 @@ public class ShulkerController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,21 +140,21 @@ public class ShulkerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SilverfishController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SilverfishController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSilverfish; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSilverfish;
import org.bukkit.entity.Silverfish; import org.bukkit.entity.Silverfish;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySilverfish; import net.minecraft.server.v1_16_R2.EntitySilverfish;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SilverfishController extends MobEntityController { public class SilverfishController extends MobEntityController {
public SilverfishController() { public SilverfishController() {
@ -75,7 +75,7 @@ public class SilverfishController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class SilverfishController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -137,21 +137,21 @@ public class SilverfishController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SkeletonController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SkeletonController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSkeleton; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSkeleton;
import org.bukkit.entity.Skeleton; import org.bukkit.entity.Skeleton;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySkeleton; import net.minecraft.server.v1_16_R2.EntitySkeleton;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SkeletonController extends MobEntityController { public class SkeletonController extends MobEntityController {
public SkeletonController() { public SkeletonController() {
@ -75,7 +75,7 @@ public class SkeletonController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class SkeletonController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class SkeletonController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SkeletonStrayController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SkeletonStrayController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftStray; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftStray;
import org.bukkit.entity.Stray; import org.bukkit.entity.Stray;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySkeletonStray; import net.minecraft.server.v1_16_R2.EntitySkeletonStray;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SkeletonStrayController extends MobEntityController { public class SkeletonStrayController extends MobEntityController {
public SkeletonStrayController() { public SkeletonStrayController() {
@ -75,7 +75,7 @@ public class SkeletonStrayController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class SkeletonStrayController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class SkeletonStrayController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SkeletonWitherController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SkeletonWitherController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftWitherSkeleton; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWitherSkeleton;
import org.bukkit.entity.WitherSkeleton; import org.bukkit.entity.WitherSkeleton;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySkeletonWither; import net.minecraft.server.v1_16_R2.EntitySkeletonWither;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SkeletonWitherController extends MobEntityController { public class SkeletonWitherController extends MobEntityController {
public SkeletonWitherController() { public SkeletonWitherController() {
@ -75,7 +75,7 @@ public class SkeletonWitherController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class SkeletonWitherController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class SkeletonWitherController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

54
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SlimeController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SlimeController.java
View File

@ -1,34 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSlime; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSlime;
import org.bukkit.entity.Slime; import org.bukkit.entity.Slime;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntitySlime; import net.minecraft.server.v1_16_R2.EntitySlime;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SlimeController extends MobEntityController { public class SlimeController extends MobEntityController {
public SlimeController() { public SlimeController() {
@ -82,7 +82,7 @@ public class SlimeController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -97,9 +97,9 @@ public class SlimeController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -147,21 +147,21 @@ public class SlimeController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SnowmanController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SnowmanController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSnowman; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSnowman;
import org.bukkit.entity.Snowman; import org.bukkit.entity.Snowman;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySnowman; import net.minecraft.server.v1_16_R2.EntitySnowman;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.GameRules; import net.minecraft.server.v1_16_R2.GameRules;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SnowmanController extends MobEntityController { public class SnowmanController extends MobEntityController {
public SnowmanController() { public SnowmanController() {
@ -76,7 +76,7 @@ public class SnowmanController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,9 +90,9 @@ public class SnowmanController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -140,21 +140,21 @@ public class SnowmanController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SpiderController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SpiderController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSpider; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSpider;
import org.bukkit.entity.Spider; import org.bukkit.entity.Spider;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySpider; import net.minecraft.server.v1_16_R2.EntitySpider;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SpiderController extends MobEntityController { public class SpiderController extends MobEntityController {
public SpiderController() { public SpiderController() {
@ -75,7 +75,7 @@ public class SpiderController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class SpiderController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class SpiderController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/SquidController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/SquidController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftSquid; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSquid;
import org.bukkit.entity.Squid; import org.bukkit.entity.Squid;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntitySquid; import net.minecraft.server.v1_16_R2.EntitySquid;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class SquidController extends MobEntityController { public class SquidController extends MobEntityController {
public SquidController() { public SquidController() {
@ -75,7 +75,7 @@ public class SquidController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class SquidController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class SquidController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/StriderController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/StriderController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftStrider; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftStrider;
import org.bukkit.entity.Strider; import org.bukkit.entity.Strider;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityStrider; import net.minecraft.server.v1_16_R2.EntityStrider;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class StriderController extends MobEntityController { public class StriderController extends MobEntityController {
public StriderController() { public StriderController() {
@ -75,7 +75,7 @@ public class StriderController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -102,9 +102,9 @@ public class StriderController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,14 +139,14 @@ public class StriderController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -154,7 +154,7 @@ public class StriderController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/TraderLlamaController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/TraderLlamaController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTraderLlama; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTraderLlama;
import org.bukkit.entity.TraderLlama; import org.bukkit.entity.TraderLlama;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.trait.HorseModifiers;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityLlamaTrader; import net.minecraft.server.v1_16_R2.EntityLlamaTrader;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class TraderLlamaController extends MobEntityController { public class TraderLlamaController extends MobEntityController {
public TraderLlamaController() { public TraderLlamaController() {
@ -101,7 +101,7 @@ public class TraderLlamaController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -116,9 +116,9 @@ public class TraderLlamaController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -166,21 +166,21 @@ public class TraderLlamaController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/TropicalFishController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/TropicalFishController.java
View File

@ -1,33 +1,33 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTropicalFish; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTropicalFish;
import org.bukkit.entity.TropicalFish; import org.bukkit.entity.TropicalFish;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTropicalFish; import net.minecraft.server.v1_16_R2.EntityTropicalFish;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class TropicalFishController extends MobEntityController { public class TropicalFishController extends MobEntityController {
public TropicalFishController() { public TropicalFishController() {
@ -80,7 +80,7 @@ public class TropicalFishController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -107,9 +107,9 @@ public class TropicalFishController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -144,21 +144,21 @@ public class TropicalFishController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

68
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/TurtleController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/TurtleController.java
View File

@ -1,37 +1,37 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTurtle; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTurtle;
import org.bukkit.entity.Turtle; import org.bukkit.entity.Turtle;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.nms.v1_16_R1.util.PlayerControllerMove; import net.citizensnpcs.nms.v1_16_R2.util.PlayerControllerMove;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.ControllerJump; import net.minecraft.server.v1_16_R2.ControllerJump;
import net.minecraft.server.v1_16_R1.ControllerMove; import net.minecraft.server.v1_16_R2.ControllerMove;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityInsentient; import net.minecraft.server.v1_16_R2.EntityInsentient;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTurtle; import net.minecraft.server.v1_16_R2.EntityTurtle;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Navigation; import net.minecraft.server.v1_16_R2.Navigation;
import net.minecraft.server.v1_16_R1.NavigationAbstract; import net.minecraft.server.v1_16_R2.NavigationAbstract;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class TurtleController extends MobEntityController { public class TurtleController extends MobEntityController {
public TurtleController() { public TurtleController() {
@ -58,9 +58,9 @@ public class TurtleController extends MobEntityController {
if (npc != null) { if (npc != null) {
NMSImpl.clearGoals(npc, goalSelector, targetSelector); NMSImpl.clearGoals(npc, goalSelector, targetSelector);
this.oldMoveController = this.moveController; this.oldMoveController = this.moveController;
this.oldJumpController = this.bp; this.oldJumpController = this.bi;
this.moveController = new ControllerMove(this); this.moveController = new ControllerMove(this);
this.bp = new EmptyControllerJump(this); this.bi = new EmptyControllerJump(this);
} }
} }
@ -95,7 +95,7 @@ public class TurtleController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -122,9 +122,9 @@ public class TurtleController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -159,21 +159,21 @@ public class TurtleController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -209,11 +209,11 @@ public class TurtleController extends MobEntityController {
NMSImpl.updateMinecraftAIState(npc, this); NMSImpl.updateMinecraftAIState(npc, this);
if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) { if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
this.moveController = this.oldMoveController; this.moveController = this.oldMoveController;
this.bp = this.oldJumpController; this.bi = this.oldJumpController;
} }
if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) { if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
this.moveController = new PlayerControllerMove(this); this.moveController = new PlayerControllerMove(this);
this.bp = new EmptyControllerJump(this); this.bi = new EmptyControllerJump(this);
} }
npc.update(); npc.update();
} }

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/VexController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/VexController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftVex; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVex;
import org.bukkit.entity.Vex; import org.bukkit.entity.Vex;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityVex; import net.minecraft.server.v1_16_R2.EntityVex;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class VexController extends MobEntityController { public class VexController extends MobEntityController {
public VexController() { public VexController() {
@ -58,7 +58,7 @@ public class VexController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -114,21 +114,21 @@ public class VexController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

87
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/VillagerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/VillagerController.java
View File

@ -1,42 +1,43 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.util.List; import java.util.List;
import java.util.TreeMap; import java.util.TreeMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftVillager; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVillager;
import org.bukkit.entity.Villager; import org.bukkit.entity.Villager;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BehaviorController; import net.minecraft.server.v1_16_R2.BehaviorController;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityLightning; import net.minecraft.server.v1_16_R2.EntityLightning;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityVillager; import net.minecraft.server.v1_16_R2.EntityVillager;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.GenericAttributes; import net.minecraft.server.v1_16_R2.GenericAttributes;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.MerchantRecipe; import net.minecraft.server.v1_16_R2.MerchantRecipe;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R2.WorldServer;
public class VillagerController extends MobEntityController { public class VillagerController extends MobEntityController {
public VillagerController() { public VillagerController() {
@ -115,7 +116,7 @@ public class VillagerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -129,6 +130,15 @@ public class VillagerController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean eN() {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.eN();
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -143,18 +153,9 @@ public class VillagerController extends MobEntityController {
} }
@Override @Override
public boolean eO() { public void g(Vec3D vec3d) {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.eO();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -189,21 +190,21 @@ public class VillagerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -263,9 +264,9 @@ public class VillagerController extends MobEntityController {
} }
@Override @Override
public void onLightningStrike(EntityLightning entitylightning) { public void onLightningStrike(WorldServer server, EntityLightning entitylightning) {
if (npc == null) { if (npc == null) {
super.onLightningStrike(entitylightning); super.onLightningStrike(server, entitylightning);
} }
} }

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/VindicatorController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/VindicatorController.java
View File

@ -1,32 +1,32 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftVindicator; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVindicator;
import org.bukkit.entity.Vindicator; import org.bukkit.entity.Vindicator;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityVindicator; import net.minecraft.server.v1_16_R2.EntityVindicator;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class VindicatorController extends MobEntityController { public class VindicatorController extends MobEntityController {
public VindicatorController() { public VindicatorController() {
@ -89,7 +89,7 @@ public class VindicatorController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -104,9 +104,9 @@ public class VindicatorController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -154,21 +154,21 @@ public class VindicatorController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

83
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/WanderingTraderController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/WanderingTraderController.java
View File

@ -1,40 +1,41 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.util.List; import java.util.List;
import java.util.TreeMap; import java.util.TreeMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftWanderingTrader; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWanderingTrader;
import org.bukkit.entity.WanderingTrader; import org.bukkit.entity.WanderingTrader;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityLightning; import net.minecraft.server.v1_16_R2.EntityLightning;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityVillagerTrader; import net.minecraft.server.v1_16_R2.EntityVillagerTrader;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.MerchantRecipe; import net.minecraft.server.v1_16_R2.MerchantRecipe;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R2.WorldServer;
public class WanderingTraderController extends MobEntityController { public class WanderingTraderController extends MobEntityController {
public WanderingTraderController() { public WanderingTraderController() {
@ -111,7 +112,7 @@ public class WanderingTraderController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -125,6 +126,15 @@ public class WanderingTraderController extends MobEntityController {
return npc == null ? super.d(save) : false; return npc == null ? super.d(save) : false;
} }
@Override
public boolean eN() {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.eN();
}
@Override @Override
public void enderTeleportTo(double d0, double d1, double d2) { public void enderTeleportTo(double d0, double d1, double d2) {
if (npc == null) { if (npc == null) {
@ -139,18 +149,9 @@ public class WanderingTraderController extends MobEntityController {
} }
@Override @Override
public boolean eO() { public void g(Vec3D vec3d) {
if (blockingATrade) {
blockingATrade = false;
return true;
}
return super.eO();
}
@Override
public void f(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -185,21 +186,21 @@ public class WanderingTraderController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is
@ -258,9 +259,9 @@ public class WanderingTraderController extends MobEntityController {
} }
@Override @Override
public void onLightningStrike(EntityLightning entitylightning) { public void onLightningStrike(WorldServer server, EntityLightning entitylightning) {
if (npc == null) { if (npc == null) {
super.onLightningStrike(entitylightning); super.onLightningStrike(server, entitylightning);
} }
} }

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/WitchController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/WitchController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftWitch; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWitch;
import org.bukkit.entity.Witch; import org.bukkit.entity.Witch;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityWitch; import net.minecraft.server.v1_16_R2.EntityWitch;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class WitchController extends MobEntityController { public class WitchController extends MobEntityController {
public WitchController() { public WitchController() {
@ -75,7 +75,7 @@ public class WitchController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class WitchController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class WitchController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/WitherController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/WitherController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftWither; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWither;
import org.bukkit.entity.Wither; import org.bukkit.entity.Wither;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityWither; import net.minecraft.server.v1_16_R2.EntityWither;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class WitherController extends MobEntityController { public class WitherController extends MobEntityController {
public WitherController() { public WitherController() {
@ -57,7 +57,7 @@ public class WitherController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -112,21 +112,21 @@ public class WitherController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

52
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/WolfController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/WolfController.java
View File

@ -1,10 +1,10 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftWolf; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftWolf;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -12,23 +12,23 @@ import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.DataWatcherObject; import net.minecraft.server.v1_16_R2.DataWatcherObject;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityLiving; import net.minecraft.server.v1_16_R2.EntityLiving;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityWolf; import net.minecraft.server.v1_16_R2.EntityWolf;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class WolfController extends MobEntityController { public class WolfController extends MobEntityController {
public WolfController() { public WolfController() {
@ -91,7 +91,7 @@ public class WolfController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -106,9 +106,9 @@ public class WolfController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -156,21 +156,21 @@ public class WolfController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

50
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ZoglinController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ZoglinController.java
View File

@ -1,34 +1,34 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import java.util.TreeMap; import java.util.TreeMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftZoglin; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftZoglin;
import org.bukkit.entity.Zoglin; import org.bukkit.entity.Zoglin;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BehaviorController; import net.minecraft.server.v1_16_R2.BehaviorController;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityZoglin; import net.minecraft.server.v1_16_R2.EntityZoglin;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ZoglinController extends MobEntityController { public class ZoglinController extends MobEntityController {
public ZoglinController() { public ZoglinController() {
@ -80,7 +80,7 @@ public class ZoglinController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -107,9 +107,9 @@ public class ZoglinController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -144,14 +144,14 @@ public class ZoglinController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) { if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) {
super.h(x, y, z); super.i(x, y, z);
} }
return; return;
} }
@ -159,7 +159,7 @@ public class ZoglinController extends MobEntityController {
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ZombieController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ZombieController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftZombie; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftZombie;
import org.bukkit.entity.Zombie; import org.bukkit.entity.Zombie;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityZombie; import net.minecraft.server.v1_16_R2.EntityZombie;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ZombieController extends MobEntityController { public class ZombieController extends MobEntityController {
public ZombieController() { public ZombieController() {
@ -75,7 +75,7 @@ public class ZombieController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class ZombieController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class ZombieController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ZombieHuskController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ZombieHuskController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftHusk; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHusk;
import org.bukkit.entity.Husk; import org.bukkit.entity.Husk;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityZombieHusk; import net.minecraft.server.v1_16_R2.EntityZombieHusk;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ZombieHuskController extends MobEntityController { public class ZombieHuskController extends MobEntityController {
public ZombieHuskController() { public ZombieHuskController() {
@ -75,7 +75,7 @@ public class ZombieHuskController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class ZombieHuskController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class ZombieHuskController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

48
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/ZombieVillagerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/ZombieVillagerController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity; package net.citizensnpcs.nms.v1_16_R2.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import net.minecraft.server.v1_16_R1.EntityMinecartAbstract; import net.minecraft.server.v1_16_R2.EntityMinecartAbstract;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftVillagerZombie; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftVillagerZombie;
import org.bukkit.entity.ZombieVillager; import org.bukkit.entity.ZombieVillager;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R2.DamageSource;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EntityZombieVillager; import net.minecraft.server.v1_16_R2.EntityZombieVillager;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.SoundEffect; import net.minecraft.server.v1_16_R2.SoundEffect;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ZombieVillagerController extends MobEntityController { public class ZombieVillagerController extends MobEntityController {
public ZombieVillagerController() { public ZombieVillagerController() {
@ -75,7 +75,7 @@ public class ZombieVillagerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -89,9 +89,9 @@ public class ZombieVillagerController extends MobEntityController {
} }
@Override @Override
public void f(Vec3D vec3d) { public void g(Vec3D vec3d) {
if (npc == null || !npc.isFlyable()) { if (npc == null || !npc.isFlyable()) {
super.f(vec3d); super.g(vec3d);
} else { } else {
NMSImpl.flyingMoveLogic(this, vec3d); NMSImpl.flyingMoveLogic(this, vec3d);
} }
@ -139,21 +139,21 @@ public class ZombieVillagerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/AreaEffectCloudController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/AreaEffectCloudController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftAreaEffectCloud; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftAreaEffectCloud;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.AreaEffectCloud; import org.bukkit.entity.AreaEffectCloud;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityAreaEffectCloud; import net.minecraft.server.v1_16_R2.EntityAreaEffectCloud;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class AreaEffectCloudController extends MobEntityController { public class AreaEffectCloudController extends MobEntityController {
public AreaEffectCloudController() { public AreaEffectCloudController() {
@ -57,7 +57,7 @@ public class AreaEffectCloudController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -72,21 +72,21 @@ public class AreaEffectCloudController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/ArmorStandController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/ArmorStandController.java
View File

@ -1,9 +1,9 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftArmorStand; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftArmorStand;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.ArmorStand; import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
@ -11,19 +11,19 @@ import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityArmorStand; import net.minecraft.server.v1_16_R2.EntityArmorStand;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ArmorStandController extends MobEntityController { public class ArmorStandController extends MobEntityController {
public ArmorStandController() { public ArmorStandController() {
@ -73,7 +73,7 @@ public class ArmorStandController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -101,21 +101,21 @@ public class ArmorStandController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

46
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/BoatController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/BoatController.java
View File

@ -1,31 +1,31 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftBoat; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftBoat;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Boat; import org.bukkit.entity.Boat;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.AxisAlignedBB; import net.minecraft.server.v1_16_R2.AxisAlignedBB;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.EntityBoat; import net.minecraft.server.v1_16_R2.EntityBoat;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumMoveType; import net.minecraft.server.v1_16_R2.EnumMoveType;
import net.minecraft.server.v1_16_R1.Fluid; import net.minecraft.server.v1_16_R2.Fluid;
import net.minecraft.server.v1_16_R1.MathHelper; import net.minecraft.server.v1_16_R2.MathHelper;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.TagsFluid; import net.minecraft.server.v1_16_R2.TagsFluid;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class BoatController extends MobEntityController { public class BoatController extends MobEntityController {
public BoatController() { public BoatController() {
@ -70,7 +70,7 @@ public class BoatController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -114,21 +114,21 @@ public class BoatController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/DragonFireballController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/DragonFireballController.java
View File

@ -1,23 +1,23 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftDragonFireball; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftDragonFireball;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.DragonFireball; import org.bukkit.entity.DragonFireball;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityDragonFireball; import net.minecraft.server.v1_16_R2.EntityDragonFireball;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class DragonFireballController extends MobEntityController { public class DragonFireballController extends MobEntityController {
public DragonFireballController() { public DragonFireballController() {
@ -56,7 +56,7 @@ public class DragonFireballController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -71,21 +71,21 @@ public class DragonFireballController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

32
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/EggController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/EggController.java
View File

@ -1,27 +1,27 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEgg; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEgg;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.Egg; import org.bukkit.entity.Egg;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityEgg; import net.minecraft.server.v1_16_R2.EntityEgg;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class EggController extends AbstractEntityController { public class EggController extends AbstractEntityController {
public EggController() { public EggController() {
@ -72,7 +72,7 @@ public class EggController extends AbstractEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -87,21 +87,21 @@ public class EggController extends AbstractEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/EnderCrystalController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/EnderCrystalController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEnderCrystal; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderCrystal;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.EnderCrystal; import org.bukkit.entity.EnderCrystal;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityEnderCrystal; import net.minecraft.server.v1_16_R2.EntityEnderCrystal;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EnderCrystalController extends MobEntityController { public class EnderCrystalController extends MobEntityController {
public EnderCrystalController() { public EnderCrystalController() {
@ -57,7 +57,7 @@ public class EnderCrystalController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -72,21 +72,21 @@ public class EnderCrystalController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/EnderPearlController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/EnderPearlController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEnderPearl; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderPearl;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.EnderPearl; import org.bukkit.entity.EnderPearl;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityEnderPearl; import net.minecraft.server.v1_16_R2.EntityEnderPearl;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EnderPearlController extends MobEntityController { public class EnderPearlController extends MobEntityController {
public EnderPearlController() { public EnderPearlController() {
@ -57,7 +57,7 @@ public class EnderPearlController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -72,21 +72,21 @@ public class EnderPearlController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/EnderSignalController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/EnderSignalController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEnderSignal; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEnderSignal;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.entity.EnderSignal; import org.bukkit.entity.EnderSignal;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityEnderSignal; import net.minecraft.server.v1_16_R2.EntityEnderSignal;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EnderSignalController extends MobEntityController { public class EnderSignalController extends MobEntityController {
public EnderSignalController() { public EnderSignalController() {
@ -57,7 +57,7 @@ public class EnderSignalController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -72,21 +72,21 @@ public class EnderSignalController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/EvokerFangsController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/EvokerFangsController.java
View File

@ -1,9 +1,9 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEvokerFangs; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEvokerFangs;
import org.bukkit.entity.EvokerFangs; import org.bukkit.entity.EvokerFangs;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
@ -11,19 +11,19 @@ import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityEvokerFangs; import net.minecraft.server.v1_16_R2.EntityEvokerFangs;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumHand; import net.minecraft.server.v1_16_R2.EnumHand;
import net.minecraft.server.v1_16_R1.EnumInteractionResult; import net.minecraft.server.v1_16_R2.EnumInteractionResult;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class EvokerFangsController extends MobEntityController { public class EvokerFangsController extends MobEntityController {
public EvokerFangsController() { public EvokerFangsController() {
@ -59,7 +59,7 @@ public class EvokerFangsController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -87,21 +87,21 @@ public class EvokerFangsController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/ExperienceOrbController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/ExperienceOrbController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftExperienceOrb; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftExperienceOrb;
import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.ExperienceOrb;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityExperienceOrb; import net.minecraft.server.v1_16_R2.EntityExperienceOrb;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ExperienceOrbController extends MobEntityController { public class ExperienceOrbController extends MobEntityController {
public ExperienceOrbController() { public ExperienceOrbController() {
@ -43,7 +43,7 @@ public class ExperienceOrbController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -58,21 +58,21 @@ public class ExperienceOrbController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

44
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/FallingBlockController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/FallingBlockController.java
View File

@ -1,13 +1,13 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftFallingBlock; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFallingBlock;
import org.bukkit.craftbukkit.v1_16_R1.util.CraftMagicNumbers; import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.FallingBlock; import org.bukkit.entity.FallingBlock;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -16,21 +16,21 @@ import net.citizensnpcs.api.event.DespawnReason;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.event.SpawnReason;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.Block; import net.minecraft.server.v1_16_R2.Block;
import net.minecraft.server.v1_16_R1.Blocks; import net.minecraft.server.v1_16_R2.Blocks;
import net.minecraft.server.v1_16_R1.EntityFallingBlock; import net.minecraft.server.v1_16_R2.EntityFallingBlock;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumMoveType; import net.minecraft.server.v1_16_R2.EnumMoveType;
import net.minecraft.server.v1_16_R1.IBlockData; import net.minecraft.server.v1_16_R2.IBlockData;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.Vec3D; import net.minecraft.server.v1_16_R2.Vec3D;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class FallingBlockController extends AbstractEntityController { public class FallingBlockController extends AbstractEntityController {
public FallingBlockController() { public FallingBlockController() {
@ -75,7 +75,7 @@ public class FallingBlockController extends AbstractEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -90,21 +90,21 @@ public class FallingBlockController extends AbstractEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/FireworkController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/FireworkController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftFirework; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFirework;
import org.bukkit.entity.Firework; import org.bukkit.entity.Firework;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityFireworks; import net.minecraft.server.v1_16_R2.EntityFireworks;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class FireworkController extends MobEntityController { public class FireworkController extends MobEntityController {
public FireworkController() { public FireworkController() {
@ -43,7 +43,7 @@ public class FireworkController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -58,21 +58,21 @@ public class FireworkController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

44
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/FishingHookController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/FishingHookController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftFishHook; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFishHook;
import org.bukkit.entity.FishHook; import org.bukkit.entity.FishHook;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -14,23 +14,23 @@ import com.mojang.authlib.GameProfile;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R2.Entity;
import net.minecraft.server.v1_16_R1.EntityFishingHook; import net.minecraft.server.v1_16_R2.EntityFishingHook;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityPlayer; import net.minecraft.server.v1_16_R2.EntityPlayer;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.ItemStack; import net.minecraft.server.v1_16_R2.ItemStack;
import net.minecraft.server.v1_16_R1.Items; import net.minecraft.server.v1_16_R2.Items;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.PlayerInteractManager; import net.minecraft.server.v1_16_R2.PlayerInteractManager;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class FishingHookController extends MobEntityController { public class FishingHookController extends MobEntityController {
public FishingHookController() { public FishingHookController() {
@ -58,7 +58,7 @@ public class FishingHookController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -86,21 +86,21 @@ public class FishingHookController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

38
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/ItemController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/ItemController.java
View File

@ -1,13 +1,13 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftItem; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftItem;
import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -16,18 +16,18 @@ import net.citizensnpcs.api.event.DespawnReason;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.event.SpawnReason; import net.citizensnpcs.api.event.SpawnReason;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityHuman; import net.minecraft.server.v1_16_R2.EntityHuman;
import net.minecraft.server.v1_16_R1.EntityItem; import net.minecraft.server.v1_16_R2.EntityItem;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.ItemStack; import net.minecraft.server.v1_16_R2.ItemStack;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class ItemController extends AbstractEntityController { public class ItemController extends AbstractEntityController {
public ItemController() { public ItemController() {
@ -66,7 +66,7 @@ public class ItemController extends AbstractEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -81,21 +81,21 @@ public class ItemController extends AbstractEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

34
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/ItemFrameController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/ItemFrameController.java
View File

@ -1,14 +1,14 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftItemFrame; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftItemFrame;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.ItemFrame; import org.bukkit.entity.ItemFrame;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -20,12 +20,12 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.BlockPosition; import net.minecraft.server.v1_16_R2.BlockPosition;
import net.minecraft.server.v1_16_R1.EntityItemFrame; import net.minecraft.server.v1_16_R2.EntityItemFrame;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.EnumDirection; import net.minecraft.server.v1_16_R2.EnumDirection;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class ItemFrameController extends MobEntityController { public class ItemFrameController extends MobEntityController {
public ItemFrameController() { public ItemFrameController() {
@ -59,7 +59,7 @@ public class ItemFrameController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -74,21 +74,21 @@ public class ItemFrameController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/LargeFireballController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/LargeFireballController.java
View File

@ -1,23 +1,23 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftLargeFireball; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLargeFireball;
import org.bukkit.entity.LargeFireball; import org.bukkit.entity.LargeFireball;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityLargeFireball; import net.minecraft.server.v1_16_R2.EntityLargeFireball;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class LargeFireballController extends MobEntityController { public class LargeFireballController extends MobEntityController {
public LargeFireballController() { public LargeFireballController() {
@ -42,7 +42,7 @@ public class LargeFireballController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -57,21 +57,21 @@ public class LargeFireballController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/LeashController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/LeashController.java
View File

@ -1,12 +1,12 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftLeash; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLeash;
import org.bukkit.entity.LeashHitch; import org.bukkit.entity.LeashHitch;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -15,10 +15,10 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityLeash; import net.minecraft.server.v1_16_R2.EntityLeash;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class LeashController extends MobEntityController { public class LeashController extends MobEntityController {
public LeashController() { public LeashController() {
@ -43,7 +43,7 @@ public class LeashController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -58,21 +58,21 @@ public class LeashController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

34
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/LlamaSpitController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/LlamaSpitController.java
View File

@ -1,28 +1,28 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftLlamaSpit; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftLlamaSpit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LlamaSpit; import org.bukkit.entity.LlamaSpit;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityLlama; import net.minecraft.server.v1_16_R2.EntityLlama;
import net.minecraft.server.v1_16_R1.EntityLlamaSpit; import net.minecraft.server.v1_16_R2.EntityLlamaSpit;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
import net.minecraft.server.v1_16_R1.WorldServer; import net.minecraft.server.v1_16_R2.WorldServer;
public class LlamaSpitController extends AbstractEntityController { public class LlamaSpitController extends AbstractEntityController {
public LlamaSpitController() { public LlamaSpitController() {
@ -61,7 +61,7 @@ public class LlamaSpitController extends AbstractEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -76,21 +76,21 @@ public class LlamaSpitController extends AbstractEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartChestController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartChestController.java
View File

@ -1,23 +1,23 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMinecartChest; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartChest;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartChest; import net.minecraft.server.v1_16_R2.EntityMinecartChest;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartChestController extends MobEntityController { public class MinecartChestController extends MobEntityController {
public MinecartChestController() { public MinecartChestController() {
@ -42,7 +42,7 @@ public class MinecartChestController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -70,21 +70,21 @@ public class MinecartChestController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartCommandController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartCommandController.java
View File

@ -1,23 +1,23 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMinecartCommand; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartCommand;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartCommandBlock; import net.minecraft.server.v1_16_R2.EntityMinecartCommandBlock;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartCommandController extends MobEntityController { public class MinecartCommandController extends MobEntityController {
public MinecartCommandController() { public MinecartCommandController() {
@ -42,7 +42,7 @@ public class MinecartCommandController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -70,21 +70,21 @@ public class MinecartCommandController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartFurnaceController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartFurnaceController.java
View File

@ -1,23 +1,23 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMinecartFurnace; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartFurnace;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartFurnace; import net.minecraft.server.v1_16_R2.EntityMinecartFurnace;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartFurnaceController extends MobEntityController { public class MinecartFurnaceController extends MobEntityController {
public MinecartFurnaceController() { public MinecartFurnaceController() {
@ -42,7 +42,7 @@ public class MinecartFurnaceController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -70,21 +70,21 @@ public class MinecartFurnaceController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

24
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartHopperController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartHopperController.java
View File

@ -1,19 +1,19 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartHopper; import net.minecraft.server.v1_16_R2.EntityMinecartHopper;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartHopperController extends MobEntityController { public class MinecartHopperController extends MobEntityController {
public MinecartHopperController() { public MinecartHopperController() {
@ -38,7 +38,7 @@ public class MinecartHopperController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -58,21 +58,21 @@ public class MinecartHopperController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

30
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartRideableController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartRideableController.java
View File

@ -1,23 +1,23 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R1.CraftServer; import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_16_R1.entity.CraftMinecartRideable; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftMinecartRideable;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartRideable; import net.minecraft.server.v1_16_R2.EntityMinecartRideable;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartRideableController extends MobEntityController { public class MinecartRideableController extends MobEntityController {
public MinecartRideableController() { public MinecartRideableController() {
@ -42,7 +42,7 @@ public class MinecartRideableController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -70,21 +70,21 @@ public class MinecartRideableController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

24
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartSpawnerController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartSpawnerController.java
View File

@ -1,19 +1,19 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartMobSpawner; import net.minecraft.server.v1_16_R2.EntityMinecartMobSpawner;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartSpawnerController extends MobEntityController { public class MinecartSpawnerController extends MobEntityController {
public MinecartSpawnerController() { public MinecartSpawnerController() {
@ -38,7 +38,7 @@ public class MinecartSpawnerController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -58,21 +58,21 @@ public class MinecartSpawnerController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

24
v1_16_R1/src/main/java/net/citizensnpcs/nms/v1_16_R1/entity/nonliving/MinecartTNTController.java → v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/entity/nonliving/MinecartTNTController.java
View File

@ -1,19 +1,19 @@
package net.citizensnpcs.nms.v1_16_R1.entity.nonliving; package net.citizensnpcs.nms.v1_16_R2.entity.nonliving;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_16_R1.entity.MobEntityController; import net.citizensnpcs.nms.v1_16_R2.entity.MobEntityController;
import net.citizensnpcs.nms.v1_16_R1.util.NMSImpl; import net.citizensnpcs.nms.v1_16_R2.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_16_R1.EntityMinecartTNT; import net.minecraft.server.v1_16_R2.EntityMinecartTNT;
import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R2.EntityTypes;
import net.minecraft.server.v1_16_R1.NBTTagCompound; import net.minecraft.server.v1_16_R2.NBTTagCompound;
import net.minecraft.server.v1_16_R1.World; import net.minecraft.server.v1_16_R2.World;
public class MinecartTNTController extends MobEntityController { public class MinecartTNTController extends MobEntityController {
public MinecartTNTController() { public MinecartTNTController() {
@ -38,7 +38,7 @@ public class MinecartTNTController extends MobEntityController {
} }
@Override @Override
public void collide(net.minecraft.server.v1_16_R1.Entity entity) { public void collide(net.minecraft.server.v1_16_R2.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
@ -58,21 +58,21 @@ public class MinecartTNTController extends MobEntityController {
} }
@Override @Override
public void h(double x, double y, double z) { public void i(double x, double y, double z) {
if (npc == null) { if (npc == null) {
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) { if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true)) if (!npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true))
super.h(x, y, z); super.i(x, y, z);
return; return;
} }
Vector vector = new Vector(x, y, z); Vector vector = new Vector(x, y, z);
NPCPushEvent event = Util.callPushEvent(npc, vector); NPCPushEvent event = Util.callPushEvent(npc, vector);
if (!event.isCancelled()) { if (!event.isCancelled()) {
vector = event.getCollisionVector(); vector = event.getCollisionVector();
super.h(vector.getX(), vector.getY(), vector.getZ()); super.i(vector.getX(), vector.getY(), vector.getZ());
} }
// when another entity collides, this method is called to push the // when another entity collides, this method is called to push the
// NPC so we prevent it from doing anything if the event is // NPC so we prevent it from doing anything if the event is

Some files were not shown because too many files have changed in this diff Show More