diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java index c850dc242..e9db3c73a 100644 --- a/main/src/main/java/net/citizensnpcs/util/NMS.java +++ b/main/src/main/java/net/citizensnpcs/util/NMS.java @@ -469,6 +469,16 @@ public class NMS { return BRIDGE.getHorizontalMovement(bukkitEntity); } + public static float getJumpPower(NPC npc, float original) { + if (npc == null) + return original; + if (npc.data().has(NPC.Metadata.JUMP_POWER_SUPPLIER)) { + return npc.data().> get(NPC.Metadata.JUMP_POWER_SUPPLIER).apply(npc); + } + + return original; + } + public static Method getMethod(Class clazz, String method, boolean log, Class... params) { if (clazz == null) return null; diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java index b9310ee0d..e4d0f7ce6 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java @@ -86,6 +86,11 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java index 44fb1b9f2..ce6bc9b61 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java @@ -83,6 +83,11 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java index d4507c178..9b9be233b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java @@ -92,6 +92,11 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java index 215d8fba8..71bdba69d 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java @@ -101,6 +101,11 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java index 9cb57ef19..b77fca35e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java @@ -116,6 +116,11 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java index da2a30060..aead8c774 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java @@ -103,6 +103,11 @@ public class CreeperController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java index 535c96700..20d6f6d6e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java @@ -89,6 +89,11 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java index 8110cac90..b590932c5 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java @@ -92,6 +92,11 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java index 627a3afb3..9ccbd84d0 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java @@ -92,6 +92,11 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java index 29fda2b86..2c750fba2 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java @@ -69,6 +69,11 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java index 07569e110..1e6ba251a 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java @@ -78,6 +78,11 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java index 73a30a101..81a0ef217 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java @@ -78,6 +78,11 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java index bd6193013..9a4e6dd57 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java @@ -47,9 +47,9 @@ public class HorseController extends MobEntityController { public static class EntityHorseNPC extends EntityHorse implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseNPC(World world) { this(world, null); } @@ -105,6 +105,11 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java index 7cbf55166..c3c6542d1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java @@ -78,6 +78,11 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java index 5499722b2..5809eb3b5 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java @@ -84,6 +84,11 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java index d9fd93143..c4bed18c4 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java @@ -97,6 +97,11 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java index a25268227..768bbd531 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java @@ -87,6 +87,11 @@ public class OcelotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java index 64681cab6..26d4e2dab 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java @@ -88,6 +88,11 @@ public class PigController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java index c18a9e63a..6d2ab631e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java @@ -78,6 +78,11 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java index e4d536245..0eb76462e 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java @@ -78,6 +78,11 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java index d11eb5bca..23f8c4d69 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java @@ -88,6 +88,11 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java index 469bf162d..239432a40 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java @@ -87,6 +87,11 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java index aeb0a4344..d4ec805c1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java @@ -79,6 +79,11 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java index cdb836c21..97298d6df 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java @@ -78,6 +78,11 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java index ad211c8e6..345c5caef 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java @@ -78,6 +78,11 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java index 258f0ab6d..8b6b2e358 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java @@ -84,6 +84,11 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java index db48cac80..1d83741a1 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java @@ -78,6 +78,11 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java index 2046c32f8..61f3616ae 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java @@ -78,6 +78,11 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java index 82a160d74..18449889b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java @@ -78,6 +78,11 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java index 3058952e1..4d7da6822 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java @@ -101,6 +101,11 @@ public class VillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java index a97bb014c..b8cd87911 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java @@ -78,6 +78,11 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java index 97f7d80c4..8f085dd7a 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java @@ -69,6 +69,11 @@ public class WitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java index 2eb758bc9..78fb2574b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java @@ -89,6 +89,11 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java index 2eac0db63..d1c8681a0 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java @@ -78,6 +78,11 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bW(), NPC.Metadata.HURT_SOUND); } + @Override + public float ck() { + return NMS.getJumpPower(npc, super.ck()); + } + @Override public void collide(net.minecraft.server.v1_10_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java index 85a0e2e03..2707a30e5 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java @@ -86,6 +86,11 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java index da71167a6..aa2dae3b2 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java @@ -83,6 +83,11 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java index 87487b968..d40be15cc 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java @@ -92,6 +92,11 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java index 9509d5567..54e26dfac 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java @@ -101,6 +101,11 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java index 83f0c6fb3..871499f71 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java @@ -116,6 +116,11 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java index c8c25d0b8..33269076c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java @@ -95,6 +95,11 @@ public class CreeperController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java index 62491076f..a91de8d49 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java @@ -90,6 +90,11 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java index 961453ffb..26d97b177 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java @@ -92,6 +92,11 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java index b6e2f0335..3441299d9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java @@ -92,6 +92,11 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java index d1c9fee7d..e672f7ffc 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java @@ -78,6 +78,11 @@ public class EvokerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java index bc8c38662..7ce31d773 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java @@ -69,6 +69,11 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java index 6bdad3597..b068d68b9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java @@ -78,6 +78,11 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java index bb02426cd..8aca051d9 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java @@ -78,6 +78,11 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java index 68f08d7a2..b00b4e70c 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java @@ -78,6 +78,11 @@ public class GuardianElderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java index 997e98786..41a51ac1f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java @@ -45,9 +45,9 @@ public class HorseController extends MobEntityController { public static class EntityHorseNPC extends EntityHorse implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseNPC(World world) { this(world, null); } @@ -103,6 +103,11 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java index 6eb8b0a56..40a4637cf 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java @@ -46,9 +46,9 @@ public class HorseDonkeyController extends MobEntityController { public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseDonkeyNPC(World world) { this(world, null); } @@ -105,6 +105,11 @@ public class HorseDonkeyController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java index ed86e17ff..db6cec365 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java @@ -46,9 +46,9 @@ public class HorseMuleController extends MobEntityController { public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseMuleNPC(World world) { this(world, null); } @@ -105,6 +105,11 @@ public class HorseMuleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java index 4bb9ca63e..d3a2e7dc1 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java @@ -46,9 +46,9 @@ public class HorseSkeletonController extends MobEntityController { public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseSkeletonNPC(World world) { this(world, null); } @@ -105,6 +105,11 @@ public class HorseSkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java index 6089624f3..f8dc7e39b 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java @@ -46,9 +46,9 @@ public class HorseZombieController extends MobEntityController { public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseZombieNPC(World world) { this(world, null); } @@ -105,6 +105,11 @@ public class HorseZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java index cd877ac03..aa6c4c4d3 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java @@ -78,6 +78,11 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java index 878dcb42a..11780229e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java @@ -98,6 +98,11 @@ public class LlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java index 6326f6a4b..5a528c460 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java @@ -92,6 +92,11 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java index 021a7c690..ba06587be 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java @@ -96,6 +96,11 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java index ab565b9ca..fb1103f5d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java @@ -87,6 +87,11 @@ public class OcelotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java index c96e915e9..f00f4d432 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java @@ -88,6 +88,11 @@ public class PigController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java index 63c1d97dd..1d31aaa24 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java @@ -78,6 +78,11 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java index 972077a3e..22cdf2852 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java @@ -78,6 +78,11 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java index 55ebecc54..dec5d1baf 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java @@ -88,6 +88,11 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java index 17e24c230..7fb91bf51 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java @@ -87,6 +87,11 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java index a0ba3c0ba..084808f81 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java @@ -89,6 +89,11 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java index 517adb0b8..a779c9eca 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java @@ -78,6 +78,11 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java index 6df00fbc7..43852162f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java @@ -78,6 +78,11 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java index 37523c86f..7d74fae2e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java @@ -78,6 +78,11 @@ public class SkeletonStrayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java index 72ce107fc..ffd6540b7 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java @@ -78,6 +78,11 @@ public class SkeletonWitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java index 76818db13..bac915a71 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java @@ -92,6 +92,11 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java index 926306f67..cb8c034ea 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java @@ -78,6 +78,11 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java index a832dfe26..3590acc20 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java @@ -78,6 +78,11 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java index 28f2582f7..0532ff0d8 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java @@ -78,6 +78,11 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java index 5c8b20223..d2783b038 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java @@ -72,6 +72,11 @@ public class VexController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java index 29c04c676..6b2f59865 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java @@ -107,6 +107,11 @@ public class VillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java index 733c953be..cdf2d125e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java @@ -87,6 +87,11 @@ public class VindicatorController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java index 80cb11578..c2803e156 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java @@ -78,6 +78,11 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java index 86c495514..ace0a5590 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java @@ -69,6 +69,11 @@ public class WitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java index 7d62ec988..01115b397 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java @@ -89,6 +89,11 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java index 10d0f0d8b..64218df68 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java @@ -78,6 +78,11 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java index e056741a4..e481399df 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java @@ -78,6 +78,11 @@ public class ZombieHuskController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java index 4142945ad..6a6bfee26 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java @@ -78,6 +78,11 @@ public class ZombieVillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.bX(), NPC.Metadata.HURT_SOUND); } + @Override + public float cl() { + return NMS.getJumpPower(npc, super.cl()); + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java index 9bb0d5f67..aca7241b9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java @@ -93,6 +93,11 @@ public class BatController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java index c614f590d..3f4f27768 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java @@ -90,6 +90,11 @@ public class BlazeController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java index 213be9e60..791252afe 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java @@ -108,6 +108,11 @@ public class CaveSpiderController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java index 01ea0279b..115f950d0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java @@ -117,6 +117,11 @@ public class ChickenController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java index 01f971b64..0d30818c2 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java @@ -132,6 +132,11 @@ public class CowController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java index 281aff9b3..13095b5ca 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java @@ -110,6 +110,11 @@ public class CreeperController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java index b645a8d7f..d63c51c14 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java @@ -95,6 +95,11 @@ public class EnderDragonController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java index 4eb97467e..9f6d44a28 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java @@ -107,6 +107,11 @@ public class EndermanController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java index 78c0b6c32..b80602f10 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java @@ -107,6 +107,11 @@ public class EndermiteController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java index 98932aa8e..42ae9bf90 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java @@ -94,6 +94,11 @@ public class EvokerController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java index 7c593b3f7..366776311 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java @@ -81,6 +81,11 @@ public class GhastController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java index 6065ef66a..245b46ee5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java @@ -93,6 +93,11 @@ public class GiantController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java index 2ce30d387..8b88b6857 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java @@ -94,6 +94,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java index 7f7eff250..18d6b9455 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java @@ -94,6 +94,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java index 4c7b1df9a..560fc2a72 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java @@ -47,9 +47,9 @@ public class HorseController extends MobEntityController { public static class EntityHorseNPC extends EntityHorse implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseNPC(World world) { this(world, null); } @@ -119,6 +119,11 @@ public class HorseController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { if (npc != null && riding) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java index b70de72e7..0d83e9c51 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java @@ -47,9 +47,9 @@ public class HorseDonkeyController extends MobEntityController { public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseDonkeyNPC(World world) { this(world, null); } @@ -119,6 +119,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { if (npc != null && riding) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java index 244b2b9c4..49a4cbcf3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java @@ -47,9 +47,9 @@ public class HorseMuleController extends MobEntityController { public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseMuleNPC(World world) { this(world, null); } @@ -119,6 +119,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { if (npc != null && riding) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java index 9ceff999b..34b065dda 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java @@ -47,9 +47,9 @@ public class HorseSkeletonController extends MobEntityController { public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseSkeletonNPC(World world) { this(world, null); } @@ -120,6 +120,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { if (npc != null && riding) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java index e3290edf5..9684a94bd 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java @@ -47,9 +47,9 @@ public class HorseZombieController extends MobEntityController { public static class EntityHorseZombieNPC extends EntityHorseZombie implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseZombieNPC(World world) { this(world, null); } @@ -120,6 +120,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { if (npc != null && riding) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java index df221b12f..cf66a01fd 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java @@ -94,6 +94,11 @@ public class IllusionerController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java index 7561c69d8..f5b122947 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java @@ -93,6 +93,11 @@ public class IronGolemController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java index be7341969..4c915984e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java @@ -49,6 +49,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(World world) { this(world, null); @@ -119,6 +120,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { if (npc != null && riding) { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java index 49ce5539c..4a58db9b9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java @@ -107,6 +107,11 @@ public class MagmaCubeController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java index 4b9fd6eac..fe42e6a62 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java @@ -111,6 +111,11 @@ public class MushroomCowController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java index f5b8b1402..db48aeee0 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java @@ -103,6 +103,11 @@ public class OcelotController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java index b68a29666..ce25fb632 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java @@ -87,6 +87,11 @@ public class ParrotController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java index 2f144cd5b..3847b4fcf 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java @@ -104,6 +104,11 @@ public class PigController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public boolean cV() { // block carrot-on-a-stick behaviour diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java index a99ed4d13..8ab5347c9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java @@ -93,6 +93,11 @@ public class PigZombieController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java index 5ccce5a27..91f166502 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java @@ -85,6 +85,11 @@ public class PolarBearController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java index 24af33883..b01aa8f87 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java @@ -104,6 +104,11 @@ public class RabbitController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java index 928d43d8d..be5ad87a4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java @@ -102,6 +102,11 @@ public class SheepController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java index 7c4540822..31f334f7b 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java @@ -103,6 +103,11 @@ public class ShulkerController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java index e034e1610..9a09f5bb9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java @@ -93,6 +93,11 @@ public class SilverfishController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java index 324f4b4ac..332ecd078 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java @@ -93,6 +93,11 @@ public class SkeletonController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java index 70c152486..2b216ef68 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java @@ -93,6 +93,11 @@ public class SkeletonStrayController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java index 660f41dcd..ad032fc52 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java @@ -93,6 +93,11 @@ public class SkeletonWitherController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java index 846ab0d5f..1bf0e47e4 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java @@ -108,6 +108,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java index 4c6c7dd20..32031c80e 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java @@ -93,6 +93,11 @@ public class SnowmanController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java index 7dbc2584f..c3a25b1b9 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java @@ -93,6 +93,11 @@ public class SpiderController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java index e20cf581e..a70a5b252 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java @@ -93,6 +93,11 @@ public class SquidController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java index 418b61f87..aca19cda6 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java @@ -79,6 +79,11 @@ public class VexController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java index 2e7cbb0a2..c835ea3c3 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java @@ -123,6 +123,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java index 2452888b2..910679c73 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java @@ -103,6 +103,11 @@ public class VindicatorController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java index 55eacf8fe..4ebad7184 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java @@ -93,6 +93,11 @@ public class WitchController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java index 356772f1c..a8ed31d2d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java @@ -75,6 +75,11 @@ public class WitherController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java index 7e15637a6..fc6d45660 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java @@ -105,6 +105,11 @@ public class WolfController extends MobEntityController { } } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java index 0efc28a10..760fdc735 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java @@ -93,6 +93,11 @@ public class ZombieController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java index 3747bd091..711688bab 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java @@ -93,6 +93,11 @@ public class ZombieHuskController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override protected SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java index 7cd37304a..d012e38b1 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java @@ -93,6 +93,11 @@ public class ZombieVillagerController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float ct() { + return NMS.getJumpPower(npc, super.ct()); + } + @Override public SoundEffect d(DamageSource damagesource) { return NMSImpl.getSoundEffect(npc, super.d(damagesource), NPC.Metadata.HURT_SOUND); diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java index dc4cfa3cd..fe38a1d18 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java @@ -99,6 +99,11 @@ public class BatController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java index ee349f525..71e396b45 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java @@ -96,6 +96,11 @@ public class BlazeController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java index 6dca00b5d..9cb029c0a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java @@ -121,6 +121,11 @@ public class CaveSpiderController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java index 29895bd2f..7fceb012a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java @@ -132,6 +132,11 @@ public class ChickenController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java index 44795a2d9..fe28a2486 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java @@ -142,6 +142,11 @@ public class CodController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java index 16b6db2fc..457bc217d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java @@ -145,6 +145,11 @@ public class CowController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java index be59429ca..cacee7cf1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java @@ -124,6 +124,11 @@ public class CreeperController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java index 00f426c05..f132ac300 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java @@ -136,6 +136,11 @@ public class DolphinController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java index 0cef1a152..b45c31ead 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java @@ -121,6 +121,11 @@ public class DrownedController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java index fe0f45a39..ed5f6e66d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java @@ -103,6 +103,11 @@ public class EnderDragonController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java index f32bc2061..5c46a4ee5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java @@ -121,6 +121,11 @@ public class EndermanController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java index 8474ab1aa..958917cf2 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java @@ -121,6 +121,11 @@ public class EndermiteController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java index 2ebf904f2..1b691f7f6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java @@ -107,6 +107,11 @@ public class EvokerController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java index c04546ef1..13f52aadd 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java @@ -82,6 +82,11 @@ public class GhastController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java index 33b15a620..00774e7c1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java @@ -107,6 +107,11 @@ public class GiantController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java index 70cdbb239..d01803a21 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java @@ -109,6 +109,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java index 835f3f252..515272963 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java @@ -109,6 +109,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java index 3fae9e8fa..bf88682eb 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java @@ -55,6 +55,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(World world) { this(world, null); } @@ -141,6 +142,11 @@ public class HorseController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java index cd15fc215..3b8b70735 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java @@ -55,6 +55,7 @@ public class HorseDonkeyController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseDonkeyNPC(World world) { this(world, null); } @@ -141,6 +142,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java index 48f3b1b00..5ba06b5ad 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java @@ -55,6 +55,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(World world) { this(world, null); } @@ -141,6 +142,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java index 6fa945c50..a42ec307d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java @@ -53,6 +53,7 @@ public class HorseSkeletonController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseSkeletonNPC(World world) { this(world, null); @@ -141,6 +142,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java index 6d9221ee6..3738979d7 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java @@ -55,6 +55,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(World world) { this(world, null); } @@ -142,6 +143,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java index bb39804f4..5549138a1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java @@ -107,6 +107,11 @@ public class IllusionerController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java index 62e939f8e..6b1d0ee33 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java @@ -107,6 +107,11 @@ public class IronGolemController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java index f42c40bea..e1a6d67a5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java @@ -53,6 +53,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(World world) { this(world, null); @@ -140,6 +141,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java index c51a7f622..0c1dae9bd 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java @@ -113,6 +113,11 @@ public class MagmaCubeController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java index 6ac0f2e2d..17796a998 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java @@ -125,6 +125,11 @@ public class MushroomCowController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java index 05309610e..0fd44c118 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java @@ -116,6 +116,11 @@ public class OcelotController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java index e8b6f30ed..f0ee57b61 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java @@ -93,6 +93,11 @@ public class ParrotController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java index 711421a2b..64518a71e 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java @@ -118,6 +118,11 @@ public class PhantomController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java index 6afe5a0fd..b9168846a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java @@ -117,6 +117,11 @@ public class PigController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java index f0ee9aec3..e979f8d65 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java @@ -107,6 +107,11 @@ public class PigZombieController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java index f2dae3afc..688ba2459 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java @@ -91,6 +91,11 @@ public class PolarBearController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java index b0c5c1976..e3ee2ed4c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java @@ -129,6 +129,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java index 2c1ed54fd..c48e0c5c5 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java @@ -117,6 +117,11 @@ public class RabbitController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java index 6203d2921..0bb300f95 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java @@ -128,6 +128,11 @@ public class SalmonController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java index ca7182933..5eb06fe1b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java @@ -116,6 +116,11 @@ public class SheepController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java index 2b487c246..33647cce4 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java @@ -110,6 +110,11 @@ public class ShulkerController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java index 36d06acaa..7f6de1727 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java @@ -107,6 +107,11 @@ public class SilverfishController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java index 5284f3901..0f1b54d0b 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java @@ -107,6 +107,11 @@ public class SkeletonController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java index 1cad9ecd8..2208b07d1 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java @@ -107,6 +107,11 @@ public class SkeletonStrayController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java index 822b4eea1..ff39b42aa 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java @@ -107,6 +107,11 @@ public class SkeletonWitherController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java index 7bb80eb7f..18d839239 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java @@ -113,6 +113,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java index 892156304..359c0ab65 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java @@ -107,6 +107,11 @@ public class SnowmanController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java index e3b08a6d2..b433eb07c 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java @@ -107,6 +107,11 @@ public class SpiderController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java index b5a627dd4..70cedb7ba 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java @@ -107,6 +107,11 @@ public class SquidController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java index 9da8f9b77..11d2c3e40 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java @@ -128,6 +128,11 @@ public class TropicalFishController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java index bb73793ff..618cbeb5d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java @@ -116,6 +116,11 @@ public class TurtleController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java index 801178dda..1b1a9e27a 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java @@ -85,6 +85,11 @@ public class VexController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java index a154a8883..6864c9a04 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java @@ -136,6 +136,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java index 5830f4490..2569e6cb6 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java @@ -116,6 +116,11 @@ public class VindicatorController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java index 62928cb26..63021967d 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java @@ -107,6 +107,11 @@ public class WitchController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java index be36131c1..f5b5a0d17 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java @@ -82,6 +82,11 @@ public class WitherController extends MobEntityController { return NMS.getFallDistance(npc, super.bn()); } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java index ea0823626..05ce0cecb 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java @@ -118,6 +118,11 @@ public class WolfController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java index 14d0c133e..9267d5cad 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java @@ -107,6 +107,11 @@ public class ZombieController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java index aa54a9055..6460cf857 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java @@ -107,6 +107,11 @@ public class ZombieHuskController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java index f4960e1b6..181573426 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java @@ -107,6 +107,11 @@ public class ZombieVillagerController extends MobEntityController { } } + @Override + public float cG() { + return NMS.getJumpPower(npc, super.cG()); + } + @Override public void collide(net.minecraft.server.v1_13_R2.Entity entity) { // this method is called by both the entities involved - cancelling diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java index 410ea022c..58a7ab7f3 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java @@ -14,6 +14,7 @@ import net.citizensnpcs.nms.v1_14_R1.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_14_R1.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.server.v1_14_R1.AxisAlignedBB; import net.minecraft.server.v1_14_R1.EntityArmorStand; @@ -103,6 +104,11 @@ public class ArmorStandController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java index 55734ddea..fe517a269 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java @@ -114,6 +114,11 @@ public class BatController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java index 72caae968..a2df41c8a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java @@ -111,6 +111,11 @@ public class BlazeController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java index c6cde2bc8..6dd26b6f2 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java @@ -137,6 +137,11 @@ public class CatController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java index 02038a4d2..c23a72ff7 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java @@ -127,6 +127,11 @@ public class CaveSpiderController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java index 5a22544d1..01bbe5e1a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java @@ -137,6 +137,11 @@ public class ChickenController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java index 757b79bfb..7281d207f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java @@ -145,6 +145,11 @@ public class CodController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java index 440b532af..2586f85aa 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java @@ -152,6 +152,11 @@ public class CowController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java index 0776520c5..605594545 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java @@ -129,6 +129,11 @@ public class CreeperController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java index 8f8e3d994..47568286a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java @@ -140,6 +140,11 @@ public class DolphinController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java index 5770fe122..bc200b6be 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java @@ -126,6 +126,11 @@ public class DrownedController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java index 6b06dc9e5..d4d95b1d5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java @@ -115,6 +115,11 @@ public class EnderDragonController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java index fe4c75eca..fae4fda4d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java @@ -134,6 +134,11 @@ public class EndermanController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java index 84fefeb98..f31732e11 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java @@ -126,6 +126,11 @@ public class EndermiteController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java index 5ffcd359d..da2929780 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java @@ -113,6 +113,11 @@ public class EvokerController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java index 91e792f87..0c94f6edc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java @@ -123,6 +123,11 @@ public class FoxController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java index 62ac7f4cb..77efd95b8 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java @@ -97,6 +97,11 @@ public class GhastController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java index f85a33ffd..44eba5356 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java @@ -112,6 +112,11 @@ public class GiantController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java index 6f6aec766..6f6b4d714 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java @@ -113,6 +113,11 @@ public class GuardianController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java index 036ef9bc1..93aee0ca4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java @@ -113,6 +113,11 @@ public class GuardianElderController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java index 6f10ce596..9cae454f0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java @@ -58,6 +58,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityTypes types, World world) { this(types, world, null); } @@ -149,6 +150,11 @@ public class HorseController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java index 898d87cc7..524d96905 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java @@ -56,6 +56,7 @@ public class HorseDonkeyController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseDonkeyNPC(EntityTypes types, World world) { this(types, world, null); @@ -147,6 +148,11 @@ public class HorseDonkeyController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java index 9456a751b..badb24d70 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java @@ -58,6 +58,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(EntityTypes types, World world) { this(types, world, null); } @@ -148,6 +149,11 @@ public class HorseMuleController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java index d1ecd213d..ea726139c 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java @@ -58,6 +58,7 @@ public class HorseSkeletonController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseSkeletonNPC(EntityTypes types, World world) { this(types, world, null); } @@ -149,6 +150,11 @@ public class HorseSkeletonController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java index 372f2ffe5..ef3b6381f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java @@ -58,6 +58,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityTypes types, World world) { this(types, world, null); } @@ -149,6 +150,11 @@ public class HorseZombieController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java index 31f6b4120..56f53c512 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java @@ -113,6 +113,11 @@ public class IllusionerController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java index 92f61ae9f..87b579247 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java @@ -112,6 +112,11 @@ public class IronGolemController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java index 6369894a9..83a07434f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java @@ -56,6 +56,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityTypes types, World world) { this(types, world, null); @@ -147,6 +148,11 @@ public class LlamaController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java index 72c3fa1f7..5cf5feb49 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java @@ -118,6 +118,11 @@ public class MagmaCubeController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java index 835fe7f3f..005ec43fe 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java @@ -131,6 +131,11 @@ public class MushroomCowController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java index 9cca8cf6d..9c79af391 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java @@ -123,6 +123,11 @@ public class OcelotController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java index bb95946b3..7ab3604ea 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java @@ -123,6 +123,11 @@ public class PandaController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java index 7ba0abeb9..1e87556e3 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java @@ -108,6 +108,11 @@ public class ParrotController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java index a43155f30..7476b32bf 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java @@ -120,6 +120,11 @@ public class PhantomController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java index 6f73fda09..5a9d72e54 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java @@ -124,6 +124,11 @@ public class PigController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java index 09ee0ab3f..cacd80433 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java @@ -112,6 +112,11 @@ public class PigZombieController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java index 889c587e7..b98a9bbec 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java @@ -123,6 +123,11 @@ public class PillagerController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java index 8f2fd298e..521df6fcc 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java @@ -107,6 +107,11 @@ public class PolarBearController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java index 93bd8e7a0..1cadc6603 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java @@ -143,6 +143,11 @@ public class PufferFishController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java index ef042b376..62fd7693d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java @@ -124,6 +124,11 @@ public class RabbitController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java index e0eb4803b..616ebe9ea 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java @@ -123,6 +123,11 @@ public class RavagerController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java index 6f81850e8..59f35a543 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java @@ -131,6 +131,11 @@ public class SalmonController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java index e8a48c4c6..deadf85da 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java @@ -122,6 +122,11 @@ public class SheepController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java index 8726245f2..2efc66132 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java @@ -113,6 +113,11 @@ public class ShulkerController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java index 365fd4002..8df6b18e4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java @@ -112,6 +112,11 @@ public class SilverfishController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java index e444ee80a..3abc45d1f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java @@ -112,6 +112,11 @@ public class SkeletonController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java index f9b849ecc..2c72932d5 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java @@ -112,6 +112,11 @@ public class SkeletonStrayController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java index d6560e224..f16d83a8a 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java @@ -112,6 +112,11 @@ public class SkeletonWitherController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java index 3b335d911..764b6c44f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java @@ -119,6 +119,11 @@ public class SlimeController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java index fbfab007a..a630c2f2d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java @@ -112,6 +112,11 @@ public class SnowmanController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java index 2795b6735..c35ec0b3f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java @@ -112,6 +112,11 @@ public class SpiderController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java index 2e0e6c21a..ee507e6eb 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java @@ -112,6 +112,11 @@ public class SquidController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java index 4053261e9..5c43936cd 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java @@ -137,6 +137,11 @@ public class TraderLlamaController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java index 8aee72ebc..f7d6c261b 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java @@ -131,6 +131,11 @@ public class TropicalFishController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java index 3690f7d45..91864e4c0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java @@ -119,6 +119,11 @@ public class TurtleController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java index db8e61a99..8562cca31 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java @@ -100,6 +100,11 @@ public class VexController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java index ac8eb1255..d1a3c2da0 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java @@ -56,6 +56,7 @@ public class VillagerController extends MobEntityController { private boolean blockingATrade; private final CitizensNPC npc; + private BehaviorController previousBehaviorController; public EntityVillagerNPC(EntityTypes types, World world) { this(types, world, null); @@ -147,6 +148,11 @@ public class VillagerController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java index e8334f1a2..b7e1943d4 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java @@ -123,6 +123,11 @@ public class VindicatorController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java index 967be3e6e..b95e7100f 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java @@ -56,6 +56,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockingATrade; private boolean blockTrades = true; + private final CitizensNPC npc; public EntityWanderingTraderNPC(EntityTypes types, World world) { this(types, world, null); @@ -147,6 +148,11 @@ public class WanderingTraderController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java index d34c614c7..3b795b970 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java @@ -112,6 +112,11 @@ public class WitchController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java index 0f12a736a..aecd16602 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java @@ -96,6 +96,11 @@ public class WitherController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java index 84e354ba5..81338f2ba 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java @@ -125,6 +125,11 @@ public class WolfController extends MobEntityController { } } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java index 1683855c2..7cb3ad009 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java @@ -112,6 +112,11 @@ public class ZombieController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java index dc116c05d..93c8f511e 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java @@ -112,6 +112,11 @@ public class ZombieHuskController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java index 262c9abff..5bc2b4374 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java @@ -112,6 +112,11 @@ public class ZombieVillagerController extends MobEntityController { Util.callCollisionEvent(npc, entity.getBukkitEntity()); } + @Override + public float cX() { + return NMS.getJumpPower(npc, super.cX()); + } + @Override public boolean d(NBTTagCompound save) { return npc == null ? super.d(save) : false; diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java index d20f0c76e..af40cda75 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java @@ -15,6 +15,7 @@ import net.citizensnpcs.nms.v1_15_R1.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; +import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.server.v1_15_R1.AxisAlignedBB; import net.minecraft.server.v1_15_R1.EntityArmorStand; @@ -101,6 +102,11 @@ public class ArmorStandController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java index 0dd6f03e4..12aff9c2c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java @@ -112,6 +112,11 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java index 5940592d0..f100f817e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java @@ -109,6 +109,11 @@ public class BeeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java index ba7fef897..b6cbd49fa 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java @@ -109,6 +109,11 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java index c7f8c0529..612c6bff6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java @@ -136,6 +136,11 @@ public class CatController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java index 44a966510..27e7b3791 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java @@ -126,6 +126,11 @@ public class CaveSpiderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java index 5c1322530..a82b441d0 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java @@ -136,6 +136,11 @@ public class ChickenController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java index 74e1706df..9492646b5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java @@ -148,6 +148,11 @@ public class CodController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java index 9d6e36e47..d513bc38f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java @@ -151,6 +151,11 @@ public class CowController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java index 0e5b910bc..96cd25528 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java @@ -128,6 +128,11 @@ public class CreeperController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java index 217e59ab0..642c0b07e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java @@ -57,6 +57,7 @@ public class DolphinController extends MobEntityController { private final CitizensNPC npc; private ControllerMove oldMoveController; + public EntityDolphinNPC(EntityTypes types, World world) { this(types, world, null); } @@ -142,6 +143,11 @@ public class DolphinController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java index 67263e02f..0db8dc92c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java @@ -125,6 +125,11 @@ public class DrownedController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java index 2bf0d69ee..a579df93d 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java @@ -127,6 +127,11 @@ public class EnderDragonController extends MobEntityController { return res; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java index 58e675c47..75f56653a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java @@ -133,6 +133,11 @@ public class EndermanController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java index 3bdeee228..7474241c9 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java @@ -125,6 +125,11 @@ public class EndermiteController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java index b9142b41a..b9e5dec19 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java @@ -120,6 +120,11 @@ public class EvokerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java index c05ec604d..6b317941c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java @@ -130,6 +130,11 @@ public class FoxController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java index 4fbf35f33..6d2398815 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java @@ -103,6 +103,11 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java index eed83481a..d173984b5 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java @@ -119,6 +119,11 @@ public class GiantController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java index 1d70525e5..6d21e024f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java @@ -120,6 +120,11 @@ public class GuardianController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java index 1498bd7a5..9c2c5df6b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java @@ -120,6 +120,11 @@ public class GuardianElderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java index 63fb6c50e..0326a91f0 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java @@ -59,6 +59,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityTypes types, World world) { this(types, world, null); } @@ -156,6 +157,11 @@ public class HorseController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public boolean dY() { return npc != null && npc.getNavigator().isNavigating() ? false : super.dY(); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java index ba3de9afd..2051a23f2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java @@ -57,6 +57,7 @@ public class HorseDonkeyController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseDonkeyNPC(EntityTypes types, World world) { this(types, world, null); @@ -154,6 +155,11 @@ public class HorseDonkeyController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public boolean dY() { return npc != null && npc.getNavigator().isNavigating() ? false : super.dY(); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java index 5c63ff367..d9d4876a4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java @@ -59,6 +59,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(EntityTypes types, World world) { this(types, world, null); } @@ -155,6 +156,11 @@ public class HorseMuleController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public boolean dY() { return npc != null && npc.getNavigator().isNavigating() ? false : super.dY(); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java index 6c546a6ae..71caf8605 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java @@ -59,6 +59,7 @@ public class HorseSkeletonController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseSkeletonNPC(EntityTypes types, World world) { this(types, world, null); } @@ -156,6 +157,11 @@ public class HorseSkeletonController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public boolean dY() { return npc != null && npc.getNavigator().isNavigating() ? false : super.dY(); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java index 5f3d6a992..1117ebc03 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java @@ -59,6 +59,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityTypes types, World world) { this(types, world, null); } @@ -156,6 +157,11 @@ public class HorseZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public boolean dY() { return npc != null && npc.getNavigator().isNavigating() ? false : super.dY(); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java index 5caf21e83..c3c5f3c81 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java @@ -120,6 +120,11 @@ public class IllusionerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java index 2c144e762..4e81ba050 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java @@ -119,6 +119,11 @@ public class IronGolemController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java index 982ce1db8..b6620cdae 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java @@ -57,6 +57,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityTypes types, World world) { this(types, world, null); @@ -154,6 +155,11 @@ public class LlamaController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java index 73de0a110..af983f748 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java @@ -129,6 +129,11 @@ public class MagmaCubeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java index 3d7ed0689..812ecd59b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java @@ -138,6 +138,11 @@ public class MushroomCowController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java index 57714e12f..b13c3b7b9 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java @@ -131,6 +131,11 @@ public class OcelotController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java index 008260f77..77c758b0f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java @@ -130,6 +130,11 @@ public class PandaController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java index c0bd5f5e8..60b6354a1 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java @@ -114,6 +114,11 @@ public class ParrotController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java index 43ffb2cdd..dd832b14f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java @@ -51,6 +51,7 @@ public class PhantomController extends MobEntityController { private ControllerLook oldLookController; private ControllerMove oldMoveController; + public EntityPhantomNPC(EntityTypes types, World world) { this(types, world, null); } @@ -132,6 +133,11 @@ public class PhantomController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java index 092d38640..4a7857783 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java @@ -131,6 +131,11 @@ public class PigController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public boolean dY() { // block carrot-on-a-stick behaviour diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java index ad27d2542..7406c62a6 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java @@ -119,6 +119,11 @@ public class PigZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java index ad882d29f..88bf4503f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java @@ -130,6 +130,11 @@ public class PillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java index ac65e1823..97a2c8a5b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java @@ -113,6 +113,11 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java index c308a16cf..9249222d4 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java @@ -154,6 +154,11 @@ public class PufferFishController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java index f18a64906..51c088161 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java @@ -131,6 +131,11 @@ public class RabbitController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java index bce33dd28..3c3b03494 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java @@ -130,6 +130,11 @@ public class RavagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java index 1dd0c1efd..3c0a5165a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java @@ -142,6 +142,11 @@ public class SalmonController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java index 43042d362..3afbc835c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java @@ -129,6 +129,11 @@ public class SheepController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java index 59fe07ed0..5a71cb602 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java @@ -120,6 +120,11 @@ public class ShulkerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java index 24ac51541..2549dab0a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java @@ -119,6 +119,11 @@ public class SilverfishController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java index a22642aef..7f341d50c 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java @@ -119,6 +119,11 @@ public class SkeletonController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java index 955cbd7e3..4de57e970 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java @@ -119,6 +119,11 @@ public class SkeletonStrayController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java index bddfbbc3f..92a43e51f 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java @@ -119,6 +119,11 @@ public class SkeletonWitherController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java index de15ea138..b44d80204 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java @@ -130,6 +130,11 @@ public class SlimeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java index d7b403494..aec372d22 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java @@ -119,6 +119,11 @@ public class SnowmanController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java index 7a3ebd04e..682467b45 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java @@ -119,6 +119,11 @@ public class SpiderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java index c26c17da6..8494dca61 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java @@ -119,6 +119,11 @@ public class SquidController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java index 1d90d5566..68edc812a 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java @@ -144,6 +144,11 @@ public class TraderLlamaController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java index 47eeb944d..0ff063bea 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java @@ -142,6 +142,11 @@ public class TropicalFishController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java index 82d05bcdb..a943957cc 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java @@ -52,6 +52,7 @@ public class TurtleController extends MobEntityController { private ControllerJump oldJumpController; private ControllerMove oldMoveController; + public EntityTurtleNPC(EntityTypes types, World world) { this(types, world, null); } @@ -132,6 +133,11 @@ public class TurtleController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java index 9b7740bbe..62ac47295 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java @@ -106,6 +106,11 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java index b105e322d..0d4f4f40e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java @@ -154,6 +154,11 @@ public class VillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java index c6efa837f..c30c2636b 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java @@ -130,6 +130,11 @@ public class VindicatorController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java index 4f9acbc77..049921d93 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java @@ -56,6 +56,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockTrades = true; private final CitizensNPC npc; + public EntityWanderingTraderNPC(EntityTypes types, World world) { this(types, world, null); } @@ -152,6 +153,11 @@ public class WanderingTraderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java index f27ab1ab0..44f5a5957 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java @@ -118,6 +118,11 @@ public class WitchController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java index 586f1c6e0..3bea9bbc2 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java @@ -102,6 +102,11 @@ public class WitherController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java index 0430eb291..d408ba2ed 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java @@ -132,6 +132,11 @@ public class WolfController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java index b1e878e1a..6c6061736 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java @@ -119,6 +119,11 @@ public class ZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java index f8ba785b6..ac3d801ea 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java @@ -119,6 +119,11 @@ public class ZombieHuskController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java index dc140f4fe..8548fafc3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java @@ -119,6 +119,11 @@ public class ZombieVillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dp() { + return NMS.getJumpPower(npc, super.dp()); + } + @Override public void e(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java index 435ca9206..774b0434e 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java @@ -56,6 +56,7 @@ public class BoatController extends MobEntityController { private float aq; private float as; private final CitizensNPC npc; + public EntityBoatNPC(EntityTypes types, World world) { this(types, world, null); } diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java index 146059641..4554bb25f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java @@ -112,6 +112,11 @@ public class BatController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java index 610478606..5149e0274 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java @@ -109,6 +109,11 @@ public class BeeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java index 2c0969a69..90539e4d6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java @@ -109,6 +109,11 @@ public class BlazeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java index 87968094f..1dde4bf8b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java @@ -136,6 +136,11 @@ public class CatController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java index 3ffe73157..2e9cca228 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java @@ -126,6 +126,11 @@ public class CaveSpiderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java index 08969742b..8d03b9af4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java @@ -136,6 +136,11 @@ public class ChickenController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java index 379cddd36..8dd814e35 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java @@ -149,6 +149,11 @@ public class CodController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java index 1ee235f8c..0aff8961a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java @@ -152,6 +152,11 @@ public class CowController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java index 9a65ede70..72ce8e2a6 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java @@ -129,6 +129,11 @@ public class CreeperController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java index f1107b557..b4624315e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java @@ -57,6 +57,7 @@ public class DolphinController extends MobEntityController { private final CitizensNPC npc; private ControllerMove oldMoveController; + public EntityDolphinNPC(EntityTypes types, World world) { this(types, world, null); } @@ -142,6 +143,11 @@ public class DolphinController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java index def0ac793..dbdbd0bbc 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java @@ -125,6 +125,11 @@ public class DrownedController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java index e8e0e4c92..73697a2b2 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java @@ -127,6 +127,11 @@ public class EnderDragonController extends MobEntityController { return res; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java index 08d1f0fc8..83df7a37b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java @@ -133,6 +133,11 @@ public class EndermanController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java index 8bd080dcc..528f9e1bb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java @@ -125,6 +125,11 @@ public class EndermiteController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java index b42f7e939..5033c278f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java @@ -120,6 +120,11 @@ public class EvokerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java index 207ee479c..12897b833 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java @@ -130,6 +130,11 @@ public class FoxController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java index 755f5dab9..3bb96dbdb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java @@ -103,6 +103,11 @@ public class GhastController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java index 7016fde2a..0f823b3dd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java @@ -119,6 +119,11 @@ public class GiantController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java index 790d3d025..b2c44fedb 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java @@ -120,6 +120,11 @@ public class GuardianController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java index 79a34aff8..4b441a754 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java @@ -120,6 +120,11 @@ public class GuardianElderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java index 0792ca954..50c6d406b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java @@ -119,6 +119,11 @@ public class HoglinController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java index 8ecae5b52..805322299 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java @@ -59,6 +59,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityTypes types, World world) { this(types, world, null); } @@ -156,6 +157,11 @@ public class HorseController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean er() { return npc != null && npc.getNavigator().isNavigating() ? false : super.er(); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java index ff04059e6..98f4d479d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java @@ -57,6 +57,7 @@ public class HorseDonkeyController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseDonkeyNPC(EntityTypes types, World world) { this(types, world, null); @@ -154,6 +155,11 @@ public class HorseDonkeyController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean er() { return npc != null && npc.getNavigator().isNavigating() ? false : super.er(); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java index 629cd5c3c..feadca506 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java @@ -59,6 +59,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(EntityTypes types, World world) { this(types, world, null); } @@ -155,6 +156,11 @@ public class HorseMuleController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean er() { return npc != null && npc.getNavigator().isNavigating() ? false : super.er(); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java index e9de1cf89..2b9fc3a48 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java @@ -59,6 +59,7 @@ public class HorseSkeletonController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseSkeletonNPC(EntityTypes types, World world) { this(types, world, null); } @@ -156,6 +157,11 @@ public class HorseSkeletonController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean er() { return npc != null && npc.getNavigator().isNavigating() ? false : super.er(); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java index 3f0b4314a..b431f6129 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java @@ -59,6 +59,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityTypes types, World world) { this(types, world, null); } @@ -156,6 +157,11 @@ public class HorseZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean er() { return npc != null && npc.getNavigator().isNavigating() ? false : super.er(); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java index 079aea0dd..e3dd782c9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java @@ -120,6 +120,11 @@ public class IllusionerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java index 2e7c32b84..ce8d0100b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java @@ -119,6 +119,11 @@ public class IronGolemController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java index ec8115c6d..d4031a17b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java @@ -57,6 +57,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityTypes types, World world) { this(types, world, null); @@ -154,6 +155,11 @@ public class LlamaController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java index fa936ef8e..94c057cc8 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java @@ -129,6 +129,11 @@ public class MagmaCubeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java index 04892182e..5bc8fd428 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java @@ -139,6 +139,11 @@ public class MushroomCowController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java index a5bb160fb..c7980ef01 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java @@ -131,6 +131,11 @@ public class OcelotController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java index 5f2190d87..1f44d2383 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java @@ -130,6 +130,11 @@ public class PandaController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java index d4ba0f493..5e1370de9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java @@ -115,6 +115,11 @@ public class ParrotController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java index 718c5f941..1078fe72d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java @@ -52,6 +52,7 @@ public class PhantomController extends MobEntityController { private ControllerLook oldLookController; private ControllerMove oldMoveController; + public EntityPhantomNPC(EntityTypes types, World world) { this(types, world, null); } @@ -142,6 +143,11 @@ public class PhantomController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean eG() { if (npc == null || !npc.isProtected()) diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java index f4ae50cbd..dc1bd1753 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java @@ -132,6 +132,11 @@ public class PigController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean er() { // block carrot-on-a-stick behaviour diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java index 9ae2b256d..5b1071189 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java @@ -119,6 +119,11 @@ public class PigZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java index bb1af6b51..846a2ebaa 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java @@ -119,6 +119,11 @@ public class PiglinBruteController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java index 54cd11b64..342ce910a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java @@ -119,6 +119,11 @@ public class PiglinController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java index e91aa9060..c145c1a92 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java @@ -130,6 +130,11 @@ public class PillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java index 9acd9dfc1..0126bee10 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java @@ -113,6 +113,11 @@ public class PolarBearController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java index ad965bd1f..663f7febf 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java @@ -155,6 +155,11 @@ public class PufferFishController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java index a9d1abd99..17deea70b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java @@ -131,6 +131,11 @@ public class RabbitController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java index 508722f56..bd585348b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java @@ -130,6 +130,11 @@ public class RavagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java index 573ffebbd..279476d0b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java @@ -143,6 +143,11 @@ public class SalmonController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java index c80756595..734eba81d 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java @@ -129,6 +129,11 @@ public class SheepController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java index 8437a018f..8252f4dd4 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java @@ -120,6 +120,11 @@ public class ShulkerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java index 2ef03bfd0..ef54fa11b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java @@ -119,6 +119,11 @@ public class SilverfishController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java index a67a883e2..61874ff0b 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java @@ -119,6 +119,11 @@ public class SkeletonController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java index 883206122..799548022 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java @@ -119,6 +119,11 @@ public class SkeletonStrayController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java index c53bf014b..e5c5048af 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java @@ -119,6 +119,11 @@ public class SkeletonWitherController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java index dabc35194..626ec4714 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java @@ -130,6 +130,11 @@ public class SlimeController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java index 8a08f279d..e0e5e3e3c 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java @@ -119,6 +119,11 @@ public class SnowmanController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java index e8f93c497..8dadd8d05 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java @@ -119,6 +119,11 @@ public class SpiderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java index 9fffb1875..e694a3b1f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java @@ -119,6 +119,11 @@ public class SquidController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java index e5bd5377a..fc1c0b108 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java @@ -119,6 +119,11 @@ public class StriderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java index cd8a79639..5cae7b934 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java @@ -144,6 +144,11 @@ public class TraderLlamaController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java index fceba4584..c79f827dd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java @@ -143,6 +143,11 @@ public class TropicalFishController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java index b97e01ecc..3b9099808 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java @@ -52,6 +52,7 @@ public class TurtleController extends MobEntityController { private ControllerJump oldJumpController; private ControllerMove oldMoveController; + public EntityTurtleNPC(EntityTypes types, World world) { this(types, world, null); } @@ -132,6 +133,11 @@ public class TurtleController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java index 107173eb8..db0036af9 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java @@ -106,6 +106,11 @@ public class VexController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java index 7baae934b..15574c283 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java @@ -156,6 +156,11 @@ public class VillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean eN() { if (blockingATrade) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java index 8071d4a71..f86b9f9c7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java @@ -130,6 +130,11 @@ public class VindicatorController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java index 3956f2190..32e4f6fc7 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java @@ -58,6 +58,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockTrades = true; private final CitizensNPC npc; + public EntityWanderingTraderNPC(EntityTypes types, World world) { this(types, world, null); } @@ -154,6 +155,11 @@ public class WanderingTraderController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public boolean eN() { if (blockingATrade) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java index 5eb8d4385..4a0bf073a 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java @@ -119,6 +119,11 @@ public class WitchController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java index 592b96bda..f6d170ecd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java @@ -102,6 +102,11 @@ public class WitherController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public CraftEntity getBukkitEntity() { if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java index 7da6ab973..df783a92f 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java @@ -132,6 +132,11 @@ public class WolfController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java index 8cf89e7fc..9b39778e0 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java @@ -119,6 +119,11 @@ public class ZoglinController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java index 4c48d9d4f..55d1cc960 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java @@ -119,6 +119,11 @@ public class ZombieController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java index 6f2196696..38f3e885e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java @@ -119,6 +119,11 @@ public class ZombieHuskController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java index 6d989226b..fd918b2d3 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java @@ -119,6 +119,11 @@ public class ZombieVillagerController extends MobEntityController { return npc == null ? super.d(save) : false; } + @Override + public float dJ() { + return NMS.getJumpPower(npc, super.dJ()); + } + @Override public void g(Vec3D vec3d) { if (npc == null || !npc.isFlyable()) { diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java index 2be1e6dfc..4f0b5dc3e 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java @@ -56,6 +56,7 @@ public class BoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityBoatNPC(EntityTypes types, World world) { this(types, world, null); } diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java index c23af3e30..d845d3914 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java @@ -131,6 +131,11 @@ public class AxolotlController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java index 731900acd..d046dbc23 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java @@ -111,6 +111,11 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java index df653ec65..e9a5ee05b 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java @@ -108,6 +108,11 @@ public class BeeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java index ce07615ee..399bb41de 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java @@ -103,6 +103,11 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java index 59f269e31..52d3b1a7d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java @@ -122,6 +122,11 @@ public class CatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java index bf444ae96..e85e79ca3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java @@ -121,6 +121,11 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java index 9cd7e6ea6..7e881b4e5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java @@ -130,6 +130,11 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java index 02ca06708..37a8ccb49 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java @@ -157,6 +157,11 @@ public class CodController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java index 83f8f2313..52648a812 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java @@ -127,6 +127,11 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java index e43fd3a2f..17b137671 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java @@ -125,6 +125,11 @@ public class CreeperController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java index eea361c97..ebdefb4b3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java @@ -56,6 +56,7 @@ public class DolphinController extends MobEntityController { private final CitizensNPC npc; private MoveControl oldMoveController; + public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -124,6 +125,11 @@ public class DolphinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java index 73aed005e..5b01638ba 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java @@ -121,6 +121,11 @@ public class DrownedController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java index 88ad93c10..a4306e616 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java @@ -185,6 +185,11 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java index 9acdb00d8..4d84eedc9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java @@ -128,6 +128,11 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java index 4a4eb218f..a964d246f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java @@ -121,6 +121,11 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java index c73b25284..1b59f1825 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java @@ -115,6 +115,11 @@ public class EvokerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java index 91853e167..94afef230 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java @@ -116,6 +116,11 @@ public class FoxController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java index 954437884..890ee8127 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java @@ -98,6 +98,11 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java index bc53b8686..a4816c310 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java @@ -115,6 +115,11 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java index 2ebb3b124..bb03c47b9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java @@ -115,6 +115,11 @@ public class GlowSquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java index a6f5a7dbd..c6c1baa55 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java @@ -116,6 +116,11 @@ public class GoatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java index ebe0ed08f..0b957d1e6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java @@ -121,6 +121,11 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java index 9f10baa37..48ee8a30f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java @@ -121,6 +121,11 @@ public class GuardianElderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java index f397f9aed..b924afdd3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java @@ -118,6 +118,11 @@ public class HoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java index 3652e3935..b9e7402a7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java @@ -58,6 +58,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityType types, Level level) { this(types, level, null); } @@ -154,6 +155,11 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java index 68296d671..2a9c56e81 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java @@ -56,6 +56,7 @@ public class HorseDonkeyController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseDonkeyNPC(EntityType types, Level level) { this(types, level, null); @@ -153,6 +154,11 @@ public class HorseDonkeyController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java index 84cfc64f2..2e6adc1fa 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java @@ -58,6 +58,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(EntityType types, Level level) { this(types, level, null); } @@ -154,6 +155,11 @@ public class HorseMuleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java index a16ab4877..a2d79cbde 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java @@ -58,6 +58,7 @@ public class HorseSkeletonController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseSkeletonNPC(EntityType types, Level level) { this(types, level, null); } @@ -154,6 +155,11 @@ public class HorseSkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java index f5c4ad51a..7e677de75 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java @@ -58,6 +58,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityType types, Level level) { this(types, level, null); } @@ -154,6 +155,11 @@ public class HorseZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java index ea190bfc5..a0f7746d4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java @@ -115,6 +115,11 @@ public class IllusionerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java index ed961efea..52c094074 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java @@ -115,6 +115,11 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java index 174735182..5edaa4ae4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java @@ -56,6 +56,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityType types, Level level) { this(types, level, null); @@ -148,6 +149,11 @@ public class LlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java index 67a3429d6..224953dba 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java @@ -116,6 +116,11 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java index a74e8267f..980bed118 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java @@ -119,6 +119,11 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java index 0861a4c31..59433ac27 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java @@ -122,6 +122,11 @@ public class OcelotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java index bb129c597..255a89ebd 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java @@ -116,6 +116,11 @@ public class PandaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java index c2f193382..478d55f0c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java @@ -105,6 +105,11 @@ public class ParrotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java index 941472f40..0991016d5 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java @@ -51,6 +51,7 @@ public class PhantomController extends MobEntityController { private LookControl oldLookController; private MoveControl oldMoveController; + public EntityPhantomNPC(EntityType types, Level level) { this(types, level, null); } @@ -140,6 +141,11 @@ public class PhantomController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java index 279c45781..b620d20bf 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java @@ -124,6 +124,11 @@ public class PigController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java index 7612ac10e..6d018ea81 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java @@ -115,6 +115,11 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java index 75e21bed2..03f5c2737 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java @@ -118,6 +118,11 @@ public class PiglinBruteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java index 20e4ea746..0d399258a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java @@ -118,6 +118,11 @@ public class PiglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java index c235cf0cb..a87cc77e4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java @@ -116,6 +116,11 @@ public class PillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java index 55ccd0d61..4a2fd62f3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java @@ -99,6 +99,11 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java index e969acf3b..844841e22 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java @@ -160,6 +160,11 @@ public class PufferFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java index b539b7981..fb5374ed4 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java @@ -120,6 +120,11 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java index 3cab6c3b6..5f6a38e94 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java @@ -116,6 +116,11 @@ public class RavagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java index 135bed17e..ad7ed3902 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java @@ -149,6 +149,11 @@ public class SalmonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java index ce4f6dad9..5e32520e3 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java @@ -116,6 +116,11 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java index 1df59ce59..cbb5f0c8d 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java @@ -119,6 +119,11 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java index 053fcd337..5e3e86119 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java @@ -115,6 +115,11 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java index 8cd1797d2..a47e75a5e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java @@ -115,6 +115,11 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java index c0647d1f0..020f35919 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java @@ -115,6 +115,11 @@ public class SkeletonStrayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java index 4cefbf522..814d37ff8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java @@ -115,6 +115,11 @@ public class SkeletonWitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java index 1e0c51c7f..5362be676 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java @@ -116,6 +116,11 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java index c7479c3d7..23fdf6b69 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java @@ -115,6 +115,11 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java index e1368ff69..5128980dc 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java @@ -115,6 +115,11 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java index f9442bc43..7787df1b6 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java @@ -115,6 +115,11 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java index 408be2251..b708470f7 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java @@ -115,6 +115,11 @@ public class StriderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java index d3193b33d..7a5649d18 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java @@ -134,6 +134,11 @@ public class TraderLlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java index 2bbfe6bdb..099ffdfc1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java @@ -151,6 +151,11 @@ public class TropicalFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java index df7ee400c..08a4e556e 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java @@ -51,6 +51,7 @@ public class TurtleController extends MobEntityController { private JumpControl oldJumpController; private MoveControl oldMoveController; + public EntityTurtleNPC(EntityType types, Level level) { this(types, level, null); } @@ -136,6 +137,11 @@ public class TurtleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java index aba229776..573dbead1 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java @@ -101,6 +101,11 @@ public class VexController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java index 3a2db280f..5bfa62b01 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java @@ -130,6 +130,11 @@ public class VillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java index ab0ac7a02..8aff8332c 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java @@ -116,6 +116,11 @@ public class VindicatorController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java index 64fdfdcf9..77357c561 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java @@ -54,6 +54,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockTrades = true; private final CitizensNPC npc; + public EntityWanderingTraderNPC(EntityType types, Level level) { this(types, level, null); } @@ -128,6 +129,11 @@ public class WanderingTraderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java index 1bdd71291..77d10a5fb 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java @@ -115,6 +115,11 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java index ff0163113..2a5f220ef 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java @@ -107,6 +107,11 @@ public class WitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java index 4acded100..bdeb5a3b8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java @@ -118,6 +118,11 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java index 3b550f513..6ce010334 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java @@ -117,6 +117,11 @@ public class ZoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java index a1025fb6a..eee144650 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java @@ -115,6 +115,11 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java index 487ad5375..35e21188f 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java @@ -115,6 +115,11 @@ public class ZombieHuskController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java index 56661366e..dc5372eca 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java @@ -115,6 +115,11 @@ public class ZombieVillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java index b115717c4..ec1b62cd9 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java @@ -56,6 +56,7 @@ public class BoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java index f80e5a1f8..98ddc0277 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java @@ -131,6 +131,11 @@ public class AxolotlController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java index 7972bf9ed..c0548e999 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java @@ -113,6 +113,11 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java index 986ad28d2..ae58050ca 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java @@ -110,6 +110,11 @@ public class BeeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java index 4c50b25db..c696c34c3 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java @@ -105,6 +105,11 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java index e2faa87c7..89fb7ad8b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java @@ -123,6 +123,11 @@ public class CatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java index 162f055c3..9f96b8ea7 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java @@ -122,6 +122,11 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java index 515902e8d..4f58fce87 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java @@ -131,6 +131,11 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java index f811467e4..2e00f99c8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java @@ -158,6 +158,11 @@ public class CodController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java index 0c86ecf4f..b24b0142a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java @@ -128,6 +128,11 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java index 890ef70ab..1579e2345 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java @@ -125,6 +125,11 @@ public class CreeperController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java index 4d2886f64..4124b56b4 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java @@ -56,6 +56,7 @@ public class DolphinController extends MobEntityController { private final CitizensNPC npc; private MoveControl oldMoveController; + public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -124,6 +125,11 @@ public class DolphinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java index a4b136ee3..0f808d1c6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java @@ -122,6 +122,11 @@ public class DrownedController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java index 7df9f5cb2..1c0a3fbe8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java @@ -187,6 +187,11 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java index dc1241b27..ab7f73fd8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java @@ -125,6 +125,11 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java index 6d90150b0..88e3c252d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java @@ -122,6 +122,11 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java index 13887c053..2c38adaea 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java @@ -116,6 +116,11 @@ public class EvokerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java index ec46b91dc..5c65d2793 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java @@ -117,6 +117,11 @@ public class FoxController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java index ae3e6ad65..a2aa11743 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java @@ -100,6 +100,11 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java index 27ec76341..fea128389 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java @@ -116,6 +116,11 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java index 906ab459a..b1be64e7b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java @@ -116,6 +116,11 @@ public class GlowSquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java index 3d5a8cea0..d822a2df2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java @@ -117,6 +117,11 @@ public class GoatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java index 0f7e86219..30b8e5841 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java @@ -122,6 +122,11 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java index 296488879..ea79decb6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java @@ -122,6 +122,11 @@ public class GuardianElderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java index c562d13ca..fe300e932 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java @@ -119,6 +119,11 @@ public class HoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java index 1a91ad633..f1c6b054a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java @@ -59,6 +59,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityType types, Level level) { this(types, level, null); } @@ -155,6 +156,11 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java index 510e241d6..86aad3ff6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java @@ -57,6 +57,7 @@ public class HorseDonkeyController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseDonkeyNPC(EntityType types, Level level) { this(types, level, null); @@ -154,6 +155,11 @@ public class HorseDonkeyController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java index 3dc1a0e02..8a0b5f710 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java @@ -59,6 +59,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(EntityType types, Level level) { this(types, level, null); } @@ -155,6 +156,11 @@ public class HorseMuleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java index ea2f3de55..7f4877ab8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java @@ -59,6 +59,7 @@ public class HorseSkeletonController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseSkeletonNPC(EntityType types, Level level) { this(types, level, null); } @@ -155,6 +156,11 @@ public class HorseSkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java index 70aca732e..1ae66d100 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java @@ -59,6 +59,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityType types, Level level) { this(types, level, null); } @@ -155,6 +156,11 @@ public class HorseZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java index 7926b0df4..cf0986ed0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java @@ -116,6 +116,11 @@ public class IllusionerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java index 0a474aacd..fea86e6c9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java @@ -116,6 +116,11 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java index 5574e0492..b2bfe88af 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java @@ -57,6 +57,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityType types, Level level) { this(types, level, null); @@ -149,6 +150,11 @@ public class LlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java index 858332b42..895055e1a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java @@ -117,6 +117,11 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java index 76d780824..b62fb2da6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java @@ -120,6 +120,11 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java index ccf6bd7cd..eed9c5be6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java @@ -123,6 +123,11 @@ public class OcelotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java index 713d6622d..8b7653acf 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java @@ -117,6 +117,11 @@ public class PandaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java index 965da49ba..727f525bc 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java @@ -107,6 +107,11 @@ public class ParrotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java index 03dca5cd9..0c4670711 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java @@ -52,6 +52,7 @@ public class PhantomController extends MobEntityController { private LookControl oldLookController; private MoveControl oldMoveController; + public EntityPhantomNPC(EntityType types, Level level) { this(types, level, null); } @@ -141,6 +142,11 @@ public class PhantomController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java index 4835e9baf..f09379e0c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java @@ -124,6 +124,11 @@ public class PigController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java index c21d32786..d00a4ff42 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java @@ -116,6 +116,11 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java index e815d0630..d9d1311a6 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java @@ -119,6 +119,11 @@ public class PiglinBruteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java index fb596674c..95341ee04 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java @@ -119,6 +119,11 @@ public class PiglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java index 786931fd2..a554d0765 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java @@ -117,6 +117,11 @@ public class PillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java index f82a6dc02..369fadc69 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java @@ -101,6 +101,11 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java index abccea6fa..e49d6e139 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java @@ -161,6 +161,11 @@ public class PufferFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java index 8804b4f55..6bc33bcd0 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java @@ -121,6 +121,11 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java index 4da9a0fb5..fc2b33e7a 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java @@ -122,6 +122,11 @@ public class RavagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java index 06b261d4d..8de51dafa 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java @@ -150,6 +150,11 @@ public class SalmonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java index 95ee05698..2f40adfc2 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java @@ -117,6 +117,11 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java index 856e055c0..40cabfdd9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java @@ -120,6 +120,11 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java index e25e76add..3b2e66dad 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java @@ -116,6 +116,11 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java index b9ae9d057..ffe2b5ef9 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java @@ -116,6 +116,11 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java index 13055ab9a..439641831 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java @@ -116,6 +116,11 @@ public class SkeletonStrayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java index 0d4bc4854..fa5951794 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java @@ -116,6 +116,11 @@ public class SkeletonWitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java index 7b16af623..b42c77b30 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java @@ -117,6 +117,11 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java index 2ad8e429b..79cd09b72 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java @@ -116,6 +116,11 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java index 80fc86b81..8764794ba 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java @@ -116,6 +116,11 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java index 1895e7c9c..73ba7476d 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java @@ -116,6 +116,11 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java index b896a83ec..e7cdd33e1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java @@ -116,6 +116,11 @@ public class StriderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java index 4fdb68b09..b82d93449 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java @@ -135,6 +135,11 @@ public class TraderLlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java index 62e0928b6..2f485d3ea 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java @@ -152,6 +152,11 @@ public class TropicalFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java index edcb1a5a0..2a6d66ff8 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java @@ -52,6 +52,7 @@ public class TurtleController extends MobEntityController { private JumpControl oldJumpController; private MoveControl oldMoveController; + public EntityTurtleNPC(EntityType types, Level level) { this(types, level, null); } @@ -137,6 +138,11 @@ public class TurtleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java index e384d1aa5..9bc84e7bb 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java @@ -103,6 +103,11 @@ public class VexController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java index e521d4b0f..d7d7a6454 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java @@ -130,6 +130,11 @@ public class VillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java index 16af7f436..478322a82 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java @@ -117,6 +117,11 @@ public class VindicatorController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java index c2d87f1e2..453aba04c 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java @@ -54,6 +54,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockTrades = true; private final CitizensNPC npc; + public EntityWanderingTraderNPC(EntityType types, Level level) { this(types, level, null); } @@ -128,6 +129,11 @@ public class WanderingTraderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java index 693b2f0a2..38a5eeb93 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java @@ -116,6 +116,11 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java index 591c73714..9e9cdfe35 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java @@ -109,6 +109,11 @@ public class WitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java index a314e11a0..769be943b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java @@ -119,6 +119,11 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java index 5850a752d..bf58adc6b 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java @@ -118,6 +118,11 @@ public class ZoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java index dc02edd09..047fae2b1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java @@ -116,6 +116,11 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java index 0bb952171..623649777 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java @@ -116,6 +116,11 @@ public class ZombieHuskController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java index 0f0d8cd34..08449c026 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java @@ -116,6 +116,11 @@ public class ZombieVillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java index 6fa4061a3..ad171a4fe 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java @@ -57,6 +57,7 @@ public class BoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java index 4db683c58..c88ed6389 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java @@ -62,6 +62,7 @@ public class AllayController extends MobEntityController { private final CitizensNPC npc; private int taskId = -1; + public EntityAllayNPC(EntityType types, Level level) { this(types, level, null); } @@ -133,6 +134,11 @@ public class AllayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java index 5c1ac12e6..04dd3689c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java @@ -132,6 +132,11 @@ public class AxolotlController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java index fb47e203b..58fbddef7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java @@ -113,6 +113,11 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java index a97dd11aa..c40d04814 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java @@ -110,6 +110,11 @@ public class BeeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java index f0b3e3427..3dfb8d836 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java @@ -105,6 +105,11 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java index 9a700381c..87617af45 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java @@ -64,6 +64,7 @@ public class CamelController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityCamelNPC(EntityType types, Level level) { this(types, level, null); @@ -156,6 +157,11 @@ public class CamelController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java index 9822938a0..112140325 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java @@ -124,6 +124,11 @@ public class CatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java index cfcc1e11d..0659a5dbd 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java @@ -123,6 +123,11 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java index 9720ad193..e54df1c0d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java @@ -132,6 +132,11 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java index 043c875b3..e3359dba7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java @@ -159,6 +159,11 @@ public class CodController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java index 88234db75..6a4c28dd9 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java @@ -129,6 +129,11 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java index 737168b9c..90a81c553 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java @@ -126,6 +126,11 @@ public class CreeperController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java index 550df4836..e56195e8e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java @@ -57,6 +57,7 @@ public class DolphinController extends MobEntityController { private final CitizensNPC npc; private MoveControl oldMoveController; + public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -125,6 +126,11 @@ public class DolphinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java index a26100771..298daa360 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java @@ -123,6 +123,11 @@ public class DrownedController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java index 330262960..35cc70d18 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java @@ -189,6 +189,11 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java index 43ba36df1..f9dbfa6bb 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java @@ -126,6 +126,11 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java index 9e336cb2a..c1d3cc0b0 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java @@ -123,6 +123,11 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java index 745222032..8c1950e01 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java @@ -117,6 +117,11 @@ public class EvokerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java index e9d4c9808..15323beeb 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java @@ -118,6 +118,11 @@ public class FoxController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java index 0efb855c3..b45f8f08c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java @@ -121,6 +121,11 @@ public class FrogController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java index 7ed9ccfd5..0357e1177 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java @@ -100,6 +100,11 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java index 08afd7fc3..180e562f2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java @@ -117,6 +117,11 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java index 9f0de55f5..3fb500bad 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java @@ -117,6 +117,11 @@ public class GlowSquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java index ba434080f..23ee3b8c6 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java @@ -118,6 +118,11 @@ public class GoatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java index 9a70ac393..a4d02ee85 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java @@ -123,6 +123,11 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java index 4b69c3dce..e754d8728 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java @@ -123,6 +123,11 @@ public class GuardianElderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java index 172636b2f..2b21308ed 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java @@ -123,6 +123,11 @@ public class HoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java index f3c5e1a88..bbf9ec27b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java @@ -60,6 +60,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +152,11 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java index 78596bd63..223e74267 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java @@ -58,6 +58,7 @@ public class HorseDonkeyController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseDonkeyNPC(EntityType types, Level level) { this(types, level, null); @@ -150,6 +151,11 @@ public class HorseDonkeyController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java index 76ed7ebe3..63e3ac52c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java @@ -60,6 +60,7 @@ public class HorseMuleController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseMuleNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +152,11 @@ public class HorseMuleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java index 9ee5f6cb4..d047efc80 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java @@ -60,6 +60,7 @@ public class HorseSkeletonController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseSkeletonNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +152,11 @@ public class HorseSkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java index 1786fdbd1..96b1e75f7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java @@ -60,6 +60,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +152,11 @@ public class HorseZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java index ca355c8db..55a309f65 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java @@ -117,6 +117,11 @@ public class IllusionerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java index b9f47c165..ae61e61f1 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java @@ -117,6 +117,11 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java index a6a8d9d71..fc1f397a6 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java @@ -58,6 +58,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityType types, Level level) { this(types, level, null); @@ -150,6 +151,11 @@ public class LlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java index 69132491e..7186de5f8 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java @@ -118,6 +118,11 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java index 2f43dfdec..d4edfa340 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java @@ -121,6 +121,11 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java index 56fb833c3..4f2562896 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java @@ -124,6 +124,11 @@ public class OcelotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java index 61d230e40..c1f77d178 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java @@ -118,6 +118,11 @@ public class PandaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java index d491a5aab..df4d075af 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java @@ -107,6 +107,11 @@ public class ParrotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java index 1c1e226f2..8cf80e0c0 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java @@ -53,6 +53,7 @@ public class PhantomController extends MobEntityController { private LookControl oldLookController; private MoveControl oldMoveController; + public EntityPhantomNPC(EntityType types, Level level) { this(types, level, null); } @@ -142,6 +143,11 @@ public class PhantomController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java index 13236336a..3db8468ee 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java @@ -119,6 +119,11 @@ public class PigController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java index 00b730af8..69cc75bee 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java @@ -117,6 +117,11 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java index 54cd7681d..da5ae4a3e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java @@ -120,6 +120,11 @@ public class PiglinBruteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java index 3a0960914..78d61e6a1 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java @@ -120,6 +120,11 @@ public class PiglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java index 62037231e..88a154a2f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java @@ -118,6 +118,11 @@ public class PillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java index 1aa14f6bc..b45088bd7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java @@ -101,6 +101,11 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java index 23bf3216f..9f593944e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java @@ -162,6 +162,11 @@ public class PufferFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java index c59bb65d6..deef91f52 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java @@ -122,6 +122,11 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java index 1078e9953..62082d3e4 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java @@ -118,6 +118,11 @@ public class RavagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java index a7301255c..79975290b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java @@ -151,6 +151,11 @@ public class SalmonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java index 28e3db124..a4641b71c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java @@ -118,6 +118,11 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java index 894880e8f..8354c4423 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java @@ -121,6 +121,11 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java index 7b943c5c3..2f43c302b 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java @@ -117,6 +117,11 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java index 5ec64a9da..10ea2715e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java @@ -117,6 +117,11 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java index 0301f8010..66397cbe4 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java @@ -117,6 +117,11 @@ public class SkeletonStrayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java index 071cc3c91..7dacaa9d7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java @@ -117,6 +117,11 @@ public class SkeletonWitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java index 5cfd7e3b9..847edccf8 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java @@ -118,6 +118,11 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java index faf76cc04..5ea462ce4 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java @@ -123,6 +123,11 @@ public class SnifferController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java index f88a75883..fe782fb14 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java @@ -117,6 +117,11 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java index b11ead798..597b9d443 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java @@ -117,6 +117,11 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java index ccd34844f..5af23bbe2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java @@ -117,6 +117,11 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java index 044e7c8f6..2b593f227 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java @@ -117,6 +117,11 @@ public class StriderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java index d68320bb9..4a829662c 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java @@ -151,6 +151,11 @@ public class TadpoleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java index 8d3b46f00..fa1423e4d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java @@ -136,6 +136,11 @@ public class TraderLlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java index 0f3fa5dac..72e2ee723 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java @@ -153,6 +153,11 @@ public class TropicalFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java index 067465236..19a9bd90a 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java @@ -53,6 +53,7 @@ public class TurtleController extends MobEntityController { private JumpControl oldJumpController; private MoveControl oldMoveController; + public EntityTurtleNPC(EntityType types, Level level) { this(types, level, null); } @@ -138,6 +139,11 @@ public class TurtleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java index 8d0aa9a6a..e1423e50d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java @@ -103,6 +103,11 @@ public class VexController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java index 097f153b1..4ed46aa20 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java @@ -54,6 +54,7 @@ public class VillagerController extends MobEntityController { private boolean blockingATrade; private final CitizensNPC npc; + public EntityVillagerNPC(EntityType types, Level level) { this(types, level, null); } @@ -133,6 +134,11 @@ public class VillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java index ce5f4a75b..5990796f3 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java @@ -118,6 +118,11 @@ public class VindicatorController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java index 459d7a86c..a94231e7e 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java @@ -55,6 +55,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockTrades = true; private final CitizensNPC npc; + public EntityWanderingTraderNPC(EntityType types, Level level) { this(types, level, null); } @@ -129,6 +130,11 @@ public class WanderingTraderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java index 9c89b02d1..a1891080d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java @@ -124,6 +124,11 @@ public class WardenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java index 1c8a6160b..7e1ee82bc 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java @@ -117,6 +117,11 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java index b79f5848e..c105f8077 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java @@ -109,6 +109,11 @@ public class WitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java index 553d56069..26eff3542 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java @@ -120,6 +120,11 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java index 17c6df925..890829de3 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java @@ -119,6 +119,11 @@ public class ZoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java index a179edb8a..68858bcdd 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java @@ -117,6 +117,11 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java index d998585ab..7fd8a830f 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java @@ -117,6 +117,11 @@ public class ZombieHuskController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java index e224c14eb..7793fc1c7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java @@ -117,6 +117,11 @@ public class ZombieVillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java index 6e29cfcb5..bf4fb51da 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java @@ -58,6 +58,7 @@ public class BoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java index 44afc3461..98c220886 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java @@ -59,6 +59,7 @@ public class ChestBoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityChestBoatNPC(EntityType types, Level level) { this(types, level, null); } diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java index 438177914..7580af54f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java @@ -19,7 +19,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket; import net.minecraft.server.level.ServerLevel; @@ -62,6 +61,7 @@ public class AllayController extends MobEntityController { private final CitizensNPC npc; private int taskId = -1; + public EntityAllayNPC(EntityType types, Level level) { this(types, level, null); } @@ -133,6 +133,11 @@ public class AllayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java index 50ec91c71..85c4aaf9a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java index b2a826fcb..82d2f2f7a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -132,6 +131,11 @@ public class AxolotlController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java index a84c7f719..4836c876b 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -113,6 +112,11 @@ public class BatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java index 133a533f5..915f2bf36 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -110,6 +109,11 @@ public class BeeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java index b87ff3852..091a46472 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -105,6 +104,11 @@ public class BlazeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java index 26e1dfc5d..a1e6d1de9 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -64,6 +63,7 @@ public class CamelController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityCamelNPC(EntityType types, Level level) { this(types, level, null); @@ -156,6 +156,11 @@ public class CamelController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java index 705b49bfe..961ac4286 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -124,6 +123,11 @@ public class CatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java index 8b6972c08..e50c07a60 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -123,6 +122,11 @@ public class CaveSpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java index afc68a388..2c2e8e650 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -132,6 +131,11 @@ public class ChickenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java index 93a2bbe16..53b87bcd6 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -159,6 +158,11 @@ public class CodController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java index f033f77ce..796cee22c 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -129,6 +128,11 @@ public class CowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java index 61c3d14b8..21b9293c0 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -52,8 +51,8 @@ public class CreeperController extends MobEntityController { public static class EntityCreeperNPC extends Creeper implements NPCHolder { private boolean allowPowered; - private final CitizensNPC npc; + private final CitizensNPC npc; public EntityCreeperNPC(EntityType types, Level level) { this(types, level, null); } @@ -125,6 +124,11 @@ public class CreeperController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java index e03f9eb3f..970156e80 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -57,6 +56,7 @@ public class DolphinController extends MobEntityController { private final CitizensNPC npc; private MoveControl oldMoveController; + public EntityDolphinNPC(EntityType types, Level level) { this(types, level, null); } @@ -125,6 +125,11 @@ public class DolphinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java index 7b15c0be9..6e0611523 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -123,6 +122,11 @@ public class DrownedController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java index eeb6fda56..863f1b58e 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java @@ -185,6 +185,11 @@ public class EnderDragonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java index 53c1e880f..2f41d8673 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -126,6 +125,11 @@ public class EndermanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java index 3db8118c3..d5de6c584 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -123,6 +122,11 @@ public class EndermiteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java index 004a21757..ca9a5fa98 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class EvokerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java index 33d4a6948..8c618c461 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class FoxController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java index 0873b18e0..1e63e74a6 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -121,6 +120,11 @@ public class FrogController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java index b059c7dfd..8ceda28d7 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -100,6 +99,11 @@ public class GhastController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java index 2bee4dce2..8a836d635 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class GiantController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java index c29f28089..6a55537d9 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class GlowSquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java index 1b24e9b29..559833eed 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class GoatController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java index 8353a650d..9cedad6de 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -123,6 +122,11 @@ public class GuardianController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java index b3e6a6f54..2af2d2fe6 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java @@ -122,6 +122,11 @@ public class GuardianElderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java index 73a5384e9..9ad3cb94a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -123,6 +122,11 @@ public class HoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java index 56fc76250..cf6d3d412 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -60,6 +59,7 @@ public class HorseController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +151,11 @@ public class HorseController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java index 17c687b10..994b8d43d 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -60,6 +59,7 @@ public class HorseDonkeyController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseDonkeyNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +151,11 @@ public class HorseDonkeyController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java index 6b5e364cf..b5554647b 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -58,6 +57,7 @@ public class HorseMuleController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityHorseMuleNPC(EntityType types, Level level) { this(types, level, null); @@ -150,6 +150,11 @@ public class HorseMuleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java index 88dfbd64d..ee425be1a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -56,9 +55,9 @@ public class HorseSkeletonController extends MobEntityController { public static class EntityHorseSkeletonNPC extends SkeletonHorse implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseSkeletonNPC(EntityType types, Level level) { this(types, level, null); } @@ -150,6 +149,11 @@ public class HorseSkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java index 700c3fb3d..aa065c65d 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -60,6 +59,7 @@ public class HorseZombieController extends MobEntityController { private final CitizensNPC npc; private boolean riding; + public EntityHorseZombieNPC(EntityType types, Level level) { this(types, level, null); } @@ -151,6 +151,11 @@ public class HorseZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java index 805ace668..49f1fb5f1 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class IllusionerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java index d88495785..48a2db674 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class IronGolemController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java index 860734d76..034da36e9 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java @@ -18,7 +18,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -58,6 +57,7 @@ public class LlamaController extends MobEntityController { private double baseMovementSpeed; private final CitizensNPC npc; + private boolean riding; public EntityLlamaNPC(EntityType types, Level level) { this(types, level, null); @@ -150,6 +150,11 @@ public class LlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java index e00f61c57..1be20deca 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -118,6 +117,11 @@ public class MagmaCubeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java index d7863444b..f7f98f429 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -121,6 +120,11 @@ public class MushroomCowController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java index 8da5bd5ba..8c5c221bd 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -124,6 +123,11 @@ public class OcelotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java index 5eaf2c00a..18634bda0 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class PandaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java index 64315c69b..1635e45e2 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -107,6 +106,11 @@ public class ParrotController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java index e6e657784..b504a9434 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -53,6 +52,7 @@ public class PhantomController extends MobEntityController { private LookControl oldLookController; private MoveControl oldMoveController; + public EntityPhantomNPC(EntityType types, Level level) { this(types, level, null); } @@ -142,6 +142,11 @@ public class PhantomController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java index e86cfeb49..3e4fb880f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -119,6 +118,11 @@ public class PigController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java index 067b34ea9..8a4ff4b1b 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class PigZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java index 2ba33efe0..78a092d26 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -120,6 +119,11 @@ public class PiglinBruteController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java index fe335b6c7..56021256d 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -120,6 +119,11 @@ public class PiglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java index f17a695e2..e8feadc19 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class PillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java index 1ab24ee57..784992a32 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -101,6 +100,11 @@ public class PolarBearController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java index 52b6e1b96..d6648bdc8 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.trait.versioned.PufferFishTrait; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -162,6 +161,11 @@ public class PufferFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java index d7ae550f6..b3b5f8561 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java @@ -121,6 +121,11 @@ public class RabbitController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java index ad14131c3..1cc6d1dd0 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class RavagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java index ab523f106..5e562f127 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -151,6 +150,11 @@ public class SalmonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java index 737a41928..4e8eab2d0 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class SheepController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java index ce1d2496a..f04bbd7b9 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java @@ -120,6 +120,11 @@ public class ShulkerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java index ddda89b5a..727594be3 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SilverfishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java index 88667bee4..a08970d0e 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SkeletonController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java index 508409ee5..c1c38b022 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SkeletonStrayController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java index 73779b9da..71adfe089 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SkeletonWitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java index 0ea6a9909..641800e77 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java @@ -47,8 +47,8 @@ public class SlimeController extends MobEntityController { public static class EntitySlimeNPC extends Slime implements NPCHolder { private final CitizensNPC npc; - private MoveControl oldMoveController; + private MoveControl oldMoveController; public EntitySlimeNPC(EntityType types, Level level) { this(types, level, null); } @@ -116,6 +116,11 @@ public class SlimeController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java index 17efae144..6d1dcaa5d 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -123,6 +122,11 @@ public class SnifferController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java index ea2214b54..46b05a427 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SnowmanController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java index 10020af9a..4edb1de3b 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SpiderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java index 693dcccb4..b3d950150 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class SquidController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java index 0fb39b12a..e475c1800 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class StriderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java index 02d3c5da1..32a04df2c 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -151,6 +150,11 @@ public class TadpoleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java index f019fb512..84f1f0c7f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.trait.HorseModifiers; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -136,6 +135,11 @@ public class TraderLlamaController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java index 3ab1e28fd..aa79fa7aa 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -153,6 +152,11 @@ public class TropicalFishController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java index 7d5b698ee..16ef7d271 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -53,6 +52,7 @@ public class TurtleController extends MobEntityController { private JumpControl oldJumpController; private MoveControl oldMoveController; + public EntityTurtleNPC(EntityType types, Level level) { this(types, level, null); } @@ -138,6 +138,11 @@ public class TurtleController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java index fdd19c7fd..a001b2604 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -103,6 +102,11 @@ public class VexController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java index 3b98ca62f..3c81e11b0 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -54,6 +53,7 @@ public class VillagerController extends MobEntityController { private boolean blockingATrade; private final CitizensNPC npc; + public EntityVillagerNPC(EntityType types, Level level) { this(types, level, null); } @@ -133,6 +133,11 @@ public class VillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java index e2537a494..9984206cb 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -118,6 +117,11 @@ public class VindicatorController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java index 61176857f..7aae31b27 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -55,6 +54,7 @@ public class WanderingTraderController extends MobEntityController { private boolean blockTrades = true; private final CitizensNPC npc; + public EntityWanderingTraderNPC(EntityType types, Level level) { this(types, level, null); } @@ -129,6 +129,11 @@ public class WanderingTraderController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java index 9b58fd797..21c53fdd6 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java @@ -124,6 +124,11 @@ public class WardenController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java index 226632855..312ed916a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class WitchController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java index 99d8d7292..3a5d5fe4b 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -109,6 +108,11 @@ public class WitherController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java index a0f56ab52..16eaa10ed 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.server.level.ServerLevel; @@ -120,6 +119,11 @@ public class WolfController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java index 0ef4b3314..aef8876d1 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -119,6 +118,11 @@ public class ZoglinController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java index 55b97342e..724f084b4 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class ZombieController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java index f9d1ffa8d..f02e9f2ae 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class ZombieHuskController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java index d55f79a4d..ccfdcbf42 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -117,6 +116,11 @@ public class ZombieVillagerController extends MobEntityController { return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.Metadata.HURT_SOUND); } + @Override + public float getJumpPower() { + return NMS.getJumpPower(npc, super.getJumpPower()); + } + @Override public int getMaxFallDistance() { return NMS.getFallDistance(npc, super.getMaxFallDistance()); diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java index 500420ca5..25b3e4d42 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java index 90ca7045c..5876f332a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -58,6 +57,7 @@ public class BoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityBoatNPC(EntityType types, Level level) { this(types, level, null); } diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java index e3bbbeafc..46261b87f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -59,6 +58,7 @@ public class ChestBoatController extends MobEntityController { private double ap; private double ar; private final CitizensNPC npc; + public EntityChestBoatNPC(EntityType types, Level level) { this(types, level, null); } diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java index 89022334a..cc44b7713 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java index d867069f9..b43a91363 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java index 2f893d247..d60d518e3 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java index cd083df5d..9e0772d47 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java index 24b890ad2..69d97e6e5 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java index 5921ece9b..ce97bfa8f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java index 0d0e677ab..2771b591e 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java index 524c1f511..b84a04eb3 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java index 23db45cd1..869ebd40a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java index f0639d196..85ed28e86 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java index 977db0575..0a036cf9a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java index 2b6176094..9efc4688f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java index 2f00a0f8d..e8ee13f65 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java @@ -17,7 +17,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java index d09604e19..eb3f3ae5c 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java index 592e8130e..23d7575d8 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java index 969a71516..22f2a1269 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java index 423e31302..df3860599 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java @@ -16,7 +16,6 @@ import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java index 50679959f..de684ce0a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java index c60d1a711..f8363341f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java index de973e8a2..2aa4ec765 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java index cbe23c19e..66309eaaa 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java index de4a97aff..9b49aab0a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java @@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java index 56ec6a2fc..30ed83313 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java index 6ddd7f5e4..b6e692c9e 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java @@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java index 134c116b9..620248ace 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java @@ -10,7 +10,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java index 2ff83a073..41ea47094 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java index 5b913fb2b..56183a4a8 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java index b3196cf0f..a2a638619 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java index c68ee0629..c188308b4 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java index 61ad8ef85..ebebc5ecf 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java index c23024224..45039126f 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java index c3a2dcd7e..50770397b 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java index d83a89685..f263556d6 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java index ec51e1ea6..5c2cd90b1 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java index 22dca2a73..11459a0eb 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java @@ -15,7 +15,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java index 0c8a82be0..ef3f0b74a 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java index c2843cb37..948da24c6 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_20_R2.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; import net.citizensnpcs.util.Util; - import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.TagKey; diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java index b60373090..8848a462e 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java @@ -476,7 +476,7 @@ public class NMSImpl implements NMSBridge { t.printStackTrace(); } } - }; + } @Override @SuppressWarnings("rawtypes") @@ -1724,7 +1724,7 @@ public class NMSImpl implements NMSBridge { ENTITY_REGISTRY_SETTER.invoke(null, ENTITY_REGISTRY.get()); } catch (Throwable e) { } - }; + } @Override public void sleep(org.bukkit.entity.Player player, boolean sleeping) { diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java index 31fb003d3..de2fa1edb 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java @@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_8_R3.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_8_R3.util.NMSImpl; import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.ai.NPCHolder; -import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.Util; import net.minecraft.server.v1_8_R3.AxisAlignedBB; import net.minecraft.server.v1_8_R3.EntityArmorStand; @@ -90,8 +89,6 @@ public class ArmorStandController extends MobEntityController { return npc == null ? super.d(save) : false; } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java index 27e7d6cb3..871e41e6c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java @@ -75,6 +75,11 @@ public class BatController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java index db436b10e..542b3a381 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java @@ -72,6 +72,11 @@ public class BlazeController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -116,8 +121,6 @@ public class BlazeController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java index b82b6eedd..8ff705c25 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java @@ -81,6 +81,11 @@ public class CaveSpiderController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -133,8 +138,6 @@ public class CaveSpiderController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java index 32d2dd6ba..389ff364e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java @@ -90,6 +90,11 @@ public class ChickenController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -142,8 +147,6 @@ public class ChickenController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java index 0e7ae8d1e..8019c6627 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java @@ -105,6 +105,11 @@ public class CowController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -157,8 +162,6 @@ public class CowController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java index 3d3014959..866abf78f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java @@ -90,6 +90,11 @@ public class CreeperController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -149,8 +154,6 @@ public class CreeperController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java index d6bd5f3c8..da4a45e60 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java @@ -77,6 +77,11 @@ public class EnderDragonController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java index fec180e8f..fd8a42872 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java @@ -81,6 +81,11 @@ public class EndermanController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -132,8 +137,6 @@ public class EndermanController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java index d39f866c5..25325d7d0 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java @@ -81,6 +81,11 @@ public class EndermiteController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -131,8 +136,6 @@ public class EndermiteController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java index 3338fed6d..da2ff5e5f 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java @@ -58,6 +58,11 @@ public class GhastController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override public boolean bM() { return npc != null; @@ -108,8 +113,6 @@ public class GhastController extends MobEntityController { super.E(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java index 344739553..26ded2653 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java @@ -67,6 +67,11 @@ public class GiantController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -118,8 +123,6 @@ public class GiantController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java index 58f5e70a5..9516367ac 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java @@ -67,6 +67,11 @@ public class GuardianController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -111,8 +116,6 @@ public class GuardianController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java index ac913a9ea..aaf7e789c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java @@ -46,9 +46,9 @@ public class HorseController extends MobEntityController { public static class EntityHorseNPC extends EntityHorse implements NPCHolder { private double baseMovementSpeed; + private final CitizensNPC npc; private boolean riding; - public EntityHorseNPC(World world) { this(world, null); } @@ -94,6 +94,11 @@ public class HorseController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java index 6dc6a2daf..8ff63aece 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java @@ -67,6 +67,11 @@ public class IronGolemController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -118,8 +123,6 @@ public class IronGolemController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java index f82eeca74..1a49ef4c5 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java @@ -73,6 +73,11 @@ public class MagmaCubeController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -123,8 +128,6 @@ public class MagmaCubeController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java index d67c8bd30..1ee8db575 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java @@ -84,6 +84,11 @@ public class MushroomCowController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -134,8 +139,6 @@ public class MushroomCowController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java index 02a3cf85b..1362a41f4 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java @@ -76,6 +76,11 @@ public class OcelotController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -133,8 +138,6 @@ public class OcelotController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java index ea7686c88..cc3cb74c1 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java @@ -77,6 +77,11 @@ public class PigController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -137,8 +142,6 @@ public class PigController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java index b31eb0378..7c876a576 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java @@ -67,6 +67,11 @@ public class PigZombieController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -117,8 +122,6 @@ public class PigZombieController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java index 585aa8a2d..8a6810476 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java @@ -77,6 +77,11 @@ public class RabbitController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -132,8 +137,6 @@ public class RabbitController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java index b012a5464..d3153d22c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java @@ -76,6 +76,11 @@ public class SheepController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -126,8 +131,6 @@ public class SheepController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java index bdbdcd1f4..12a49170e 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java @@ -67,6 +67,11 @@ public class SilverfishController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -117,8 +122,6 @@ public class SilverfishController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java index 4d3ece522..a9c1ddf82 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java @@ -67,6 +67,11 @@ public class SkeletonController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -118,8 +123,6 @@ public class SkeletonController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java index 54b04b544..46598bfc5 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java @@ -73,6 +73,11 @@ public class SlimeController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -124,8 +129,6 @@ public class SlimeController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java index 2210c54b4..34cb9f7e1 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java @@ -67,6 +67,11 @@ public class SnowmanController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -118,8 +123,6 @@ public class SnowmanController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java index 583b91707..cb9a74284 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java @@ -67,6 +67,11 @@ public class SpiderController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -117,8 +122,6 @@ public class SpiderController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java index 6c1999171..fb102df99 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java @@ -67,6 +67,11 @@ public class SquidController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -110,8 +115,6 @@ public class SquidController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java index 3f3e6ffce..ee533152d 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java @@ -88,6 +88,11 @@ public class VillagerController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -149,8 +154,6 @@ public class VillagerController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java index 7bcf63c2a..3bcd4d155 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java @@ -67,6 +67,11 @@ public class WitchController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -117,8 +122,6 @@ public class WitchController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java index 6e7630bcf..d71da093b 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java @@ -58,6 +58,11 @@ public class WitherController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -109,8 +114,6 @@ public class WitherController extends MobEntityController { npc.update(); } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java index a17c6e84a..64697da56 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java @@ -78,6 +78,11 @@ public class WolfController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -130,8 +135,6 @@ public class WolfController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z); diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java index 36e88b6ee..1c86fda5a 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java @@ -67,6 +67,11 @@ public class ZombieController extends MobEntityController { return NMS.getFallDistance(npc, super.aE()); } + @Override + public float bE() { + return NMS.getJumpPower(npc, super.bE()); + } + @Override protected String bo() { return NMSImpl.getSoundEffect(npc, super.bo(), NPC.Metadata.HURT_SOUND); @@ -118,8 +123,6 @@ public class ZombieController extends MobEntityController { } } - - @Override public void g(double x, double y, double z) { Vector vector = Util.callPushEvent(npc, x, y, z);